diff options
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps | bin | 1512972 -> 1601128 bytes | |||
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log | 29 | ||||
| -rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 14 | ||||
| -rwxr-xr-x | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray | bin | 365368 -> 365288 bytes | |||
| -rw-r--r-- | src/raytracer/raytracer.cpp | 2 |
5 files changed, 37 insertions, 8 deletions
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps Binary files differindex cc43fa9..0f069e0 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log index af29a51..924db38 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log @@ -64,3 +64,32 @@ 25 134 1702457571390450267 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff 147 4772 1702457576015137115 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a 4773 5178 1702457576414622802 projects_ray a842e040bf3d79e9 +33 1388 1702457971442789000 projects_ray_autogen/timestamp 596afd61accb21ff +33 1388 1702457971442789000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +33 1388 1702457971442789000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +33 1388 1702457971442789000 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +1394 15938 1702457985980761977 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +1393 15986 1702457986023752094 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +1392 16014 1702457986067034872 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +1391 16141 1702457986198895966 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +1391 16201 1702457986256653779 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 +1392 16384 1702457986443256612 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +1391 16898 1702457986954194296 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +1391 17209 1702457987267329398 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +1389 17506 1702457987562077531 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a +1390 18471 1702457988529623338 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +1390 18835 1702457988892858508 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd +1389 19466 1702457989521829824 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +1389 21369 1702457991412545183 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +15986 24170 1702457994233248121 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd +16385 24196 1702457994256794947 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e +15942 24767 1702457994830385561 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +16142 24863 1702457994927390065 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +16201 24979 1702457995045812005 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +16015 27690 1702457997758741886 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +23 131 1702458038454640879 projects_ray_autogen/timestamp 596afd61accb21ff +23 131 1702458038454640879 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +23 131 1702458038454640879 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +23 131 1702458038454640879 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +142 4694 1702458043004470207 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +4694 5150 1702458043455719044 projects_ray a842e040bf3d79e9 diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 14feee2..2f25d27 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -9027,6 +9027,8 @@ /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/reflect.cpp +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.h mmc:Q_OBJECT mdp:/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/mainwindow.h @@ -9981,13 +9983,6 @@ mdp:/Users/daviddoan/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/mainwindow.cpp -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/reflect.cpp -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.h -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.h -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/supersample.cpp -/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h mmc:Q_OBJECT mdp:/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracer.h @@ -10916,4 +10911,9 @@ mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/lafayette_bussey/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.h +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/aliasing/supersample.cpp +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/accelerate/kdtree.h /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.cpp diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray Binary files differindex 5d4f411..934d9b9 100755 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 19595e8..b85a14e 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -191,7 +191,7 @@ void RayTracer::settingsChanged(QLabel* imageLabel) { if (m_controlPointIndex % 3 == 0){ settings.yz += 8.f; } - this->render(data, rtScene); + this->render(m_imageData, rtScene); QImage flippedImage = image.mirrored(false, false); flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); |