diff options
| -rw-r--r-- | cmake-build-release/.ninja_deps | bin | 486212 -> 553376 bytes | |||
| -rw-r--r-- | cmake-build-release/.ninja_log | 28 | ||||
| -rw-r--r-- | cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt | 124 | ||||
| -rw-r--r-- | cmake-build-release/Testing/Temporary/LastTest.log | 4 | ||||
| -rwxr-xr-x | cmake-build-release/projects_ray | bin | 351833 -> 353561 bytes | |||
| -rw-r--r-- | cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp | 64 | ||||
| -rw-r--r-- | cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp | 272 | ||||
| -rw-r--r-- | scenefiles-4d/five_shapes.json | 2 |
8 files changed, 284 insertions, 210 deletions
diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps Binary files differindex 3795333..f9ce467 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 8968c6c..ee636d4 100644 --- a/cmake-build-release/.ninja_log +++ b/cmake-build-release/.ninja_log @@ -88,3 +88,31 @@ 6 33 1702452369238762000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f 36 1360 1702452370562378093 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc 1360 1465 1702452370669676125 projects_ray 45fbfe11691b47a4 +7 406 1702452576958836000 projects_ray_autogen/timestamp 55fca76aac650d2f +7 406 1702452576958836000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +7 406 1702452576958836000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f +7 406 1702452576958836000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f +407 631 1702452577188925730 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51 +407 764 1702452577320246727 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0 +407 1084 1702452577636902535 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6 +406 1224 1702452577780216305 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1 +408 1266 1702452577821843548 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07 +407 1345 1702452577900255040 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba +407 1478 1702452578033432441 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c +764 1513 1702452578068197159 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda +632 1535 1702452578086357696 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386 +407 1693 1702452578247598042 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1 +1084 1837 1702452578392517130 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10 +1224 1917 1702452578473192908 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640 +1266 1950 1702452578506323308 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062 +1345 2037 1702452578590039217 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37 +1478 2160 1702452578715901294 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3 +1513 2179 1702452578735842902 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352 +1837 2197 1702452578754826578 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2 +1535 2212 1702452578769213805 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7 +1693 2445 1702452579001092270 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214 +1950 2726 1702452579281942761 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b +2160 2797 1702452579353843525 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e +2038 2840 1702452579396783205 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8 +1917 3319 1702452579874611066 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc +3319 3423 1702452579981981184 projects_ray 45fbfe11691b47a4 diff --git a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index 05a22d1..0e68cf3 100644 --- a/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,26 +1,10 @@ # Generated by CMake. Changes will be overwritten. -/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/aliasing/filter.cpp -/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/intersect/normals.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/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/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/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/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/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/mainwindow.h +/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/utils/rgba.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 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-release/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 @@ -473,7 +457,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 @@ -524,7 +507,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 @@ -545,7 +527,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 @@ -618,52 +599,21 @@ 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/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/camera/camera.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/utils/scenefilereader.h -/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/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/accelerate/bvh.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/utils/sceneparser.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/utils/aspectratiowidget/aspectratiowidget.hpp mmc:Q_OBJECT mdp:/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/aspectratiowidget/aspectratiowidget.hpp @@ -1115,10 +1065,20 @@ 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/raytracer/raytracer.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/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/bvh.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/myqthreads.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/vec4ops/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/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/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-release/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 @@ -1571,6 +1531,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 @@ -1621,6 +1582,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 @@ -1641,6 +1603,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 @@ -1713,20 +1676,57 @@ 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/accelerate/kdtree.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/accelerate/myqtconcurrent.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/intersect/intersect.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/mainwindow.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/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/settings.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/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/texture/texture.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/vec4ops/transform4d.cpp +/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/aliasing/filter.cpp +/Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index ae07a38..15e684e 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 02:26 EST +Start testing: Dec 13 02:29 EST ---------------------------------------------------------- -End testing: Dec 13 02:26 EST +End testing: Dec 13 02:29 EST diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray Binary files differindex d34b153..a433436 100755 --- a/cmake-build-release/projects_ray +++ b/cmake-build-release/projects_ray diff --git a/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp b/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp index 9f49bf4..e0375a1 100644 --- a/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp +++ b/cmake-build-release/projects_ray_autogen/SKZFJBACJG/moc_raytracer.cpp @@ -48,11 +48,13 @@ static constexpr auto qt_meta_stringdata_CLASSRayTracerENDCLASS = QtMocHelpers:: "yzRotationChanged", "ywRotationChanged", "zwRotationChanged", - "rotationChanged" + "rotationChanged", + "cameraPositionChanged", + "glm::vec3" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { - uint offsetsAndSizes[20]; + uint offsetsAndSizes[24]; char stringdata0[10]; char stringdata1[18]; char stringdata2[1]; @@ -63,6 +65,8 @@ struct qt_meta_stringdata_CLASSRayTracerENDCLASS_t { char stringdata7[18]; char stringdata8[18]; char stringdata9[16]; + char stringdata10[22]; + char stringdata11[10]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSRayTracerENDCLASS_t::offsetsAndSizes) + ofs), len @@ -77,7 +81,9 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str QT_MOC_LITERAL(71, 17), // "yzRotationChanged" QT_MOC_LITERAL(89, 17), // "ywRotationChanged" QT_MOC_LITERAL(107, 17), // "zwRotationChanged" - QT_MOC_LITERAL(125, 15) // "rotationChanged" + QT_MOC_LITERAL(125, 15), // "rotationChanged" + QT_MOC_LITERAL(141, 21), // "cameraPositionChanged" + QT_MOC_LITERAL(163, 9) // "glm::vec3" }, "RayTracer", "xyRotationChanged", @@ -88,7 +94,9 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSRayTracerENDCLASS_t qt_meta_str "yzRotationChanged", "ywRotationChanged", "zwRotationChanged", - "rotationChanged" + "rotationChanged", + "cameraPositionChanged", + "glm::vec3" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -100,21 +108,22 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSRayTracerENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 7, 14, // methods + 8, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors 0, // flags - 7, // signalCount + 8, // signalCount // signals: name, argc, parameters, tag, flags, initial metatype offsets - 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 */, + 1, 1, 62, 2, 0x06, 1 /* Public */, + 4, 1, 65, 2, 0x06, 3 /* Public */, + 5, 1, 68, 2, 0x06, 5 /* Public */, + 6, 1, 71, 2, 0x06, 7 /* Public */, + 7, 1, 74, 2, 0x06, 9 /* Public */, + 8, 1, 77, 2, 0x06, 11 /* Public */, + 9, 1, 80, 2, 0x06, 13 /* Public */, + 10, 1, 83, 2, 0x06, 15 /* Public */, // signals: parameters QMetaType::Void, QMetaType::Float, 3, @@ -124,6 +133,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, 0x80000000 | 11, 3, 0 // eod }; @@ -157,7 +167,10 @@ Q_CONSTINIT const QMetaObject RayTracer::staticMetaObject = { { QtPrivate::TypeAndForceComplete<float, std::false_type>, // method 'rotationChanged' QtPrivate::TypeAndForceComplete<void, std::false_type>, - QtPrivate::TypeAndForceComplete<float, std::false_type> + QtPrivate::TypeAndForceComplete<float, std::false_type>, + // method 'cameraPositionChanged' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<glm::vec3, std::false_type> >, nullptr } }; @@ -175,6 +188,7 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v 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; + case 7: _t->cameraPositionChanged((*reinterpret_cast< std::add_pointer_t<glm::vec3>>(_a[1]))); break; default: ; } } else if (_c == QMetaObject::IndexOfMethod) { @@ -228,6 +242,13 @@ void RayTracer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, v return; } } + { + using _t = void (RayTracer::*)(glm::vec3 ); + if (_t _q_method = &RayTracer::cameraPositionChanged; *reinterpret_cast<_t *>(_a[1]) == _q_method) { + *result = 7; + return; + } + } } } @@ -250,13 +271,13 @@ int RayTracer::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 7) + if (_id < 8) qt_static_metacall(this, _c, _id, _a); - _id -= 7; + _id -= 8; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 7) + if (_id < 8) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 7; + _id -= 8; } return _id; } @@ -309,4 +330,11 @@ void RayTracer::rotationChanged(float _t1) void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; QMetaObject::activate(this, &staticMetaObject, 6, _a); } + +// SIGNAL 7 +void RayTracer::cameraPositionChanged(glm::vec3 _t1) +{ + void *_a[] = { nullptr, const_cast<void*>(reinterpret_cast<const void*>(std::addressof(_t1))) }; + QMetaObject::activate(this, &staticMetaObject, 7, _a); +} QT_WARNING_POP diff --git a/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp index 18c0a51..3d75784 100644 --- a/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/cmake-build-release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -43,6 +43,7 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "onUploadFile", "", "onSaveImage", + "onBulkRender", "onValChangexySlider", "newValue", "onValChangexyBox", @@ -67,40 +68,43 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateCameraPosition" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[58]; + uint offsetsAndSizes[62]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; char stringdata3[12]; - char stringdata4[20]; - char stringdata5[9]; - char stringdata6[17]; - char stringdata7[20]; - char stringdata8[17]; - char stringdata9[20]; - char stringdata10[17]; - char stringdata11[20]; - char stringdata12[17]; - char stringdata13[20]; - char stringdata14[17]; - char stringdata15[20]; - char stringdata16[17]; - char stringdata17[25]; - char stringdata18[22]; - char stringdata19[17]; - char stringdata20[15]; + char stringdata4[13]; + char stringdata5[20]; + char stringdata6[9]; + char stringdata7[17]; + char stringdata8[20]; + char stringdata9[17]; + char stringdata10[20]; + char stringdata11[17]; + char stringdata12[20]; + char stringdata13[17]; + char stringdata14[20]; + char stringdata15[17]; + char stringdata16[20]; + char stringdata17[17]; + char stringdata18[25]; + char stringdata19[22]; + char stringdata20[17]; char stringdata21[15]; char stringdata22[15]; char stringdata23[15]; char stringdata24[15]; char stringdata25[15]; - char stringdata26[21]; - char stringdata27[19]; - char stringdata28[16]; + char stringdata26[15]; + char stringdata27[21]; + char stringdata28[19]; + char stringdata29[16]; + char stringdata30[21]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -110,36 +114,39 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st QT_MOC_LITERAL(11, 12), // "onUploadFile" QT_MOC_LITERAL(24, 0), // "" QT_MOC_LITERAL(25, 11), // "onSaveImage" - QT_MOC_LITERAL(37, 19), // "onValChangexySlider" - QT_MOC_LITERAL(57, 8), // "newValue" - QT_MOC_LITERAL(66, 16), // "onValChangexyBox" - QT_MOC_LITERAL(83, 19), // "onValChangexzSlider" - QT_MOC_LITERAL(103, 16), // "onValChangexzBox" - QT_MOC_LITERAL(120, 19), // "onValChangexwSlider" - QT_MOC_LITERAL(140, 16), // "onValChangexwBox" - QT_MOC_LITERAL(157, 19), // "onValChangeyzSlider" - QT_MOC_LITERAL(177, 16), // "onValChangeyzBox" - QT_MOC_LITERAL(194, 19), // "onValChangeywSlider" - QT_MOC_LITERAL(214, 16), // "onValChangeywBox" - QT_MOC_LITERAL(231, 19), // "onValChangezwSlider" - QT_MOC_LITERAL(251, 16), // "onValChangezwBox" - QT_MOC_LITERAL(268, 24), // "onValChangeMaxTimeSlider" - QT_MOC_LITERAL(293, 21), // "onValChangeMaxTimeBox" - QT_MOC_LITERAL(315, 16), // "onRotateNegative" - QT_MOC_LITERAL(332, 14), // "updateXySlider" - QT_MOC_LITERAL(347, 14), // "updateXzSlider" - QT_MOC_LITERAL(362, 14), // "updateXwSlider" - QT_MOC_LITERAL(377, 14), // "updateYzSlider" - QT_MOC_LITERAL(392, 14), // "updateYwSlider" - QT_MOC_LITERAL(407, 14), // "updateZwSlider" - QT_MOC_LITERAL(422, 20), // "updateRotationSlider" - QT_MOC_LITERAL(443, 18), // "onValChangeWSlider" - QT_MOC_LITERAL(462, 15) // "onValChangeWBox" + QT_MOC_LITERAL(37, 12), // "onBulkRender" + QT_MOC_LITERAL(50, 19), // "onValChangexySlider" + QT_MOC_LITERAL(70, 8), // "newValue" + QT_MOC_LITERAL(79, 16), // "onValChangexyBox" + QT_MOC_LITERAL(96, 19), // "onValChangexzSlider" + QT_MOC_LITERAL(116, 16), // "onValChangexzBox" + QT_MOC_LITERAL(133, 19), // "onValChangexwSlider" + QT_MOC_LITERAL(153, 16), // "onValChangexwBox" + QT_MOC_LITERAL(170, 19), // "onValChangeyzSlider" + QT_MOC_LITERAL(190, 16), // "onValChangeyzBox" + QT_MOC_LITERAL(207, 19), // "onValChangeywSlider" + QT_MOC_LITERAL(227, 16), // "onValChangeywBox" + QT_MOC_LITERAL(244, 19), // "onValChangezwSlider" + QT_MOC_LITERAL(264, 16), // "onValChangezwBox" + QT_MOC_LITERAL(281, 24), // "onValChangeMaxTimeSlider" + QT_MOC_LITERAL(306, 21), // "onValChangeMaxTimeBox" + QT_MOC_LITERAL(328, 16), // "onRotateNegative" + QT_MOC_LITERAL(345, 14), // "updateXySlider" + QT_MOC_LITERAL(360, 14), // "updateXzSlider" + QT_MOC_LITERAL(375, 14), // "updateXwSlider" + QT_MOC_LITERAL(390, 14), // "updateYzSlider" + QT_MOC_LITERAL(405, 14), // "updateYwSlider" + QT_MOC_LITERAL(420, 14), // "updateZwSlider" + QT_MOC_LITERAL(435, 20), // "updateRotationSlider" + QT_MOC_LITERAL(456, 18), // "onValChangeWSlider" + QT_MOC_LITERAL(475, 15), // "onValChangeWBox" + QT_MOC_LITERAL(491, 20) // "updateCameraPosition" }, "MainWindow", "onUploadFile", "", "onSaveImage", + "onBulkRender", "onValChangexySlider", "newValue", "onValChangexyBox", @@ -164,7 +171,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateCameraPosition" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -176,7 +184,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 26, 14, // methods + 28, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -184,60 +192,64 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 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 */, + 1, 0, 182, 2, 0x08, 1 /* Private */, + 3, 0, 183, 2, 0x08, 2 /* Private */, + 4, 0, 184, 2, 0x08, 3 /* Private */, + 5, 1, 185, 2, 0x08, 4 /* Private */, + 7, 1, 188, 2, 0x08, 6 /* Private */, + 8, 1, 191, 2, 0x08, 8 /* Private */, + 9, 1, 194, 2, 0x08, 10 /* Private */, + 10, 1, 197, 2, 0x08, 12 /* Private */, + 11, 1, 200, 2, 0x08, 14 /* Private */, + 12, 1, 203, 2, 0x08, 16 /* Private */, + 13, 1, 206, 2, 0x08, 18 /* Private */, + 14, 1, 209, 2, 0x08, 20 /* Private */, + 15, 1, 212, 2, 0x08, 22 /* Private */, + 16, 1, 215, 2, 0x08, 24 /* Private */, + 17, 1, 218, 2, 0x08, 26 /* Private */, + 18, 1, 221, 2, 0x08, 28 /* Private */, + 19, 1, 224, 2, 0x08, 30 /* Private */, + 20, 0, 227, 2, 0x08, 32 /* Private */, + 21, 1, 228, 2, 0x08, 33 /* Private */, + 22, 1, 231, 2, 0x08, 35 /* Private */, + 23, 1, 234, 2, 0x08, 37 /* Private */, + 24, 1, 237, 2, 0x08, 39 /* Private */, + 25, 1, 240, 2, 0x08, 41 /* Private */, + 26, 1, 243, 2, 0x08, 43 /* Private */, + 27, 1, 246, 2, 0x08, 45 /* Private */, + 28, 1, 249, 2, 0x08, 47 /* Private */, + 29, 1, 252, 2, 0x08, 49 /* Private */, + 30, 0, 255, 2, 0x08, 51 /* Private */, // slots: parameters QMetaType::Void, QMetaType::Void, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Int, 5, - QMetaType::Void, QMetaType::Double, 5, QMetaType::Void, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Double, 5, - QMetaType::Void, QMetaType::Double, 5, - 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, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Float, 6, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, 0 // eod }; @@ -255,6 +267,8 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<void, std::false_type>, // method 'onSaveImage' QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'onBulkRender' + QtPrivate::TypeAndForceComplete<void, std::false_type>, // method 'onValChangexySlider' QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<int, std::false_type>, @@ -325,7 +339,9 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<int, std::false_type>, // method 'onValChangeWBox' QtPrivate::TypeAndForceComplete<void, std::false_type>, - QtPrivate::TypeAndForceComplete<double, std::false_type> + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'updateCameraPosition' + QtPrivate::TypeAndForceComplete<void, std::false_type> >, nullptr } }; @@ -338,30 +354,32 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, switch (_id) { case 0: _t->onUploadFile(); break; case 1: _t->onSaveImage(); break; - case 2: _t->onValChangexySlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 3: _t->onValChangexyBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 4: _t->onValChangexzSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 5: _t->onValChangexzBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 6: _t->onValChangexwSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 7: _t->onValChangexwBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 8: _t->onValChangeyzSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 9: _t->onValChangeyzBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 10: _t->onValChangeywSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 11: _t->onValChangeywBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 12: _t->onValChangezwSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 13: _t->onValChangezwBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 14: _t->onValChangeMaxTimeSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 15: _t->onValChangeMaxTimeBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 16: _t->onRotateNegative(); break; - case 17: _t->updateXySlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 18: _t->updateXzSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - case 19: _t->updateXwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; - 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; + case 2: _t->onBulkRender(); break; + case 3: _t->onValChangexySlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 4: _t->onValChangexyBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 5: _t->onValChangexzSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 6: _t->onValChangexzBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 7: _t->onValChangexwSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 8: _t->onValChangexwBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 9: _t->onValChangeyzSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 10: _t->onValChangeyzBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 11: _t->onValChangeywSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 12: _t->onValChangeywBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 13: _t->onValChangezwSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 14: _t->onValChangezwBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 15: _t->onValChangeMaxTimeSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 16: _t->onValChangeMaxTimeBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 17: _t->onRotateNegative(); break; + case 18: _t->updateXySlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 19: _t->updateXzSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 20: _t->updateXwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 21: _t->updateYzSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 22: _t->updateYwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 23: _t->updateZwSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 24: _t->updateRotationSlider((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; + case 25: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 26: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 27: _t->updateCameraPosition(); break; default: ; } } @@ -386,13 +404,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 26) + if (_id < 28) qt_static_metacall(this, _c, _id, _a); - _id -= 26; + _id -= 28; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 26) + if (_id < 28) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 26; + _id -= 28; } return _id; } diff --git a/scenefiles-4d/five_shapes.json b/scenefiles-4d/five_shapes.json index 9fc54ed..c6c6645 100644 --- a/scenefiles-4d/five_shapes.json +++ b/scenefiles-4d/five_shapes.json @@ -8,7 +8,7 @@ "gravity": [0.0, -0.0098, 0.0, 0.0] }, "cameraData": { - "position": [3.0, 3.0, 3.0, 1.0], + "position": [30.0, 30.0, 30.0, 30.0], "up": [0.0, 1.0, 0.0, 0.0], "heightAngle": 30.0, "focus": [0.0, 0.0, 0.0, 0.0], |