diff options
| -rw-r--r-- | cmake-build-debug/.ninja_deps | bin | 168256 -> 239880 bytes | |||
| -rw-r--r-- | cmake-build-debug/.ninja_log | 30 | ||||
| -rw-r--r-- | cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 128 | ||||
| -rw-r--r-- | cmake-build-debug/Testing/Temporary/LastTest.log | 4 | ||||
| -rwxr-xr-x | cmake-build-debug/projects_ray | bin | 1657145 -> 1675513 bytes | |||
| -rw-r--r-- | cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp | 56 | ||||
| -rw-r--r-- | cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp | 94 | ||||
| -rw-r--r-- | cmake-build-debug/projects_ray_autogen/deps | 8 | ||||
| -rw-r--r-- | src/accelerate/myqtconcurrent.cpp | 9 | ||||
| -rw-r--r-- | src/camera/camera.cpp | 6 |
10 files changed, 211 insertions, 124 deletions
diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps Binary files differindex 16d6d26..eb70c0c 100644 --- a/cmake-build-debug/.ninja_deps +++ b/cmake-build-debug/.ninja_deps diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index d85601a..0701005 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -30,3 +30,33 @@ 1843 2626 1702062978126233527 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c 2277 3074 1702062978573573842 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd 2190 3283 1702062978781768457 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 +9 433 1702444372415632000 projects_ray_autogen/timestamp d580242d2b9854b3 +9 433 1702444372415632000 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +9 433 1702444372415632000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +9 433 1702444372415632000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +434 845 1702444372830855560 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849 +434 967 1702444372952353755 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +434 1326 1702444373310625571 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b +435 1444 1702444373427498710 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c +434 1457 1702444373441093751 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd +434 1535 1702444373516827643 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df +967 1828 1702444373811590395 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a +434 1848 1702444373830546326 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 +845 1872 1702444373854539272 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 41959d435611c983 +434 1960 1702444373930524124 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 +1326 2077 1702444374059597091 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a +1457 2192 1702444374175167768 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec +1444 2214 1702444374197933794 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f +1535 2338 1702444374321818413 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 +1848 2555 1702444374539960645 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898 +2192 2560 1702444374545924746 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 624c5f86ab14c5d7 +1873 2602 1702444374586308575 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a +1828 2610 1702444374593939972 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e +1961 2700 1702444374684408616 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 +2602 2723 1702444374710448277 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o efaf5a8825d854f8 +2077 2873 1702444374857265006 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4 +2338 3095 1702444375079242000 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f +2560 3225 1702444375208994636 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa +2556 3309 1702444375293640721 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603 +2214 3481 1702444375464470312 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +3481 3703 1702444375690641860 projects_ray dac5017ee9a78855 diff --git a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 771268d..c37537b 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,17 +1,21 @@ # Generated by CMake. Changes will be overwritten. -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -464,6 +468,7 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -514,6 +519,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -534,6 +540,7 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -606,21 +613,53 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h + mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mmc:Q_OBJECT mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp @@ -1072,20 +1111,10 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mmc:Q_OBJECT - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.h + mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/moc_predefs.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/Availability.h mdp:/Library/Developer/CommandLineTools/SDKs/MacOSX13.1.sdk/usr/include/AvailabilityInternal.h @@ -1538,7 +1567,6 @@ mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.h - mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenedata.h mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h @@ -1589,7 +1617,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qiterator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qline.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlist.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlocale.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qlogging.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmalloc.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qmap.h @@ -1610,7 +1637,6 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qprocessordetection.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrect.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qrefcount.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qregularexpression.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopedpointer.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qscopeguard.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtCore.framework/Versions/A/Headers/qset.h @@ -1683,50 +1709,28 @@ mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtguiglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qtransform.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qvalidator.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtGui.framework/Versions/A/Headers/qwindowdefs.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/QOpenGLWidget mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qopenglwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtOpenGLWidgets.framework/Versions/A/Headers/qtopenglwidgetsglobal.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QBoxLayout - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QCheckBox - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QDoubleSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QLabel - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QMainWindow - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QPushButton - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSlider - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QSpinBox mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/QWidget - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractbutton.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qabstractspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qboxlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qcheckbox.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qframe.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qgridlayout.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlabel.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayout.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qlayoutitem.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qmainwindow.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qpushbutton.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qsizepolicy.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qslider.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qspinbox.h - mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtabwidget.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgets-config.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsexports.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qtwidgetsglobal.h mdp:/Users/sotech117/Qt/6.5.2/macos/lib/QtWidgets.framework/Versions/A/Headers/qwidget.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/mainwindow.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/raytracer/raytracer.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/texture/texture.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/illuminate.cpp -/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/main.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/camera/camera.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/rgba.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/illuminate/shadow.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/settings.h +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/myqtconcurrent.cpp diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 831e9e8..7a04019 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 08 15:03 EST +Start testing: Dec 13 00:12 EST ---------------------------------------------------------- -End testing: Dec 08 15:03 EST +End testing: Dec 13 00:12 EST diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray Binary files differindex 9e19353..6220afb 100755 --- a/cmake-build-debug/projects_ray +++ b/cmake-build-debug/projects_ray diff --git a/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp b/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp index 4ec036f..9f49bf4 100644 --- a/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp +++ b/cmake-build-debug/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp @@ -47,11 +47,12 @@ static constexpr auto qt_meta_stringdata_CLASSRayTracerENDCLASS = QtMocHelpers:: "xwRotationChanged", "yzRotationChanged", "ywRotationChanged", - "zwRotationChanged" + "zwRotationChanged", + "rotationChanged" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { - uint offsetsAndSizes[18]; + uint offsetsAndSizes[20]; char stringdata0[10]; char stringdata1[18]; char stringdata2[1]; @@ -61,6 +62,7 @@ struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { char stringdata6[18]; char stringdata7[18]; char stringdata8[18]; + char stringdata9[16]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSRayTracerENDCLASS_t::offsetsAndSizes) + ofs), len @@ -74,7 +76,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str QT_MOC_LITERAL(53, 17), // "xwRotationChanged" QT_MOC_LITERAL(71, 17), // "yzRotationChanged" QT_MOC_LITERAL(89, 17), // "ywRotationChanged" - QT_MOC_LITERAL(107, 17) // "zwRotationChanged" + QT_MOC_LITERAL(107, 17), // "zwRotationChanged" + QT_MOC_LITERAL(125, 15) // "rotationChanged" }, "RayTracer", "xyRotationChanged", @@ -84,7 +87,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str "xwRotationChanged", "yzRotationChanged", "ywRotationChanged", - "zwRotationChanged" + "zwRotationChanged", + "rotationChanged" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -96,20 +100,21 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 6, 14, // methods + 7, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 6, // signalCount + 7, // signalCount // signals: name, argc, parameters, tag, flags, initial metatype offsets - 1, 1, 50, 2, 0x06, 1 /* Public */, - 4, 1, 53, 2, 0x06, 3 /* Public */, - 5, 1, 56, 2, 0x06, 5 /* Public */, - 6, 1, 59, 2, 0x06, 7 /* Public */, - 7, 1, 62, 2, 0x06, 9 /* Public */, - 8, 1, 65, 2, 0x06, 11 /* Public */, + 1, 1, 56, 2, 0x06, 1 /* Public */, + 4, 1, 59, 2, 0x06, 3 /* Public */, + 5, 1, 62, 2, 0x06, 5 /* Public */, + 6, 1, 65, 2, 0x06, 7 /* Public */, + 7, 1, 68, 2, 0x06, 9 /* Public */, + 8, 1, 71, 2, 0x06, 11 /* Public */, + 9, 1, 74, 2, 0x06, 13 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Float, 3, @@ -118,6 +123,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, QMetaType::Float, 3, QMetaType::Void, QMetaType::Float, 3, + QMetaType::Void, QMetaType::Float, 3, 0 // eod }; @@ -148,6 +154,9 @@ Q_CONSTINIT const QMetaObject RayTracer::staticMetaObject = { { QtPrivate::TypeAndForceComplete<float, std::false_type>, // method 'zwRotationChanged' QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<float, std::false_type>, + // method 'rotationChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<float, std::false_type> >, nullptr @@ -165,6 +174,7 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v case 3: _t->yzRotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 4: _t->ywRotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 5: _t->zwRotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; + case 6: _t->rotationChanged((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -211,6 +221,13 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (RayTracer::*)(float ); + if (_t _q_method = &RayTracer::rotationChanged; *reinterpret_cast<_t *>(_a[1]) == _q_method) { + *result = 6; + return; + } + } } } @@ -233,13 +250,13 @@ int RayTracer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 6) + if (_id < 7) qt_static_metacall(this, _c, _id, _a); - _id -= 6; + _id -= 7; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 6) + if (_id < 7) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 6; + _id -= 7; } return _id; } @@ -285,4 +302,11 @@ void RayTracer::zwRotationChanged(float _t1) void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 5, _a); } + +// SIGNAL 6 +void RayTracer::rotationChanged(float _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 6, _a); +} QT_WARNING_POP diff --git a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp index 6511227..7981b1e 100644 --- a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -64,11 +64,14 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateXwSlider", "updateYzSlider", "updateYwSlider", - "updateZwSlider" + "updateZwSlider", + "updateRotationSlider", + "onValChangeWSlider", + "onValChangeWBox" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[52]; + uint offsetsAndSizes[58]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; @@ -95,6 +98,9 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata23[15]; char stringdata24[15]; char stringdata25[15]; + char stringdata26[21]; + char stringdata27[19]; + char stringdata28[16]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -125,7 +131,10 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st QT_MOC_LITERAL(364, 14), // "updateXwSlider" QT_MOC_LITERAL(379, 14), // "updateYzSlider" QT_MOC_LITERAL(394, 14), // "updateYwSlider" - QT_MOC_LITERAL(409, 14) // "updateZwSlider" + QT_MOC_LITERAL(409, 14), // "updateZwSlider" + QT_MOC_LITERAL(424, 20), // "updateRotationSlider" + QT_MOC_LITERAL(445, 18), // "onValChangeWSlider" + QT_MOC_LITERAL(464, 15) // "onValChangeWBox" }, "MainWindow", "onUploadFile", @@ -152,7 +161,10 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateXwSlider", "updateYzSlider", "updateYwSlider", - "updateZwSlider" + "updateZwSlider", + "updateRotationSlider", + "onValChangeWSlider", + "onValChangeWBox" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -164,7 +176,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 23, 14, // methods + 26, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -172,29 +184,32 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 0, 152, 2, 0x08, 1 /* Private */, - 3, 0, 153, 2, 0x08, 2 /* Private */, - 4, 1, 154, 2, 0x08, 3 /* Private */, - 6, 1, 157, 2, 0x08, 5 /* Private */, - 7, 1, 160, 2, 0x08, 7 /* Private */, - 8, 1, 163, 2, 0x08, 9 /* Private */, - 9, 1, 166, 2, 0x08, 11 /* Private */, - 10, 1, 169, 2, 0x08, 13 /* Private */, - 11, 1, 172, 2, 0x08, 15 /* Private */, - 12, 1, 175, 2, 0x08, 17 /* Private */, - 13, 1, 178, 2, 0x08, 19 /* Private */, - 14, 1, 181, 2, 0x08, 21 /* Private */, - 15, 1, 184, 2, 0x08, 23 /* Private */, - 16, 1, 187, 2, 0x08, 25 /* Private */, - 17, 1, 190, 2, 0x08, 27 /* Private */, - 18, 1, 193, 2, 0x08, 29 /* Private */, - 19, 0, 196, 2, 0x08, 31 /* Private */, - 20, 1, 197, 2, 0x08, 32 /* Private */, - 21, 1, 200, 2, 0x08, 34 /* Private */, - 22, 1, 203, 2, 0x08, 36 /* Private */, - 23, 1, 206, 2, 0x08, 38 /* Private */, - 24, 1, 209, 2, 0x08, 40 /* Private */, - 25, 1, 212, 2, 0x08, 42 /* Private */, + 1, 0, 170, 2, 0x08, 1 /* Private */, + 3, 0, 171, 2, 0x08, 2 /* Private */, + 4, 1, 172, 2, 0x08, 3 /* Private */, + 6, 1, 175, 2, 0x08, 5 /* Private */, + 7, 1, 178, 2, 0x08, 7 /* Private */, + 8, 1, 181, 2, 0x08, 9 /* Private */, + 9, 1, 184, 2, 0x08, 11 /* Private */, + 10, 1, 187, 2, 0x08, 13 /* Private */, + 11, 1, 190, 2, 0x08, 15 /* Private */, + 12, 1, 193, 2, 0x08, 17 /* Private */, + 13, 1, 196, 2, 0x08, 19 /* Private */, + 14, 1, 199, 2, 0x08, 21 /* Private */, + 15, 1, 202, 2, 0x08, 23 /* Private */, + 16, 1, 205, 2, 0x08, 25 /* Private */, + 17, 1, 208, 2, 0x08, 27 /* Private */, + 18, 1, 211, 2, 0x08, 29 /* Private */, + 19, 0, 214, 2, 0x08, 31 /* Private */, + 20, 1, 215, 2, 0x08, 32 /* Private */, + 21, 1, 218, 2, 0x08, 34 /* Private */, + 22, 1, 221, 2, 0x08, 36 /* Private */, + 23, 1, 224, 2, 0x08, 38 /* Private */, + 24, 1, 227, 2, 0x08, 40 /* Private */, + 25, 1, 230, 2, 0x08, 42 /* Private */, + 26, 1, 233, 2, 0x08, 44 /* Private */, + 27, 1, 236, 2, 0x08, 46 /* Private */, + 28, 1, 239, 2, 0x08, 48 /* Private */, // slots: parameters QMetaType::Void, @@ -220,6 +235,9 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { QMetaType::Void, QMetaType::Double, 5, QMetaType::Void, QMetaType::Double, 5, QMetaType::Void, QMetaType::Double, 5, + QMetaType::Void, QMetaType::Float, 5, + QMetaType::Void, QMetaType::Int, 5, + QMetaType::Void, QMetaType::Double, 5, 0 // eod }; @@ -298,6 +316,15 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<double, std::false_type>, // method 'updateZwSlider' QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'updateRotationSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<float, std::false_type>, + // method 'onValChangeWSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangeWBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<double, std::false_type> >, nullptr @@ -332,6 +359,9 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 20: _t->updateYzSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; case 21: _t->updateYwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; case 22: _t->updateZwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 23: _t->updateRotationSlider((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; + case 24: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 25: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; default: ; } } @@ -356,13 +386,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 23) + if (_id < 26) qt_static_metacall(this, _c, _id, _a); - _id -= 23; + _id -= 26; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 23) + if (_id < 26) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 23; + _id -= 26; } return _id; } diff --git a/cmake-build-debug/projects_ray_autogen/deps b/cmake-build-debug/projects_ray_autogen/deps index 50ec721..04fc2dc 100644 --- a/cmake-build-debug/projects_ray_autogen/deps +++ b/cmake-build-debug/projects_ray_autogen/deps @@ -449,10 +449,6 @@ projects_ray_autogen/timestamp: \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/glm/vec3.hpp \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/glm/vec4.hpp \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/glm/vector_relational.hpp \ - /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/rotations4d.cpp \ - /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/transform4d.cpp \ - /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4operations.cpp \ - /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/4dvecops/vec4ops.h \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.cpp \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/bvh.h \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/accelerate/kdtree.cpp \ @@ -486,6 +482,10 @@ projects_ray_autogen/timestamp: \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.h \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp \ /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/sceneparser.h \ + /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/rotations4d.cpp \ + /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/transform4d.cpp \ + /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.cpp \ + /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/vec4ops/vec4ops.h \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCXXInformation.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCommonLanguageInclude.cmake \ diff --git a/src/accelerate/myqtconcurrent.cpp b/src/accelerate/myqtconcurrent.cpp index 74dbd88..de83f8a 100644 --- a/src/accelerate/myqtconcurrent.cpp +++ b/src/accelerate/myqtconcurrent.cpp @@ -67,9 +67,12 @@ void RayTracer::renderParallel(RGBA *imageData, const RayTraceScene &scene) } QList<RGBA> pixels = QtConcurrent::blockingMapped(l, pixelRoutine); QtConcurrent::blockingMap(l, pixelRoutine); - int index = 0; - for (RGBA p : pixels) { - imageData[index++] = p; + + // get the slice relating to z == 0 and set it into int the iamge data array + int currentSlice = 0; + int ptr = currentSlice * scene.width() * scene.height(); + for (int i = 0; i < scene.width() * scene.height(); i++) { + imageData[i] = pixels[ptr + i]; } if (m_enableAntiAliasing) diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index 1b37938..1b4cd43 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -53,8 +53,4 @@ float Camera::getFocalLength() const { float Camera::getAperture() const { // Optional TODO: implement the getter or make your own design return m_aperture; -} - -glm::vec3 Camera::getPos() const { - return m_pos; -} +}
\ No newline at end of file |