diff options
11 files changed, 489 insertions, 135 deletions
diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps Binary files differindex dbb83df..f598500 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log index 038650f..2d12477 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log @@ -1,72 +1,59 @@ # ninja log v5 -1518 7753 1702003216918938854 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1573 16096 1701990825641772359 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 -2 397 1701990808946533077 build.ninja d13bedc3f8269e08 -1519 7447 1702003216605842517 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -4527 5434 1702003314434455491 projects_ray 39216eb93299dfb -24 121 1702003309156308153 projects_ray_autogen/timestamp 596afd61accb21ff -7394 11026 1702003220201082344 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -24 121 1702003309156308153 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1521 7538 1702003216705080931 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -24 121 1702003309156308153 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1523 7322 1702003216473710600 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -1521 7513 1702003216675921800 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1522 7394 1702003216558994370 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1523 8028 1702003217194125172 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -1520 7475 1702003216633517780 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -7447 11129 1702003220307150838 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -132 4526 1702003313543704066 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -1563 6941 1701990816481916015 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -24 121 1702003309156308153 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -1421 6121 1701995212614233462 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e -217 5985 1701995634163012992 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -1519 8376 1702003217542021419 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -7348 13133 1702003222309982779 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -1519 9967 1702003219140423370 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -1518 9505 1702003218674022595 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -1520 7638 1702003216804832672 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -1522 7347 1702003216515065213 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 7322 10643 1702003219820090244 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -24 123 1702003366322380486 projects_ray_autogen/timestamp 596afd61accb21ff -24 123 1702003366322380486 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -24 123 1702003366322380486 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -24 123 1702003366322380486 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -134 4028 1702003370206861869 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -4028 4638 1702003370812462141 projects_ray 39216eb93299dfb -22 120 1702003848215642216 projects_ray_autogen/timestamp 596afd61accb21ff -22 120 1702003848215642216 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -22 120 1702003848215642216 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -22 120 1702003848215642216 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -131 4117 1702003852194592442 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -4117 4792 1702003852859088222 projects_ray 39216eb93299dfb -25 120 1702003881545063692 projects_ray_autogen/timestamp 596afd61accb21ff -25 120 1702003881545063692 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 120 1702003881545063692 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -25 120 1702003881545063692 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -131 4303 1702003885711583262 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -4303 4937 1702003886336803719 projects_ray 39216eb93299dfb -35 183 1702003956313590900 projects_ray_autogen/timestamp 596afd61accb21ff -35 183 1702003956313590900 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -35 183 1702003956313590900 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -35 183 1702003956313590900 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -198 5926 1702003962028979440 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -199 7964 1702003964075376361 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -7964 8524 1702003964627584488 projects_ray 39216eb93299dfb -25 129 1702004085125233675 projects_ray_autogen/timestamp 596afd61accb21ff -25 129 1702004085125233675 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 129 1702004085125233675 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -25 129 1702004085125233675 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -140 6664 1702004091638891582 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -6665 7413 1702004092383589540 projects_ray 39216eb93299dfb -37 194 1702004141875405867 projects_ray_autogen/timestamp 596afd61accb21ff -37 194 1702004141875405867 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -37 194 1702004141875405867 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -37 194 1702004141875405867 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -205 8018 1702004149674907145 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -8019 9152 1702004150807318401 projects_ray 39216eb93299dfb -36 189 1702004184971483525 projects_ray_autogen/timestamp 596afd61accb21ff -36 189 1702004184971483525 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -36 189 1702004184971483525 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -36 189 1702004184971483525 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -205 7390 1702004192150391768 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -7391 8229 1702004192981160354 projects_ray 39216eb93299dfb +1522 7347 1702003216515065213 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +1520 7638 1702003216804832672 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +1374 10525 1702051295639392649 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +142 4589 1702051323309388843 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +7348 13133 1702003222309982779 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +1519 8376 1702003217542021419 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +217 5985 1701995634163012992 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd +141 1304 1702051320029330483 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e +28 130 1702051318863014632 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +1563 6941 1701990816481916015 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 +141 3548 1702051322269948042 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +7447 11129 1702003220307150838 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +1520 7475 1702003216633517780 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 +1523 8028 1702003217194125172 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +1522 7394 1702003216558994370 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +1521 7513 1702003216675921800 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +1523 7322 1702003216473710600 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +28 130 1702051318863014632 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +1521 7538 1702003216705080931 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +28 130 1702051318863014632 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +7394 11026 1702003220201082344 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +28 130 1702051318863014632 projects_ray_autogen/timestamp 596afd61accb21ff +4590 5022 1702051323740946844 projects_ray 39216eb93299dfb +1519 7447 1702003216605842517 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +2 397 1701990808946533077 build.ninja d13bedc3f8269e08 +1573 16096 1701990825641772359 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 +1374 8208 1702051293321020274 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a +24 121 1702051504348612853 projects_ray_autogen/timestamp 596afd61accb21ff +24 121 1702051504348612853 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +24 121 1702051504348612853 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +24 121 1702051504348612853 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +132 4613 1702051508820144433 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +4613 5383 1702051509577455800 projects_ray 39216eb93299dfb +24 130 1702051680675022762 projects_ray_autogen/timestamp 596afd61accb21ff +24 130 1702051680675022762 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +24 130 1702051680675022762 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +24 130 1702051680675022762 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +141 4809 1702051685335507885 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +4809 5474 1702051685987942091 projects_ray 39216eb93299dfb +23 120 1702051907024345728 projects_ray_autogen/timestamp 596afd61accb21ff +23 120 1702051907024345728 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +23 120 1702051907024345728 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +23 120 1702051907024345728 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +131 4430 1702051911317761260 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +4431 5081 1702051911959642034 projects_ray 39216eb93299dfb +24 116 1702052039623722149 projects_ray_autogen/timestamp 596afd61accb21ff +24 116 1702052039623722149 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +24 116 1702052039623722149 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +24 116 1702052039623722149 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +127 4934 1702052044421455549 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +4934 5612 1702052045088443249 projects_ray 39216eb93299dfb +23 114 1702052095652159293 projects_ray_autogen/timestamp 596afd61accb21ff +23 114 1702052095652159293 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +23 114 1702052095652159293 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff +23 114 1702052095652159293 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +124 3293 1702052098820834216 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +3293 3771 1702052099285388510 projects_ray 39216eb93299dfb diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx Binary files differindex 4930f9b..2cdfbfe 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.cpp.98C70BDD9E551185.idx diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx Binary files differindex 87fc467..2dff661 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/mainwindow.h.23DBF4EEAB76EA9F.idx diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx Binary files differindex 97a8263..6fdf8a0 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/settings.h.1343DBB067FD6052.idx diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt index b938715..a51b0d2 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/CMakeFiles/projects_ray_autogen.dir/ParseCache.txt @@ -1,13 +1,13 @@ # Generated by CMake. Changes will be overwritten. /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/raytracer/raytracescene.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/main.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/raytracerutils.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/supersample.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/main.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/accelerate/myqthreads.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/normals.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/intersect/intersect.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/illuminate/reflect.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/aliasing/filter.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray Binary files differindex 468bd02..e9d3b09 100755 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp index 68217c0..ab0a902 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp @@ -43,20 +43,40 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "onUploadFile", "", "onSaveImage", - "onValChangeWSlider", + "onValChangexySlider", "newValue", - "onValChangeWBox" + "onValChangexyBox", + "onValChangexzSlider", + "onValChangexzBox", + "onValChangexwSlider", + "onValChangexwBox", + "onValChangeyzSlider", + "onValChangeyzBox", + "onValChangeywSlider", + "onValChangeywBox", + "onValChangezwSlider", + "onValChangezwBox" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[14]; + uint offsetsAndSizes[34]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; char stringdata3[12]; - char stringdata4[19]; + char stringdata4[20]; char stringdata5[9]; - char stringdata6[16]; + 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]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -66,17 +86,37 @@ 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, 18), // "onValChangeWSlider" - QT_MOC_LITERAL(56, 8), // "newValue" - QT_MOC_LITERAL(65, 15) // "onValChangeWBox" + 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" }, "MainWindow", "onUploadFile", "", "onSaveImage", - "onValChangeWSlider", + "onValChangexySlider", "newValue", - "onValChangeWBox" + "onValChangexyBox", + "onValChangexzSlider", + "onValChangexzBox", + "onValChangexwSlider", + "onValChangexwBox", + "onValChangeyzSlider", + "onValChangeyzBox", + "onValChangeywSlider", + "onValChangeywBox", + "onValChangezwSlider", + "onValChangezwBox" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -88,7 +128,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 4, 14, // methods + 14, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -96,16 +136,36 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 0, 38, 2, 0x08, 1 /* Private */, - 3, 0, 39, 2, 0x08, 2 /* Private */, - 4, 1, 40, 2, 0x08, 3 /* Private */, - 6, 1, 43, 2, 0x08, 5 /* Private */, + 1, 0, 98, 2, 0x08, 1 /* Private */, + 3, 0, 99, 2, 0x08, 2 /* Private */, + 4, 1, 100, 2, 0x08, 3 /* Private */, + 6, 1, 103, 2, 0x08, 5 /* Private */, + 7, 1, 106, 2, 0x08, 7 /* Private */, + 8, 1, 109, 2, 0x08, 9 /* Private */, + 9, 1, 112, 2, 0x08, 11 /* Private */, + 10, 1, 115, 2, 0x08, 13 /* Private */, + 11, 1, 118, 2, 0x08, 15 /* Private */, + 12, 1, 121, 2, 0x08, 17 /* Private */, + 13, 1, 124, 2, 0x08, 19 /* Private */, + 14, 1, 127, 2, 0x08, 21 /* Private */, + 15, 1, 130, 2, 0x08, 23 /* Private */, + 16, 1, 133, 2, 0x08, 25 /* 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, 0 // eod }; @@ -123,10 +183,40 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<void, std::false_type>, // method 'onSaveImage' QtPrivate::TypeAndForceComplete<void, std::false_type>, - // method 'onValChangeWSlider' + // method 'onValChangexySlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangexyBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'onValChangexzSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangexzBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'onValChangexwSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangexwBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'onValChangeyzSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangeyzBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'onValChangeywSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangeywBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'onValChangezwSlider' QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<int, std::false_type>, - // method 'onValChangeWBox' + // method 'onValChangezwBox' QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<double, std::false_type> >, @@ -141,8 +231,18 @@ 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->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; - case 3: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); 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; default: ; } } @@ -167,13 +267,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 4) + if (_id < 14) qt_static_metacall(this, _c, _id, _a); - _id -= 4; + _id -= 14; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 4) + if (_id < 14) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 4; + _id -= 14; } return _id; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index e4c9675..45c1c2c 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -25,8 +25,25 @@ void MainWindow::initialize() { QFont font; font.setPointSize(12); font.setBold(true); - QLabel *w_label = new QLabel(); // Width label - w_label->setText("W value:"); + QLabel *xy_label = new QLabel(); // XY label + xy_label->setText("XY value:"); + xy_label->setFont(font); + QLabel *xz_label = new QLabel(); // XZ label + xz_label->setText("XZ value:"); + xz_label->setFont(font); + QLabel *xw_label = new QLabel(); // XW label + xw_label->setText("XW value:"); + xw_label->setFont(font); + QLabel *yz_label = new QLabel(); // YZ label + yz_label->setText("YZ value:"); + yz_label->setFont(font); + QLabel *yw_label = new QLabel(); // YW label + yw_label->setText("YW value:"); + yw_label->setFont(font); + QLabel *zw_label = new QLabel(); // ZW label + zw_label->setText("ZW value:"); + zw_label->setFont(font); + // Create file uploader for scene file uploadFile = new QPushButton(); @@ -35,33 +52,148 @@ void MainWindow::initialize() { saveImage = new QPushButton(); saveImage->setText(QStringLiteral("Save image")); - QGroupBox *wLayout = new QGroupBox(); // horizonal w slider alignment - QHBoxLayout *lw = new QHBoxLayout(); + QGroupBox *xyLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lxy = new QHBoxLayout(); + + xySlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + xySlider->setTickInterval(1); + xySlider->setMinimum(-1000); + xySlider->setMaximum(1000); + xySlider->setValue(0); + + xyBox = new QDoubleSpinBox(); + xyBox->setMinimum(-10.0f); + xyBox->setMaximum(10.f); + xyBox->setSingleStep(0.1f); + xyBox->setValue(0.f); + + lxy->addWidget(xySlider); + lxy->addWidget(xyBox); + xyLayout->setLayout(lxy); + + // XZ Slider + QGroupBox *xzLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lxz = new QHBoxLayout(); + + xzSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + xzSlider->setTickInterval(1); + xzSlider->setMinimum(-1000); + xzSlider->setMaximum(1000); + xzSlider->setValue(0); + + xzBox = new QDoubleSpinBox(); + xzBox->setMinimum(-10.0f); + xzBox->setMaximum(10.f); + xzBox->setSingleStep(0.1f); + xzBox->setValue(0.f); + + lxz->addWidget(xzSlider); + lxz->addWidget(xzBox); + xzLayout->setLayout(lxz); + + // XW Slider + QGroupBox *xwLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lxw = new QHBoxLayout(); + + xwSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + xwSlider->setTickInterval(1); + xwSlider->setMinimum(-1000); + xwSlider->setMaximum(1000); + xwSlider->setValue(0); + + xwBox = new QDoubleSpinBox(); + xwBox->setMinimum(-10.0f); + xwBox->setMaximum(10.f); + xwBox->setSingleStep(0.1f); + xwBox->setValue(0.f); + + lxw->addWidget(xwSlider); + lxw->addWidget(xwBox); + xwLayout->setLayout(lxw); + + // YZ Slider + QGroupBox *yzLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lyz = new QHBoxLayout(); + + yzSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + yzSlider->setTickInterval(1); + yzSlider->setMinimum(-1000); + yzSlider->setMaximum(1000); + yzSlider->setValue(0); + + yzBox = new QDoubleSpinBox(); + yzBox->setMinimum(-10.0f); + yzBox->setMaximum(10.f); + yzBox->setSingleStep(0.1f); + yzBox->setValue(0.f); + + lyz->addWidget(yzSlider); + lyz->addWidget(yzBox); + yzLayout->setLayout(lyz); + + // YW Slider + QGroupBox *ywLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lyw = new QHBoxLayout(); + + ywSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + ywSlider->setTickInterval(1); + ywSlider->setMinimum(-1000); + ywSlider->setMaximum(1000); + ywSlider->setValue(0); + + ywBox = new QDoubleSpinBox(); + ywBox->setMinimum(-10.0f); + ywBox->setMaximum(10.f); + ywBox->setSingleStep(0.1f); + ywBox->setValue(100.f); + + lyw->addWidget(ywSlider); + lyw->addWidget(ywBox); + ywLayout->setLayout(lyw); + + // ZW Slider + QGroupBox *zwLayout = new QGroupBox(); // horizonal w slider alignment + QHBoxLayout *lzw = new QHBoxLayout(); - wSlider = new QSlider(Qt::Orientation::Horizontal); // W value slider - wSlider->setTickInterval(1); - wSlider->setMinimum(1); - wSlider->setMaximum(100); - wSlider->setValue(1); + zwSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + zwSlider->setTickInterval(1); + zwSlider->setMinimum(-1000); + zwSlider->setMaximum(1000); + zwSlider->setValue(0); - wBox = new QDoubleSpinBox(); - wBox->setMinimum(0.01f); - wBox->setMaximum(1.f); - wBox->setSingleStep(0.01f); - wBox->setValue(0.01f); + zwBox = new QDoubleSpinBox(); + zwBox->setMinimum(-10.0f); + zwBox->setMaximum(10.f); + zwBox->setSingleStep(0.1f); + zwBox->setValue(100.f); - lw->addWidget(wSlider); - lw->addWidget(wBox); - wLayout->setLayout(lw); + lzw->addWidget(zwSlider); + lzw->addWidget(zwBox); + zwLayout->setLayout(lzw); vLayout->addWidget(uploadFile); vLayout->addWidget(saveImage); - vLayout->addWidget(w_label); - vLayout->addWidget(wLayout); + vLayout->addWidget(xy_label); + vLayout->addWidget(xyLayout); + vLayout->addWidget(xz_label); + vLayout->addWidget(xzLayout); + vLayout->addWidget(xw_label); + vLayout->addWidget(xwLayout); + vLayout->addWidget(yz_label); + vLayout->addWidget(yzLayout); + vLayout->addWidget(yw_label); + vLayout->addWidget(ywLayout); + vLayout->addWidget(zw_label); + vLayout->addWidget(zwLayout); connectUIElements(); - onValChangeWBox(0.01f); + onValChangexyBox(0.0f); + onValChangexzBox(0.0f); + onValChangexwBox(0.0f); + onValChangeyzBox(0.0f); + onValChangeywBox(0.0f); + onValChangezwBox(0.0f); } void MainWindow::finish() { @@ -72,7 +204,12 @@ void MainWindow::finish() { void MainWindow::connectUIElements() { connectUploadFile(); connectSaveImage(); - connectW(); + connectxy(); + connectxz(); + connectxw(); + connectyz(); + connectyw(); + connectzw(); } void MainWindow::connectUploadFile() { @@ -83,10 +220,40 @@ void MainWindow::connectSaveImage() { connect(saveImage, &QPushButton::clicked, this, &MainWindow::onSaveImage); } -void MainWindow::connectW() { - connect(wSlider, &QSlider::valueChanged, this, &MainWindow::onValChangeWSlider); - connect(wBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), - this, &MainWindow::onValChangeWBox); +void MainWindow::connectxy() { + connect(xySlider, &QSlider::valueChanged, this, &MainWindow::onValChangexySlider); + connect(xyBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangexyBox); +} + +void MainWindow::connectxz() { + connect(xzSlider, &QSlider::valueChanged, this, &MainWindow::onValChangexzSlider); + connect(xzBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangexzBox); +} + +void MainWindow::connectxw() { + connect(xwSlider, &QSlider::valueChanged, this, &MainWindow::onValChangexwSlider); + connect(xwBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangexwBox); +} + +void MainWindow::connectyz() { + connect(yzSlider, &QSlider::valueChanged, this, &MainWindow::onValChangeyzSlider); + connect(yzBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangeyzBox); +} + +void MainWindow::connectyw() { + connect(ywSlider, &QSlider::valueChanged, this, &MainWindow::onValChangeywSlider); + connect(ywBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangeywBox); +} + +void MainWindow::connectzw() { + connect(zwSlider, &QSlider::valueChanged, this, &MainWindow::onValChangezwSlider); + connect(zwBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangezwBox); } void MainWindow::onUploadFile() { @@ -132,16 +299,86 @@ void MainWindow::onSaveImage() { // realtime->saveViewportImage(filePath.toStdString()); } -void MainWindow::onValChangeWSlider(int newValue) { +void MainWindow::onValChangexySlider(int newValue) { + //wSlider->setValue(newValue); + xyBox->setValue(newValue/100.f); + settings.xy = xyBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangexyBox(double newValue) { + xySlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.xy = xyBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangexzSlider(int newValue) { + //wSlider->setValue(newValue); + xzBox->setValue(newValue/100.f); + settings.xz = xzBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangexzBox(double newValue) { + xzSlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.xz = xzBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangexwSlider(int newValue) { + //wSlider->setValue(newValue); + xwBox->setValue(newValue/100.f); + settings.xw = xwBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangexwBox(double newValue) { + xwSlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.xw = xwBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangeyzSlider(int newValue) { + //wSlider->setValue(newValue); + yzBox->setValue(newValue/100.f); + settings.yz = yzBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangeyzBox(double newValue) { + yzSlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.yz = yzBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangeywSlider(int newValue) { + //wSlider->setValue(newValue); + ywBox->setValue(newValue/100.f); + settings.yw = ywBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangeywBox(double newValue) { + ywSlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.yw = ywBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangezwSlider(int newValue) { //wSlider->setValue(newValue); - wBox->setValue(newValue/100.f); - settings.w = wBox->value(); + zwBox->setValue(newValue/100.f); + settings.zw = zwBox->value(); rayTracer->settingsChanged(imageLabel); } -void MainWindow::onValChangeWBox(double newValue) { - wSlider->setValue(int(newValue*100.f)); +void MainWindow::onValChangezwBox(double newValue) { + zwSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); - settings.w = wBox->value(); + settings.zw = zwBox->value(); rayTracer->settingsChanged(imageLabel); } diff --git a/src/mainwindow.h b/src/mainwindow.h index 9cd5d1a..6c98ae2 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -24,18 +24,43 @@ private: void connectUIElements(); void connectUploadFile(); void connectSaveImage(); - void connectW(); + void connectxy(); + void connectxz(); + void connectxw(); + void connectyz(); + void connectyw(); + void connectzw(); RayTracer *rayTracer; AspectRatioWidget *aspectRatioWidget; QPushButton *uploadFile; QPushButton *saveImage; - QSlider *wSlider; - QDoubleSpinBox *wBox; + QSlider *xySlider; + QDoubleSpinBox *xyBox; + QSlider *xzSlider; + QDoubleSpinBox *xzBox; + QSlider *xwSlider; + QDoubleSpinBox *xwBox; + QSlider *yzSlider; + QDoubleSpinBox *yzBox; + QSlider *ywSlider; + QDoubleSpinBox *ywBox; + QSlider *zwSlider; + QDoubleSpinBox *zwBox; private slots: void onUploadFile(); void onSaveImage(); - void onValChangeWSlider(int newValue); - void onValChangeWBox(double newValue); + void onValChangexySlider(int newValue); + void onValChangexyBox(double newValue); + void onValChangexzSlider(int newValue); + void onValChangexzBox(double newValue); + void onValChangexwSlider(int newValue); + void onValChangexwBox(double newValue); + void onValChangeyzSlider(int newValue); + void onValChangeyzBox(double newValue); + void onValChangeywSlider(int newValue); + void onValChangeywBox(double newValue); + void onValChangezwSlider(int newValue); + void onValChangezwBox(double newValue); }; diff --git a/src/settings.h b/src/settings.h index c8a454e..ba383b3 100644 --- a/src/settings.h +++ b/src/settings.h @@ -5,8 +5,13 @@ struct Settings { std::string sceneFilePath; - float w = 1; - + float xy = 0.f; + float z = 0.f; + float xz = 0.f; + float yz = 0.f; + float xw = 0.f; + float yw = 0.f; + float zw = 0.f; }; |