aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-12-13 20:06:17 -0500
committersotech117 <michael_foiani@brown.edu>2023-12-13 20:06:17 -0500
commitdc644bd10d504a49f6982c9326754f67287c1aec (patch)
tree5d95bd9a8879d7805a95ada2f4aae47478a66726
parent9b8f378a50aa379b8663e84f9826218b3e319649 (diff)
fun scene fules
-rw-r--r--.DS_Storebin14340 -> 14340 bytes
-rw-r--r--cmake-build-release/.ninja_depsbin857960 -> 975088 bytes
-rw-r--r--cmake-build-release/.ninja_log132
-rw-r--r--cmake-build-release/Testing/Temporary/LastTest.log4
-rwxr-xr-xcmake-build-release/projects_raybin373529 -> 373385 bytes
-rw-r--r--cmake-build-release/t/0000.pngbin850 -> 1099 bytes
-rw-r--r--cmake-build-release/t/0001.pngbin891 -> 824 bytes
-rw-r--r--cmake-build-release/t/0002.pngbin862 -> 824 bytes
-rw-r--r--cmake-build-release/t/0003.pngbin946 -> 824 bytes
-rw-r--r--cmake-build-release/t/0004.pngbin1144 -> 824 bytes
-rw-r--r--cmake-build-release/t/0005.pngbin1247 -> 824 bytes
-rw-r--r--cmake-build-release/t/0006.pngbin1468 -> 824 bytes
-rw-r--r--cmake-build-release/t/0007.pngbin1664 -> 824 bytes
-rw-r--r--cmake-build-release/t/0008.pngbin1885 -> 824 bytes
-rw-r--r--cmake-build-release/t/0009.pngbin2043 -> 824 bytes
-rw-r--r--cmake-build-release/t/0010.pngbin2390 -> 824 bytes
-rw-r--r--cmake-build-release/t/0011.pngbin2706 -> 824 bytes
-rw-r--r--cmake-build-release/t/0012.pngbin3182 -> 824 bytes
-rw-r--r--cmake-build-release/t/0013.pngbin3556 -> 824 bytes
-rw-r--r--cmake-build-release/t/0014.pngbin4129 -> 824 bytes
-rw-r--r--cmake-build-release/t/0015.pngbin4442 -> 824 bytes
-rw-r--r--cmake-build-release/t/0016.pngbin4835 -> 824 bytes
-rw-r--r--cmake-build-release/t/0017.pngbin4894 -> 824 bytes
-rw-r--r--cmake-build-release/t/0018.pngbin5030 -> 824 bytes
-rw-r--r--cmake-build-release/t/0019.pngbin5104 -> 824 bytes
-rw-r--r--cmake-build-release/t/0020.pngbin5213 -> 824 bytes
-rw-r--r--cmake-build-release/t/0021.pngbin5348 -> 824 bytes
-rw-r--r--cmake-build-release/t/0022.pngbin5472 -> 824 bytes
-rw-r--r--cmake-build-release/t/0023.pngbin5521 -> 824 bytes
-rw-r--r--cmake-build-release/t/0024.pngbin5567 -> 824 bytes
-rw-r--r--cmake-build-release/t/0025.pngbin5696 -> 824 bytes
-rw-r--r--cmake-build-release/t/0026.pngbin5973 -> 824 bytes
-rw-r--r--cmake-build-release/t/0027.pngbin6154 -> 824 bytes
-rw-r--r--cmake-build-release/t/0028.pngbin6212 -> 824 bytes
-rw-r--r--cmake-build-release/t/0029.pngbin6421 -> 824 bytes
-rw-r--r--cmake-build-release/t/0030.pngbin6599 -> 824 bytes
-rw-r--r--cmake-build-release/t/0031.pngbin6857 -> 824 bytes
-rw-r--r--cmake-build-release/t/0032.pngbin7122 -> 824 bytes
-rw-r--r--cmake-build-release/t/0033.pngbin7316 -> 824 bytes
-rw-r--r--cmake-build-release/t/0034.pngbin7387 -> 824 bytes
-rw-r--r--cmake-build-release/t/0035.pngbin7597 -> 824 bytes
-rw-r--r--cmake-build-release/t/0036.pngbin7766 -> 824 bytes
-rw-r--r--cmake-build-release/t/0037.pngbin7946 -> 824 bytes
-rw-r--r--cmake-build-release/t/0038.pngbin8259 -> 824 bytes
-rw-r--r--cmake-build-release/t/0039.pngbin8334 -> 824 bytes
-rw-r--r--cmake-build-release/t/0040.pngbin8622 -> 824 bytes
-rw-r--r--cmake-build-release/t/0041.pngbin8835 -> 824 bytes
-rw-r--r--cmake-build-release/t/0042.pngbin9047 -> 824 bytes
-rw-r--r--cmake-build-release/t/0043.pngbin9250 -> 824 bytes
-rw-r--r--cmake-build-release/t/0044.pngbin9620 -> 824 bytes
-rw-r--r--cmake-build-release/t/0045.pngbin9724 -> 824 bytes
-rw-r--r--cmake-build-release/t/0046.pngbin10029 -> 824 bytes
-rw-r--r--cmake-build-release/t/0047.pngbin10073 -> 824 bytes
-rw-r--r--cmake-build-release/t/0048.pngbin10320 -> 824 bytes
-rw-r--r--cmake-build-release/t/0049.pngbin10449 -> 824 bytes
-rw-r--r--cmake-build-release/t/0050.pngbin10525 -> 824 bytes
-rw-r--r--cmake-build-release/t/0051.pngbin10765 -> 824 bytes
-rw-r--r--cmake-build-release/t/0052.pngbin10838 -> 824 bytes
-rw-r--r--cmake-build-release/t/0053.pngbin10971 -> 824 bytes
-rw-r--r--cmake-build-release/t/0054.pngbin10810 -> 824 bytes
-rw-r--r--cmake-build-release/t/0055.pngbin10842 -> 824 bytes
-rw-r--r--cmake-build-release/t/0056.pngbin10991 -> 824 bytes
-rw-r--r--cmake-build-release/t/0057.pngbin10942 -> 824 bytes
-rw-r--r--cmake-build-release/t/0058.pngbin11148 -> 824 bytes
-rw-r--r--cmake-build-release/t/0059.pngbin11050 -> 824 bytes
-rw-r--r--cmake-build-release/t/0060.pngbin11231 -> 824 bytes
-rw-r--r--cmake-build-release/t/0061.pngbin11166 -> 824 bytes
-rw-r--r--cmake-build-release/t/0062.pngbin11256 -> 824 bytes
-rw-r--r--cmake-build-release/t/0063.pngbin11254 -> 824 bytes
-rw-r--r--cmake-build-release/t/0064.pngbin11384 -> 824 bytes
-rw-r--r--cmake-build-release/t/0065.pngbin11283 -> 824 bytes
-rw-r--r--cmake-build-release/t/0066.pngbin10956 -> 824 bytes
-rw-r--r--cmake-build-release/t/0067.pngbin11082 -> 824 bytes
-rw-r--r--cmake-build-release/t/0068.pngbin11773 -> 824 bytes
-rw-r--r--cmake-build-release/t/0069.pngbin11879 -> 824 bytes
-rw-r--r--cmake-build-release/t/0070.pngbin11420 -> 824 bytes
-rw-r--r--cmake-build-release/t/0071.pngbin10957 -> 824 bytes
-rw-r--r--cmake-build-release/t/0072.pngbin11915 -> 824 bytes
-rw-r--r--cmake-build-release/t/0073.pngbin11689 -> 824 bytes
-rw-r--r--cmake-build-release/t/0074.pngbin8433 -> 824 bytes
-rw-r--r--cmake-build-release/t/0075.pngbin7490 -> 824 bytes
-rw-r--r--cmake-build-release/t/0076.pngbin6375 -> 824 bytes
-rw-r--r--cmake-build-release/t/0077.pngbin6179 -> 824 bytes
-rw-r--r--cmake-build-release/t/0078.pngbin6615 -> 824 bytes
-rw-r--r--cmake-build-release/t/0079.pngbin6685 -> 824 bytes
-rw-r--r--cmake-build-release/t/0080.pngbin6837 -> 824 bytes
-rw-r--r--cmake-build-release/t/0081.pngbin6754 -> 824 bytes
-rw-r--r--cmake-build-release/t/0082.pngbin6789 -> 824 bytes
-rw-r--r--cmake-build-release/t/0083.pngbin6753 -> 824 bytes
-rw-r--r--cmake-build-release/t/0084.pngbin6620 -> 824 bytes
-rw-r--r--cmake-build-release/t/0085.pngbin6588 -> 824 bytes
-rw-r--r--cmake-build-release/t/0086.pngbin6435 -> 824 bytes
-rw-r--r--cmake-build-release/t/0087.pngbin6341 -> 824 bytes
-rw-r--r--cmake-build-release/t/0088.pngbin6215 -> 906 bytes
-rw-r--r--cmake-build-release/t/0089.pngbin6100 -> 963 bytes
-rw-r--r--cmake-build-release/t/0090.pngbin5907 -> 1113 bytes
-rw-r--r--cmake-build-release/t/0091.pngbin5783 -> 1303 bytes
-rw-r--r--cmake-build-release/t/0092.pngbin5545 -> 1489 bytes
-rw-r--r--cmake-build-release/t/0093.pngbin5441 -> 1430 bytes
-rw-r--r--cmake-build-release/t/0094.pngbin5237 -> 1595 bytes
-rw-r--r--cmake-build-release/t/0095.pngbin5151 -> 1712 bytes
-rw-r--r--cmake-build-release/t/0096.pngbin4914 -> 1531 bytes
-rw-r--r--cmake-build-release/t/0097.pngbin4796 -> 1692 bytes
-rw-r--r--cmake-build-release/t/0098.pngbin4611 -> 2131 bytes
-rw-r--r--cmake-build-release/t/0099.pngbin4461 -> 1852 bytes
-rw-r--r--cmake-build-release/t/0100.pngbin4207 -> 2218 bytes
-rw-r--r--cmake-build-release/t/0101.pngbin4232 -> 2843 bytes
-rw-r--r--cmake-build-release/t/0102.pngbin3992 -> 2820 bytes
-rw-r--r--cmake-build-release/t/0103.pngbin3788 -> 2345 bytes
-rw-r--r--cmake-build-release/t/0104.pngbin3533 -> 2056 bytes
-rw-r--r--cmake-build-release/t/0105.pngbin824 -> 2110 bytes
-rw-r--r--cmake-build-release/t/0106.pngbin824 -> 2184 bytes
-rw-r--r--cmake-build-release/t/0107.pngbin824 -> 1897 bytes
-rw-r--r--cmake-build-release/t/0108.pngbin824 -> 1919 bytes
-rw-r--r--cmake-build-release/t/0109.pngbin824 -> 1799 bytes
-rw-r--r--cmake-build-release/t/0110.pngbin824 -> 1525 bytes
-rw-r--r--cmake-build-release/t/0111.pngbin824 -> 1587 bytes
-rw-r--r--cmake-build-release/t/0112.pngbin824 -> 1534 bytes
-rw-r--r--cmake-build-release/t/0113.pngbin824 -> 1364 bytes
-rw-r--r--cmake-build-release/t/0141.pngbin824 -> 11538 bytes
-rw-r--r--cmake-build-release/t/0142.pngbin824 -> 11952 bytes
-rw-r--r--cmake-build-release/t/0143.pngbin824 -> 12367 bytes
-rw-r--r--cmake-build-release/t/0144.pngbin824 -> 12959 bytes
-rw-r--r--cmake-build-release/t/0145.pngbin824 -> 12558 bytes
-rw-r--r--cmake-build-release/t/0146.pngbin824 -> 12752 bytes
-rw-r--r--cmake-build-release/t/0147.pngbin824 -> 13147 bytes
-rw-r--r--cmake-build-release/t/0148.pngbin824 -> 13547 bytes
-rw-r--r--cmake-build-release/t/0149.pngbin824 -> 12811 bytes
-rw-r--r--cmake-build-release/t/0150.pngbin824 -> 11058 bytes
-rw-r--r--cmake-build-release/t/0151.pngbin824 -> 11249 bytes
-rw-r--r--cmake-build-release/t/0152.pngbin824 -> 12055 bytes
-rw-r--r--cmake-build-release/t/0153.pngbin824 -> 11937 bytes
-rw-r--r--cmake-build-release/t/0154.pngbin824 -> 11870 bytes
-rw-r--r--cmake-build-release/t/0155.pngbin824 -> 11931 bytes
-rw-r--r--cmake-build-release/t/0156.pngbin824 -> 11696 bytes
-rw-r--r--cmake-build-release/t/0157.pngbin824 -> 11607 bytes
-rw-r--r--cmake-build-release/t/0158.pngbin824 -> 12195 bytes
-rw-r--r--cmake-build-release/t/0159.pngbin824 -> 12012 bytes
-rw-r--r--cmake-build-release/t/0160.pngbin824 -> 13080 bytes
-rw-r--r--cmake-build-release/t/0161.pngbin824 -> 14173 bytes
-rw-r--r--cmake-build-release/t/0162.pngbin824 -> 14441 bytes
-rw-r--r--cmake-build-release/t/0163.pngbin824 -> 13710 bytes
-rw-r--r--cmake-build-release/t/0164.pngbin824 -> 12753 bytes
-rw-r--r--cmake-build-release/t/0165.pngbin824 -> 12858 bytes
-rw-r--r--cmake-build-release/t/0166.pngbin824 -> 13402 bytes
-rw-r--r--cmake-build-release/t/0167.pngbin824 -> 12394 bytes
-rw-r--r--cmake-build-release/t/0168.pngbin824 -> 11005 bytes
-rw-r--r--cmake-build-release/t/0169.pngbin824 -> 10413 bytes
-rw-r--r--cmake-build-release/t/0170.pngbin824 -> 10489 bytes
-rw-r--r--cmake-build-release/t/0171.pngbin824 -> 9040 bytes
-rw-r--r--cmake-build-release/t/0172.pngbin824 -> 7094 bytes
-rw-r--r--cmake-build-release/t/0173.pngbin824 -> 6915 bytes
-rw-r--r--cmake-build-release/t/0174.pngbin824 -> 6789 bytes
-rw-r--r--cmake-build-release/t/0175.pngbin824 -> 6728 bytes
-rw-r--r--cmake-build-release/t/0176.pngbin824 -> 6967 bytes
-rw-r--r--cmake-build-release/t/0177.pngbin824 -> 7925 bytes
-rw-r--r--cmake-build-release/t/0178.pngbin824 -> 8480 bytes
-rw-r--r--cmake-build-release/t/0179.pngbin824 -> 8866 bytes
-rw-r--r--cmake-build-release/t/0180.pngbin824 -> 9308 bytes
-rw-r--r--cmake-build-release/t/video.mp4bin226851 -> 858242 bytes
-rw-r--r--scenefiles-4d/sphere_lattic.json91
-rw-r--r--src/raytracer/raytracer.cpp2
-rw-r--r--src/raytracer/raytracer.h2
163 files changed, 120 insertions, 111 deletions
diff --git a/.DS_Store b/.DS_Store
index 905261c..d8c3ddf 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/cmake-build-release/.ninja_deps b/cmake-build-release/.ninja_deps
index 3042c2d..4c7286a 100644
--- a/cmake-build-release/.ninja_deps
+++ b/cmake-build-release/.ninja_deps
Binary files differ
diff --git a/cmake-build-release/.ninja_log b/cmake-build-release/.ninja_log
index e4fbe44..25a428a 100644
--- a/cmake-build-release/.ninja_log
+++ b/cmake-build-release/.ninja_log
@@ -1,80 +1,56 @@
# ninja log v5
-6 401 1702510149801891000 projects_ray_autogen/timestamp 55fca76aac650d2f
-1856 2644 1702510152049163012 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
-402 1244 1702510150647102646 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-6 401 1702510149801891000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-1160 1875 1702510151275437016 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-6 401 1702510149801891000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-1888 2568 1702510151972757827 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
-401 1222 1702510150625340526 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-401 1466 1702510150868632086 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-1163 1888 1702510151289433602 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-402 1122 1702510150524098382 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
-1876 2674 1702510152078511001 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
-37 316 1702499323014073371 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4
-401 1364 1702510150765893084 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
-414 822 1702509387003669825 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
-40 287 1702501758830513024 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51
-40 884 1702501759425971839 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386
-40 431 1702501758973841272 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2
-402 1727 1702510151129577479 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-402 1163 1702510150566465009 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
-402 1160 1702510150563003800 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-6 401 1702510149801891000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-3147 3257 1702510152663164051 projects_ray 3c6678764a94cd8d
-1244 1922 1702510151325053517 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-1222 1953 1702510151356984184 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
-675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb
+1862 3374 1702514704806556899 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
+1239 1965 1702514703398137254 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
+1641 2449 1702514703881707322 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
+1471 2156 1702514703588729319 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
2208 2595 1702509388779495677 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o d5828f7344b43f3f
-1364 2066 1702510151467780591 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
-1466 2255 1702510151659093052 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
-1122 1856 1702510151257164689 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-1727 3147 1702510152549663509 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-6 415 1702510326986090000 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 415 1702510326986090000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 415 1702510326986090000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 415 1702510326986090000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-417 1248 1702510327821449357 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-416 1317 1702510327885981682 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
-416 1319 1702510327892184401 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
-416 1344 1702510327921894844 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
-416 1454 1702510328028482592 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
-416 1579 1702510328155781513 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
-416 1694 1702510328268393066 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
-416 1984 1702510328559687811 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-1248 2070 1702510328645177057 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
-1344 2086 1702510328662326231 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
-1319 2109 1702510328686955817 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
-1317 2140 1702510328718391072 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
-1454 2177 1702510328755066350 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
-1579 2388 1702510328965265590 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
-1694 2584 1702510329160933333 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
-2109 2813 1702510329391121755 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
-2070 2885 1702510329463245491 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
-2086 2909 1702510329487619913 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
-1984 3480 1702510330056725188 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
-3480 3590 1702510330170370520 projects_ray 3c6678764a94cd8d
-6 35 1702513795184850127 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 35 1702513795184850127 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 35 1702513795184850127 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 35 1702513795184850127 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-38 696 1702513795842837296 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-696 810 1702513795958119031 projects_ray 3c6678764a94cd8d
-6 37 1702513827326770308 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 37 1702513827326770308 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 37 1702513827326770308 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 37 1702513827326770308 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-40 711 1702513827997785024 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-711 818 1702513828106776967 projects_ray 3c6678764a94cd8d
-6 35 1702513882564469119 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 35 1702513882564469119 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 35 1702513882564469119 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 35 1702513882564469119 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-37 709 1702513883234764784 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
-709 813 1702513883341801743 projects_ray 3c6678764a94cd8d
-6 33 1702514294868404606 projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702514294868404606 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-6 33 1702514294868404606 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
-6 33 1702514294868404606 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
-37 1284 1702514296113882469 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
-1284 1391 1702514296224117346 projects_ray 3c6678764a94cd8d
+675 2432 1702446595224556920 CMakeFiles/projects_ray.dir/src/utils/scenefilereader.cpp.o 5dbf3687fca6fb
+1315 2007 1702514703439664804 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
+1375 2065 1702514703497890075 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
+3374 3482 1702514704917661912 projects_ray 3c6678764a94cd8d
+7 429 1702514701853029000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
+430 1249 1702514702681373848 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
+430 1239 1702514702669543108 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
+430 1862 1702514703292354479 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
+40 431 1702501758973841272 CMakeFiles/projects_ray.dir/src/vec4ops/vec4ops.cpp.o d7fc6a03a78a11b2
+40 884 1702501759425971839 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o e6ffba0ae97d5386
+40 287 1702501758830513024 CMakeFiles/projects_ray.dir/src/settings.cpp.o af593dd8c38f8a51
+414 822 1702509387003669825 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o ae395a7ba55f31e0
+1965 2788 1702514704221888493 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
+430 1471 1702514702903483663 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
+37 316 1702499323014073371 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 7e5d8f712f75efb4
+430 1275 1702514702707745489 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
+1275 1975 1702514703407876716 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
+429 1641 1702514703071733599 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
+429 1315 1702514702746927716 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
+1975 2685 1702514704117971325 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
+7 429 1702514701853029000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
+1249 1948 1702514703380586772 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
+7 429 1702514701853029000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
+430 1375 1702514702807121096 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
+1948 2784 1702514704211220185 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
+7 429 1702514701853029000 projects_ray_autogen/timestamp 55fca76aac650d2f
+6 420 1702515075704911000 projects_ray_autogen/timestamp 55fca76aac650d2f
+6 420 1702515075704911000 projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
+6 420 1702515075704911000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/timestamp 55fca76aac650d2f
+6 420 1702515075704911000 /Users/sotech117/Documents/master/graphics/the-all-americans-in-cs1230/cmake-build-release/projects_ray_autogen/mocs_compilation.cpp 55fca76aac650d2f
+421 1333 1702515076617553508 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 36fb1526130d4f10
+420 1335 1702515076619613523 CMakeFiles/projects_ray.dir/src/intersect/intersect.cpp.o d2b1593379e5dcda
+420 1338 1702515076623215091 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o dc9fbf174942b6a6
+420 1369 1702515076654923236 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 1ad68196f2f117c1
+420 1426 1702515076712865072 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o 4a558d7c0ab76c07
+420 1516 1702515076801169794 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 8a94e9f3bb65e6ba
+420 1709 1702515076993218473 CMakeFiles/projects_ray.dir/src/main.cpp.o 94fb23c1a8b2c56c
+420 1997 1702515077278267492 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o 19b4d88ef40a6db1
+1334 2152 1702515077438046355 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 976dc05943374640
+1427 2166 1702515077453559634 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 2155c0e78af65352
+1338 2187 1702515077474103699 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o ee619672f0183b37
+1369 2206 1702515077493528964 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 1275de63f43c05f3
+1335 2240 1702515077527730711 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o 899987bee3f68062
+1516 2279 1702515077567239580 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o 856523a4b6d122f7
+1709 2592 1702515077878079577 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o 9dee6d99978c214
+2187 2912 1702515078199920487 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o cad2614c6119bd5e
+2153 2981 1702515078269217446 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o cef03b69fda1011b
+2166 3017 1702515078305661543 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 58a267a27bf597a8
+1997 3521 1702515078807745547 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 202e3ecc659447bc
+3521 3633 1702515078922974171 projects_ray 3c6678764a94cd8d
diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log
index 032cf27..5e20ec8 100644
--- a/cmake-build-release/Testing/Temporary/LastTest.log
+++ b/cmake-build-release/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Dec 13 19:38 EST
+Start testing: Dec 13 20:02 EST
----------------------------------------------------------
-End testing: Dec 13 19:38 EST
+End testing: Dec 13 20:02 EST
diff --git a/cmake-build-release/projects_ray b/cmake-build-release/projects_ray
index 79acfd3..bd3b23a 100755
--- a/cmake-build-release/projects_ray
+++ b/cmake-build-release/projects_ray
Binary files differ
diff --git a/cmake-build-release/t/0000.png b/cmake-build-release/t/0000.png
index 517c58b..507a3af 100644
--- a/cmake-build-release/t/0000.png
+++ b/cmake-build-release/t/0000.png
Binary files differ
diff --git a/cmake-build-release/t/0001.png b/cmake-build-release/t/0001.png
index 85cec89..615555a 100644
--- a/cmake-build-release/t/0001.png
+++ b/cmake-build-release/t/0001.png
Binary files differ
diff --git a/cmake-build-release/t/0002.png b/cmake-build-release/t/0002.png
index 2288ba3..615555a 100644
--- a/cmake-build-release/t/0002.png
+++ b/cmake-build-release/t/0002.png
Binary files differ
diff --git a/cmake-build-release/t/0003.png b/cmake-build-release/t/0003.png
index 6a4948f..615555a 100644
--- a/cmake-build-release/t/0003.png
+++ b/cmake-build-release/t/0003.png
Binary files differ
diff --git a/cmake-build-release/t/0004.png b/cmake-build-release/t/0004.png
index 62bdc82..615555a 100644
--- a/cmake-build-release/t/0004.png
+++ b/cmake-build-release/t/0004.png
Binary files differ
diff --git a/cmake-build-release/t/0005.png b/cmake-build-release/t/0005.png
index 3ab98e9..615555a 100644
--- a/cmake-build-release/t/0005.png
+++ b/cmake-build-release/t/0005.png
Binary files differ
diff --git a/cmake-build-release/t/0006.png b/cmake-build-release/t/0006.png
index ff85831..615555a 100644
--- a/cmake-build-release/t/0006.png
+++ b/cmake-build-release/t/0006.png
Binary files differ
diff --git a/cmake-build-release/t/0007.png b/cmake-build-release/t/0007.png
index 7e8abdc..615555a 100644
--- a/cmake-build-release/t/0007.png
+++ b/cmake-build-release/t/0007.png
Binary files differ
diff --git a/cmake-build-release/t/0008.png b/cmake-build-release/t/0008.png
index 0e64584..615555a 100644
--- a/cmake-build-release/t/0008.png
+++ b/cmake-build-release/t/0008.png
Binary files differ
diff --git a/cmake-build-release/t/0009.png b/cmake-build-release/t/0009.png
index 74ad792..615555a 100644
--- a/cmake-build-release/t/0009.png
+++ b/cmake-build-release/t/0009.png
Binary files differ
diff --git a/cmake-build-release/t/0010.png b/cmake-build-release/t/0010.png
index e60f555..615555a 100644
--- a/cmake-build-release/t/0010.png
+++ b/cmake-build-release/t/0010.png
Binary files differ
diff --git a/cmake-build-release/t/0011.png b/cmake-build-release/t/0011.png
index 42dd478..615555a 100644
--- a/cmake-build-release/t/0011.png
+++ b/cmake-build-release/t/0011.png
Binary files differ
diff --git a/cmake-build-release/t/0012.png b/cmake-build-release/t/0012.png
index df61db2..615555a 100644
--- a/cmake-build-release/t/0012.png
+++ b/cmake-build-release/t/0012.png
Binary files differ
diff --git a/cmake-build-release/t/0013.png b/cmake-build-release/t/0013.png
index 179906a..615555a 100644
--- a/cmake-build-release/t/0013.png
+++ b/cmake-build-release/t/0013.png
Binary files differ
diff --git a/cmake-build-release/t/0014.png b/cmake-build-release/t/0014.png
index f512f59..615555a 100644
--- a/cmake-build-release/t/0014.png
+++ b/cmake-build-release/t/0014.png
Binary files differ
diff --git a/cmake-build-release/t/0015.png b/cmake-build-release/t/0015.png
index 9200495..615555a 100644
--- a/cmake-build-release/t/0015.png
+++ b/cmake-build-release/t/0015.png
Binary files differ
diff --git a/cmake-build-release/t/0016.png b/cmake-build-release/t/0016.png
index 4337781..615555a 100644
--- a/cmake-build-release/t/0016.png
+++ b/cmake-build-release/t/0016.png
Binary files differ
diff --git a/cmake-build-release/t/0017.png b/cmake-build-release/t/0017.png
index b6b79b0..615555a 100644
--- a/cmake-build-release/t/0017.png
+++ b/cmake-build-release/t/0017.png
Binary files differ
diff --git a/cmake-build-release/t/0018.png b/cmake-build-release/t/0018.png
index a67316c..615555a 100644
--- a/cmake-build-release/t/0018.png
+++ b/cmake-build-release/t/0018.png
Binary files differ
diff --git a/cmake-build-release/t/0019.png b/cmake-build-release/t/0019.png
index dc589da..615555a 100644
--- a/cmake-build-release/t/0019.png
+++ b/cmake-build-release/t/0019.png
Binary files differ
diff --git a/cmake-build-release/t/0020.png b/cmake-build-release/t/0020.png
index 3ec3b01..615555a 100644
--- a/cmake-build-release/t/0020.png
+++ b/cmake-build-release/t/0020.png
Binary files differ
diff --git a/cmake-build-release/t/0021.png b/cmake-build-release/t/0021.png
index eaa2e8f..615555a 100644
--- a/cmake-build-release/t/0021.png
+++ b/cmake-build-release/t/0021.png
Binary files differ
diff --git a/cmake-build-release/t/0022.png b/cmake-build-release/t/0022.png
index 7dec870..615555a 100644
--- a/cmake-build-release/t/0022.png
+++ b/cmake-build-release/t/0022.png
Binary files differ
diff --git a/cmake-build-release/t/0023.png b/cmake-build-release/t/0023.png
index d48fbd1..615555a 100644
--- a/cmake-build-release/t/0023.png
+++ b/cmake-build-release/t/0023.png
Binary files differ
diff --git a/cmake-build-release/t/0024.png b/cmake-build-release/t/0024.png
index fe9225b..615555a 100644
--- a/cmake-build-release/t/0024.png
+++ b/cmake-build-release/t/0024.png
Binary files differ
diff --git a/cmake-build-release/t/0025.png b/cmake-build-release/t/0025.png
index 50413b1..615555a 100644
--- a/cmake-build-release/t/0025.png
+++ b/cmake-build-release/t/0025.png
Binary files differ
diff --git a/cmake-build-release/t/0026.png b/cmake-build-release/t/0026.png
index 07ebeee..615555a 100644
--- a/cmake-build-release/t/0026.png
+++ b/cmake-build-release/t/0026.png
Binary files differ
diff --git a/cmake-build-release/t/0027.png b/cmake-build-release/t/0027.png
index 0fb48fe..615555a 100644
--- a/cmake-build-release/t/0027.png
+++ b/cmake-build-release/t/0027.png
Binary files differ
diff --git a/cmake-build-release/t/0028.png b/cmake-build-release/t/0028.png
index c94413a..615555a 100644
--- a/cmake-build-release/t/0028.png
+++ b/cmake-build-release/t/0028.png
Binary files differ
diff --git a/cmake-build-release/t/0029.png b/cmake-build-release/t/0029.png
index ef65c2c..615555a 100644
--- a/cmake-build-release/t/0029.png
+++ b/cmake-build-release/t/0029.png
Binary files differ
diff --git a/cmake-build-release/t/0030.png b/cmake-build-release/t/0030.png
index d71c9f7..615555a 100644
--- a/cmake-build-release/t/0030.png
+++ b/cmake-build-release/t/0030.png
Binary files differ
diff --git a/cmake-build-release/t/0031.png b/cmake-build-release/t/0031.png
index 09c0770..615555a 100644
--- a/cmake-build-release/t/0031.png
+++ b/cmake-build-release/t/0031.png
Binary files differ
diff --git a/cmake-build-release/t/0032.png b/cmake-build-release/t/0032.png
index d5b87c6..615555a 100644
--- a/cmake-build-release/t/0032.png
+++ b/cmake-build-release/t/0032.png
Binary files differ
diff --git a/cmake-build-release/t/0033.png b/cmake-build-release/t/0033.png
index 749ee26..615555a 100644
--- a/cmake-build-release/t/0033.png
+++ b/cmake-build-release/t/0033.png
Binary files differ
diff --git a/cmake-build-release/t/0034.png b/cmake-build-release/t/0034.png
index 9daaa0c..615555a 100644
--- a/cmake-build-release/t/0034.png
+++ b/cmake-build-release/t/0034.png
Binary files differ
diff --git a/cmake-build-release/t/0035.png b/cmake-build-release/t/0035.png
index dec31af..615555a 100644
--- a/cmake-build-release/t/0035.png
+++ b/cmake-build-release/t/0035.png
Binary files differ
diff --git a/cmake-build-release/t/0036.png b/cmake-build-release/t/0036.png
index c8db3e3..615555a 100644
--- a/cmake-build-release/t/0036.png
+++ b/cmake-build-release/t/0036.png
Binary files differ
diff --git a/cmake-build-release/t/0037.png b/cmake-build-release/t/0037.png
index 1ca2df3..615555a 100644
--- a/cmake-build-release/t/0037.png
+++ b/cmake-build-release/t/0037.png
Binary files differ
diff --git a/cmake-build-release/t/0038.png b/cmake-build-release/t/0038.png
index 0617c2f..615555a 100644
--- a/cmake-build-release/t/0038.png
+++ b/cmake-build-release/t/0038.png
Binary files differ
diff --git a/cmake-build-release/t/0039.png b/cmake-build-release/t/0039.png
index 934b01b..615555a 100644
--- a/cmake-build-release/t/0039.png
+++ b/cmake-build-release/t/0039.png
Binary files differ
diff --git a/cmake-build-release/t/0040.png b/cmake-build-release/t/0040.png
index 2fe5f84..615555a 100644
--- a/cmake-build-release/t/0040.png
+++ b/cmake-build-release/t/0040.png
Binary files differ
diff --git a/cmake-build-release/t/0041.png b/cmake-build-release/t/0041.png
index 3a0bfe0..615555a 100644
--- a/cmake-build-release/t/0041.png
+++ b/cmake-build-release/t/0041.png
Binary files differ
diff --git a/cmake-build-release/t/0042.png b/cmake-build-release/t/0042.png
index c8dbd5a..615555a 100644
--- a/cmake-build-release/t/0042.png
+++ b/cmake-build-release/t/0042.png
Binary files differ
diff --git a/cmake-build-release/t/0043.png b/cmake-build-release/t/0043.png
index 49da883..615555a 100644
--- a/cmake-build-release/t/0043.png
+++ b/cmake-build-release/t/0043.png
Binary files differ
diff --git a/cmake-build-release/t/0044.png b/cmake-build-release/t/0044.png
index 25add29..615555a 100644
--- a/cmake-build-release/t/0044.png
+++ b/cmake-build-release/t/0044.png
Binary files differ
diff --git a/cmake-build-release/t/0045.png b/cmake-build-release/t/0045.png
index 32b1af4..615555a 100644
--- a/cmake-build-release/t/0045.png
+++ b/cmake-build-release/t/0045.png
Binary files differ
diff --git a/cmake-build-release/t/0046.png b/cmake-build-release/t/0046.png
index a4327be..615555a 100644
--- a/cmake-build-release/t/0046.png
+++ b/cmake-build-release/t/0046.png
Binary files differ
diff --git a/cmake-build-release/t/0047.png b/cmake-build-release/t/0047.png
index 165e6fa..615555a 100644
--- a/cmake-build-release/t/0047.png
+++ b/cmake-build-release/t/0047.png
Binary files differ
diff --git a/cmake-build-release/t/0048.png b/cmake-build-release/t/0048.png
index 3296457..615555a 100644
--- a/cmake-build-release/t/0048.png
+++ b/cmake-build-release/t/0048.png
Binary files differ
diff --git a/cmake-build-release/t/0049.png b/cmake-build-release/t/0049.png
index bbeef5b..615555a 100644
--- a/cmake-build-release/t/0049.png
+++ b/cmake-build-release/t/0049.png
Binary files differ
diff --git a/cmake-build-release/t/0050.png b/cmake-build-release/t/0050.png
index 9ad9113..615555a 100644
--- a/cmake-build-release/t/0050.png
+++ b/cmake-build-release/t/0050.png
Binary files differ
diff --git a/cmake-build-release/t/0051.png b/cmake-build-release/t/0051.png
index 5167cb3..615555a 100644
--- a/cmake-build-release/t/0051.png
+++ b/cmake-build-release/t/0051.png
Binary files differ
diff --git a/cmake-build-release/t/0052.png b/cmake-build-release/t/0052.png
index b774c5a..615555a 100644
--- a/cmake-build-release/t/0052.png
+++ b/cmake-build-release/t/0052.png
Binary files differ
diff --git a/cmake-build-release/t/0053.png b/cmake-build-release/t/0053.png
index c204371..615555a 100644
--- a/cmake-build-release/t/0053.png
+++ b/cmake-build-release/t/0053.png
Binary files differ
diff --git a/cmake-build-release/t/0054.png b/cmake-build-release/t/0054.png
index 38f784e..615555a 100644
--- a/cmake-build-release/t/0054.png
+++ b/cmake-build-release/t/0054.png
Binary files differ
diff --git a/cmake-build-release/t/0055.png b/cmake-build-release/t/0055.png
index 3204f4b..615555a 100644
--- a/cmake-build-release/t/0055.png
+++ b/cmake-build-release/t/0055.png
Binary files differ
diff --git a/cmake-build-release/t/0056.png b/cmake-build-release/t/0056.png
index 382c64d..615555a 100644
--- a/cmake-build-release/t/0056.png
+++ b/cmake-build-release/t/0056.png
Binary files differ
diff --git a/cmake-build-release/t/0057.png b/cmake-build-release/t/0057.png
index 525e39c..615555a 100644
--- a/cmake-build-release/t/0057.png
+++ b/cmake-build-release/t/0057.png
Binary files differ
diff --git a/cmake-build-release/t/0058.png b/cmake-build-release/t/0058.png
index 13a6f2f..615555a 100644
--- a/cmake-build-release/t/0058.png
+++ b/cmake-build-release/t/0058.png
Binary files differ
diff --git a/cmake-build-release/t/0059.png b/cmake-build-release/t/0059.png
index 98189c3..615555a 100644
--- a/cmake-build-release/t/0059.png
+++ b/cmake-build-release/t/0059.png
Binary files differ
diff --git a/cmake-build-release/t/0060.png b/cmake-build-release/t/0060.png
index 0e49db8..615555a 100644
--- a/cmake-build-release/t/0060.png
+++ b/cmake-build-release/t/0060.png
Binary files differ
diff --git a/cmake-build-release/t/0061.png b/cmake-build-release/t/0061.png
index a3d2daf..615555a 100644
--- a/cmake-build-release/t/0061.png
+++ b/cmake-build-release/t/0061.png
Binary files differ
diff --git a/cmake-build-release/t/0062.png b/cmake-build-release/t/0062.png
index 4ddc4c6..615555a 100644
--- a/cmake-build-release/t/0062.png
+++ b/cmake-build-release/t/0062.png
Binary files differ
diff --git a/cmake-build-release/t/0063.png b/cmake-build-release/t/0063.png
index e238ab8..615555a 100644
--- a/cmake-build-release/t/0063.png
+++ b/cmake-build-release/t/0063.png
Binary files differ
diff --git a/cmake-build-release/t/0064.png b/cmake-build-release/t/0064.png
index 72dad68..615555a 100644
--- a/cmake-build-release/t/0064.png
+++ b/cmake-build-release/t/0064.png
Binary files differ
diff --git a/cmake-build-release/t/0065.png b/cmake-build-release/t/0065.png
index 13844ad..615555a 100644
--- a/cmake-build-release/t/0065.png
+++ b/cmake-build-release/t/0065.png
Binary files differ
diff --git a/cmake-build-release/t/0066.png b/cmake-build-release/t/0066.png
index 93504a1..615555a 100644
--- a/cmake-build-release/t/0066.png
+++ b/cmake-build-release/t/0066.png
Binary files differ
diff --git a/cmake-build-release/t/0067.png b/cmake-build-release/t/0067.png
index eaf7180..615555a 100644
--- a/cmake-build-release/t/0067.png
+++ b/cmake-build-release/t/0067.png
Binary files differ
diff --git a/cmake-build-release/t/0068.png b/cmake-build-release/t/0068.png
index c314b91..615555a 100644
--- a/cmake-build-release/t/0068.png
+++ b/cmake-build-release/t/0068.png
Binary files differ
diff --git a/cmake-build-release/t/0069.png b/cmake-build-release/t/0069.png
index cd01bb8..615555a 100644
--- a/cmake-build-release/t/0069.png
+++ b/cmake-build-release/t/0069.png
Binary files differ
diff --git a/cmake-build-release/t/0070.png b/cmake-build-release/t/0070.png
index ed03d42..615555a 100644
--- a/cmake-build-release/t/0070.png
+++ b/cmake-build-release/t/0070.png
Binary files differ
diff --git a/cmake-build-release/t/0071.png b/cmake-build-release/t/0071.png
index 729d62d..615555a 100644
--- a/cmake-build-release/t/0071.png
+++ b/cmake-build-release/t/0071.png
Binary files differ
diff --git a/cmake-build-release/t/0072.png b/cmake-build-release/t/0072.png
index 8ab903c..615555a 100644
--- a/cmake-build-release/t/0072.png
+++ b/cmake-build-release/t/0072.png
Binary files differ
diff --git a/cmake-build-release/t/0073.png b/cmake-build-release/t/0073.png
index 88dc53f..615555a 100644
--- a/cmake-build-release/t/0073.png
+++ b/cmake-build-release/t/0073.png
Binary files differ
diff --git a/cmake-build-release/t/0074.png b/cmake-build-release/t/0074.png
index 4bbe928..615555a 100644
--- a/cmake-build-release/t/0074.png
+++ b/cmake-build-release/t/0074.png
Binary files differ
diff --git a/cmake-build-release/t/0075.png b/cmake-build-release/t/0075.png
index a477acf..615555a 100644
--- a/cmake-build-release/t/0075.png
+++ b/cmake-build-release/t/0075.png
Binary files differ
diff --git a/cmake-build-release/t/0076.png b/cmake-build-release/t/0076.png
index 471e11d..615555a 100644
--- a/cmake-build-release/t/0076.png
+++ b/cmake-build-release/t/0076.png
Binary files differ
diff --git a/cmake-build-release/t/0077.png b/cmake-build-release/t/0077.png
index 71a7c84..615555a 100644
--- a/cmake-build-release/t/0077.png
+++ b/cmake-build-release/t/0077.png
Binary files differ
diff --git a/cmake-build-release/t/0078.png b/cmake-build-release/t/0078.png
index d2f0a9a..615555a 100644
--- a/cmake-build-release/t/0078.png
+++ b/cmake-build-release/t/0078.png
Binary files differ
diff --git a/cmake-build-release/t/0079.png b/cmake-build-release/t/0079.png
index 170fd7e..615555a 100644
--- a/cmake-build-release/t/0079.png
+++ b/cmake-build-release/t/0079.png
Binary files differ
diff --git a/cmake-build-release/t/0080.png b/cmake-build-release/t/0080.png
index 868e9c6..615555a 100644
--- a/cmake-build-release/t/0080.png
+++ b/cmake-build-release/t/0080.png
Binary files differ
diff --git a/cmake-build-release/t/0081.png b/cmake-build-release/t/0081.png
index d5f4a1d..615555a 100644
--- a/cmake-build-release/t/0081.png
+++ b/cmake-build-release/t/0081.png
Binary files differ
diff --git a/cmake-build-release/t/0082.png b/cmake-build-release/t/0082.png
index 19e7151..615555a 100644
--- a/cmake-build-release/t/0082.png
+++ b/cmake-build-release/t/0082.png
Binary files differ
diff --git a/cmake-build-release/t/0083.png b/cmake-build-release/t/0083.png
index f04e3e6..615555a 100644
--- a/cmake-build-release/t/0083.png
+++ b/cmake-build-release/t/0083.png
Binary files differ
diff --git a/cmake-build-release/t/0084.png b/cmake-build-release/t/0084.png
index e78539f..615555a 100644
--- a/cmake-build-release/t/0084.png
+++ b/cmake-build-release/t/0084.png
Binary files differ
diff --git a/cmake-build-release/t/0085.png b/cmake-build-release/t/0085.png
index d63b8f6..615555a 100644
--- a/cmake-build-release/t/0085.png
+++ b/cmake-build-release/t/0085.png
Binary files differ
diff --git a/cmake-build-release/t/0086.png b/cmake-build-release/t/0086.png
index fad3e78..615555a 100644
--- a/cmake-build-release/t/0086.png
+++ b/cmake-build-release/t/0086.png
Binary files differ
diff --git a/cmake-build-release/t/0087.png b/cmake-build-release/t/0087.png
index c5f7364..615555a 100644
--- a/cmake-build-release/t/0087.png
+++ b/cmake-build-release/t/0087.png
Binary files differ
diff --git a/cmake-build-release/t/0088.png b/cmake-build-release/t/0088.png
index 6858f09..03fbaa4 100644
--- a/cmake-build-release/t/0088.png
+++ b/cmake-build-release/t/0088.png
Binary files differ
diff --git a/cmake-build-release/t/0089.png b/cmake-build-release/t/0089.png
index 84af693..f84fc53 100644
--- a/cmake-build-release/t/0089.png
+++ b/cmake-build-release/t/0089.png
Binary files differ
diff --git a/cmake-build-release/t/0090.png b/cmake-build-release/t/0090.png
index 9d9fb9b..ad41a97 100644
--- a/cmake-build-release/t/0090.png
+++ b/cmake-build-release/t/0090.png
Binary files differ
diff --git a/cmake-build-release/t/0091.png b/cmake-build-release/t/0091.png
index df41394..ed2dd49 100644
--- a/cmake-build-release/t/0091.png
+++ b/cmake-build-release/t/0091.png
Binary files differ
diff --git a/cmake-build-release/t/0092.png b/cmake-build-release/t/0092.png
index 2084d35..7406062 100644
--- a/cmake-build-release/t/0092.png
+++ b/cmake-build-release/t/0092.png
Binary files differ
diff --git a/cmake-build-release/t/0093.png b/cmake-build-release/t/0093.png
index aecdc7a..138ba83 100644
--- a/cmake-build-release/t/0093.png
+++ b/cmake-build-release/t/0093.png
Binary files differ
diff --git a/cmake-build-release/t/0094.png b/cmake-build-release/t/0094.png
index f359ba8..7e43875 100644
--- a/cmake-build-release/t/0094.png
+++ b/cmake-build-release/t/0094.png
Binary files differ
diff --git a/cmake-build-release/t/0095.png b/cmake-build-release/t/0095.png
index 858c739..cb9a3ca 100644
--- a/cmake-build-release/t/0095.png
+++ b/cmake-build-release/t/0095.png
Binary files differ
diff --git a/cmake-build-release/t/0096.png b/cmake-build-release/t/0096.png
index 1562e55..92044be 100644
--- a/cmake-build-release/t/0096.png
+++ b/cmake-build-release/t/0096.png
Binary files differ
diff --git a/cmake-build-release/t/0097.png b/cmake-build-release/t/0097.png
index 643569f..642b695 100644
--- a/cmake-build-release/t/0097.png
+++ b/cmake-build-release/t/0097.png
Binary files differ
diff --git a/cmake-build-release/t/0098.png b/cmake-build-release/t/0098.png
index 22d0321..48a2c1d 100644
--- a/cmake-build-release/t/0098.png
+++ b/cmake-build-release/t/0098.png
Binary files differ
diff --git a/cmake-build-release/t/0099.png b/cmake-build-release/t/0099.png
index 9e854bf..c3fff66 100644
--- a/cmake-build-release/t/0099.png
+++ b/cmake-build-release/t/0099.png
Binary files differ
diff --git a/cmake-build-release/t/0100.png b/cmake-build-release/t/0100.png
index 4c13e69..a6fd687 100644
--- a/cmake-build-release/t/0100.png
+++ b/cmake-build-release/t/0100.png
Binary files differ
diff --git a/cmake-build-release/t/0101.png b/cmake-build-release/t/0101.png
index f6afce5..d7564e6 100644
--- a/cmake-build-release/t/0101.png
+++ b/cmake-build-release/t/0101.png
Binary files differ
diff --git a/cmake-build-release/t/0102.png b/cmake-build-release/t/0102.png
index 4569f5c..11c3818 100644
--- a/cmake-build-release/t/0102.png
+++ b/cmake-build-release/t/0102.png
Binary files differ
diff --git a/cmake-build-release/t/0103.png b/cmake-build-release/t/0103.png
index dcc2520..719dec0 100644
--- a/cmake-build-release/t/0103.png
+++ b/cmake-build-release/t/0103.png
Binary files differ
diff --git a/cmake-build-release/t/0104.png b/cmake-build-release/t/0104.png
index aba088b..a19a81c 100644
--- a/cmake-build-release/t/0104.png
+++ b/cmake-build-release/t/0104.png
Binary files differ
diff --git a/cmake-build-release/t/0105.png b/cmake-build-release/t/0105.png
index 615555a..8fe7aaf 100644
--- a/cmake-build-release/t/0105.png
+++ b/cmake-build-release/t/0105.png
Binary files differ
diff --git a/cmake-build-release/t/0106.png b/cmake-build-release/t/0106.png
index 615555a..3e43400 100644
--- a/cmake-build-release/t/0106.png
+++ b/cmake-build-release/t/0106.png
Binary files differ
diff --git a/cmake-build-release/t/0107.png b/cmake-build-release/t/0107.png
index 615555a..cfa57e5 100644
--- a/cmake-build-release/t/0107.png
+++ b/cmake-build-release/t/0107.png
Binary files differ
diff --git a/cmake-build-release/t/0108.png b/cmake-build-release/t/0108.png
index 615555a..8cd0369 100644
--- a/cmake-build-release/t/0108.png
+++ b/cmake-build-release/t/0108.png
Binary files differ
diff --git a/cmake-build-release/t/0109.png b/cmake-build-release/t/0109.png
index 615555a..b8fe03b 100644
--- a/cmake-build-release/t/0109.png
+++ b/cmake-build-release/t/0109.png
Binary files differ
diff --git a/cmake-build-release/t/0110.png b/cmake-build-release/t/0110.png
index 615555a..1851c8a 100644
--- a/cmake-build-release/t/0110.png
+++ b/cmake-build-release/t/0110.png
Binary files differ
diff --git a/cmake-build-release/t/0111.png b/cmake-build-release/t/0111.png
index 615555a..c506e1b 100644
--- a/cmake-build-release/t/0111.png
+++ b/cmake-build-release/t/0111.png
Binary files differ
diff --git a/cmake-build-release/t/0112.png b/cmake-build-release/t/0112.png
index 615555a..03498e5 100644
--- a/cmake-build-release/t/0112.png
+++ b/cmake-build-release/t/0112.png
Binary files differ
diff --git a/cmake-build-release/t/0113.png b/cmake-build-release/t/0113.png
index 615555a..d9a1b8d 100644
--- a/cmake-build-release/t/0113.png
+++ b/cmake-build-release/t/0113.png
Binary files differ
diff --git a/cmake-build-release/t/0141.png b/cmake-build-release/t/0141.png
index 615555a..06e282a 100644
--- a/cmake-build-release/t/0141.png
+++ b/cmake-build-release/t/0141.png
Binary files differ
diff --git a/cmake-build-release/t/0142.png b/cmake-build-release/t/0142.png
index 615555a..736238b 100644
--- a/cmake-build-release/t/0142.png
+++ b/cmake-build-release/t/0142.png
Binary files differ
diff --git a/cmake-build-release/t/0143.png b/cmake-build-release/t/0143.png
index 615555a..2516c40 100644
--- a/cmake-build-release/t/0143.png
+++ b/cmake-build-release/t/0143.png
Binary files differ
diff --git a/cmake-build-release/t/0144.png b/cmake-build-release/t/0144.png
index 615555a..109209c 100644
--- a/cmake-build-release/t/0144.png
+++ b/cmake-build-release/t/0144.png
Binary files differ
diff --git a/cmake-build-release/t/0145.png b/cmake-build-release/t/0145.png
index 615555a..0ac70ce 100644
--- a/cmake-build-release/t/0145.png
+++ b/cmake-build-release/t/0145.png
Binary files differ
diff --git a/cmake-build-release/t/0146.png b/cmake-build-release/t/0146.png
index 615555a..6843ddc 100644
--- a/cmake-build-release/t/0146.png
+++ b/cmake-build-release/t/0146.png
Binary files differ
diff --git a/cmake-build-release/t/0147.png b/cmake-build-release/t/0147.png
index 615555a..18a7fbc 100644
--- a/cmake-build-release/t/0147.png
+++ b/cmake-build-release/t/0147.png
Binary files differ
diff --git a/cmake-build-release/t/0148.png b/cmake-build-release/t/0148.png
index 615555a..690c16c 100644
--- a/cmake-build-release/t/0148.png
+++ b/cmake-build-release/t/0148.png
Binary files differ
diff --git a/cmake-build-release/t/0149.png b/cmake-build-release/t/0149.png
index 615555a..d8c4c8b 100644
--- a/cmake-build-release/t/0149.png
+++ b/cmake-build-release/t/0149.png
Binary files differ
diff --git a/cmake-build-release/t/0150.png b/cmake-build-release/t/0150.png
index 615555a..32fc63c 100644
--- a/cmake-build-release/t/0150.png
+++ b/cmake-build-release/t/0150.png
Binary files differ
diff --git a/cmake-build-release/t/0151.png b/cmake-build-release/t/0151.png
index 615555a..a0050ef 100644
--- a/cmake-build-release/t/0151.png
+++ b/cmake-build-release/t/0151.png
Binary files differ
diff --git a/cmake-build-release/t/0152.png b/cmake-build-release/t/0152.png
index 615555a..1ecf686 100644
--- a/cmake-build-release/t/0152.png
+++ b/cmake-build-release/t/0152.png
Binary files differ
diff --git a/cmake-build-release/t/0153.png b/cmake-build-release/t/0153.png
index 615555a..8843580 100644
--- a/cmake-build-release/t/0153.png
+++ b/cmake-build-release/t/0153.png
Binary files differ
diff --git a/cmake-build-release/t/0154.png b/cmake-build-release/t/0154.png
index 615555a..a235b65 100644
--- a/cmake-build-release/t/0154.png
+++ b/cmake-build-release/t/0154.png
Binary files differ
diff --git a/cmake-build-release/t/0155.png b/cmake-build-release/t/0155.png
index 615555a..e33ddeb 100644
--- a/cmake-build-release/t/0155.png
+++ b/cmake-build-release/t/0155.png
Binary files differ
diff --git a/cmake-build-release/t/0156.png b/cmake-build-release/t/0156.png
index 615555a..71a4319 100644
--- a/cmake-build-release/t/0156.png
+++ b/cmake-build-release/t/0156.png
Binary files differ
diff --git a/cmake-build-release/t/0157.png b/cmake-build-release/t/0157.png
index 615555a..63e9f43 100644
--- a/cmake-build-release/t/0157.png
+++ b/cmake-build-release/t/0157.png
Binary files differ
diff --git a/cmake-build-release/t/0158.png b/cmake-build-release/t/0158.png
index 615555a..ab9dd44 100644
--- a/cmake-build-release/t/0158.png
+++ b/cmake-build-release/t/0158.png
Binary files differ
diff --git a/cmake-build-release/t/0159.png b/cmake-build-release/t/0159.png
index 615555a..09fb147 100644
--- a/cmake-build-release/t/0159.png
+++ b/cmake-build-release/t/0159.png
Binary files differ
diff --git a/cmake-build-release/t/0160.png b/cmake-build-release/t/0160.png
index 615555a..4d72d2c 100644
--- a/cmake-build-release/t/0160.png
+++ b/cmake-build-release/t/0160.png
Binary files differ
diff --git a/cmake-build-release/t/0161.png b/cmake-build-release/t/0161.png
index 615555a..2d89d56 100644
--- a/cmake-build-release/t/0161.png
+++ b/cmake-build-release/t/0161.png
Binary files differ
diff --git a/cmake-build-release/t/0162.png b/cmake-build-release/t/0162.png
index 615555a..aa11d4d 100644
--- a/cmake-build-release/t/0162.png
+++ b/cmake-build-release/t/0162.png
Binary files differ
diff --git a/cmake-build-release/t/0163.png b/cmake-build-release/t/0163.png
index 615555a..5b49f8a 100644
--- a/cmake-build-release/t/0163.png
+++ b/cmake-build-release/t/0163.png
Binary files differ
diff --git a/cmake-build-release/t/0164.png b/cmake-build-release/t/0164.png
index 615555a..41253df 100644
--- a/cmake-build-release/t/0164.png
+++ b/cmake-build-release/t/0164.png
Binary files differ
diff --git a/cmake-build-release/t/0165.png b/cmake-build-release/t/0165.png
index 615555a..d65f8b1 100644
--- a/cmake-build-release/t/0165.png
+++ b/cmake-build-release/t/0165.png
Binary files differ
diff --git a/cmake-build-release/t/0166.png b/cmake-build-release/t/0166.png
index 615555a..4836e2a 100644
--- a/cmake-build-release/t/0166.png
+++ b/cmake-build-release/t/0166.png
Binary files differ
diff --git a/cmake-build-release/t/0167.png b/cmake-build-release/t/0167.png
index 615555a..bb19a9f 100644
--- a/cmake-build-release/t/0167.png
+++ b/cmake-build-release/t/0167.png
Binary files differ
diff --git a/cmake-build-release/t/0168.png b/cmake-build-release/t/0168.png
index 615555a..214ea74 100644
--- a/cmake-build-release/t/0168.png
+++ b/cmake-build-release/t/0168.png
Binary files differ
diff --git a/cmake-build-release/t/0169.png b/cmake-build-release/t/0169.png
index 615555a..fb0b707 100644
--- a/cmake-build-release/t/0169.png
+++ b/cmake-build-release/t/0169.png
Binary files differ
diff --git a/cmake-build-release/t/0170.png b/cmake-build-release/t/0170.png
index 615555a..fbe899e 100644
--- a/cmake-build-release/t/0170.png
+++ b/cmake-build-release/t/0170.png
Binary files differ
diff --git a/cmake-build-release/t/0171.png b/cmake-build-release/t/0171.png
index 615555a..2d684bc 100644
--- a/cmake-build-release/t/0171.png
+++ b/cmake-build-release/t/0171.png
Binary files differ
diff --git a/cmake-build-release/t/0172.png b/cmake-build-release/t/0172.png
index 615555a..58f5972 100644
--- a/cmake-build-release/t/0172.png
+++ b/cmake-build-release/t/0172.png
Binary files differ
diff --git a/cmake-build-release/t/0173.png b/cmake-build-release/t/0173.png
index 615555a..b44e03e 100644
--- a/cmake-build-release/t/0173.png
+++ b/cmake-build-release/t/0173.png
Binary files differ
diff --git a/cmake-build-release/t/0174.png b/cmake-build-release/t/0174.png
index 615555a..867982b 100644
--- a/cmake-build-release/t/0174.png
+++ b/cmake-build-release/t/0174.png
Binary files differ
diff --git a/cmake-build-release/t/0175.png b/cmake-build-release/t/0175.png
index 615555a..8f32880 100644
--- a/cmake-build-release/t/0175.png
+++ b/cmake-build-release/t/0175.png
Binary files differ
diff --git a/cmake-build-release/t/0176.png b/cmake-build-release/t/0176.png
index 615555a..8de7e9a 100644
--- a/cmake-build-release/t/0176.png
+++ b/cmake-build-release/t/0176.png
Binary files differ
diff --git a/cmake-build-release/t/0177.png b/cmake-build-release/t/0177.png
index 615555a..6892b9c 100644
--- a/cmake-build-release/t/0177.png
+++ b/cmake-build-release/t/0177.png
Binary files differ
diff --git a/cmake-build-release/t/0178.png b/cmake-build-release/t/0178.png
index 615555a..5825afb 100644
--- a/cmake-build-release/t/0178.png
+++ b/cmake-build-release/t/0178.png
Binary files differ
diff --git a/cmake-build-release/t/0179.png b/cmake-build-release/t/0179.png
index 615555a..0475ccd 100644
--- a/cmake-build-release/t/0179.png
+++ b/cmake-build-release/t/0179.png
Binary files differ
diff --git a/cmake-build-release/t/0180.png b/cmake-build-release/t/0180.png
index 615555a..e899ab8 100644
--- a/cmake-build-release/t/0180.png
+++ b/cmake-build-release/t/0180.png
Binary files differ
diff --git a/cmake-build-release/t/video.mp4 b/cmake-build-release/t/video.mp4
index 1a0ced2..ef527c4 100644
--- a/cmake-build-release/t/video.mp4
+++ b/cmake-build-release/t/video.mp4
Binary files differ
diff --git a/scenefiles-4d/sphere_lattic.json b/scenefiles-4d/sphere_lattic.json
index 440e58a..0fd4052 100644
--- a/scenefiles-4d/sphere_lattic.json
+++ b/scenefiles-4d/sphere_lattic.json
@@ -39,12 +39,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [1.0, 0.0, 0.0],
+ "diffuse": [1.0, 1.0, 0.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -56,12 +56,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 1.0, 0.0],
+ "diffuse": [0.0, 1.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -72,13 +72,13 @@
"scale": [1.0, 1.0, 1.0, 1.0],
"primitives": [
{
- "type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "type": "cylinder",
+ "diffuse": [0.0, 1.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -90,12 +90,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "diffuse": [1.0, 0.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -112,7 +112,7 @@
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -124,13 +124,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
- "specular":
- [1.0, 1.0, 1.0],
+ "diffuse": [1.0, 0.0, 1.0],
+ "specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -142,12 +141,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "diffuse": [0.0, 1.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -159,12 +158,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "diffuse": [1.0, 0.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -176,12 +175,12 @@
"primitives": [
{
"type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "diffuse": [0.5, 1.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -198,7 +197,7 @@
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -209,13 +208,13 @@
"scale": [1.0, 1.0, 1.0, 1.0],
"primitives": [
{
- "type": "sphere",
- "diffuse": [0.0, 0.0, 1.0],
+ "type": "cube",
+ "diffuse": [0.0, 1.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -226,13 +225,13 @@
"scale": [1.0, 1.0, 1.0, 1.0],
"primitives": [
{
- "type": "sphere",
+ "type": "cone",
"diffuse": [0.0, 0.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
@@ -243,24 +242,58 @@
"scale": [1.0, 1.0, 1.0, 1.0],
"primitives": [
{
- "type": "sphere",
+ "type": "cube",
"diffuse": [0.0, 0.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
"velocity": [0.0, 0.0, 0.0, 0.0],
"reflective": [0.6, 0.6, 0.6],
- "transparent": [0.2, 0.2, 0.2],
+ "transparent": [0.8, 0.8, 0.8],
"ior": 1.01
}
]
},
{
+ "translate": [1.0, 0.0, 5.0, 0.0],
+ "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+ "scale": [1.0, 1.0, 1.0, 1.0],
+ "primitives": [
+ {
+ "type": "cylinder",
+ "diffuse": [0.0, 0.0, 1.0],
+ "specular": [1.0, 1.0, 1.0],
+ "shininess": 25.0,
+ "velocity": [0.0, 0.0, 0.0, 0.0],
+ "reflective": [0.6, 0.6, 0.6],
+ "transparent": [0.8, 0.8, 0.8],
+ "ior": 1.01
+ }
+ ]
+ },
+ {
+ "translate": [0.0, 4.0, 5.0, 0.0],
+ "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+ "scale": [1.0, 1.0, 1.0, 1.0],
+ "primitives": [
+ {
+ "type": "cylinder",
+ "diffuse": [0.0, 0.0, 1.0],
+ "specular": [1.0, 1.0, 1.0],
+ "shininess": 25.0,
+ "velocity": [0.0, 0.0, 0.0, 0.0],
+ "reflective": [0.6, 0.6, 0.6],
+ "transparent": [0.8, 0.8, 0.8],
+ "ior": 1.01
+ }
+ ]
+ },
+ {
"translate": [2.0, 0.0, 4.0, 0.0],
"rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
"scale": [1.0, 1.0, 1.0, 1.0],
"primitives": [
{
- "type": "sphere",
+ "type": "cube",
"diffuse": [0.0, 0.0, 1.0],
"specular": [1.0, 1.0, 1.0],
"shininess": 25.0,
diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp
index e412d9b..56fd440 100644
--- a/src/raytracer/raytracer.cpp
+++ b/src/raytracer/raytracer.cpp
@@ -118,7 +118,7 @@ void RayTracer::render(RGBA *imageData, const RayTraceScene &scene) {
}
settings.currentTime++;
- settings.w++;
+ // settings.w++;
// update physics for moving objects
Physics::updateShapePositions(m_metaData.shapes);
diff --git a/src/raytracer/raytracer.h b/src/raytracer/raytracer.h
index 1054d11..7118840 100644
--- a/src/raytracer/raytracer.h
+++ b/src/raytracer/raytracer.h
@@ -155,7 +155,7 @@ public:
bool m_enableAntiAliasing = false;
bool m_enableDepthOfField = false;
bool m_enableSuperSample = false;
- bool m_enableCameraBezier = false;
+ bool m_enableCameraBezier = true;
void sceneChanged(QLabel* imageLabel);
void settingsChanged(QLabel* imageLabel);