From caa765bff49d54217b75aaf0e7acf4e5392a11e4 Mon Sep 17 00:00:00 2001 From: sotech117 Date: Thu, 7 Dec 2023 16:23:20 -0500 Subject: upload base code --- student_outputs/.DS_Store | Bin 0 -> 6148 bytes student_outputs/illuminate/.DS_Store | Bin 0 -> 6148 bytes student_outputs/illuminate/extra-credit/bvh.png | Bin 0 -> 284003 bytes student_outputs/illuminate/extra-credit/dof.png | Bin 0 -> 419495 bytes .../extra-credit/point_light_2-kd-issues.png | Bin 0 -> 73348 bytes .../point_light_2_bvh-shadow-issues.png | Bin 0 -> 271533 bytes .../illuminate/extra-credit/refract1.png | Bin 0 -> 1098071 bytes .../illuminate/extra-credit/refract2.png | Bin 0 -> 896145 bytes .../illuminate/extra-credit/snowman.json | 129 +++++++++++++++++++++ .../illuminate/extra-credit/soft_shadow.json | 97 ++++++++++++++++ .../illuminate/extra-credit/soft_shadow.png | Bin 0 -> 145213 bytes student_outputs/illuminate/required/README.md | 1 + .../illuminate/required/point_light_1.png | Bin 0 -> 42882 bytes .../illuminate/required/point_light_2.png | Bin 0 -> 85149 bytes .../illuminate/required/reflections_basic.png | Bin 0 -> 15174 bytes .../illuminate/required/reflections_complex.png | Bin 0 -> 80826 bytes student_outputs/illuminate/required/refract1.png | Bin 0 -> 1098071 bytes .../illuminate/required/shadow_special_case.png | Bin 0 -> 5031 bytes .../illuminate/required/shadow_test.png | Bin 0 -> 326430 bytes .../illuminate/required/simple_shadow.png | Bin 0 -> 34677 bytes .../illuminate/required/spot_light_1.png | Bin 0 -> 55633 bytes .../illuminate/required/spot_light_2.png | Bin 0 -> 71718 bytes .../illuminate/required/texture_cone.png | Bin 0 -> 26588 bytes .../illuminate/required/texture_cone2.png | Bin 0 -> 178862 bytes .../illuminate/required/texture_cube.png | Bin 0 -> 17884 bytes .../illuminate/required/texture_cube2.png | Bin 0 -> 302345 bytes .../illuminate/required/texture_cyl.png | Bin 0 -> 23706 bytes .../illuminate/required/texture_cyl2.png | Bin 0 -> 261528 bytes .../illuminate/required/texture_sphere.png | Bin 0 -> 21319 bytes .../illuminate/required/texture_sphere2.png | Bin 0 -> 202635 bytes student_outputs/intersect/.DS_Store | Bin 0 -> 6148 bytes student_outputs/intersect/required/README.md | 1 + .../intersect/required/ambient_total.png | Bin 0 -> 6854 bytes .../intersect/required/diffuse_total.png | Bin 0 -> 24748 bytes .../required/diffuse_total_my_normals.png | Bin 0 -> 69272 bytes .../intersect/required/directional_light_1.png | Bin 0 -> 16929 bytes .../intersect/required/directional_light_2.png | Bin 0 -> 33894 bytes .../intersect/required/parse_matrix.png | Bin 0 -> 24849 bytes student_outputs/intersect/required/phong_total.png | Bin 0 -> 28425 bytes .../intersect/required/specular_total.png | Bin 0 -> 4565 bytes student_outputs/intersect/required/unit_cone.png | Bin 0 -> 19568 bytes .../intersect/required/unit_cone_cap.png | Bin 0 -> 8012 bytes student_outputs/intersect/required/unit_cube.png | Bin 0 -> 5738 bytes .../intersect/required/unit_cylinder.png | Bin 0 -> 8548 bytes student_outputs/intersect/required/unit_sphere.png | Bin 0 -> 21600 bytes 45 files changed, 228 insertions(+) create mode 100644 student_outputs/.DS_Store create mode 100644 student_outputs/illuminate/.DS_Store create mode 100644 student_outputs/illuminate/extra-credit/bvh.png create mode 100644 student_outputs/illuminate/extra-credit/dof.png create mode 100644 student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png create mode 100644 student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png create mode 100644 student_outputs/illuminate/extra-credit/refract1.png create mode 100644 student_outputs/illuminate/extra-credit/refract2.png create mode 100644 student_outputs/illuminate/extra-credit/snowman.json create mode 100644 student_outputs/illuminate/extra-credit/soft_shadow.json create mode 100644 student_outputs/illuminate/extra-credit/soft_shadow.png create mode 100644 student_outputs/illuminate/required/README.md create mode 100644 student_outputs/illuminate/required/point_light_1.png create mode 100644 student_outputs/illuminate/required/point_light_2.png create mode 100644 student_outputs/illuminate/required/reflections_basic.png create mode 100644 student_outputs/illuminate/required/reflections_complex.png create mode 100644 student_outputs/illuminate/required/refract1.png create mode 100644 student_outputs/illuminate/required/shadow_special_case.png create mode 100644 student_outputs/illuminate/required/shadow_test.png create mode 100644 student_outputs/illuminate/required/simple_shadow.png create mode 100644 student_outputs/illuminate/required/spot_light_1.png create mode 100644 student_outputs/illuminate/required/spot_light_2.png create mode 100644 student_outputs/illuminate/required/texture_cone.png create mode 100644 student_outputs/illuminate/required/texture_cone2.png create mode 100644 student_outputs/illuminate/required/texture_cube.png create mode 100644 student_outputs/illuminate/required/texture_cube2.png create mode 100644 student_outputs/illuminate/required/texture_cyl.png create mode 100644 student_outputs/illuminate/required/texture_cyl2.png create mode 100644 student_outputs/illuminate/required/texture_sphere.png create mode 100644 student_outputs/illuminate/required/texture_sphere2.png create mode 100644 student_outputs/intersect/.DS_Store create mode 100644 student_outputs/intersect/required/README.md create mode 100644 student_outputs/intersect/required/ambient_total.png create mode 100644 student_outputs/intersect/required/diffuse_total.png create mode 100644 student_outputs/intersect/required/diffuse_total_my_normals.png create mode 100644 student_outputs/intersect/required/directional_light_1.png create mode 100644 student_outputs/intersect/required/directional_light_2.png create mode 100644 student_outputs/intersect/required/parse_matrix.png create mode 100644 student_outputs/intersect/required/phong_total.png create mode 100644 student_outputs/intersect/required/specular_total.png create mode 100644 student_outputs/intersect/required/unit_cone.png create mode 100644 student_outputs/intersect/required/unit_cone_cap.png create mode 100644 student_outputs/intersect/required/unit_cube.png create mode 100644 student_outputs/intersect/required/unit_cylinder.png create mode 100644 student_outputs/intersect/required/unit_sphere.png (limited to 'student_outputs') diff --git a/student_outputs/.DS_Store b/student_outputs/.DS_Store new file mode 100644 index 0000000..832662c Binary files /dev/null and b/student_outputs/.DS_Store differ diff --git a/student_outputs/illuminate/.DS_Store b/student_outputs/illuminate/.DS_Store new file mode 100644 index 0000000..5105f22 Binary files /dev/null and b/student_outputs/illuminate/.DS_Store differ diff --git a/student_outputs/illuminate/extra-credit/bvh.png b/student_outputs/illuminate/extra-credit/bvh.png new file mode 100644 index 0000000..a435f15 Binary files /dev/null and b/student_outputs/illuminate/extra-credit/bvh.png differ diff --git a/student_outputs/illuminate/extra-credit/dof.png b/student_outputs/illuminate/extra-credit/dof.png new file mode 100644 index 0000000..c7e4838 Binary files /dev/null and b/student_outputs/illuminate/extra-credit/dof.png differ diff --git a/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png b/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png new file mode 100644 index 0000000..0d21a89 Binary files /dev/null and b/student_outputs/illuminate/extra-credit/point_light_2-kd-issues.png differ diff --git a/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png b/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png new file mode 100644 index 0000000..9784fcf Binary files /dev/null and b/student_outputs/illuminate/extra-credit/point_light_2_bvh-shadow-issues.png differ diff --git a/student_outputs/illuminate/extra-credit/refract1.png b/student_outputs/illuminate/extra-credit/refract1.png new file mode 100644 index 0000000..13ae49a Binary files /dev/null and b/student_outputs/illuminate/extra-credit/refract1.png differ diff --git a/student_outputs/illuminate/extra-credit/refract2.png b/student_outputs/illuminate/extra-credit/refract2.png new file mode 100644 index 0000000..8aafc1e Binary files /dev/null and b/student_outputs/illuminate/extra-credit/refract2.png differ diff --git a/student_outputs/illuminate/extra-credit/snowman.json b/student_outputs/illuminate/extra-credit/snowman.json new file mode 100644 index 0000000..cde5954 --- /dev/null +++ b/student_outputs/illuminate/extra-credit/snowman.json @@ -0,0 +1,129 @@ +{ + "name": "root", + "globalData": { + "ambientCoeff": 0.5, + "diffuseCoeff": 0.5, + "specularCoeff": 0.5, + "transparentCoeff": 0 + }, + "cameraData": { + "position": [6.0, -2.0, 1.0], + "up": [0.0, 0.5, 0.0], + "focus": [0, 0, 0], + "heightAngle": 45.0 + }, + "groups": [ + { + "lights": [ + { + "type": "directional", + "color": [0.99, 0.99, 0.99], + "direction": [-2.0, -0.25, -0.5] + } + ] + }, + { + "groups": [ + { + "translate": [-0.0, -1.0, 0.0], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.99, 0.99, 0.99], + "specular": [1.0, 1.0, 1.0], + "shininess": 15.0 + } + ] + }, + { + "translate": [0.0, 0.0, 0.0], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.99, 0.99, 0.99], + "specular": [0.5, 0.5, 0.5], + "shininess": 30.0 + } + ] + }, + { + "translate": [0.0, -2.0, 0.0], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.99, 0.99, 0.99], + "specular": [1.0, 1.0, 1.0], + "shininess": 9.0 + } + ] + }, + { + "scale": [0.1, 0.1, 0.1], + "translate": [0.458, 0.167, 0.083], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.01, 0.01, 0.99], + "specular": [0.55, 1.05, 0.55], + "shininess": 100.0 + } + ] + }, + { + "scale": [0.1, 0.1, 0.1], + "translate": [0.458, 0.167, -0.083], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.01, 0.01, 0.99], + "specular": [0.55, 1.05, 0.55], + "shininess": 100.0 + } + ] + }, + { + "translate": [0.5, 0.0, 0.0], + "rotate": [0.0, 0.0, 1.0, -90.0], + "scale": [0.3, 0.3, 0.3], + "primitives": [ + { + "type": "cone", + "ambient": [0.75, 0.33, 0.01], + "diffuse": [0.99, 0.5, 0.01], + "specular": [0.55, 1.05, 0.55], + "shininess": 100.0 + } + ] + }, + { + "translate": [0.458, -0.167, 0.0], + "rotate": [0.0, 0.0, 1.0, -90], + "rotate": [0.0, 0.0, 1.0, -19.47], + "scale": [0.1, 0.075, 0.166], + "primitives": [ + { + "type": "cube", + "ambient": [0.0, 0.25, 0.0], + "diffuse": [0.01, 0.99, 0.01], + "specular": [0.55, 1.05, 0.55], + "shininess": 100.0 + } + ] + }, + { + "translate": [0.0, 0.5, 0.0], + "scale": [0.4, 0.4, 0.4], + "primitives": [ + { + "type": "cone", + "ambient": [1.0, 1.0, 1.0], + "diffuse": [1.0, 1.0, 1.0], + "specular": [1.0, 1.0, 1.0], + "shininess": 10.0 + } + ] + } + ] + } + ] +} diff --git a/student_outputs/illuminate/extra-credit/soft_shadow.json b/student_outputs/illuminate/extra-credit/soft_shadow.json new file mode 100644 index 0000000..472f0ea --- /dev/null +++ b/student_outputs/illuminate/extra-credit/soft_shadow.json @@ -0,0 +1,97 @@ +{ + "name": "root", + "globalData": { + "ambientCoeff": 0.5, + "diffuseCoeff": 0.5, + "specularCoeff": 0.5, + "transparentCoeff": 0 + }, + "cameraData": { + "position": [-6.0, 4.0, 4.0], + "up": [0.0, 1.0, 0.0], + "focus": [0, 0, 0], + "heightAngle": 30.0 + }, + "groups": [ + { + "translate": [0.0, 6.0, 0.0], + "lights": [ + { + "type": "point", + "color": [1.0, 1.0, 1.0], + "attenuationCoeff": [0, 0, 0] + } + ] + }, + { + "translate": [0.0, 0.0, 100.0], + "lights": [ + { + "type": "area", + "width": 5.0, + "height": 5.0, + "color": [0.3, 0.3, 0.3], + "attenuationCoeff": [1.0, 0, 0] + } + ] + }, + { + "groups": [ + { + "translate": [-0.65, 0.0, 0.65], + "primitives": [ + { + "type": "cylinder", + "diffuse": [0.8, 0.6, 0.6], + "specular": [1.0, 1.0, 1.0], + "shininess": 15.0 + } + ] + }, + { + "translate": [-0.65, 0.0, -0.65], + "primitives": [ + { + "type": "cone", + "diffuse": [0.6, 0.6, 0.8], + "specular": [1.0, 1.0, 1.0], + "shininess": 15.0 + } + ] + }, + { + "translate": [0.65, 0.0, -0.65], + "primitives": [ + { + "type": "sphere", + "diffuse": [0.6, 0.8, 0.6], + "specular": [1.0, 1.0, 1.0], + "shininess": 15.0 + } + ] + }, + { + "translate": [0.65, 0.0, 0.65], + "primitives": [ + { + "type": "cube", + "diffuse": [0.7, 0.7, 0.7], + "specular": [1.0, 1.0, 1.0], + "shininess": 15.0 + } + ] + }, + { + "translate": [0.0, -0.6, 0.0], + "scale": [6.0, 0.1, 6.0], + "primitives": [ + { + "type": "cube", + "diffuse": [0.1, 0.4, 0.8] + } + ] + } + ] + } + ] +} diff --git a/student_outputs/illuminate/extra-credit/soft_shadow.png b/student_outputs/illuminate/extra-credit/soft_shadow.png new file mode 100644 index 0000000..54de18e Binary files /dev/null and b/student_outputs/illuminate/extra-credit/soft_shadow.png differ diff --git a/student_outputs/illuminate/required/README.md b/student_outputs/illuminate/required/README.md new file mode 100644 index 0000000..103ebed --- /dev/null +++ b/student_outputs/illuminate/required/README.md @@ -0,0 +1 @@ +Required output for Illuminate goes here! \ No newline at end of file diff --git a/student_outputs/illuminate/required/point_light_1.png b/student_outputs/illuminate/required/point_light_1.png new file mode 100644 index 0000000..ea6dbca Binary files /dev/null and b/student_outputs/illuminate/required/point_light_1.png differ diff --git a/student_outputs/illuminate/required/point_light_2.png b/student_outputs/illuminate/required/point_light_2.png new file mode 100644 index 0000000..ac56878 Binary files /dev/null and b/student_outputs/illuminate/required/point_light_2.png differ diff --git a/student_outputs/illuminate/required/reflections_basic.png b/student_outputs/illuminate/required/reflections_basic.png new file mode 100644 index 0000000..001b2d4 Binary files /dev/null and b/student_outputs/illuminate/required/reflections_basic.png differ diff --git a/student_outputs/illuminate/required/reflections_complex.png b/student_outputs/illuminate/required/reflections_complex.png new file mode 100644 index 0000000..6639db9 Binary files /dev/null and b/student_outputs/illuminate/required/reflections_complex.png differ diff --git a/student_outputs/illuminate/required/refract1.png b/student_outputs/illuminate/required/refract1.png new file mode 100644 index 0000000..13ae49a Binary files /dev/null and b/student_outputs/illuminate/required/refract1.png differ diff --git a/student_outputs/illuminate/required/shadow_special_case.png b/student_outputs/illuminate/required/shadow_special_case.png new file mode 100644 index 0000000..bedb1c3 Binary files /dev/null and b/student_outputs/illuminate/required/shadow_special_case.png differ diff --git a/student_outputs/illuminate/required/shadow_test.png b/student_outputs/illuminate/required/shadow_test.png new file mode 100644 index 0000000..5ec2fc2 Binary files /dev/null and b/student_outputs/illuminate/required/shadow_test.png differ diff --git a/student_outputs/illuminate/required/simple_shadow.png b/student_outputs/illuminate/required/simple_shadow.png new file mode 100644 index 0000000..1dd0c71 Binary files /dev/null and b/student_outputs/illuminate/required/simple_shadow.png differ diff --git a/student_outputs/illuminate/required/spot_light_1.png b/student_outputs/illuminate/required/spot_light_1.png new file mode 100644 index 0000000..2d3b220 Binary files /dev/null and b/student_outputs/illuminate/required/spot_light_1.png differ diff --git a/student_outputs/illuminate/required/spot_light_2.png b/student_outputs/illuminate/required/spot_light_2.png new file mode 100644 index 0000000..97ce328 Binary files /dev/null and b/student_outputs/illuminate/required/spot_light_2.png differ diff --git a/student_outputs/illuminate/required/texture_cone.png b/student_outputs/illuminate/required/texture_cone.png new file mode 100644 index 0000000..ec4caf1 Binary files /dev/null and b/student_outputs/illuminate/required/texture_cone.png differ diff --git a/student_outputs/illuminate/required/texture_cone2.png b/student_outputs/illuminate/required/texture_cone2.png new file mode 100644 index 0000000..39c8245 Binary files /dev/null and b/student_outputs/illuminate/required/texture_cone2.png differ diff --git a/student_outputs/illuminate/required/texture_cube.png b/student_outputs/illuminate/required/texture_cube.png new file mode 100644 index 0000000..dbbebe3 Binary files /dev/null and b/student_outputs/illuminate/required/texture_cube.png differ diff --git a/student_outputs/illuminate/required/texture_cube2.png b/student_outputs/illuminate/required/texture_cube2.png new file mode 100644 index 0000000..019e22a Binary files /dev/null and b/student_outputs/illuminate/required/texture_cube2.png differ diff --git a/student_outputs/illuminate/required/texture_cyl.png b/student_outputs/illuminate/required/texture_cyl.png new file mode 100644 index 0000000..8934c56 Binary files /dev/null and b/student_outputs/illuminate/required/texture_cyl.png differ diff --git a/student_outputs/illuminate/required/texture_cyl2.png b/student_outputs/illuminate/required/texture_cyl2.png new file mode 100644 index 0000000..9d17ccc Binary files /dev/null and b/student_outputs/illuminate/required/texture_cyl2.png differ diff --git a/student_outputs/illuminate/required/texture_sphere.png b/student_outputs/illuminate/required/texture_sphere.png new file mode 100644 index 0000000..465ea40 Binary files /dev/null and b/student_outputs/illuminate/required/texture_sphere.png differ diff --git a/student_outputs/illuminate/required/texture_sphere2.png b/student_outputs/illuminate/required/texture_sphere2.png new file mode 100644 index 0000000..349a27b Binary files /dev/null and b/student_outputs/illuminate/required/texture_sphere2.png differ diff --git a/student_outputs/intersect/.DS_Store b/student_outputs/intersect/.DS_Store new file mode 100644 index 0000000..72f41c1 Binary files /dev/null and b/student_outputs/intersect/.DS_Store differ diff --git a/student_outputs/intersect/required/README.md b/student_outputs/intersect/required/README.md new file mode 100644 index 0000000..0664aff --- /dev/null +++ b/student_outputs/intersect/required/README.md @@ -0,0 +1 @@ +Required output for Intersect goes here! \ No newline at end of file diff --git a/student_outputs/intersect/required/ambient_total.png b/student_outputs/intersect/required/ambient_total.png new file mode 100644 index 0000000..d4351b3 Binary files /dev/null and b/student_outputs/intersect/required/ambient_total.png differ diff --git a/student_outputs/intersect/required/diffuse_total.png b/student_outputs/intersect/required/diffuse_total.png new file mode 100644 index 0000000..3615af9 Binary files /dev/null and b/student_outputs/intersect/required/diffuse_total.png differ diff --git a/student_outputs/intersect/required/diffuse_total_my_normals.png b/student_outputs/intersect/required/diffuse_total_my_normals.png new file mode 100644 index 0000000..de0eed6 Binary files /dev/null and b/student_outputs/intersect/required/diffuse_total_my_normals.png differ diff --git a/student_outputs/intersect/required/directional_light_1.png b/student_outputs/intersect/required/directional_light_1.png new file mode 100644 index 0000000..b2ef957 Binary files /dev/null and b/student_outputs/intersect/required/directional_light_1.png differ diff --git a/student_outputs/intersect/required/directional_light_2.png b/student_outputs/intersect/required/directional_light_2.png new file mode 100644 index 0000000..d1ab492 Binary files /dev/null and b/student_outputs/intersect/required/directional_light_2.png differ diff --git a/student_outputs/intersect/required/parse_matrix.png b/student_outputs/intersect/required/parse_matrix.png new file mode 100644 index 0000000..b69aaa8 Binary files /dev/null and b/student_outputs/intersect/required/parse_matrix.png differ diff --git a/student_outputs/intersect/required/phong_total.png b/student_outputs/intersect/required/phong_total.png new file mode 100644 index 0000000..2104a08 Binary files /dev/null and b/student_outputs/intersect/required/phong_total.png differ diff --git a/student_outputs/intersect/required/specular_total.png b/student_outputs/intersect/required/specular_total.png new file mode 100644 index 0000000..4d033ba Binary files /dev/null and b/student_outputs/intersect/required/specular_total.png differ diff --git a/student_outputs/intersect/required/unit_cone.png b/student_outputs/intersect/required/unit_cone.png new file mode 100644 index 0000000..566afa7 Binary files /dev/null and b/student_outputs/intersect/required/unit_cone.png differ diff --git a/student_outputs/intersect/required/unit_cone_cap.png b/student_outputs/intersect/required/unit_cone_cap.png new file mode 100644 index 0000000..2716453 Binary files /dev/null and b/student_outputs/intersect/required/unit_cone_cap.png differ diff --git a/student_outputs/intersect/required/unit_cube.png b/student_outputs/intersect/required/unit_cube.png new file mode 100644 index 0000000..4e8f004 Binary files /dev/null and b/student_outputs/intersect/required/unit_cube.png differ diff --git a/student_outputs/intersect/required/unit_cylinder.png b/student_outputs/intersect/required/unit_cylinder.png new file mode 100644 index 0000000..3a56ce0 Binary files /dev/null and b/student_outputs/intersect/required/unit_cylinder.png differ diff --git a/student_outputs/intersect/required/unit_sphere.png b/student_outputs/intersect/required/unit_sphere.png new file mode 100644 index 0000000..d15f658 Binary files /dev/null and b/student_outputs/intersect/required/unit_sphere.png differ -- cgit v1.2.3-70-g09d2