diff options
88 files changed, 75 insertions, 1065 deletions
diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps Binary files differindex b282309..1dd70c6 100644 --- a/cmake-build-release/.ninja_deps +++ b/cmake-build-release/.ninja_deps diff --git a/cmake-build-release/.ninja_log b/cmake-build-release/.ninja_log index 05a15b7..0536d40 100644 --- a/cmake-build-release/.ninja_log +++ b/cmake-build-release/.ninja_log @@ -1,101 +1,37 @@ # ninja log v5 -154 260 1702447781315410879 projects_ray 45fbfe11691b47a4 -39 1392 1702447466513612837 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1991 2750 1702446595544090623 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 -1839 2530 1702446595324513579 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 -675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb -1692 2383 1702446595176643525 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 -1278 2008 1702446594802049344 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 -1759 2452 1702446595244689767 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 -6 36 1702447781092833495 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -41 777 1702447518128546572 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 -43 702 1702447733820987971 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda -38 1198 1702447670100699535 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 -2008 2351 1702446595146034010 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 -757 1692 1702446594485292649 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 -435 675 1702446593470170245 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51 -436 757 1702446593552201990 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 -2351 3149 1702446595943941675 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 -40 153 1702447781208318596 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4 -434 1369 1702446594162602358 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba -1494 2174 1702446594966067875 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 -437 1140 1702446593933045264 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 -434 1494 1702446594287021479 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c -434 1237 1702446594030720700 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 -2383 3031 1702446595825027072 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e -6 36 1702447781092833495 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -437 1278 1702446594071361222 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 -1369 2042 1702446594835637032 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 -6 36 1702447781092833495 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 34 1702449218043095899 projects_ray_autogen/timestamp 55fca76aac650d2f 2174 2962 1702446595756054008 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b -6 36 1702447781092833495 projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702447876162640983 projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702447876162640983 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 36 1702447876162640983 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702447876162640983 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +6 34 1702449218043095899 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +1369 2042 1702446594835637032 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 +437 1278 1702446594071361222 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 +6 34 1702449218043095899 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +2383 3031 1702446595825027072 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e +434 1237 1702446594030720700 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +434 1494 1702446594287021479 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c +437 1140 1702446593933045264 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +1494 2174 1702446594966067875 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 +2351 3149 1702446595943941675 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 40 161 1702447876286034325 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4 +434 1369 1702446594162602358 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +436 757 1702446593552201990 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 +435 675 1702446593470170245 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51 +757 1692 1702446594485292649 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 39 370 1702447876494799413 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 -370 483 1702447876607801960 projects_ray 45fbfe11691b47a4 -7 36 1702447916659752703 projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702447916659752703 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 36 1702447916659752703 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702447916659752703 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 748 1702447917368247128 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda -748 858 1702447917479893607 projects_ray 45fbfe11691b47a4 -7 35 1702448001491012178 projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448001491012178 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 35 1702448001491012178 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448001491012178 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 733 1702448002185128979 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda -39 755 1702448002207572799 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 39 1214 1702448002665166546 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 -1214 1320 1702448002774601344 projects_ray 45fbfe11691b47a4 -7 35 1702448120988874182 projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448120988874182 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 35 1702448120988874182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448120988874182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 708 1702448121658543104 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 -708 815 1702448121767005954 projects_ray 45fbfe11691b47a4 -6 34 1702448235479913482 projects_ray_autogen/timestamp 55fca76aac650d2f -6 34 1702448235479913482 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -6 34 1702448235479913482 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -6 34 1702448235479913482 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +39 733 1702448002185128979 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda 38 759 1702448236200489389 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 -38 1419 1702448236859769517 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1419 1530 1702448236974515960 projects_ray 45fbfe11691b47a4 -7 36 1702448417410612702 projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702448417410612702 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 36 1702448417410612702 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702448417410612702 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 1382 1702448418751854474 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1382 1489 1702448418861828677 projects_ray 45fbfe11691b47a4 -7 34 1702448478936101300 projects_ray_autogen/timestamp 55fca76aac650d2f -7 34 1702448478936101300 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 34 1702448478936101300 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 34 1702448478936101300 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -38 1368 1702448480265570567 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1368 1476 1702448480376740774 projects_ray 45fbfe11691b47a4 -7 35 1702448673408163296 projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448673408163296 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 35 1702448673408163296 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 35 1702448673408163296 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 1377 1702448674744974068 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1377 1484 1702448674855052237 projects_ray 45fbfe11691b47a4 -7 36 1702448731330339182 projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702448731330339182 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 36 1702448731330339182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 36 1702448731330339182 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 1383 1702448732673030331 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1383 1487 1702448732780397288 projects_ray 45fbfe11691b47a4 -6 35 1702448805865948465 projects_ray_autogen/timestamp 55fca76aac650d2f -6 35 1702448805865948465 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -6 35 1702448805865948465 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -6 35 1702448805865948465 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -39 1360 1702448807186145761 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1360 1469 1702448807298618522 projects_ray 45fbfe11691b47a4 -7 34 1702448878474139565 projects_ray_autogen/timestamp 55fca76aac650d2f -7 34 1702448878474139565 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -7 34 1702448878474139565 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f -7 34 1702448878474139565 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f -38 1337 1702448879772065006 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc -1337 1444 1702448879882062135 projects_ray 45fbfe11691b47a4 +6 34 1702449218043095899 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +1388 1493 1702449219500349612 projects_ray 45fbfe11691b47a4 +1759 2452 1702446595244689767 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +1692 2383 1702446595176643525 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb +1839 2530 1702446595324513579 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +1278 2008 1702446594802049344 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +1991 2750 1702446595544090623 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +38 1388 1702449219392412871 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +7 34 1702449311248367705 projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702449311248367705 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 34 1702449311248367705 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 34 1702449311248367705 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +38 1376 1702449312584870357 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +1376 1487 1702449312699120051 projects_ray 45fbfe11691b47a4 diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index 0500d4b..6b7e648 100644 --- a/cmake-build-release/Testing/Temporary/LastTest.log +++ b/cmake-build-release/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 13 01:29 EST +Start testing: Dec 13 01:35 EST ---------------------------------------------------------- -End testing: Dec 13 01:29 EST +End testing: Dec 13 01:35 EST diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray Binary files differindex bb364be..bbcd585 100755 --- a/cmake-build-release/projects_ray +++ b/cmake-build-release/projects_ray diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index 12e9138..1615bca 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -45,34 +45,29 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) for (int imageRow = 0; imageRow < scene.height(); imageRow++) { for (int imageCol = 0; imageCol < scene.width(); imageCol++) { // FIXME: for now, use height as depth - for (int imageDepth = 0; imageDepth < scene.depth(); imageDepth++) { - // compute the ray - float x = (imageCol - scene.width()/2.f) * viewplaneWidth / scene.width(); - float y = (imageRow - scene.height()/2.f) * viewplaneHeight / scene.height(); - float z = (imageDepth - scene.depth()/2.f) * viewplaneDepth / scene.depth(); - - glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); - glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix()); - // get the pixel color - glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); - - if (pixelColor.r > 0) { - std::cout << "pixelColor.r: " << pixelColor.r << ", x" << imageCol << ", y" << imageRow << ", z" << imageDepth << std::endl; - } - - // set the pixel color - if (imageDepth == 250) - { - int index = imageRow * scene.width() + imageCol; - imageData[index] = RGBA{ - (std::uint8_t) (pixelColor.r * 255.f), - (std::uint8_t) (pixelColor.g * 255.f), - (std::uint8_t) (pixelColor.b * 255.f), - (std::uint8_t) (pixelColor.a * 255.f) - }; - } - + int imageDepth = (int) ((settings.w + 100.f) * (5.f / 2.f)); + // compute the ray + float x = (imageCol - scene.width()/2.f) * viewplaneWidth / scene.width(); + float y = (imageRow - scene.height()/2.f) * viewplaneHeight / scene.height(); + float z = (imageDepth - scene.depth()/2.f) * viewplaneDepth / scene.depth(); + + glm::vec4 pWorld = Vec4Ops::transformPoint4(glm::vec4(0.f), camera.getViewMatrix(), camera.getTranslationVector()); + glm::vec4 dWorld = Vec4Ops::transformDir4(glm::vec4(x, y, z, -1.0), camera.getViewMatrix()); + // get the pixel color + glm::vec4 pixelColor = getPixelFromRay(pWorld, dWorld, scene, 0); + + if (pixelColor.r > 0) { + std::cout << "pixelColor.r: " << pixelColor.r << ", x" << imageCol << ", y" << imageRow << ", z" << imageDepth << std::endl; } + + // set the pixel color + int index = imageRow * scene.width() + imageCol; + imageData[index] = RGBA{ + (std::uint8_t) (pixelColor.r * 255.f), + (std::uint8_t) (pixelColor.g * 255.f), + (std::uint8_t) (pixelColor.b * 255.f), + (std::uint8_t) (pixelColor.a * 255.f) + }; } } QList<RGBA> pixels = QtConcurrent::blockingMapped(l, pixelRoutine); diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 449a04a..f831f82 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -68,7 +68,17 @@ void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) { } } } - settings.rotation += 0.5f; + + if (settings.bulkOutputFilePath.size() > 0) { // means we are doing bulk rendering + // save the image to the bulk directory + std::string filePath = settings.bulkOutputFilePath + QDir::separator().toLatin1() + std::to_string(settings.currentTime) + ".png"; + saveViewportImage(filePath); + if (settings.currentTime < settings.maxTime) { // still more to render + // render the next frame + settings.currentTime++; + emit settingsChanged(m_imageLabel); // emit to allow the UI to update then render the next frame + } + } } @@ -197,6 +207,7 @@ void RayTracer::settingsChanged(QLabel* imageLabel) { QImage image = QImage(576, 432, QImage::Format_RGBX8888); image.fill(Qt::black); RGBA *data = reinterpret_cast<RGBA *>(image.bits()); + m_imageData = data; imageLabel->setPixmap(QPixmap::fromImage(image)); return; } @@ -288,3 +299,7 @@ void RayTracer::keyReleaseEvent(QKeyEvent *event) { m_keyMap[Qt::Key(event->key())] = false; } +void RayTracer::saveViewportImage(std::string filePath) { + QImage image = QImage((uchar *) m_imageData, 576, 432, QImage::Format_RGBX8888); + image.save(QString::fromStdString(filePath)); +} diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h index cf32a99..da4ec2d 100644 --- a/src/raytracer/raytracer.h +++ b/src/raytracer/raytracer.h @@ -177,6 +177,7 @@ public: int m_depth; QImage m_image; + void saveViewportImage(std::string filename); signals: void xyRotationChanged(float value); void xzRotationChanged(float value); diff --git a/src/settings.h b/src/settings.h index 1d9e358..0865e44 100644 --- a/src/settings.h +++ b/src/settings.h @@ -15,6 +15,9 @@ struct Settings { float rotation = 0.f; bool negative = false; float w = 0.f; + int currentTime = 0; + int maxTime = 0; + std::string bulkOutputFilePath; }; diff --git a/student_outputs/illuminate/.DS_Store b/student_outputs/illuminate/.DS_Store Binary files differdeleted file mode 100644 index 5105f22..0000000 --- a/student_outputs/illuminate/.DS_Store +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/bvh.png b/student_outputs/illuminate/extra-credit/bvh.png Binary files differdeleted file mode 100644 index a435f15..0000000 --- a/student_outputs/illuminate/extra-credit/bvh.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/dof.png b/student_outputs/illuminate/extra-credit/dof.png Binary files differdeleted file mode 100644 index c7e4838..0000000 --- a/student_outputs/illuminate/extra-credit/dof.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png b/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png Binary files differdeleted file mode 100644 index 0d21a89..0000000 --- a/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png b/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png Binary files differdeleted file mode 100644 index 9784fcf..0000000 --- a/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/refract1.png b/student_outputs/illuminate/extra-credit/refract1.png Binary files differdeleted file mode 100644 index 13ae49a..0000000 --- a/student_outputs/illuminate/extra-credit/refract1.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/refract2.png b/student_outputs/illuminate/extra-credit/refract2.png Binary files differdeleted file mode 100644 index 8aafc1e..0000000 --- a/student_outputs/illuminate/extra-credit/refract2.png +++ /dev/null diff --git a/student_outputs/illuminate/extra-credit/snowman.json b/student_outputs/illuminate/extra-credit/snowman.json deleted file mode 100644 index cde5954..0000000 --- a/student_outputs/illuminate/extra-credit/snowman.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "name": "root", - "globalData": { - "ambientCoeff": 0.5, - "diffuseCoeff": 0.5, - "specularCoeff": 0.5, - "transparentCoeff": 0 - }, - "cameraData": { - "position": [6.0, -2.0, 1.0], - "up": [0.0, 0.5, 0.0], - "focus": [0, 0, 0], - "heightAngle": 45.0 - }, - "groups": [ - { - "lights": [ - { - "type": "directional", - "color": [0.99, 0.99, 0.99], - "direction": [-2.0, -0.25, -0.5] - } - ] - }, - { - "groups": [ - { - "translate": [-0.0, -1.0, 0.0], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.99, 0.99, 0.99], - "specular": [1.0, 1.0, 1.0], - "shininess": 15.0 - } - ] - }, - { - "translate": [0.0, 0.0, 0.0], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.99, 0.99, 0.99], - "specular": [0.5, 0.5, 0.5], - "shininess": 30.0 - } - ] - }, - { - "translate": [0.0, -2.0, 0.0], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.99, 0.99, 0.99], - "specular": [1.0, 1.0, 1.0], - "shininess": 9.0 - } - ] - }, - { - "scale": [0.1, 0.1, 0.1], - "translate": [0.458, 0.167, 0.083], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.01, 0.01, 0.99], - "specular": [0.55, 1.05, 0.55], - "shininess": 100.0 - } - ] - }, - { - "scale": [0.1, 0.1, 0.1], - "translate": [0.458, 0.167, -0.083], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.01, 0.01, 0.99], - "specular": [0.55, 1.05, 0.55], - "shininess": 100.0 - } - ] - }, - { - "translate": [0.5, 0.0, 0.0], - "rotate": [0.0, 0.0, 1.0, -90.0], - "scale": [0.3, 0.3, 0.3], - "primitives": [ - { - "type": "cone", - "ambient": [0.75, 0.33, 0.01], - "diffuse": [0.99, 0.5, 0.01], - "specular": [0.55, 1.05, 0.55], - "shininess": 100.0 - } - ] - }, - { - "translate": [0.458, -0.167, 0.0], - "rotate": [0.0, 0.0, 1.0, -90], - "rotate": [0.0, 0.0, 1.0, -19.47], - "scale": [0.1, 0.075, 0.166], - "primitives": [ - { - "type": "cube", - "ambient": [0.0, 0.25, 0.0], - "diffuse": [0.01, 0.99, 0.01], - "specular": [0.55, 1.05, 0.55], - "shininess": 100.0 - } - ] - }, - { - "translate": [0.0, 0.5, 0.0], - "scale": [0.4, 0.4, 0.4], - "primitives": [ - { - "type": "cone", - "ambient": [1.0, 1.0, 1.0], - "diffuse": [1.0, 1.0, 1.0], - "specular": [1.0, 1.0, 1.0], - "shininess": 10.0 - } - ] - } - ] - } - ] -} diff --git a/student_outputs/illuminate/extra-credit/soft_shadow.json b/student_outputs/illuminate/extra-credit/soft_shadow.json deleted file mode 100644 index 472f0ea..0000000 --- a/student_outputs/illuminate/extra-credit/soft_shadow.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "name": "root", - "globalData": { - "ambientCoeff": 0.5, - "diffuseCoeff": 0.5, - "specularCoeff": 0.5, - "transparentCoeff": 0 - }, - "cameraData": { - "position": [-6.0, 4.0, 4.0], - "up": [0.0, 1.0, 0.0], - "focus": [0, 0, 0], - "heightAngle": 30.0 - }, - "groups": [ - { - "translate": [0.0, 6.0, 0.0], - "lights": [ - { - "type": "point", - "color": [1.0, 1.0, 1.0], - "attenuationCoeff": [0, 0, 0] - } - ] - }, - { - "translate": [0.0, 0.0, 100.0], - "lights": [ - { - "type": "area", - "width": 5.0, - "height": 5.0, - "color": [0.3, 0.3, 0.3], - "attenuationCoeff": [1.0, 0, 0] - } - ] - }, - { - "groups": [ - { - "translate": [-0.65, 0.0, 0.65], - "primitives": [ - { - "type": "cylinder", - "diffuse": [0.8, 0.6, 0.6], - "specular": [1.0, 1.0, 1.0], - "shininess": 15.0 - } - ] - }, - { - "translate": [-0.65, 0.0, -0.65], - "primitives": [ - { - "type": "cone", - "diffuse": [0.6, 0.6, 0.8], - "specular": [1.0, 1.0, 1.0], - "shininess": 15.0 - } - ] - }, - { - "translate": [0.65, 0.0, -0.65], - "primitives": [ - { - "type": "sphere", - "diffuse": [0.6, 0.8, 0.6], - "specular": [1.0, 1.0, 1.0], - "shininess": 15.0 - } - ] - }, - { - "translate": [0.65, 0.0, 0.65], - "primitives": [ - { - "type": "cube", - "diffuse": [0.7, 0.7, 0.7], - "specular": [1.0, 1.0, 1.0], - "shininess": 15.0 - } - ] - }, - { - "translate": [0.0, -0.6, 0.0], - "scale": [6.0, 0.1, 6.0], - "primitives": [ - { - "type": "cube", - "diffuse": [0.1, 0.4, 0.8] - } - ] - } - ] - } - ] -} diff --git a/student_outputs/illuminate/extra-credit/soft_shadow.png b/student_outputs/illuminate/extra-credit/soft_shadow.png Binary files differdeleted file mode 100644 index 54de18e..0000000 --- a/student_outputs/illuminate/extra-credit/soft_shadow.png +++ /dev/null diff --git a/student_outputs/illuminate/required/README.md b/student_outputs/illuminate/required/README.md deleted file mode 100644 index 103ebed..0000000 --- a/student_outputs/illuminate/required/README.md +++ /dev/null @@ -1 +0,0 @@ -Required output for Illuminate goes here!
\ No newline at end of file diff --git a/student_outputs/illuminate/required/point_light_1.png b/student_outputs/illuminate/required/point_light_1.png Binary files differdeleted file mode 100644 index ea6dbca..0000000 --- a/student_outputs/illuminate/required/point_light_1.png +++ /dev/null diff --git a/student_outputs/illuminate/required/point_light_2.png b/student_outputs/illuminate/required/point_light_2.png Binary files differdeleted file mode 100644 index ac56878..0000000 --- a/student_outputs/illuminate/required/point_light_2.png +++ /dev/null diff --git a/student_outputs/illuminate/required/reflections_basic.png b/student_outputs/illuminate/required/reflections_basic.png Binary files differdeleted file mode 100644 index 001b2d4..0000000 --- a/student_outputs/illuminate/required/reflections_basic.png +++ /dev/null diff --git a/student_outputs/illuminate/required/reflections_complex.png b/student_outputs/illuminate/required/reflections_complex.png Binary files differdeleted file mode 100644 index 6639db9..0000000 --- a/student_outputs/illuminate/required/reflections_complex.png +++ /dev/null diff --git a/student_outputs/illuminate/required/refract1.png b/student_outputs/illuminate/required/refract1.png Binary files differdeleted file mode 100644 index 13ae49a..0000000 --- a/student_outputs/illuminate/required/refract1.png +++ /dev/null diff --git a/student_outputs/illuminate/required/shadow_special_case.png b/student_outputs/illuminate/required/shadow_special_case.png Binary files differdeleted file mode 100644 index bedb1c3..0000000 --- a/student_outputs/illuminate/required/shadow_special_case.png +++ /dev/null diff --git a/student_outputs/illuminate/required/shadow_test.png b/student_outputs/illuminate/required/shadow_test.png Binary files differdeleted file mode 100644 index 5ec2fc2..0000000 --- a/student_outputs/illuminate/required/shadow_test.png +++ /dev/null diff --git a/student_outputs/illuminate/required/simple_shadow.png b/student_outputs/illuminate/required/simple_shadow.png Binary files differdeleted file mode 100644 index 1dd0c71..0000000 --- a/student_outputs/illuminate/required/simple_shadow.png +++ /dev/null diff --git a/student_outputs/illuminate/required/spot_light_1.png b/student_outputs/illuminate/required/spot_light_1.png Binary files differdeleted file mode 100644 index 2d3b220..0000000 --- a/student_outputs/illuminate/required/spot_light_1.png +++ /dev/null diff --git a/student_outputs/illuminate/required/spot_light_2.png b/student_outputs/illuminate/required/spot_light_2.png Binary files differdeleted file mode 100644 index 97ce328..0000000 --- a/student_outputs/illuminate/required/spot_light_2.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cone.png b/student_outputs/illuminate/required/texture_cone.png Binary files differdeleted file mode 100644 index ec4caf1..0000000 --- a/student_outputs/illuminate/required/texture_cone.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cone2.png b/student_outputs/illuminate/required/texture_cone2.png Binary files differdeleted file mode 100644 index 39c8245..0000000 --- a/student_outputs/illuminate/required/texture_cone2.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cube.png b/student_outputs/illuminate/required/texture_cube.png Binary files differdeleted file mode 100644 index dbbebe3..0000000 --- a/student_outputs/illuminate/required/texture_cube.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cube2.png b/student_outputs/illuminate/required/texture_cube2.png Binary files differdeleted file mode 100644 index 019e22a..0000000 --- a/student_outputs/illuminate/required/texture_cube2.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cyl.png b/student_outputs/illuminate/required/texture_cyl.png Binary files differdeleted file mode 100644 index 8934c56..0000000 --- a/student_outputs/illuminate/required/texture_cyl.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_cyl2.png b/student_outputs/illuminate/required/texture_cyl2.png Binary files differdeleted file mode 100644 index 9d17ccc..0000000 --- a/student_outputs/illuminate/required/texture_cyl2.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_sphere.png b/student_outputs/illuminate/required/texture_sphere.png Binary files differdeleted file mode 100644 index 465ea40..0000000 --- a/student_outputs/illuminate/required/texture_sphere.png +++ /dev/null diff --git a/student_outputs/illuminate/required/texture_sphere2.png b/student_outputs/illuminate/required/texture_sphere2.png Binary files differdeleted file mode 100644 index 349a27b..0000000 --- a/student_outputs/illuminate/required/texture_sphere2.png +++ /dev/null diff --git a/student_outputs/intersect/.DS_Store b/student_outputs/intersect/.DS_Store Binary files differdeleted file mode 100644 index 72f41c1..0000000 --- a/student_outputs/intersect/.DS_Store +++ /dev/null diff --git a/student_outputs/intersect/required/README.md b/student_outputs/intersect/required/README.md deleted file mode 100644 index 0664aff..0000000 --- a/student_outputs/intersect/required/README.md +++ /dev/null @@ -1 +0,0 @@ -Required output for Intersect goes here!
\ No newline at end of file diff --git a/student_outputs/intersect/required/ambient_total.png b/student_outputs/intersect/required/ambient_total.png Binary files differdeleted file mode 100644 index d4351b3..0000000 --- a/student_outputs/intersect/required/ambient_total.png +++ /dev/null diff --git a/student_outputs/intersect/required/diffuse_total.png b/student_outputs/intersect/required/diffuse_total.png Binary files differdeleted file mode 100644 index 3615af9..0000000 --- a/student_outputs/intersect/required/diffuse_total.png +++ /dev/null diff --git a/student_outputs/intersect/required/diffuse_total_my_normals.png b/student_outputs/intersect/required/diffuse_total_my_normals.png Binary files differdeleted file mode 100644 index de0eed6..0000000 --- a/student_outputs/intersect/required/diffuse_total_my_normals.png +++ /dev/null diff --git a/student_outputs/intersect/required/directional_light_1.png b/student_outputs/intersect/required/directional_light_1.png Binary files differdeleted file mode 100644 index b2ef957..0000000 --- a/student_outputs/intersect/required/directional_light_1.png +++ /dev/null diff --git a/student_outputs/intersect/required/directional_light_2.png b/student_outputs/intersect/required/directional_light_2.png Binary files differdeleted file mode 100644 index d1ab492..0000000 --- a/student_outputs/intersect/required/directional_light_2.png +++ /dev/null diff --git a/student_outputs/intersect/required/parse_matrix.png b/student_outputs/intersect/required/parse_matrix.png Binary files differdeleted file mode 100644 index b69aaa8..0000000 --- a/student_outputs/intersect/required/parse_matrix.png +++ /dev/null diff --git a/student_outputs/intersect/required/phong_total.png b/student_outputs/intersect/required/phong_total.png Binary files differdeleted file mode 100644 index 2104a08..0000000 --- a/student_outputs/intersect/required/phong_total.png +++ /dev/null diff --git a/student_outputs/intersect/required/specular_total.png b/student_outputs/intersect/required/specular_total.png Binary files differdeleted file mode 100644 index 4d033ba..0000000 --- a/student_outputs/intersect/required/specular_total.png +++ /dev/null diff --git a/student_outputs/intersect/required/unit_cone.png b/student_outputs/intersect/required/unit_cone.png Binary files differdeleted file mode 100644 index 566afa7..0000000 --- a/student_outputs/intersect/required/unit_cone.png +++ /dev/null diff --git a/student_outputs/intersect/required/unit_cone_cap.png b/student_outputs/intersect/required/unit_cone_cap.png Binary files differdeleted file mode 100644 index 2716453..0000000 --- a/student_outputs/intersect/required/unit_cone_cap.png +++ /dev/null diff --git a/student_outputs/intersect/required/unit_cube.png b/student_outputs/intersect/required/unit_cube.png Binary files differdeleted file mode 100644 index 4e8f004..0000000 --- a/student_outputs/intersect/required/unit_cube.png +++ /dev/null diff --git a/student_outputs/intersect/required/unit_cylinder.png b/student_outputs/intersect/required/unit_cylinder.png Binary files differdeleted file mode 100644 index 3a56ce0..0000000 --- a/student_outputs/intersect/required/unit_cylinder.png +++ /dev/null diff --git a/student_outputs/intersect/required/unit_sphere.png b/student_outputs/intersect/required/unit_sphere.png Binary files differdeleted file mode 100644 index d15f658..0000000 --- a/student_outputs/intersect/required/unit_sphere.png +++ /dev/null diff --git a/template_inis/.DS_Store b/template_inis/.DS_Store Binary files differdeleted file mode 100644 index 2b8d023..0000000 --- a/template_inis/.DS_Store +++ /dev/null diff --git a/template_inis/illuminate/dof.ini b/template_inis/illuminate/dof.ini deleted file mode 100644 index 97e6f7b..0000000 --- a/template_inis/illuminate/dof.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/extra_credit/depth_of_field.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/dof.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = true - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = true - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/point_light_1.ini b/template_inis/illuminate/point_light_1.ini deleted file mode 100644 index 0f80bb7..0000000 --- a/template_inis/illuminate/point_light_1.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/point_light/point_light_1.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/point_light_1.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/point_light_2.ini b/template_inis/illuminate/point_light_2.ini deleted file mode 100644 index 3e02177..0000000 --- a/template_inis/illuminate/point_light_2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/point_light/point_light_2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/point_light_2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = true - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/recursive.ini b/template_inis/illuminate/recursive.ini deleted file mode 100644 index 71d6698..0000000 --- a/template_inis/illuminate/recursive.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/optional/recursive_sphere_5.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/recursive.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = true - texture = true - parallel = true - super-sample = false - num-samples = 1 - post-process = false - acceleration = true - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/reflections_basic.ini b/template_inis/illuminate/reflections_basic.ini deleted file mode 100644 index c3b6485..0000000 --- a/template_inis/illuminate/reflections_basic.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/reflection/reflections_basic.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/reflections_basic.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4 diff --git a/template_inis/illuminate/reflections_complex.ini b/template_inis/illuminate/reflections_complex.ini deleted file mode 100644 index 2e50aeb..0000000 --- a/template_inis/illuminate/reflections_complex.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/reflection/reflections_complex.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/reflections_complex.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/refract1.ini b/template_inis/illuminate/refract1.ini deleted file mode 100644 index 66915b9..0000000 --- a/template_inis/illuminate/refract1.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/extra_credit/refract1.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/refract1.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = true - texture = true - parallel = true - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/refract2.ini b/template_inis/illuminate/refract2.ini deleted file mode 100644 index 37fb194..0000000 --- a/template_inis/illuminate/refract2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/extra_credit/refract2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/refract2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = true - texture = true - parallel = true - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/shadow_special_case.ini b/template_inis/illuminate/shadow_special_case.ini deleted file mode 100644 index cc8eb67..0000000 --- a/template_inis/illuminate/shadow_special_case.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/shadow/shadow_special_case.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/shadow_special_case.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/shadow_test.ini b/template_inis/illuminate/shadow_test.ini deleted file mode 100644 index 52368bb..0000000 --- a/template_inis/illuminate/shadow_test.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/shadow/shadow_test.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/shadow_test.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = true - super-sample = false - num-samples = 1 - post-process = false - acceleration = true - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/simple_shadow.ini b/template_inis/illuminate/simple_shadow.ini deleted file mode 100644 index 626e69a..0000000 --- a/template_inis/illuminate/simple_shadow.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/shadow/simple_shadow.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/simple_shadow.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/soft_shadow.ini b/template_inis/illuminate/soft_shadow.ini deleted file mode 100644 index bac50a0..0000000 --- a/template_inis/illuminate/soft_shadow.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/extra_credit/soft_shadow.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/soft_shadow.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/spheres.ini b/template_inis/illuminate/spheres.ini deleted file mode 100644 index e69de29..0000000 --- a/template_inis/illuminate/spheres.ini +++ /dev/null diff --git a/template_inis/illuminate/spot_light_1.ini b/template_inis/illuminate/spot_light_1.ini deleted file mode 100644 index 59ba1e4..0000000 --- a/template_inis/illuminate/spot_light_1.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/spot_light/spot_light_1.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/spot_light_1.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/spot_light_2.ini b/template_inis/illuminate/spot_light_2.ini deleted file mode 100644 index fd91f8a..0000000 --- a/template_inis/illuminate/spot_light_2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/spot_light/spot_light_2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/spot_light_2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cone.ini b/template_inis/illuminate/texture_cone.ini deleted file mode 100644 index 138a25c..0000000 --- a/template_inis/illuminate/texture_cone.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cone.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cone.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cone2.ini b/template_inis/illuminate/texture_cone2.ini deleted file mode 100644 index 2a88223..0000000 --- a/template_inis/illuminate/texture_cone2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cone2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cone2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cube.ini b/template_inis/illuminate/texture_cube.ini deleted file mode 100644 index 2713bbb..0000000 --- a/template_inis/illuminate/texture_cube.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cube.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cube.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cube2.ini b/template_inis/illuminate/texture_cube2.ini deleted file mode 100644 index 6296540..0000000 --- a/template_inis/illuminate/texture_cube2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cube2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cube2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cyl.ini b/template_inis/illuminate/texture_cyl.ini deleted file mode 100644 index ca2e1fc..0000000 --- a/template_inis/illuminate/texture_cyl.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cyl.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cyl.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_cyl2.ini b/template_inis/illuminate/texture_cyl2.ini deleted file mode 100644 index 3c7a3eb..0000000 --- a/template_inis/illuminate/texture_cyl2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_cyl2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_cyl2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_sphere.ini b/template_inis/illuminate/texture_sphere.ini deleted file mode 100644 index e99a3b7..0000000 --- a/template_inis/illuminate/texture_sphere.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_sphere.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_sphere.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/illuminate/texture_sphere2.ini b/template_inis/illuminate/texture_sphere2.ini deleted file mode 100644 index 51659dc..0000000 --- a/template_inis/illuminate/texture_sphere2.ini +++ /dev/null @@ -1,22 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/illuminate/required/texture_tests/texture_sphere2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/illuminate/required/texture_sphere2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = true - reflect = true - refract = false - texture = true - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false - -[Settings] - maximum-recursive-depth = 4
\ No newline at end of file diff --git a/template_inis/intersect/ambient_total.ini b/template_inis/intersect/ambient_total.ini deleted file mode 100644 index 7480706..0000000 --- a/template_inis/intersect/ambient_total.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/ambient_total.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/ambient_total.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/diffuse_total.ini b/template_inis/intersect/diffuse_total.ini deleted file mode 100644 index 6628465..0000000 --- a/template_inis/intersect/diffuse_total.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/diffuse_total.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/diffuse_total.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/directional_light_1.ini b/template_inis/intersect/directional_light_1.ini deleted file mode 100644 index e269dbe..0000000 --- a/template_inis/intersect/directional_light_1.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/directional_light_1.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/directional_light_1.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/directional_light_2.ini b/template_inis/intersect/directional_light_2.ini deleted file mode 100644 index a7c3712..0000000 --- a/template_inis/intersect/directional_light_2.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/directional_light_2.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/directional_light_2.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/parse_matrix.ini b/template_inis/intersect/parse_matrix.ini deleted file mode 100644 index 291fa69..0000000 --- a/template_inis/intersect/parse_matrix.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/parse_matrix.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/parse_matrix.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/phong_total.ini b/template_inis/intersect/phong_total.ini deleted file mode 100644 index 1e71e55..0000000 --- a/template_inis/intersect/phong_total.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/phong_total.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/phong_total.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/specular_total.ini b/template_inis/intersect/specular_total.ini deleted file mode 100644 index 89d0eae..0000000 --- a/template_inis/intersect/specular_total.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/specular_total.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/specular_total.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/unit_cone.ini b/template_inis/intersect/unit_cone.ini deleted file mode 100644 index e51efe4..0000000 --- a/template_inis/intersect/unit_cone.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/unit_cone.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/unit_cone.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/unit_cone_cap.ini b/template_inis/intersect/unit_cone_cap.ini deleted file mode 100644 index 9ee2fd7..0000000 --- a/template_inis/intersect/unit_cone_cap.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/unit_cone_cap.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/unit_cone_cap.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/unit_cube.ini b/template_inis/intersect/unit_cube.ini deleted file mode 100644 index c7d177a..0000000 --- a/template_inis/intersect/unit_cube.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/unit_cube.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/unit_cube.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/unit_cylinder.ini b/template_inis/intersect/unit_cylinder.ini deleted file mode 100644 index 7bc5c4e..0000000 --- a/template_inis/intersect/unit_cylinder.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/unit_cylinder.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/unit_cylinder.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false diff --git a/template_inis/intersect/unit_sphere.ini b/template_inis/intersect/unit_sphere.ini deleted file mode 100644 index 158f77f..0000000 --- a/template_inis/intersect/unit_sphere.ini +++ /dev/null @@ -1,19 +0,0 @@ -[IO] - scene = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/scenefiles/intersect/required/unit_sphere.json - output = /Users/sotech117/Documents/master/graphics/projects-ray-sotech117/student_outputs/intersect/required/unit_sphere.png - -[Canvas] - width = 1024 - height = 768 - -[Feature] - shadows = false - reflect = false - refract = false - texture = false - parallel = false - super-sample = false - num-samples = 1 - post-process = false - acceleration = false - depthoffield = false |
