From 7de05373a0423a24f9719b0158bc9a78e3238aef Mon Sep 17 00:00:00 2001 From: sotech117 Date: Wed, 13 Dec 2023 02:09:18 -0500 Subject: small changes --- cmake-build-debug/.ninja_deps | Bin 178880 -> 250828 bytes cmake-build-debug/.ninja_log | 35 ++++++++++++++++ .../projects_ray_autogen.dir/ParseCache.txt | 14 +++---- cmake-build-debug/Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/projects_ray | Bin 1675225 -> 1748921 bytes .../UVLADIE3JM/moc_mainwindow.cpp | 44 ++++++++++----------- 6 files changed, 66 insertions(+), 31 deletions(-) (limited to 'cmake-build-debug') diff --git a/cmake-build-debug/.ninja_deps b/cmake-build-debug/.ninja_deps index 5e4528c..adacbbe 100644 Binary files a/cmake-build-debug/.ninja_deps and b/cmake-build-debug/.ninja_deps differ diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 4b566ec..4581354 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -39,3 +39,38 @@ 7 35 1702446644324961670 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 38 1255 1702446645539941558 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 1255 1376 1702446645663883852 projects_ray dac5017ee9a78855 +6 398 1702451053129304000 projects_ray_autogen/timestamp d580242d2b9854b3 +6 398 1702451053129304000 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +6 398 1702451053129304000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +6 398 1702451053129304000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +398 625 1702451053360902208 CMakeFiles/projects_ray.dir/src/settings.cpp.o 7c89207347735849 +398 748 1702451053481370988 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 9f825ee08bf53b36 +399 1113 1702451053844649818 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o f9c9e1c96d11334b +399 1205 1702451053938465012 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o b0ea56778abe094c +398 1229 1702451053962886566 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 75d01056e19b5cdd +398 1330 1702451054062789857 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 96d8c110d02a09df +625 1455 1702451054187537410 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o d9e1b1ef9f57a97a +748 1536 1702451054269061868 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 46167bd837be2b2a +398 1552 1702451054284491131 CMakeFiles/projects_ray.dir/src/main.cpp.o 18bcd3026e919fd3 +399 1679 1702451054411072340 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 78383fd2d33d7c09 +1113 1890 1702451054622790117 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 1e4b595f9246a14f +1205 1940 1702451054674004673 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 643a1e808e96cec +1229 1967 1702451054700436885 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 63ef5fb7afacbb32 +1330 2070 1702451054803966660 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o a6917eb97660581e +1455 2148 1702451054882168175 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o e51322a1e2833898 +1890 2244 1702451054978834522 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 624c5f86ab14c5d7 +1536 2245 1702451054979865684 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 6d0b760a9c84856a +1552 2283 1702451055017201888 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 829a155a1ffac273 +2244 2361 1702451055097878643 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o efaf5a8825d854f8 +1679 2461 1702451055195258070 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o c1cad78d9998b2c4 +1967 2735 1702451055469294519 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o affe7813bf94b99f +2148 2818 1702451055552382970 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 502b39b3210366aa +2070 2828 1702451055563472919 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o a8cce28f179d7603 +1941 3225 1702451055958245021 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +3225 3340 1702451056077164934 projects_ray dac5017ee9a78855 +7 34 1702451295273999693 projects_ray_autogen/timestamp d580242d2b9854b3 +7 34 1702451295273999693 projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +7 34 1702451295273999693 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/timestamp d580242d2b9854b3 +7 34 1702451295273999693 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-debug/projects_ray_autogen/mocs_compilation.cpp d580242d2b9854b3 +37 1293 1702451296522610205 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 5d42dc23cb8d46fc +1293 1408 1702451296646479261 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 ac18445..f109c5d 100644 --- a/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/cmake-build-debug/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,9 +1,9 @@ # Generated by CMake. Changes will be overwritten. /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/utils/sceneparser.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/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 @@ -1720,15 +1720,15 @@ 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.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/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/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/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/utils/scenefilereader.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 diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index 5382781..fd0150a 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Dec 13 00:50 EST +Start testing: Dec 13 02:08 EST ---------------------------------------------------------- -End testing: Dec 13 00:50 EST +End testing: Dec 13 02:08 EST diff --git a/cmake-build-debug/projects_ray b/cmake-build-debug/projects_ray index 6a5421c..872dc91 100755 Binary files a/cmake-build-debug/projects_ray and b/cmake-build-debug/projects_ray differ 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 7981b1e..18c0a51 100644 --- a/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/cmake-build-debug/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -56,8 +56,8 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "onValChangeywBox", "onValChangezwSlider", "onValChangezwBox", - "onValChangeRotationSlider", - "onValChangeRotationBox", + "onValChangeMaxTimeSlider", + "onValChangeMaxTimeBox", "onRotateNegative", "updateXySlider", "updateXzSlider", @@ -89,8 +89,8 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata14[17]; char stringdata15[20]; char stringdata16[17]; - char stringdata17[26]; - char stringdata18[23]; + char stringdata17[25]; + char stringdata18[22]; char stringdata19[17]; char stringdata20[15]; char stringdata21[15]; @@ -123,18 +123,18 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st QT_MOC_LITERAL(214, 16), // "onValChangeywBox" QT_MOC_LITERAL(231, 19), // "onValChangezwSlider" QT_MOC_LITERAL(251, 16), // "onValChangezwBox" - QT_MOC_LITERAL(268, 25), // "onValChangeRotationSlider" - QT_MOC_LITERAL(294, 22), // "onValChangeRotationBox" - QT_MOC_LITERAL(317, 16), // "onRotateNegative" - QT_MOC_LITERAL(334, 14), // "updateXySlider" - QT_MOC_LITERAL(349, 14), // "updateXzSlider" - 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(424, 20), // "updateRotationSlider" - QT_MOC_LITERAL(445, 18), // "onValChangeWSlider" - QT_MOC_LITERAL(464, 15) // "onValChangeWBox" + 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" }, "MainWindow", "onUploadFile", @@ -153,8 +153,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "onValChangeywBox", "onValChangezwSlider", "onValChangezwBox", - "onValChangeRotationSlider", - "onValChangeRotationBox", + "onValChangeMaxTimeSlider", + "onValChangeMaxTimeBox", "onRotateNegative", "updateXySlider", "updateXzSlider", @@ -291,10 +291,10 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { // method 'onValChangezwBox' QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, - // method 'onValChangeRotationSlider' + // method 'onValChangeMaxTimeSlider' QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, - // method 'onValChangeRotationBox' + // method 'onValChangeMaxTimeBox' QtPrivate::TypeAndForceComplete, QtPrivate::TypeAndForceComplete, // method 'onRotateNegative' @@ -350,8 +350,8 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 11: _t->onValChangeywBox((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; case 12: _t->onValChangezwSlider((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; case 13: _t->onValChangezwBox((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; - case 14: _t->onValChangeRotationSlider((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; - case 15: _t->onValChangeRotationBox((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; + case 14: _t->onValChangeMaxTimeSlider((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; + case 15: _t->onValChangeMaxTimeBox((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; case 16: _t->onRotateNegative(); break; case 17: _t->updateXySlider((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; case 18: _t->updateXzSlider((*reinterpret_cast< std::add_pointer_t>(_a[1]))); break; -- cgit v1.2.3-70-g09d2