diff options
14 files changed, 247 insertions, 132 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 9c478ad..7bbf227 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 e87be80..767b535 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,75 +1,86 @@ # ninja log v5 -1462 8443 1702497743027057245 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -7970 16478 1702496995857081328 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 -3 644 1702496979342877780 build.ninja d13bedc3f8269e08 -1464 8226 1702497742808110235 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -7932 14357 1702496993731854831 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -8301 11075 1702496990452048080 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e -23 142 1702499620401460301 /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 -1463 5285 1702497739854993443 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -7824 12107 1702497746699373523 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -23 142 1702499620401460301 projects_ray_autogen/timestamp 596afd61accb21ff -23 142 1702499620401460301 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -1465 7824 1702497742404091638 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -1466 7828 1702497742403816618 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1466 8091 1702497742674323769 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -5286 11013 1702497745599992662 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -1465 7833 1702497742411369493 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -7833 11675 1702497746266975022 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -186 3961 1702499007367373462 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -7828 12199 1702497746794061051 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -133 2103 1702496981479061715 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 -7700 14273 1702497748866868254 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -1463 8964 1702497743544475194 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -1462 10353 1702497744935503521 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +1442 11333 1702502080261897670 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +7373 11955 1702502080895124963 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd +14529 14975 1702502083913028186 projects_ray cae90fddb8ce24a +1444 7785 1702502076706246748 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +4137 9638 1702502078572682560 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +7785 10644 1702502079568768108 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 +25 1440 1702502070364219000 /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 +4997 10377 1702502079309285897 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed 133 4986 1702496984352747028 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o fb1aaa91c9ad0758 -1468 7699 1702497742276914140 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -23 142 1702499620401460301 /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 -133 4626 1702496983996797838 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 -1467 7641 1702497742216732530 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -1464 8308 1702497742891850212 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -5756 6214 1702499626456213661 projects_ray cae90fddb8ce24a -7641 11693 1702497746286128824 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -153 5756 1702499625997420014 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -25 142 1702499707985021873 projects_ray_autogen/timestamp 596afd61accb21ff -25 142 1702499707985021873 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -25 142 1702499707985021873 /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 142 1702499707985021873 /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 -152 5210 1702499713039574739 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -5210 5616 1702499713440518960 projects_ray cae90fddb8ce24a -44 230 1702500800071527644 projects_ray_autogen/timestamp 596afd61accb21ff -44 230 1702500800071527644 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -44 230 1702500800071527644 /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 -44 230 1702500800071527644 /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 -242 6004 1702500805828390622 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -6004 6501 1702500806326815787 projects_ray cae90fddb8ce24a -24 1462 1702501292592543000 projects_ray_autogen/timestamp 596afd61accb21ff -24 1462 1702501292592543000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -24 1462 1702501292592543000 /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 1462 1702501292592543000 /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 -1469 7315 1702501298451180729 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -1470 7415 1702501298547523110 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -1465 7525 1702501298663733475 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -1464 7543 1702501298681999754 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -1466 7551 1702501298686285580 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -1468 7772 1702501298902231247 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -1464 7938 1702501299076364610 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b -1464 7986 1702501299122708824 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 -1462 8117 1702501299256168038 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -1473 8180 1702501299314625470 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -1463 8536 1702501299676130377 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -1463 8914 1702501300052976872 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -1462 9807 1702501300946463934 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -1463 10596 1702501301736685757 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -7316 10969 1702501302117475959 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -7551 11012 1702501302158592748 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -7525 11417 1702501302564157257 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -7544 11487 1702501302635536016 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -7415 13574 1702501304719725411 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -13575 13997 1702501305143786399 projects_ray cae90fddb8ce24a -22 129 1702501320355387853 projects_ray_autogen/timestamp 596afd61accb21ff -22 129 1702501320355387853 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -22 129 1702501320355387853 /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 129 1702501320355387853 /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 -139 4441 1702501324656091892 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -4442 4818 1702501325025444101 projects_ray cae90fddb8ce24a +1441 10260 1702502079190011027 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +1442 8607 1702502077537074931 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +7389 14529 1702502083470206839 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +1441 9183 1702502078111367353 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +8607 10464 1702502079398877485 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 +7745 12512 1702502081454465406 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +7938 12177 1702502081118646465 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e +1445 7373 1702502076293422448 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 +7369 12285 1702502081226970973 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +1447 7548 1702502076479699068 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +1446 7368 1702502076298566107 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +1445 7389 1702502076320362321 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +25 1440 1702502070364219000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +25 1440 1702502070364219000 projects_ray_autogen/timestamp 596afd61accb21ff +7548 12384 1702502081324628833 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +1442 4996 1702502073932406730 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 +1443 8722 1702502077634388661 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd +1441 4136 1702502073070914922 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e +25 1440 1702502070364219000 /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 +1444 7744 1702502076671039056 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +3 644 1702496979342877780 build.ninja d13bedc3f8269e08 +7970 16478 1702496995857081328 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 4d14ff80692ac6b3 +1440 7938 1702502076858533560 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a +41 1416 1702503055426635000 projects_ray_autogen/timestamp 596afd61accb21ff +41 1416 1702503055426635000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +41 1416 1702503055426635000 /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 +41 1416 1702503055426635000 /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 +1417 4370 1702503058390240459 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e +1418 5287 1702503059300395795 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 +1421 7900 1702503061897932338 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 +1420 7904 1702503061897551890 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 +1420 7930 1702503061941045593 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 +1422 8367 1702503062377210780 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 +1419 8464 1702503062470776194 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o 2ea2e8e07c7b357b +1419 8535 1702503062531372618 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +1416 8739 1702503062737692408 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a +1418 9518 1702503063528101124 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de +1419 9619 1702503063633632587 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd +4370 10731 1702503064751048045 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 +1417 11249 1702503065257238717 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +5287 11315 1702503065333784637 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed +8535 11505 1702503065530125532 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o 176379e1dc38d565 +1418 12142 1702503066152084623 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +7905 12619 1702503066643491947 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd +8739 12892 1702503066912153573 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e +7900 12990 1702503067016107946 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 +8367 13158 1702503067185765064 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 +8464 13274 1702503067302212123 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 +7931 15245 1702503069270843271 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc +29 1203 1702503137114049000 projects_ray_autogen/timestamp 596afd61accb21ff +29 1203 1702503137114049000 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +29 1203 1702503137114049000 /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 +29 1203 1702503137114049000 /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 +1203 4793 1702503140720509418 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a +1204 5497 1702503141425276473 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +1204 6105 1702503142030087394 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 +1204 6749 1702503142677037948 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a +6749 7183 1702503143108017882 projects_ray cae90fddb8ce24a +25 131 1702503230850786211 projects_ray_autogen/timestamp 596afd61accb21ff +25 131 1702503230850786211 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +25 131 1702503230850786211 /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 131 1702503230850786211 /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 3661 1702503234366648933 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +3661 4217 1702503234909838916 projects_ray cae90fddb8ce24a +25 151 1702503377940814912 projects_ray_autogen/timestamp 596afd61accb21ff +25 151 1702503377940814912 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +25 151 1702503377940814912 /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 151 1702503377940814912 /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 +164 3623 1702503381400279783 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +3623 4141 1702503381915840291 projects_ray cae90fddb8ce24a +23 138 1702503499779212795 projects_ray_autogen/timestamp 596afd61accb21ff +23 138 1702503499779212795 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff +23 138 1702503499779212795 /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 138 1702503499779212795 /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 +148 3878 1702503503505907724 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff +3878 4391 1702503504005217089 projects_ray cae90fddb8ce24a diff --git a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/camera.cpp.1985063F4A77CAE0.idx b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/camera.cpp.1985063F4A77CAE0.idx Binary files differindex c8b1eaf..1752d22 100644 --- a/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/camera.cpp.1985063F4A77CAE0.idx +++ b/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.qtc_clangd/.cache/clangd/index/camera.cpp.1985063F4A77CAE0.idx 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 2741c62..adcdbe4 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 3468e81..ffa38b8 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 bccbe99..c9fc280 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 4258689..d9d8111 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,8 +1,8 @@ # Generated by CMake. Changes will be overwritten. /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/settings.cpp +/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/camera/camera.cpp /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/utils/scenefilereader.cpp -/Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/utils/sceneparser.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/physics/physics.cpp /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/src/settings.h /Users/lafayette_bussey/Desktop/cs1230/the-all-americans-in-cs1230/src/raytracer/raytracescene.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 2b252cb..0316272 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 b36939a..ef1c83a 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 @@ -69,11 +69,14 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateRotationSlider", "onValChangeWSlider", "onValChangeWBox", - "updateTimeValue" + "updateTimeValue", + "onValChangezSlider", + "onValChangezBox", + "updateZSlider" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[62]; + uint offsetsAndSizes[68]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; @@ -105,6 +108,9 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata28[19]; char stringdata29[16]; char stringdata30[16]; + char stringdata31[19]; + char stringdata32[16]; + char stringdata33[14]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -140,7 +146,10 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st QT_MOC_LITERAL(435, 20), // "updateRotationSlider" QT_MOC_LITERAL(456, 18), // "onValChangeWSlider" QT_MOC_LITERAL(475, 15), // "onValChangeWBox" - QT_MOC_LITERAL(491, 15) // "updateTimeValue" + QT_MOC_LITERAL(491, 15), // "updateTimeValue" + QT_MOC_LITERAL(507, 18), // "onValChangezSlider" + QT_MOC_LITERAL(526, 15), // "onValChangezBox" + QT_MOC_LITERAL(542, 13) // "updateZSlider" }, "MainWindow", "onUploadFile", @@ -172,7 +181,10 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateRotationSlider", "onValChangeWSlider", "onValChangeWBox", - "updateTimeValue" + "updateTimeValue", + "onValChangezSlider", + "onValChangezBox", + "updateZSlider" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -184,7 +196,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 28, 14, // methods + 31, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -192,34 +204,37 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 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 */, + 1, 0, 200, 2, 0x08, 1 /* Private */, + 3, 0, 201, 2, 0x08, 2 /* Private */, + 4, 0, 202, 2, 0x08, 3 /* Private */, + 5, 1, 203, 2, 0x08, 4 /* Private */, + 7, 1, 206, 2, 0x08, 6 /* Private */, + 8, 1, 209, 2, 0x08, 8 /* Private */, + 9, 1, 212, 2, 0x08, 10 /* Private */, + 10, 1, 215, 2, 0x08, 12 /* Private */, + 11, 1, 218, 2, 0x08, 14 /* Private */, + 12, 1, 221, 2, 0x08, 16 /* Private */, + 13, 1, 224, 2, 0x08, 18 /* Private */, + 14, 1, 227, 2, 0x08, 20 /* Private */, + 15, 1, 230, 2, 0x08, 22 /* Private */, + 16, 1, 233, 2, 0x08, 24 /* Private */, + 17, 1, 236, 2, 0x08, 26 /* Private */, + 18, 1, 239, 2, 0x08, 28 /* Private */, + 19, 1, 242, 2, 0x08, 30 /* Private */, + 20, 0, 245, 2, 0x08, 32 /* Private */, + 21, 1, 246, 2, 0x08, 33 /* Private */, + 22, 1, 249, 2, 0x08, 35 /* Private */, + 23, 1, 252, 2, 0x08, 37 /* Private */, + 24, 1, 255, 2, 0x08, 39 /* Private */, + 25, 1, 258, 2, 0x08, 41 /* Private */, + 26, 1, 261, 2, 0x08, 43 /* Private */, + 27, 1, 264, 2, 0x08, 45 /* Private */, + 28, 1, 267, 2, 0x08, 47 /* Private */, + 29, 1, 270, 2, 0x08, 49 /* Private */, + 30, 0, 273, 2, 0x08, 51 /* Private */, + 31, 1, 274, 2, 0x08, 52 /* Private */, + 32, 1, 277, 2, 0x08, 54 /* Private */, + 33, 1, 280, 2, 0x08, 56 /* Private */, // slots: parameters QMetaType::Void, @@ -250,6 +265,9 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { QMetaType::Void, QMetaType::Int, 6, QMetaType::Void, QMetaType::Double, 6, QMetaType::Void, + QMetaType::Void, QMetaType::Int, 6, + QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, QMetaType::Double, 6, 0 // eod }; @@ -341,7 +359,16 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<void, std::false_type>, QtPrivate::TypeAndForceComplete<double, std::false_type>, // method 'updateTimeValue' - QtPrivate::TypeAndForceComplete<void, std::false_type> + QtPrivate::TypeAndForceComplete<void, std::false_type>, + // method 'onValChangezSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<int, std::false_type>, + // method 'onValChangezBox' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'updateZSlider' + QtPrivate::TypeAndForceComplete<void, std::false_type>, + QtPrivate::TypeAndForceComplete<double, std::false_type> >, nullptr } }; @@ -380,6 +407,9 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, 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->updateTimeValue(); break; + case 28: _t->onValChangezSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; + case 29: _t->onValChangezBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 30: _t->updateZSlider((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; default: ; } } @@ -404,13 +434,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 28) + if (_id < 31) qt_static_metacall(this, _c, _id, _a); - _id -= 28; + _id -= 31; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 28) + if (_id < 31) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 28; + _id -= 31; } return _id; } diff --git a/src/camera/camera.cpp b/src/camera/camera.cpp index ae7fdd3..172c5de 100644 --- a/src/camera/camera.cpp +++ b/src/camera/camera.cpp @@ -14,7 +14,7 @@ void Camera::updateViewMatrix(SceneCameraData cameraData) { // TODO: rename & link sliders here. also add one more for the fourth dimension. // make them smaller intervals on the sliders since our objects are so small - glm::vec4 uiTranslation = glm::vec4(settings.xw, settings.yw, 0.f, settings.zw); + glm::vec4 uiTranslation = glm::vec4(settings.xw, settings.yw, settings.z, settings.zw); m_translationVector = -cameraData.pos + uiTranslation; m_inverseViewMatrix = glm::inverse(m_viewMatrix); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ed5b32e..8895742 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -32,7 +32,7 @@ void MainWindow::initialize() { xz_label->setText("Rotation XZ angle (I, M)"); xz_label->setFont(font); QLabel *xw_label = new QLabel(); // XW label - xw_label->setText("Translate X (W,D)"); + xw_label->setText("Translate X (W,S)"); xw_label->setFont(font); QLabel *yz_label = new QLabel(); // YZ label yz_label->setText("Rotation YZ angle (O, N):"); @@ -43,6 +43,9 @@ void MainWindow::initialize() { QLabel *zw_label = new QLabel(); // ZW label zw_label->setText("Translate W (R, F):"); zw_label->setFont(font); + QLabel *z_label = new QLabel(); // W label + z_label->setText("Translate Z (T, G):"); + z_label->setFont(font); QLabel *w_label = new QLabel(); // W label w_label->setText("Vorex Depth:"); w_label->setFont(font); @@ -79,7 +82,7 @@ void MainWindow::initialize() { xyBox = new QDoubleSpinBox(); xyBox->setMinimum(0.0f); xyBox->setMaximum(360.f); - xyBox->setSingleStep(1.f); + xyBox->setSingleStep(0.1f); xyBox->setValue(0.f); lxy->addWidget(xySlider); @@ -99,7 +102,7 @@ void MainWindow::initialize() { xzBox = new QDoubleSpinBox(); xzBox->setMinimum(0.0f); xzBox->setMaximum(360.f); - xzBox->setSingleStep(1.f); + xzBox->setSingleStep(0.1f); xzBox->setValue(0.f); lxz->addWidget(xzSlider); @@ -112,14 +115,14 @@ void MainWindow::initialize() { xwSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider xwSlider->setTickInterval(1); - xwSlider->setMinimum(0); - xwSlider->setMaximum(36000); + xwSlider->setMinimum(-10000); + xwSlider->setMaximum(10000); xwSlider->setValue(0); xwBox = new QDoubleSpinBox(); - xwBox->setMinimum(0.0f); - xwBox->setMaximum(360.f); - xwBox->setSingleStep(1.f); + xwBox->setMinimum(-100.0f); + xwBox->setMaximum(100.f); + xwBox->setSingleStep(0.1f); xwBox->setValue(0.f); lxw->addWidget(xwSlider); @@ -139,7 +142,7 @@ void MainWindow::initialize() { yzBox = new QDoubleSpinBox(); yzBox->setMinimum(0.0f); yzBox->setMaximum(360.f); - yzBox->setSingleStep(1.f); + yzBox->setSingleStep(0.1f); yzBox->setValue(0.f); lyz->addWidget(yzSlider); @@ -152,14 +155,14 @@ void MainWindow::initialize() { ywSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider ywSlider->setTickInterval(1); - ywSlider->setMinimum(0); - ywSlider->setMaximum(36000); + ywSlider->setMinimum(-10000); + ywSlider->setMaximum(10000); ywSlider->setValue(0); ywBox = new QDoubleSpinBox(); - ywBox->setMinimum(0.0f); - ywBox->setMaximum(360.f); - ywBox->setSingleStep(1.f); + ywBox->setMinimum(-100.0f); + ywBox->setMaximum(100.f); + ywBox->setSingleStep(0.1f); ywBox->setValue(0.f); lyw->addWidget(ywSlider); @@ -172,20 +175,40 @@ void MainWindow::initialize() { zwSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider zwSlider->setTickInterval(1); - zwSlider->setMinimum(0); - zwSlider->setMaximum(36000); + zwSlider->setMinimum(-10000); + zwSlider->setMaximum(10000); zwSlider->setValue(0); zwBox = new QDoubleSpinBox(); - zwBox->setMinimum(0.0f); - zwBox->setMaximum(360.f); - zwBox->setSingleStep(1.f); + zwBox->setMinimum(-100.0f); + zwBox->setMaximum(100.f); + zwBox->setSingleStep(0.1f); zwBox->setValue(0.f); lzw->addWidget(zwSlider); lzw->addWidget(zwBox); zwLayout->setLayout(lzw); + // translate z + QGroupBox *zLayout = new QGroupBox(); // horizontal w slider alignment + QHBoxLayout *lz = new QHBoxLayout(); + + zSlider = new QSlider(Qt::Orientation::Horizontal); // XY value slider + zSlider->setTickInterval(1); + zSlider->setMinimum(-10000); + zSlider->setMaximum(10000); + zSlider->setValue(0); + + zBox = new QDoubleSpinBox(); + zBox->setMinimum(-100.0f); + zBox->setMaximum(100.f); + zBox->setSingleStep(0.1f); + zBox->setValue(0.f); + + lz->addWidget(zSlider); + lz->addWidget(zBox); + zLayout->setLayout(lz); + // Max Time Slider QGroupBox *maxTimeGroupBox = new QGroupBox(); // horizontal QHBoxLayout *maxTimeLayout = new QHBoxLayout(); @@ -248,6 +271,8 @@ void MainWindow::initialize() { vLayout->addWidget(ywLayout); vLayout->addWidget(zw_label); vLayout->addWidget(zwLayout); + vLayout->addWidget(z_label); + vLayout->addWidget(zLayout); vLayout->addWidget(w_label); vLayout->addWidget(wLayout); vLayout->addWidget(currTimeLabel); @@ -277,6 +302,7 @@ void MainWindow::connectUIElements() { connectyz(); connectyw(); connectzw(); + connectz(); connectMaxTimeSlider(); connectNegativeRotation(); connect(rayTracer, &RayTracer::xyRotationChanged, this, &MainWindow::updateXySlider); @@ -285,6 +311,8 @@ void MainWindow::connectUIElements() { connect(rayTracer, &RayTracer::yzRotationChanged, this, &MainWindow::updateYzSlider); connect(rayTracer, &RayTracer::ywRotationChanged, this, &MainWindow::updateYwSlider); connect(rayTracer, &RayTracer::zwRotationChanged, this, &MainWindow::updateZwSlider); + connect(rayTracer, &RayTracer::zChanged, this, &MainWindow::updateZSlider); + connect(rayTracer, &RayTracer::rotationChanged, this, &MainWindow::updateRotationSlider); // connect(rayTracer, &RayTracer::cameraPositionChanged, this, &MainWindow::updateCameraPosition); connect(rayTracer, &RayTracer::timeValueChanged, this, &MainWindow::updateTimeValue); @@ -339,6 +367,26 @@ void MainWindow::connectzw() { this, &MainWindow::onValChangezwBox); } +void MainWindow::connectz() { + connect(zSlider, &QSlider::valueChanged, this, &MainWindow::onValChangezSlider); + connect(zBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), + this, &MainWindow::onValChangezBox); +} + +void MainWindow::onValChangezSlider(int newValue) { + //wSlider->setValue(newValue); + zBox->setValue(newValue/100.f); + settings.z = zBox->value(); + rayTracer->settingsChanged(imageLabel); +} + +void MainWindow::onValChangezBox(double newValue) { + zSlider->setValue(int(newValue*100.f)); + //wBox->setValue(newValue); + settings.z = zBox->value(); + rayTracer->settingsChanged(imageLabel); +} + void MainWindow::connectMaxTimeSlider() { connect(maxTimeSlider, &QSlider::valueChanged, this, &MainWindow::onValChangeMaxTimeSlider); connect(maxTimeSpinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), @@ -573,3 +621,10 @@ void MainWindow::updateRotationSlider(float value) { void MainWindow::updateTimeValue() { currTimeLabel->setText("Curr Time: " + QString::number(settings.currentTime)); } + +void MainWindow::updateZSlider(double value) { + // TODO IDK why the values are not changin + zSlider->setValue(int(settings.z*100.f)); + zBox->setValue(settings.z); + rayTracer->settingsChanged(imageLabel); +} diff --git a/src/mainwindow.h b/src/mainwindow.h index b608dd5..ff0d203 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -33,6 +33,7 @@ private: void connectMaxTimeSlider(); void connectNegativeRotation(); void connectW(); + void connectz(); RayTracer *rayTracer; AspectRatioWidget *aspectRatioWidget; @@ -57,6 +58,8 @@ private: QSlider *wSlider; QDoubleSpinBox *wBox; QLabel *currTimeLabel; + QSlider *zSlider; + QDoubleSpinBox *zBox; private slots: @@ -89,4 +92,9 @@ private slots: void onValChangeWBox(double newValue); // void updateCameraPosition(); void updateTimeValue(); + + void onValChangezSlider(int newValue); + void onValChangezBox(double newValue); + void updateZSlider(double newValue); + }; diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index 604d717..6c3c77a 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -323,6 +323,16 @@ void RayTracer::keyPressEvent(QKeyEvent *event) { } // TODO: add slider for z translation + // T and G for z translation + if (m_keyMap[Qt::Key_T]) { + settings.z += settings.translation; + emit zChanged(settings.zw); + } + + if (m_keyMap[Qt::Key_G]) { + settings.z -= settings.translation; + emit zChanged(settings.zw); + } // R & F for w translation using zw if (m_keyMap[Qt::Key_R]) { diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h index 1d88de9..d783289 100644 --- a/src/raytracer/raytracer.h +++ b/src/raytracer/raytracer.h @@ -194,5 +194,6 @@ signals: void rotationChanged(float value); void cameraPositionChanged(glm::vec3 value); void timeValueChanged(int value); + void zChanged(int value); }; |