diff options
-rw-r--r-- | .DS_Store | bin | 10244 -> 14340 bytes | |||
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_deps | bin | 1762692 -> 1990104 bytes | |||
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/.ninja_log | 108 | ||||
-rwxr-xr-x | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray | bin | 367288 -> 367432 bytes | |||
-rw-r--r-- | build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/UVLADIE3JM/moc_mainwindow.cpp | 83 | ||||
-rw-r--r-- | scenefiles-4d/sphere_lattic.json | 277 | ||||
-rw-r--r-- | scenefiles-4d/sphere_lattic2.json | 313 | ||||
-rw-r--r-- | src/mainwindow.cpp | 13 | ||||
-rw-r--r-- | src/raytracer/raytracer.cpp | 2 | ||||
-rw-r--r-- | student_outputs/0000.png | bin | 9170 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0001.png | bin | 9051 -> 1121 bytes | |||
-rw-r--r-- | student_outputs/0002.png | bin | 9051 -> 1121 bytes | |||
-rw-r--r-- | student_outputs/0003.png | bin | 8880 -> 1492 bytes | |||
-rw-r--r-- | student_outputs/0004.png | bin | 8880 -> 1492 bytes | |||
-rw-r--r-- | student_outputs/0005.png | bin | 8387 -> 2166 bytes | |||
-rw-r--r-- | student_outputs/0006.png | bin | 8387 -> 2166 bytes | |||
-rw-r--r-- | student_outputs/0007.png | bin | 8229 -> 2497 bytes | |||
-rw-r--r-- | student_outputs/0008.png | bin | 8229 -> 2497 bytes | |||
-rw-r--r-- | student_outputs/0009.png | bin | 8071 -> 2824 bytes | |||
-rw-r--r-- | student_outputs/0010.png | bin | 8071 -> 2824 bytes | |||
-rw-r--r-- | student_outputs/0011.png | bin | 8102 -> 3615 bytes | |||
-rw-r--r-- | student_outputs/0012.png | bin | 8102 -> 3615 bytes | |||
-rw-r--r-- | student_outputs/0013.png | bin | 8153 -> 4108 bytes | |||
-rw-r--r-- | student_outputs/0014.png | bin | 8153 -> 4108 bytes | |||
-rw-r--r-- | student_outputs/0015.png | bin | 8453 -> 4043 bytes | |||
-rw-r--r-- | student_outputs/0016.png | bin | 8453 -> 4043 bytes | |||
-rw-r--r-- | student_outputs/0017.png | bin | 8581 -> 3570 bytes | |||
-rw-r--r-- | student_outputs/0018.png | bin | 8581 -> 3570 bytes | |||
-rw-r--r-- | student_outputs/0019.png | bin | 8592 -> 2677 bytes | |||
-rw-r--r-- | student_outputs/0020.png | bin | 8592 -> 2677 bytes | |||
-rw-r--r-- | student_outputs/0021.png | bin | 8795 -> 1935 bytes | |||
-rw-r--r-- | student_outputs/0022.png | bin | 8795 -> 1935 bytes | |||
-rw-r--r-- | student_outputs/0023.png | bin | 8305 -> 1664 bytes | |||
-rw-r--r-- | student_outputs/0024.png | bin | 8305 -> 1664 bytes | |||
-rw-r--r-- | student_outputs/0025.png | bin | 8052 -> 2508 bytes | |||
-rw-r--r-- | student_outputs/0026.png | bin | 8052 -> 2508 bytes | |||
-rw-r--r-- | student_outputs/0027.png | bin | 7857 -> 3281 bytes | |||
-rw-r--r-- | student_outputs/0028.png | bin | 7857 -> 3281 bytes | |||
-rw-r--r-- | student_outputs/0029.png | bin | 7602 -> 3797 bytes | |||
-rw-r--r-- | student_outputs/0030.png | bin | 7602 -> 3797 bytes | |||
-rw-r--r-- | student_outputs/0031.png | bin | 8212 -> 4022 bytes | |||
-rw-r--r-- | student_outputs/0032.png | bin | 8212 -> 4022 bytes | |||
-rw-r--r-- | student_outputs/0033.png | bin | 8285 -> 3937 bytes | |||
-rw-r--r-- | student_outputs/0034.png | bin | 8285 -> 3937 bytes | |||
-rw-r--r-- | student_outputs/0035.png | bin | 8353 -> 3608 bytes | |||
-rw-r--r-- | student_outputs/0036.png | bin | 8353 -> 3608 bytes | |||
-rw-r--r-- | student_outputs/0037.png | bin | 8394 -> 2918 bytes | |||
-rw-r--r-- | student_outputs/0038.png | bin | 8394 -> 2918 bytes | |||
-rw-r--r-- | student_outputs/0039.png | bin | 8299 -> 1982 bytes | |||
-rw-r--r-- | student_outputs/0040.png | bin | 8299 -> 1982 bytes | |||
-rw-r--r-- | student_outputs/0041.png | bin | 8400 -> 1062 bytes | |||
-rw-r--r-- | student_outputs/0042.png | bin | 8400 -> 1062 bytes | |||
-rw-r--r-- | student_outputs/0043.png | bin | 8736 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0044.png | bin | 8736 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0045.png | bin | 9189 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0046.png | bin | 9189 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0047.png | bin | 9349 -> 1666 bytes | |||
-rw-r--r-- | student_outputs/0048.png | bin | 9349 -> 1666 bytes | |||
-rw-r--r-- | student_outputs/0049.png | bin | 9137 -> 4983 bytes | |||
-rw-r--r-- | student_outputs/0050.png | bin | 9137 -> 4983 bytes | |||
-rw-r--r-- | student_outputs/0051.png | bin | 8563 -> 7378 bytes | |||
-rw-r--r-- | student_outputs/0052.png | bin | 8563 -> 7378 bytes | |||
-rw-r--r-- | student_outputs/0053.png | bin | 8552 -> 5682 bytes | |||
-rw-r--r-- | student_outputs/0054.png | bin | 8552 -> 5682 bytes | |||
-rw-r--r-- | student_outputs/0055.png | bin | 8354 -> 3849 bytes | |||
-rw-r--r-- | student_outputs/0056.png | bin | 8354 -> 3849 bytes | |||
-rw-r--r-- | student_outputs/0057.png | bin | 8097 -> 4058 bytes | |||
-rw-r--r-- | student_outputs/0058.png | bin | 8097 -> 4058 bytes | |||
-rw-r--r-- | student_outputs/0059.png | bin | 7947 -> 7584 bytes | |||
-rw-r--r-- | student_outputs/0060.png | bin | 7947 -> 7584 bytes | |||
-rw-r--r-- | student_outputs/0061.png | bin | 7655 -> 9994 bytes | |||
-rw-r--r-- | student_outputs/0062.png | bin | 7655 -> 9994 bytes | |||
-rw-r--r-- | student_outputs/0063.png | bin | 7745 -> 7335 bytes | |||
-rw-r--r-- | student_outputs/0064.png | bin | 7745 -> 7335 bytes | |||
-rw-r--r-- | student_outputs/0065.png | bin | 8101 -> 7036 bytes | |||
-rw-r--r-- | student_outputs/0066.png | bin | 8101 -> 7036 bytes | |||
-rw-r--r-- | student_outputs/0067.png | bin | 8581 -> 12391 bytes | |||
-rw-r--r-- | student_outputs/0068.png | bin | 8581 -> 12391 bytes | |||
-rw-r--r-- | student_outputs/0069.png | bin | 8552 -> 17458 bytes | |||
-rw-r--r-- | student_outputs/0070.png | bin | 8552 -> 17458 bytes | |||
-rw-r--r-- | student_outputs/0071.png | bin | 8285 -> 13690 bytes | |||
-rw-r--r-- | student_outputs/0072.png | bin | 8285 -> 13690 bytes | |||
-rw-r--r-- | student_outputs/0073.png | bin | 8165 -> 10055 bytes | |||
-rw-r--r-- | student_outputs/0074.png | bin | 8165 -> 10055 bytes | |||
-rw-r--r-- | student_outputs/0075.png | bin | 8494 -> 12121 bytes | |||
-rw-r--r-- | student_outputs/0076.png | bin | 8494 -> 12121 bytes | |||
-rw-r--r-- | student_outputs/0077.png | bin | 8466 -> 14103 bytes | |||
-rw-r--r-- | student_outputs/0078.png | bin | 8466 -> 14103 bytes | |||
-rw-r--r-- | student_outputs/0079.png | bin | 8209 -> 10076 bytes | |||
-rw-r--r-- | student_outputs/0080.png | bin | 8209 -> 10076 bytes | |||
-rw-r--r-- | student_outputs/0081.png | bin | 8160 -> 8672 bytes | |||
-rw-r--r-- | student_outputs/0082.png | bin | 8160 -> 8672 bytes | |||
-rw-r--r-- | student_outputs/0083.png | bin | 7490 -> 8357 bytes | |||
-rw-r--r-- | student_outputs/0084.png | bin | 7490 -> 8357 bytes | |||
-rw-r--r-- | student_outputs/0085.png | bin | 7916 -> 10245 bytes | |||
-rw-r--r-- | student_outputs/0086.png | bin | 7916 -> 10245 bytes | |||
-rw-r--r-- | student_outputs/0087.png | bin | 8792 -> 12642 bytes | |||
-rw-r--r-- | student_outputs/0088.png | bin | 8792 -> 12642 bytes | |||
-rw-r--r-- | student_outputs/0089.png | bin | 9308 -> 12253 bytes | |||
-rw-r--r-- | student_outputs/0090.png | bin | 9308 -> 12253 bytes | |||
-rw-r--r-- | student_outputs/0091.png | bin | 9056 -> 9590 bytes | |||
-rw-r--r-- | student_outputs/0092.png | bin | 9056 -> 9590 bytes | |||
-rw-r--r-- | student_outputs/0093.png | bin | 8877 -> 8468 bytes | |||
-rw-r--r-- | student_outputs/0094.png | bin | 8877 -> 8468 bytes | |||
-rw-r--r-- | student_outputs/0095.png | bin | 8379 -> 8230 bytes | |||
-rw-r--r-- | student_outputs/0096.png | bin | 8379 -> 8230 bytes | |||
-rw-r--r-- | student_outputs/0097.png | bin | 8232 -> 6886 bytes | |||
-rw-r--r-- | student_outputs/0098.png | bin | 8232 -> 6886 bytes | |||
-rw-r--r-- | student_outputs/0099.png | bin | 8081 -> 5465 bytes | |||
-rw-r--r-- | student_outputs/0100.png | bin | 8081 -> 5465 bytes | |||
-rw-r--r-- | student_outputs/0101.png | bin | 8105 -> 4986 bytes | |||
-rw-r--r-- | student_outputs/0102.png | bin | 8105 -> 4986 bytes | |||
-rw-r--r-- | student_outputs/0103.png | bin | 8159 -> 4711 bytes | |||
-rw-r--r-- | student_outputs/0104.png | bin | 8159 -> 4711 bytes | |||
-rw-r--r-- | student_outputs/0105.png | bin | 8452 -> 4779 bytes | |||
-rw-r--r-- | student_outputs/0106.png | bin | 8452 -> 4779 bytes | |||
-rw-r--r-- | student_outputs/0107.png | bin | 8584 -> 5087 bytes | |||
-rw-r--r-- | student_outputs/0108.png | bin | 8584 -> 5087 bytes | |||
-rw-r--r-- | student_outputs/0109.png | bin | 8568 -> 6981 bytes | |||
-rw-r--r-- | student_outputs/0110.png | bin | 8568 -> 6981 bytes | |||
-rw-r--r-- | student_outputs/0111.png | bin | 8792 -> 9442 bytes | |||
-rw-r--r-- | student_outputs/0112.png | bin | 8792 -> 9442 bytes | |||
-rw-r--r-- | student_outputs/0113.png | bin | 8315 -> 10390 bytes | |||
-rw-r--r-- | student_outputs/0114.png | bin | 8315 -> 10390 bytes | |||
-rw-r--r-- | student_outputs/0115.png | bin | 8062 -> 9226 bytes | |||
-rw-r--r-- | student_outputs/0116.png | bin | 8062 -> 9226 bytes | |||
-rw-r--r-- | student_outputs/0117.png | bin | 7863 -> 6124 bytes | |||
-rw-r--r-- | student_outputs/0118.png | bin | 7863 -> 6124 bytes | |||
-rw-r--r-- | student_outputs/0119.png | bin | 7607 -> 4407 bytes | |||
-rw-r--r-- | student_outputs/0120.png | bin | 7607 -> 4407 bytes | |||
-rw-r--r-- | student_outputs/0121.png | bin | 8207 -> 3805 bytes | |||
-rw-r--r-- | student_outputs/0122.png | bin | 8207 -> 3805 bytes | |||
-rw-r--r-- | student_outputs/0123.png | bin | 8283 -> 5273 bytes | |||
-rw-r--r-- | student_outputs/0124.png | bin | 8283 -> 5273 bytes | |||
-rw-r--r-- | student_outputs/0125.png | bin | 8331 -> 6266 bytes | |||
-rw-r--r-- | student_outputs/0126.png | bin | 8331 -> 6266 bytes | |||
-rw-r--r-- | student_outputs/0127.png | bin | 8405 -> 7740 bytes | |||
-rw-r--r-- | student_outputs/0128.png | bin | 8405 -> 7740 bytes | |||
-rw-r--r-- | student_outputs/0129.png | bin | 8301 -> 7858 bytes | |||
-rw-r--r-- | student_outputs/0130.png | bin | 8301 -> 7858 bytes | |||
-rw-r--r-- | student_outputs/0131.png | bin | 8396 -> 6980 bytes | |||
-rw-r--r-- | student_outputs/0132.png | bin | 8396 -> 6980 bytes | |||
-rw-r--r-- | student_outputs/0133.png | bin | 8730 -> 5369 bytes | |||
-rw-r--r-- | student_outputs/0134.png | bin | 8730 -> 5369 bytes | |||
-rw-r--r-- | student_outputs/0135.png | bin | 9185 -> 3654 bytes | |||
-rw-r--r-- | student_outputs/0136.png | bin | 9185 -> 3654 bytes | |||
-rw-r--r-- | student_outputs/0137.png | bin | 9339 -> 3444 bytes | |||
-rw-r--r-- | student_outputs/0138.png | bin | 9339 -> 3444 bytes | |||
-rw-r--r-- | student_outputs/0139.png | bin | 9135 -> 3372 bytes | |||
-rw-r--r-- | student_outputs/0140.png | bin | 9135 -> 3372 bytes | |||
-rw-r--r-- | student_outputs/0141.png | bin | 8569 -> 2307 bytes | |||
-rw-r--r-- | student_outputs/0142.png | bin | 8569 -> 2307 bytes | |||
-rw-r--r-- | student_outputs/0143.png | bin | 8554 -> 1965 bytes | |||
-rw-r--r-- | student_outputs/0144.png | bin | 8554 -> 1965 bytes | |||
-rw-r--r-- | student_outputs/0145.png | bin | 8358 -> 1572 bytes | |||
-rw-r--r-- | student_outputs/0146.png | bin | 8358 -> 1572 bytes | |||
-rw-r--r-- | student_outputs/0147.png | bin | 8094 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0148.png | bin | 8094 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0149.png | bin | 7949 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0150.png | bin | 7949 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0151.png | bin | 7647 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0152.png | bin | 7647 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0153.png | bin | 7741 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0154.png | bin | 7741 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0155.png | bin | 8103 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0156.png | bin | 8103 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0157.png | bin | 8578 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0158.png | bin | 8578 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0159.png | bin | 8553 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0160.png | bin | 8553 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0161.png | bin | 8289 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0162.png | bin | 8289 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0163.png | bin | 8167 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0164.png | bin | 8167 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0165.png | bin | 8491 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0166.png | bin | 8491 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0167.png | bin | 8463 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0168.png | bin | 8463 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0169.png | bin | 8206 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0170.png | bin | 8206 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0171.png | bin | 8168 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0172.png | bin | 8168 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0173.png | bin | 7494 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0174.png | bin | 7494 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0175.png | bin | 7916 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0176.png | bin | 7916 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0177.png | bin | 8787 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0178.png | bin | 8787 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0179.png | bin | 9304 -> 824 bytes | |||
-rw-r--r-- | student_outputs/0180.png | bin | 9304 -> 824 bytes |
190 files changed, 716 insertions, 80 deletions
Binary files differ 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 3c0a214..9c478ad 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 d453808..e87be80 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,39 +1,75 @@ # 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 133 4986 1702496984352747028 CMakeFiles/projects_ray.dir/src/physics/physics.cpp.o fb1aaa91c9ad0758 -8182 15998 1702496995373816649 CMakeFiles/projects_ray.dir/src/raytracer/raytracer.cpp.o efa4d0ee111c147a -135 8181 1702496987523873339 CMakeFiles/projects_ray.dir/src/accelerate/myqthreads.cpp.o 81fffec8aaaec0bd -138 7932 1702496987290500499 CMakeFiles/projects_ray.dir/src/utils/raytracerutils.cpp.o 35a3ae2d0b82dd65 -4107 4515 1702497595356645973 projects_ray cae90fddb8ce24a -4627 12490 1702496991858823824 CMakeFiles/projects_ray.dir/src/illuminate/illuminate.cpp.o 4731cafbc4b4e737 +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 -26 153 1702497591008567536 /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 -137 7970 1702496987333439635 CMakeFiles/projects_ray.dir/src/aliasing/supersample.cpp.o d10c1da10eac29ed -9275 15649 1702496995023671708 CMakeFiles/projects_ray.dir/src/main.cpp.o 987044590434d8d1 -8003 14299 1702496993674053115 CMakeFiles/projects_ray.dir/src/raytracer/raytracescene.cpp.o aaa2fe512335b7de -134 14147 1702496993509663502 CMakeFiles/projects_ray.dir/src/accelerate/myqtconcurrent.cpp.o 28d12937d9255fcc -164 4107 1702497594949499295 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -133 2103 1702496981479061715 CMakeFiles/projects_ray.dir/src/vec4ops/transform4d.cpp.o 9cafd52c1d615711 -134 9623 1702496988987370901 CMakeFiles/projects_ray.dir/src/accelerate/bvh.cpp.o 2ac5d1ff96197a9 -133 8003 1702496987364117467 CMakeFiles/projects_ray.dir/src/vec4ops/rotations4d.cpp.o 936dea6b1a330a9e -2103 10035 1702496989403354899 CMakeFiles/projects_ray.dir/src/illuminate/shadow.cpp.o 98378b8788da3ce3 -136 9274 1702496988634792660 CMakeFiles/projects_ray.dir/src/aliasing/filter.cpp.o bc288befd0c32eb0 -139 8636 1702496987994475594 CMakeFiles/projects_ray.dir/src/intersect/normals.cpp.o d622514f4a212179 -140 8284 1702496987648163278 CMakeFiles/projects_ray.dir/src/texture/texture.cpp.o d3d7e9f0c176bf47 -141 8301 1702496987659972539 CMakeFiles/projects_ray.dir/src/illuminate/reflect.cpp.o e72528d54abad0c9 -26 153 1702497591008567536 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -26 153 1702497591008567536 projects_ray_autogen/timestamp 596afd61accb21ff -134 9491 1702496988857163996 CMakeFiles/projects_ray.dir/src/accelerate/kdtree.cpp.o a0b7647ef5416d35 -8284 12106 1702496991478583140 CMakeFiles/projects_ray.dir/src/camera/camera.cpp.o 5f7d45d0b689d9f7 -26 153 1702497591008567536 /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 -8301 11075 1702496990452048080 CMakeFiles/projects_ray.dir/src/settings.cpp.o 73db81265aa9dd0e -7932 14357 1702496993731854831 CMakeFiles/projects_ray.dir/src/utils/sceneparser.cpp.o ed3cc2e1b7dc62bd -4987 12622 1702496991993915138 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 -9492 14497 1702496993868834378 CMakeFiles/projects_ray.dir/projects_ray_autogen/mocs_compilation.cpp.o 21ccedb02e7f6f6a -24 130 1702497672619921645 projects_ray_autogen/timestamp 596afd61accb21ff -24 130 1702497672619921645 projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -24 130 1702497672619921645 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/timestamp 596afd61accb21ff -24 130 1702497672619921645 /Users/daviddoan/Desktop/Graphics/the-all-americans-in-cs1230/build/build-the-all-americans-in-cs1230-Qt_6_5_2_for_macOS-Release/projects_ray_autogen/mocs_compilation.cpp 596afd61accb21ff -140 3389 1702497675868286820 CMakeFiles/projects_ray.dir/src/mainwindow.cpp.o 6c6dd3bd167ac5ff -3389 3766 1702497676240230691 projects_ray cae90fddb8ce24a +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 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 8267223..2b252cb 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 6f73b5a..b36939a 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 @@ -68,11 +68,12 @@ static constexpr auto qt_meta_stringdata_CLASSMainWindowENDCLASS = QtMocHelpers: "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateTimeValue" ); #else // !QT_MOC_HAS_STRING_DATA struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { - uint offsetsAndSizes[60]; + uint offsetsAndSizes[62]; char stringdata0[11]; char stringdata1[13]; char stringdata2[1]; @@ -103,6 +104,7 @@ struct qt_meta_stringdata_CLASSMainWindowENDCLASS_t { char stringdata27[21]; char stringdata28[19]; char stringdata29[16]; + char stringdata30[16]; }; #define QT_MOC_LITERAL(ofs, len) \ uint(sizeof(qt_meta_stringdata_CLASSMainWindowENDCLASS_t::offsetsAndSizes) + ofs), len @@ -137,7 +139,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st QT_MOC_LITERAL(420, 14), // "updateZwSlider" QT_MOC_LITERAL(435, 20), // "updateRotationSlider" QT_MOC_LITERAL(456, 18), // "onValChangeWSlider" - QT_MOC_LITERAL(475, 15) // "onValChangeWBox" + QT_MOC_LITERAL(475, 15), // "onValChangeWBox" + QT_MOC_LITERAL(491, 15) // "updateTimeValue" }, "MainWindow", "onUploadFile", @@ -168,7 +171,8 @@ Q_CONSTINIT static const qt_meta_stringdata_CLASSMainWindowENDCLASS_t qt_meta_st "updateZwSlider", "updateRotationSlider", "onValChangeWSlider", - "onValChangeWBox" + "onValChangeWBox", + "updateTimeValue" }; #undef QT_MOC_LITERAL #endif // !QT_MOC_HAS_STRING_DATA @@ -180,7 +184,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 11, // revision 0, // classname 0, 0, // classinfo - 27, 14, // methods + 28, 14, // methods 0, 0, // properties 0, 0, // enums/sets 0, 0, // constructors @@ -188,33 +192,34 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { 0, // signalCount // slots: name, argc, parameters, tag, flags, initial metatype offsets - 1, 0, 176, 2, 0x08, 1 /* Private */, - 3, 0, 177, 2, 0x08, 2 /* Private */, - 4, 0, 178, 2, 0x08, 3 /* Private */, - 5, 1, 179, 2, 0x08, 4 /* Private */, - 7, 1, 182, 2, 0x08, 6 /* Private */, - 8, 1, 185, 2, 0x08, 8 /* Private */, - 9, 1, 188, 2, 0x08, 10 /* Private */, - 10, 1, 191, 2, 0x08, 12 /* Private */, - 11, 1, 194, 2, 0x08, 14 /* Private */, - 12, 1, 197, 2, 0x08, 16 /* Private */, - 13, 1, 200, 2, 0x08, 18 /* Private */, - 14, 1, 203, 2, 0x08, 20 /* Private */, - 15, 1, 206, 2, 0x08, 22 /* Private */, - 16, 1, 209, 2, 0x08, 24 /* Private */, - 17, 1, 212, 2, 0x08, 26 /* Private */, - 18, 1, 215, 2, 0x08, 28 /* Private */, - 19, 1, 218, 2, 0x08, 30 /* Private */, - 20, 0, 221, 2, 0x08, 32 /* Private */, - 21, 1, 222, 2, 0x08, 33 /* Private */, - 22, 1, 225, 2, 0x08, 35 /* Private */, - 23, 1, 228, 2, 0x08, 37 /* Private */, - 24, 1, 231, 2, 0x08, 39 /* Private */, - 25, 1, 234, 2, 0x08, 41 /* Private */, - 26, 1, 237, 2, 0x08, 43 /* Private */, - 27, 1, 240, 2, 0x08, 45 /* Private */, - 28, 1, 243, 2, 0x08, 47 /* Private */, - 29, 1, 246, 2, 0x08, 49 /* Private */, + 1, 0, 182, 2, 0x08, 1 /* Private */, + 3, 0, 183, 2, 0x08, 2 /* Private */, + 4, 0, 184, 2, 0x08, 3 /* Private */, + 5, 1, 185, 2, 0x08, 4 /* Private */, + 7, 1, 188, 2, 0x08, 6 /* Private */, + 8, 1, 191, 2, 0x08, 8 /* Private */, + 9, 1, 194, 2, 0x08, 10 /* Private */, + 10, 1, 197, 2, 0x08, 12 /* Private */, + 11, 1, 200, 2, 0x08, 14 /* Private */, + 12, 1, 203, 2, 0x08, 16 /* Private */, + 13, 1, 206, 2, 0x08, 18 /* Private */, + 14, 1, 209, 2, 0x08, 20 /* Private */, + 15, 1, 212, 2, 0x08, 22 /* Private */, + 16, 1, 215, 2, 0x08, 24 /* Private */, + 17, 1, 218, 2, 0x08, 26 /* Private */, + 18, 1, 221, 2, 0x08, 28 /* Private */, + 19, 1, 224, 2, 0x08, 30 /* Private */, + 20, 0, 227, 2, 0x08, 32 /* Private */, + 21, 1, 228, 2, 0x08, 33 /* Private */, + 22, 1, 231, 2, 0x08, 35 /* Private */, + 23, 1, 234, 2, 0x08, 37 /* Private */, + 24, 1, 237, 2, 0x08, 39 /* Private */, + 25, 1, 240, 2, 0x08, 41 /* Private */, + 26, 1, 243, 2, 0x08, 43 /* Private */, + 27, 1, 246, 2, 0x08, 45 /* Private */, + 28, 1, 249, 2, 0x08, 47 /* Private */, + 29, 1, 252, 2, 0x08, 49 /* Private */, + 30, 0, 255, 2, 0x08, 51 /* Private */, // slots: parameters QMetaType::Void, @@ -244,6 +249,7 @@ Q_CONSTINIT static const uint qt_meta_data_CLASSMainWindowENDCLASS[] = { QMetaType::Void, QMetaType::Float, 6, QMetaType::Void, QMetaType::Int, 6, QMetaType::Void, QMetaType::Double, 6, + QMetaType::Void, 0 // eod }; @@ -333,7 +339,9 @@ Q_CONSTINIT const QMetaObject MainWindow::staticMetaObject = { { QtPrivate::TypeAndForceComplete<int, std::false_type>, // method 'onValChangeWBox' QtPrivate::TypeAndForceComplete<void, std::false_type>, - QtPrivate::TypeAndForceComplete<double, std::false_type> + QtPrivate::TypeAndForceComplete<double, std::false_type>, + // method 'updateTimeValue' + QtPrivate::TypeAndForceComplete<void, std::false_type> >, nullptr } }; @@ -371,6 +379,7 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, case 24: _t->updateRotationSlider((*reinterpret_cast< std::add_pointer_t<float>>(_a[1]))); break; case 25: _t->onValChangeWSlider((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break; case 26: _t->onValChangeWBox((*reinterpret_cast< std::add_pointer_t<double>>(_a[1]))); break; + case 27: _t->updateTimeValue(); break; default: ; } } @@ -395,13 +404,13 @@ int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) if (_id < 0) return _id; if (_c == QMetaObject::InvokeMetaMethod) { - if (_id < 27) + if (_id < 28) qt_static_metacall(this, _c, _id, _a); - _id -= 27; + _id -= 28; } else if (_c == QMetaObject::RegisterMethodArgumentMetaType) { - if (_id < 27) + if (_id < 28) *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); - _id -= 27; + _id -= 28; } return _id; } diff --git a/scenefiles-4d/sphere_lattic.json b/scenefiles-4d/sphere_lattic.json new file mode 100644 index 0000000..31a05c9 --- /dev/null +++ b/scenefiles-4d/sphere_lattic.json @@ -0,0 +1,277 @@ +{ + "name": "root", + "globalData": { + "ambientCoeff": 0.5, + "diffuseCoeff": 0.5, + "specularCoeff": 0.5, + "transparentCoeff": 0.5, + "gravity": [0.0, -0.0098, 0.0, 0.0] + }, + "cameraData": { + "position": [3.0, 3.0, 3.0, 1.0], + "up": [0.0, 1.0, 0.0, 0.0], + "heightAngle": 30.0, + "depthAngle": 30.0, + "focus": [0.0, 0.0, 0.0, 0.0], + "over": [0.0, 0.0, 0.0, 1.0] + }, + "groups": [ + { + "lights": [ + { + "type": "directional", + "color": [1.0, 1.0, 1.0], + "direction": [0.0, -1.0, 0.0, 0.0] + }, + { + "type": "directional", + "color": [1.0, 1.0, 1.0], + "direction": [1.0, 1.0, 3.0, 3.0] + } + ] + }, + { + "groups": [ + { + "translate": [-2.0, -2.0, -2.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", + "diffuse": [1.0, 0.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], + "ior": 1.01 + } + ] + }, + { + "translate": [2.0, 2.0, 2.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", + "diffuse": [0.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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 0.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 2.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 2.0, 0.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 2.0, 2.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 2.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 4.0, 0.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 4.0, 2.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 4.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [2.0, 0.0, 0.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", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [2.0, 0.0, 2.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", + "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], + "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", + "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], + "ior": 1.01 + } + ] + } + ] + } + ] +} diff --git a/scenefiles-4d/sphere_lattic2.json b/scenefiles-4d/sphere_lattic2.json new file mode 100644 index 0000000..6e764c7 --- /dev/null +++ b/scenefiles-4d/sphere_lattic2.json @@ -0,0 +1,313 @@ +{ + "name": "root", + "globalData": { + "ambientCoeff": 0.5, + "diffuseCoeff": 0.5, + "specularCoeff": 0.5, + "transparentCoeff": 0, + "gravity": [0.0, -0.0098, 0.0, 0.0] + }, + "cameraData": { + "position": [3.0, 3.0, 3.0, 1.0], + "up": [0.0, 1.0, 0.0, 0.0], + "heightAngle": 30.0, + "depthAngle": 30.0, + "focus": [0.0, 0.0, 0.0, 0.0], + "over": [0.0, 0.0, 0.0, 1.0] + }, + "groups": [ + { + "lights": [ + { + "type": "directional", + "color": [1.0, 1.0, 1.0], + "direction": [0.0, -1.0, 0.0, 0.0] + }, + { + "type": "directional", + "color": [1.0, 1.0, 1.0], + "direction": [1.0, 1.0, 3.0, 3.0] + } + ] + }, + { + "groups": [ + { + "translate": [1.0, 0.0, 0.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 1.0, 0.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 1.0, 1.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 1.0, 1.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 1.0, 0.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 1.0, 1.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 1.0, 1.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 1.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 1.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 0.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 0.0, 1.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 0.0, 1.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 0.0, 0.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 1.0, 0.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [0.0, 0.0, 0.0, 0.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + }, + { + "translate": [1.0, 1.0, 0.0, 1.0], + "rotate": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0], + "scale": [0.5, 0.5, 0.5, 0.5], + "primitives": [ + { + "type": "sphere", + "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], + "ior": 1.01 + } + ] + } + ] + } + ] +} + +
\ No newline at end of file diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ac65c1f..4eda325 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -26,22 +26,22 @@ void MainWindow::initialize() { font.setPointSize(12); font.setBold(true); QLabel *xy_label = new QLabel(); // XY label - xy_label->setText("XY value:"); + xy_label->setText("Camera XY:"); xy_label->setFont(font); QLabel *xz_label = new QLabel(); // XZ label - xz_label->setText("XZ value:"); + xz_label->setText("Camera XZ:"); xz_label->setFont(font); QLabel *xw_label = new QLabel(); // XW label - xw_label->setText("XW value:"); + xw_label->setText("Camera XW:"); xw_label->setFont(font); QLabel *yz_label = new QLabel(); // YZ label - yz_label->setText("YZ value:"); + yz_label->setText("Camera YZ:"); yz_label->setFont(font); QLabel *yw_label = new QLabel(); // YW label - yw_label->setText("YW value:"); + yw_label->setText("Camera YW:"); yw_label->setFont(font); QLabel *zw_label = new QLabel(); // ZW label - zw_label->setText("ZW value:"); + zw_label->setText("Camera ZW:"); zw_label->setFont(font); QLabel *w_label = new QLabel(); // W label w_label->setText("W value:"); @@ -526,6 +526,7 @@ void MainWindow::onRotateNegative() { void MainWindow::updateXySlider(double value) { xySlider->setValue(int(value*100.f)); xyBox->setValue(value); + settings.xy = xyBox->value(); rayTracer->settingsChanged(imageLabel); } diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index b5e8986..dbc1988 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -181,7 +181,7 @@ void RayTracer::sceneChanged(QLabel* imageLabel) { QImage flippedImage = image.mirrored(false, false); flippedImage = flippedImage.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); imageLabel->setPixmap(QPixmap::fromImage(flippedImage)); - m_controlPointIndex++; + // m_controlPointIndex++; // QTimer::singleShot(3500, this, [this, imageLabel]() { diff --git a/student_outputs/0000.png b/student_outputs/0000.png Binary files differindex 0ef904a..615555a 100644 --- a/student_outputs/0000.png +++ b/student_outputs/0000.png diff --git a/student_outputs/0001.png b/student_outputs/0001.png Binary files differindex 44de89b..2d9a3e4 100644 --- a/student_outputs/0001.png +++ b/student_outputs/0001.png diff --git a/student_outputs/0002.png b/student_outputs/0002.png Binary files differindex 44de89b..2d9a3e4 100644 --- a/student_outputs/0002.png +++ b/student_outputs/0002.png diff --git a/student_outputs/0003.png b/student_outputs/0003.png Binary files differindex 91ab936..25678e0 100644 --- a/student_outputs/0003.png +++ b/student_outputs/0003.png diff --git a/student_outputs/0004.png b/student_outputs/0004.png Binary files differindex 91ab936..25678e0 100644 --- a/student_outputs/0004.png +++ b/student_outputs/0004.png diff --git a/student_outputs/0005.png b/student_outputs/0005.png Binary files differindex 31ede8f..132ecc9 100644 --- a/student_outputs/0005.png +++ b/student_outputs/0005.png diff --git a/student_outputs/0006.png b/student_outputs/0006.png Binary files differindex 31ede8f..132ecc9 100644 --- a/student_outputs/0006.png +++ b/student_outputs/0006.png diff --git a/student_outputs/0007.png b/student_outputs/0007.png Binary files differindex e8527ab..a9828e9 100644 --- a/student_outputs/0007.png +++ b/student_outputs/0007.png diff --git a/student_outputs/0008.png b/student_outputs/0008.png Binary files differindex e8527ab..a9828e9 100644 --- a/student_outputs/0008.png +++ b/student_outputs/0008.png diff --git a/student_outputs/0009.png b/student_outputs/0009.png Binary files differindex 0d2788a..16d6c38 100644 --- a/student_outputs/0009.png +++ b/student_outputs/0009.png diff --git a/student_outputs/0010.png b/student_outputs/0010.png Binary files differindex 0d2788a..16d6c38 100644 --- a/student_outputs/0010.png +++ b/student_outputs/0010.png diff --git a/student_outputs/0011.png b/student_outputs/0011.png Binary files differindex 9f1c6c7..802f665 100644 --- a/student_outputs/0011.png +++ b/student_outputs/0011.png diff --git a/student_outputs/0012.png b/student_outputs/0012.png Binary files differindex 9f1c6c7..802f665 100644 --- a/student_outputs/0012.png +++ b/student_outputs/0012.png diff --git a/student_outputs/0013.png b/student_outputs/0013.png Binary files differindex a34e7ad..024863b 100644 --- a/student_outputs/0013.png +++ b/student_outputs/0013.png diff --git a/student_outputs/0014.png b/student_outputs/0014.png Binary files differindex a34e7ad..024863b 100644 --- a/student_outputs/0014.png +++ b/student_outputs/0014.png diff --git a/student_outputs/0015.png b/student_outputs/0015.png Binary files differindex 8572a09..7e83ea7 100644 --- a/student_outputs/0015.png +++ b/student_outputs/0015.png diff --git a/student_outputs/0016.png b/student_outputs/0016.png Binary files differindex 8572a09..7e83ea7 100644 --- a/student_outputs/0016.png +++ b/student_outputs/0016.png diff --git a/student_outputs/0017.png b/student_outputs/0017.png Binary files differindex fbede17..4222102 100644 --- a/student_outputs/0017.png +++ b/student_outputs/0017.png diff --git a/student_outputs/0018.png b/student_outputs/0018.png Binary files differindex fbede17..4222102 100644 --- a/student_outputs/0018.png +++ b/student_outputs/0018.png diff --git a/student_outputs/0019.png b/student_outputs/0019.png Binary files differindex 314c72c..4daf0e1 100644 --- a/student_outputs/0019.png +++ b/student_outputs/0019.png diff --git a/student_outputs/0020.png b/student_outputs/0020.png Binary files differindex 314c72c..4daf0e1 100644 --- a/student_outputs/0020.png +++ b/student_outputs/0020.png diff --git a/student_outputs/0021.png b/student_outputs/0021.png Binary files differindex 4fcb3f7..012f7cd 100644 --- a/student_outputs/0021.png +++ b/student_outputs/0021.png diff --git a/student_outputs/0022.png b/student_outputs/0022.png Binary files differindex 4fcb3f7..012f7cd 100644 --- a/student_outputs/0022.png +++ b/student_outputs/0022.png diff --git a/student_outputs/0023.png b/student_outputs/0023.png Binary files differindex d531ca1..4835290 100644 --- a/student_outputs/0023.png +++ b/student_outputs/0023.png diff --git a/student_outputs/0024.png b/student_outputs/0024.png Binary files differindex d531ca1..4835290 100644 --- a/student_outputs/0024.png +++ b/student_outputs/0024.png diff --git a/student_outputs/0025.png b/student_outputs/0025.png Binary files differindex d730781..4eb11a4 100644 --- a/student_outputs/0025.png +++ b/student_outputs/0025.png diff --git a/student_outputs/0026.png b/student_outputs/0026.png Binary files differindex d730781..4eb11a4 100644 --- a/student_outputs/0026.png +++ b/student_outputs/0026.png diff --git a/student_outputs/0027.png b/student_outputs/0027.png Binary files differindex 276303b..01ca08d 100644 --- a/student_outputs/0027.png +++ b/student_outputs/0027.png diff --git a/student_outputs/0028.png b/student_outputs/0028.png Binary files differindex 276303b..01ca08d 100644 --- a/student_outputs/0028.png +++ b/student_outputs/0028.png diff --git a/student_outputs/0029.png b/student_outputs/0029.png Binary files differindex f00614c..b2a3cc1 100644 --- a/student_outputs/0029.png +++ b/student_outputs/0029.png diff --git a/student_outputs/0030.png b/student_outputs/0030.png Binary files differindex f00614c..b2a3cc1 100644 --- a/student_outputs/0030.png +++ b/student_outputs/0030.png diff --git a/student_outputs/0031.png b/student_outputs/0031.png Binary files differindex 271eba5..311dfe7 100644 --- a/student_outputs/0031.png +++ b/student_outputs/0031.png diff --git a/student_outputs/0032.png b/student_outputs/0032.png Binary files differindex 271eba5..311dfe7 100644 --- a/student_outputs/0032.png +++ b/student_outputs/0032.png diff --git a/student_outputs/0033.png b/student_outputs/0033.png Binary files differindex d02ef73..ed50255 100644 --- a/student_outputs/0033.png +++ b/student_outputs/0033.png diff --git a/student_outputs/0034.png b/student_outputs/0034.png Binary files differindex d02ef73..ed50255 100644 --- a/student_outputs/0034.png +++ b/student_outputs/0034.png diff --git a/student_outputs/0035.png b/student_outputs/0035.png Binary files differindex 79a7683..e40d504 100644 --- a/student_outputs/0035.png +++ b/student_outputs/0035.png diff --git a/student_outputs/0036.png b/student_outputs/0036.png Binary files differindex 79a7683..e40d504 100644 --- a/student_outputs/0036.png +++ b/student_outputs/0036.png diff --git a/student_outputs/0037.png b/student_outputs/0037.png Binary files differindex 5ad2d6f..126bd04 100644 --- a/student_outputs/0037.png +++ b/student_outputs/0037.png diff --git a/student_outputs/0038.png b/student_outputs/0038.png Binary files differindex 5ad2d6f..126bd04 100644 --- a/student_outputs/0038.png +++ b/student_outputs/0038.png diff --git a/student_outputs/0039.png b/student_outputs/0039.png Binary files differindex 959da0d..115f9c6 100644 --- a/student_outputs/0039.png +++ b/student_outputs/0039.png diff --git a/student_outputs/0040.png b/student_outputs/0040.png Binary files differindex 959da0d..115f9c6 100644 --- a/student_outputs/0040.png +++ b/student_outputs/0040.png diff --git a/student_outputs/0041.png b/student_outputs/0041.png Binary files differindex 935d8ce..bffbda2 100644 --- a/student_outputs/0041.png +++ b/student_outputs/0041.png diff --git a/student_outputs/0042.png b/student_outputs/0042.png Binary files differindex 935d8ce..bffbda2 100644 --- a/student_outputs/0042.png +++ b/student_outputs/0042.png diff --git a/student_outputs/0043.png b/student_outputs/0043.png Binary files differindex 85ccfc5..615555a 100644 --- a/student_outputs/0043.png +++ b/student_outputs/0043.png diff --git a/student_outputs/0044.png b/student_outputs/0044.png Binary files differindex 85ccfc5..615555a 100644 --- a/student_outputs/0044.png +++ b/student_outputs/0044.png diff --git a/student_outputs/0045.png b/student_outputs/0045.png Binary files differindex 945fd4c..615555a 100644 --- a/student_outputs/0045.png +++ b/student_outputs/0045.png diff --git a/student_outputs/0046.png b/student_outputs/0046.png Binary files differindex 945fd4c..615555a 100644 --- a/student_outputs/0046.png +++ b/student_outputs/0046.png diff --git a/student_outputs/0047.png b/student_outputs/0047.png Binary files differindex 3f2b088..0bd74e1 100644 --- a/student_outputs/0047.png +++ b/student_outputs/0047.png diff --git a/student_outputs/0048.png b/student_outputs/0048.png Binary files differindex 3f2b088..0bd74e1 100644 --- a/student_outputs/0048.png +++ b/student_outputs/0048.png diff --git a/student_outputs/0049.png b/student_outputs/0049.png Binary files differindex f9b9b68..f1c136f 100644 --- a/student_outputs/0049.png +++ b/student_outputs/0049.png diff --git a/student_outputs/0050.png b/student_outputs/0050.png Binary files differindex f9b9b68..f1c136f 100644 --- a/student_outputs/0050.png +++ b/student_outputs/0050.png diff --git a/student_outputs/0051.png b/student_outputs/0051.png Binary files differindex f1d42d8..f818b71 100644 --- a/student_outputs/0051.png +++ b/student_outputs/0051.png diff --git a/student_outputs/0052.png b/student_outputs/0052.png Binary files differindex f1d42d8..f818b71 100644 --- a/student_outputs/0052.png +++ b/student_outputs/0052.png diff --git a/student_outputs/0053.png b/student_outputs/0053.png Binary files differindex d7f85bc..efc956b 100644 --- a/student_outputs/0053.png +++ b/student_outputs/0053.png diff --git a/student_outputs/0054.png b/student_outputs/0054.png Binary files differindex d7f85bc..efc956b 100644 --- a/student_outputs/0054.png +++ b/student_outputs/0054.png diff --git a/student_outputs/0055.png b/student_outputs/0055.png Binary files differindex ed6f75c..daa07bb 100644 --- a/student_outputs/0055.png +++ b/student_outputs/0055.png diff --git a/student_outputs/0056.png b/student_outputs/0056.png Binary files differindex ed6f75c..daa07bb 100644 --- a/student_outputs/0056.png +++ b/student_outputs/0056.png diff --git a/student_outputs/0057.png b/student_outputs/0057.png Binary files differindex 1f89d65..515144c 100644 --- a/student_outputs/0057.png +++ b/student_outputs/0057.png diff --git a/student_outputs/0058.png b/student_outputs/0058.png Binary files differindex 1f89d65..515144c 100644 --- a/student_outputs/0058.png +++ b/student_outputs/0058.png diff --git a/student_outputs/0059.png b/student_outputs/0059.png Binary files differindex e19e336..c1f5ddb 100644 --- a/student_outputs/0059.png +++ b/student_outputs/0059.png diff --git a/student_outputs/0060.png b/student_outputs/0060.png Binary files differindex e19e336..c1f5ddb 100644 --- a/student_outputs/0060.png +++ b/student_outputs/0060.png diff --git a/student_outputs/0061.png b/student_outputs/0061.png Binary files differindex f8663d3..dae250f 100644 --- a/student_outputs/0061.png +++ b/student_outputs/0061.png diff --git a/student_outputs/0062.png b/student_outputs/0062.png Binary files differindex f8663d3..dae250f 100644 --- a/student_outputs/0062.png +++ b/student_outputs/0062.png diff --git a/student_outputs/0063.png b/student_outputs/0063.png Binary files differindex 84c21f0..84b2df6 100644 --- a/student_outputs/0063.png +++ b/student_outputs/0063.png diff --git a/student_outputs/0064.png b/student_outputs/0064.png Binary files differindex 84c21f0..84b2df6 100644 --- a/student_outputs/0064.png +++ b/student_outputs/0064.png diff --git a/student_outputs/0065.png b/student_outputs/0065.png Binary files differindex 59cc7db..85e5210 100644 --- a/student_outputs/0065.png +++ b/student_outputs/0065.png diff --git a/student_outputs/0066.png b/student_outputs/0066.png Binary files differindex 59cc7db..85e5210 100644 --- a/student_outputs/0066.png +++ b/student_outputs/0066.png diff --git a/student_outputs/0067.png b/student_outputs/0067.png Binary files differindex 9a78433..20209c1 100644 --- a/student_outputs/0067.png +++ b/student_outputs/0067.png diff --git a/student_outputs/0068.png b/student_outputs/0068.png Binary files differindex 9a78433..20209c1 100644 --- a/student_outputs/0068.png +++ b/student_outputs/0068.png diff --git a/student_outputs/0069.png b/student_outputs/0069.png Binary files differindex 9ddee1c..e4b1511 100644 --- a/student_outputs/0069.png +++ b/student_outputs/0069.png diff --git a/student_outputs/0070.png b/student_outputs/0070.png Binary files differindex 9ddee1c..e4b1511 100644 --- a/student_outputs/0070.png +++ b/student_outputs/0070.png diff --git a/student_outputs/0071.png b/student_outputs/0071.png Binary files differindex 1ffeedb..466eec1 100644 --- a/student_outputs/0071.png +++ b/student_outputs/0071.png diff --git a/student_outputs/0072.png b/student_outputs/0072.png Binary files differindex 1ffeedb..466eec1 100644 --- a/student_outputs/0072.png +++ b/student_outputs/0072.png diff --git a/student_outputs/0073.png b/student_outputs/0073.png Binary files differindex 496f505..3c8cfba 100644 --- a/student_outputs/0073.png +++ b/student_outputs/0073.png diff --git a/student_outputs/0074.png b/student_outputs/0074.png Binary files differindex 496f505..3c8cfba 100644 --- a/student_outputs/0074.png +++ b/student_outputs/0074.png diff --git a/student_outputs/0075.png b/student_outputs/0075.png Binary files differindex eb9dcc0..cc7430c 100644 --- a/student_outputs/0075.png +++ b/student_outputs/0075.png diff --git a/student_outputs/0076.png b/student_outputs/0076.png Binary files differindex eb9dcc0..cc7430c 100644 --- a/student_outputs/0076.png +++ b/student_outputs/0076.png diff --git a/student_outputs/0077.png b/student_outputs/0077.png Binary files differindex 48085bb..a520cbf 100644 --- a/student_outputs/0077.png +++ b/student_outputs/0077.png diff --git a/student_outputs/0078.png b/student_outputs/0078.png Binary files differindex 48085bb..a520cbf 100644 --- a/student_outputs/0078.png +++ b/student_outputs/0078.png diff --git a/student_outputs/0079.png b/student_outputs/0079.png Binary files differindex d37576c..508868e 100644 --- a/student_outputs/0079.png +++ b/student_outputs/0079.png diff --git a/student_outputs/0080.png b/student_outputs/0080.png Binary files differindex d37576c..508868e 100644 --- a/student_outputs/0080.png +++ b/student_outputs/0080.png diff --git a/student_outputs/0081.png b/student_outputs/0081.png Binary files differindex 9c7c9f3..e8ba2f2 100644 --- a/student_outputs/0081.png +++ b/student_outputs/0081.png diff --git a/student_outputs/0082.png b/student_outputs/0082.png Binary files differindex 9c7c9f3..e8ba2f2 100644 --- a/student_outputs/0082.png +++ b/student_outputs/0082.png diff --git a/student_outputs/0083.png b/student_outputs/0083.png Binary files differindex ce5f8d8..d184cc8 100644 --- a/student_outputs/0083.png +++ b/student_outputs/0083.png diff --git a/student_outputs/0084.png b/student_outputs/0084.png Binary files differindex ce5f8d8..d184cc8 100644 --- a/student_outputs/0084.png +++ b/student_outputs/0084.png diff --git a/student_outputs/0085.png b/student_outputs/0085.png Binary files differindex 2f22c34..a304245 100644 --- a/student_outputs/0085.png +++ b/student_outputs/0085.png diff --git a/student_outputs/0086.png b/student_outputs/0086.png Binary files differindex 2f22c34..a304245 100644 --- a/student_outputs/0086.png +++ b/student_outputs/0086.png diff --git a/student_outputs/0087.png b/student_outputs/0087.png Binary files differindex 7cff618..7083946 100644 --- a/student_outputs/0087.png +++ b/student_outputs/0087.png diff --git a/student_outputs/0088.png b/student_outputs/0088.png Binary files differindex 7cff618..7083946 100644 --- a/student_outputs/0088.png +++ b/student_outputs/0088.png diff --git a/student_outputs/0089.png b/student_outputs/0089.png Binary files differindex 23f121c..f22587a 100644 --- a/student_outputs/0089.png +++ b/student_outputs/0089.png diff --git a/student_outputs/0090.png b/student_outputs/0090.png Binary files differindex 23f121c..f22587a 100644 --- a/student_outputs/0090.png +++ b/student_outputs/0090.png diff --git a/student_outputs/0091.png b/student_outputs/0091.png Binary files differindex 87533fc..3c0970b 100644 --- a/student_outputs/0091.png +++ b/student_outputs/0091.png diff --git a/student_outputs/0092.png b/student_outputs/0092.png Binary files differindex 87533fc..3c0970b 100644 --- a/student_outputs/0092.png +++ b/student_outputs/0092.png diff --git a/student_outputs/0093.png b/student_outputs/0093.png Binary files differindex 3893e8b..6ed2fbf 100644 --- a/student_outputs/0093.png +++ b/student_outputs/0093.png diff --git a/student_outputs/0094.png b/student_outputs/0094.png Binary files differindex 3893e8b..6ed2fbf 100644 --- a/student_outputs/0094.png +++ b/student_outputs/0094.png diff --git a/student_outputs/0095.png b/student_outputs/0095.png Binary files differindex f11bd73..ea85423 100644 --- a/student_outputs/0095.png +++ b/student_outputs/0095.png diff --git a/student_outputs/0096.png b/student_outputs/0096.png Binary files differindex f11bd73..ea85423 100644 --- a/student_outputs/0096.png +++ b/student_outputs/0096.png diff --git a/student_outputs/0097.png b/student_outputs/0097.png Binary files differindex 630a4f8..8bbaf79 100644 --- a/student_outputs/0097.png +++ b/student_outputs/0097.png diff --git a/student_outputs/0098.png b/student_outputs/0098.png Binary files differindex 630a4f8..8bbaf79 100644 --- a/student_outputs/0098.png +++ b/student_outputs/0098.png diff --git a/student_outputs/0099.png b/student_outputs/0099.png Binary files differindex 9ae29a9..a2b9070 100644 --- a/student_outputs/0099.png +++ b/student_outputs/0099.png diff --git a/student_outputs/0100.png b/student_outputs/0100.png Binary files differindex 9ae29a9..a2b9070 100644 --- a/student_outputs/0100.png +++ b/student_outputs/0100.png diff --git a/student_outputs/0101.png b/student_outputs/0101.png Binary files differindex 56605cd..70ccc4b 100644 --- a/student_outputs/0101.png +++ b/student_outputs/0101.png diff --git a/student_outputs/0102.png b/student_outputs/0102.png Binary files differindex 56605cd..70ccc4b 100644 --- a/student_outputs/0102.png +++ b/student_outputs/0102.png diff --git a/student_outputs/0103.png b/student_outputs/0103.png Binary files differindex 8d5ebb7..a7690e0 100644 --- a/student_outputs/0103.png +++ b/student_outputs/0103.png diff --git a/student_outputs/0104.png b/student_outputs/0104.png Binary files differindex 8d5ebb7..a7690e0 100644 --- a/student_outputs/0104.png +++ b/student_outputs/0104.png diff --git a/student_outputs/0105.png b/student_outputs/0105.png Binary files differindex 0b4cc48..0847b0a 100644 --- a/student_outputs/0105.png +++ b/student_outputs/0105.png diff --git a/student_outputs/0106.png b/student_outputs/0106.png Binary files differindex 0b4cc48..0847b0a 100644 --- a/student_outputs/0106.png +++ b/student_outputs/0106.png diff --git a/student_outputs/0107.png b/student_outputs/0107.png Binary files differindex 70749cc..860c095 100644 --- a/student_outputs/0107.png +++ b/student_outputs/0107.png diff --git a/student_outputs/0108.png b/student_outputs/0108.png Binary files differindex 70749cc..860c095 100644 --- a/student_outputs/0108.png +++ b/student_outputs/0108.png diff --git a/student_outputs/0109.png b/student_outputs/0109.png Binary files differindex 5f74b98..e828134 100644 --- a/student_outputs/0109.png +++ b/student_outputs/0109.png diff --git a/student_outputs/0110.png b/student_outputs/0110.png Binary files differindex 5f74b98..e828134 100644 --- a/student_outputs/0110.png +++ b/student_outputs/0110.png diff --git a/student_outputs/0111.png b/student_outputs/0111.png Binary files differindex 9094f31..3c72fbe 100644 --- a/student_outputs/0111.png +++ b/student_outputs/0111.png diff --git a/student_outputs/0112.png b/student_outputs/0112.png Binary files differindex 9094f31..3c72fbe 100644 --- a/student_outputs/0112.png +++ b/student_outputs/0112.png diff --git a/student_outputs/0113.png b/student_outputs/0113.png Binary files differindex 6ea04cd..445b8d9 100644 --- a/student_outputs/0113.png +++ b/student_outputs/0113.png diff --git a/student_outputs/0114.png b/student_outputs/0114.png Binary files differindex 6ea04cd..445b8d9 100644 --- a/student_outputs/0114.png +++ b/student_outputs/0114.png diff --git a/student_outputs/0115.png b/student_outputs/0115.png Binary files differindex 8f76e2b..5abc4ca 100644 --- a/student_outputs/0115.png +++ b/student_outputs/0115.png diff --git a/student_outputs/0116.png b/student_outputs/0116.png Binary files differindex 8f76e2b..5abc4ca 100644 --- a/student_outputs/0116.png +++ b/student_outputs/0116.png diff --git a/student_outputs/0117.png b/student_outputs/0117.png Binary files differindex 8f54f81..8a74d6a 100644 --- a/student_outputs/0117.png +++ b/student_outputs/0117.png diff --git a/student_outputs/0118.png b/student_outputs/0118.png Binary files differindex 8f54f81..8a74d6a 100644 --- a/student_outputs/0118.png +++ b/student_outputs/0118.png diff --git a/student_outputs/0119.png b/student_outputs/0119.png Binary files differindex cac7b0e..c1c35cf 100644 --- a/student_outputs/0119.png +++ b/student_outputs/0119.png diff --git a/student_outputs/0120.png b/student_outputs/0120.png Binary files differindex cac7b0e..c1c35cf 100644 --- a/student_outputs/0120.png +++ b/student_outputs/0120.png diff --git a/student_outputs/0121.png b/student_outputs/0121.png Binary files differindex 503ff30..c9b25a9 100644 --- a/student_outputs/0121.png +++ b/student_outputs/0121.png diff --git a/student_outputs/0122.png b/student_outputs/0122.png Binary files differindex 503ff30..c9b25a9 100644 --- a/student_outputs/0122.png +++ b/student_outputs/0122.png diff --git a/student_outputs/0123.png b/student_outputs/0123.png Binary files differindex 54f7847..e5cf80e 100644 --- a/student_outputs/0123.png +++ b/student_outputs/0123.png diff --git a/student_outputs/0124.png b/student_outputs/0124.png Binary files differindex 54f7847..e5cf80e 100644 --- a/student_outputs/0124.png +++ b/student_outputs/0124.png diff --git a/student_outputs/0125.png b/student_outputs/0125.png Binary files differindex 1bf7f13..dfff8cb 100644 --- a/student_outputs/0125.png +++ b/student_outputs/0125.png diff --git a/student_outputs/0126.png b/student_outputs/0126.png Binary files differindex 1bf7f13..dfff8cb 100644 --- a/student_outputs/0126.png +++ b/student_outputs/0126.png diff --git a/student_outputs/0127.png b/student_outputs/0127.png Binary files differindex b4c3945..4e40a20 100644 --- a/student_outputs/0127.png +++ b/student_outputs/0127.png diff --git a/student_outputs/0128.png b/student_outputs/0128.png Binary files differindex b4c3945..4e40a20 100644 --- a/student_outputs/0128.png +++ b/student_outputs/0128.png diff --git a/student_outputs/0129.png b/student_outputs/0129.png Binary files differindex 37ef88e..ef7e6b9 100644 --- a/student_outputs/0129.png +++ b/student_outputs/0129.png diff --git a/student_outputs/0130.png b/student_outputs/0130.png Binary files differindex 37ef88e..ef7e6b9 100644 --- a/student_outputs/0130.png +++ b/student_outputs/0130.png diff --git a/student_outputs/0131.png b/student_outputs/0131.png Binary files differindex d06e19f..474bea9 100644 --- a/student_outputs/0131.png +++ b/student_outputs/0131.png diff --git a/student_outputs/0132.png b/student_outputs/0132.png Binary files differindex d06e19f..474bea9 100644 --- a/student_outputs/0132.png +++ b/student_outputs/0132.png diff --git a/student_outputs/0133.png b/student_outputs/0133.png Binary files differindex 9ff91a3..9082476 100644 --- a/student_outputs/0133.png +++ b/student_outputs/0133.png diff --git a/student_outputs/0134.png b/student_outputs/0134.png Binary files differindex 9ff91a3..9082476 100644 --- a/student_outputs/0134.png +++ b/student_outputs/0134.png diff --git a/student_outputs/0135.png b/student_outputs/0135.png Binary files differindex 229d2b5..71a4508 100644 --- a/student_outputs/0135.png +++ b/student_outputs/0135.png diff --git a/student_outputs/0136.png b/student_outputs/0136.png Binary files differindex 229d2b5..71a4508 100644 --- a/student_outputs/0136.png +++ b/student_outputs/0136.png diff --git a/student_outputs/0137.png b/student_outputs/0137.png Binary files differindex acac73a..5b79bdb 100644 --- a/student_outputs/0137.png +++ b/student_outputs/0137.png diff --git a/student_outputs/0138.png b/student_outputs/0138.png Binary files differindex acac73a..5b79bdb 100644 --- a/student_outputs/0138.png +++ b/student_outputs/0138.png diff --git a/student_outputs/0139.png b/student_outputs/0139.png Binary files differindex 16ca67e..4b5bb15 100644 --- a/student_outputs/0139.png +++ b/student_outputs/0139.png diff --git a/student_outputs/0140.png b/student_outputs/0140.png Binary files differindex 16ca67e..4b5bb15 100644 --- a/student_outputs/0140.png +++ b/student_outputs/0140.png diff --git a/student_outputs/0141.png b/student_outputs/0141.png Binary files differindex 7f254a1..f27c5d5 100644 --- a/student_outputs/0141.png +++ b/student_outputs/0141.png diff --git a/student_outputs/0142.png b/student_outputs/0142.png Binary files differindex 7f254a1..f27c5d5 100644 --- a/student_outputs/0142.png +++ b/student_outputs/0142.png diff --git a/student_outputs/0143.png b/student_outputs/0143.png Binary files differindex 33925bf..c74b0b3 100644 --- a/student_outputs/0143.png +++ b/student_outputs/0143.png diff --git a/student_outputs/0144.png b/student_outputs/0144.png Binary files differindex 33925bf..c74b0b3 100644 --- a/student_outputs/0144.png +++ b/student_outputs/0144.png diff --git a/student_outputs/0145.png b/student_outputs/0145.png Binary files differindex aa7c9d0..54f9fec 100644 --- a/student_outputs/0145.png +++ b/student_outputs/0145.png diff --git a/student_outputs/0146.png b/student_outputs/0146.png Binary files differindex aa7c9d0..54f9fec 100644 --- a/student_outputs/0146.png +++ b/student_outputs/0146.png diff --git a/student_outputs/0147.png b/student_outputs/0147.png Binary files differindex 0c6b654..615555a 100644 --- a/student_outputs/0147.png +++ b/student_outputs/0147.png diff --git a/student_outputs/0148.png b/student_outputs/0148.png Binary files differindex 0c6b654..615555a 100644 --- a/student_outputs/0148.png +++ b/student_outputs/0148.png diff --git a/student_outputs/0149.png b/student_outputs/0149.png Binary files differindex a3faf28..615555a 100644 --- a/student_outputs/0149.png +++ b/student_outputs/0149.png diff --git a/student_outputs/0150.png b/student_outputs/0150.png Binary files differindex a3faf28..615555a 100644 --- a/student_outputs/0150.png +++ b/student_outputs/0150.png diff --git a/student_outputs/0151.png b/student_outputs/0151.png Binary files differindex 2114a99..615555a 100644 --- a/student_outputs/0151.png +++ b/student_outputs/0151.png diff --git a/student_outputs/0152.png b/student_outputs/0152.png Binary files differindex 2114a99..615555a 100644 --- a/student_outputs/0152.png +++ b/student_outputs/0152.png diff --git a/student_outputs/0153.png b/student_outputs/0153.png Binary files differindex fbc6b09..615555a 100644 --- a/student_outputs/0153.png +++ b/student_outputs/0153.png diff --git a/student_outputs/0154.png b/student_outputs/0154.png Binary files differindex fbc6b09..615555a 100644 --- a/student_outputs/0154.png +++ b/student_outputs/0154.png diff --git a/student_outputs/0155.png b/student_outputs/0155.png Binary files differindex ee89680..615555a 100644 --- a/student_outputs/0155.png +++ b/student_outputs/0155.png diff --git a/student_outputs/0156.png b/student_outputs/0156.png Binary files differindex ee89680..615555a 100644 --- a/student_outputs/0156.png +++ b/student_outputs/0156.png diff --git a/student_outputs/0157.png b/student_outputs/0157.png Binary files differindex 689c3af..615555a 100644 --- a/student_outputs/0157.png +++ b/student_outputs/0157.png diff --git a/student_outputs/0158.png b/student_outputs/0158.png Binary files differindex 689c3af..615555a 100644 --- a/student_outputs/0158.png +++ b/student_outputs/0158.png diff --git a/student_outputs/0159.png b/student_outputs/0159.png Binary files differindex 1b2b484..615555a 100644 --- a/student_outputs/0159.png +++ b/student_outputs/0159.png diff --git a/student_outputs/0160.png b/student_outputs/0160.png Binary files differindex 1b2b484..615555a 100644 --- a/student_outputs/0160.png +++ b/student_outputs/0160.png diff --git a/student_outputs/0161.png b/student_outputs/0161.png Binary files differindex 304c98a..615555a 100644 --- a/student_outputs/0161.png +++ b/student_outputs/0161.png diff --git a/student_outputs/0162.png b/student_outputs/0162.png Binary files differindex 304c98a..615555a 100644 --- a/student_outputs/0162.png +++ b/student_outputs/0162.png diff --git a/student_outputs/0163.png b/student_outputs/0163.png Binary files differindex 10011d9..615555a 100644 --- a/student_outputs/0163.png +++ b/student_outputs/0163.png diff --git a/student_outputs/0164.png b/student_outputs/0164.png Binary files differindex 10011d9..615555a 100644 --- a/student_outputs/0164.png +++ b/student_outputs/0164.png diff --git a/student_outputs/0165.png b/student_outputs/0165.png Binary files differindex 83cd24c..615555a 100644 --- a/student_outputs/0165.png +++ b/student_outputs/0165.png diff --git a/student_outputs/0166.png b/student_outputs/0166.png Binary files differindex 83cd24c..615555a 100644 --- a/student_outputs/0166.png +++ b/student_outputs/0166.png diff --git a/student_outputs/0167.png b/student_outputs/0167.png Binary files differindex 67f8575..615555a 100644 --- a/student_outputs/0167.png +++ b/student_outputs/0167.png diff --git a/student_outputs/0168.png b/student_outputs/0168.png Binary files differindex 67f8575..615555a 100644 --- a/student_outputs/0168.png +++ b/student_outputs/0168.png diff --git a/student_outputs/0169.png b/student_outputs/0169.png Binary files differindex 7315e17..615555a 100644 --- a/student_outputs/0169.png +++ b/student_outputs/0169.png diff --git a/student_outputs/0170.png b/student_outputs/0170.png Binary files differindex 7315e17..615555a 100644 --- a/student_outputs/0170.png +++ b/student_outputs/0170.png diff --git a/student_outputs/0171.png b/student_outputs/0171.png Binary files differindex 62b7fb5..615555a 100644 --- a/student_outputs/0171.png +++ b/student_outputs/0171.png diff --git a/student_outputs/0172.png b/student_outputs/0172.png Binary files differindex 62b7fb5..615555a 100644 --- a/student_outputs/0172.png +++ b/student_outputs/0172.png diff --git a/student_outputs/0173.png b/student_outputs/0173.png Binary files differindex e79deca..615555a 100644 --- a/student_outputs/0173.png +++ b/student_outputs/0173.png diff --git a/student_outputs/0174.png b/student_outputs/0174.png Binary files differindex e79deca..615555a 100644 --- a/student_outputs/0174.png +++ b/student_outputs/0174.png diff --git a/student_outputs/0175.png b/student_outputs/0175.png Binary files differindex 71f68ac..615555a 100644 --- a/student_outputs/0175.png +++ b/student_outputs/0175.png diff --git a/student_outputs/0176.png b/student_outputs/0176.png Binary files differindex 71f68ac..615555a 100644 --- a/student_outputs/0176.png +++ b/student_outputs/0176.png diff --git a/student_outputs/0177.png b/student_outputs/0177.png Binary files differindex 6d4fdd9..615555a 100644 --- a/student_outputs/0177.png +++ b/student_outputs/0177.png diff --git a/student_outputs/0178.png b/student_outputs/0178.png Binary files differindex 6d4fdd9..615555a 100644 --- a/student_outputs/0178.png +++ b/student_outputs/0178.png diff --git a/student_outputs/0179.png b/student_outputs/0179.png Binary files differindex 931d08e..615555a 100644 --- a/student_outputs/0179.png +++ b/student_outputs/0179.png diff --git a/student_outputs/0180.png b/student_outputs/0180.png Binary files differindex 931d08e..615555a 100644 --- a/student_outputs/0180.png +++ b/student_outputs/0180.png |