diff --git a/Image Spheres Bleues Finales/one_sphere.wmv b/Image Spheres Bleues Finales/one_sphere.wmv new file mode 100644 index 0000000000000000000000000000000000000000..7eacf064f0d0e66a2d3eb1be510d9cb49101fb82 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere.wmv differ diff --git a/Image Spheres Bleues Finales/one_sphere_0.png b/Image Spheres Bleues Finales/one_sphere_0.png new file mode 100644 index 0000000000000000000000000000000000000000..69796b92e5285fa51e17e99a1289bd539d89b09b Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_0.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_1.png b/Image Spheres Bleues Finales/one_sphere_1.png new file mode 100644 index 0000000000000000000000000000000000000000..8da1f245887a624e00f8d9ea5df8631e16938cc4 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_1.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_10.png b/Image Spheres Bleues Finales/one_sphere_10.png new file mode 100644 index 0000000000000000000000000000000000000000..73a32950a319bef19219177bfa1879f9a0d962cc Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_10.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_11.png b/Image Spheres Bleues Finales/one_sphere_11.png new file mode 100644 index 0000000000000000000000000000000000000000..6bef26ca58f0d97752d1e452a5ae9c124a592633 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_11.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_12.png b/Image Spheres Bleues Finales/one_sphere_12.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0730142eefd57f9f0080283309f87bfc65ec23 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_12.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_13.png b/Image Spheres Bleues Finales/one_sphere_13.png new file mode 100644 index 0000000000000000000000000000000000000000..7ad2f34e76762f7d78fa618011cc0f6ea5096dfc Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_13.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_14.png b/Image Spheres Bleues Finales/one_sphere_14.png new file mode 100644 index 0000000000000000000000000000000000000000..dca03fa9579460e0ebf8446992d465efdcf0beea Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_14.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_15.png b/Image Spheres Bleues Finales/one_sphere_15.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6fcc7ceec2b227cea6d9c5255d1d32d96e3a13 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_15.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_16.png b/Image Spheres Bleues Finales/one_sphere_16.png new file mode 100644 index 0000000000000000000000000000000000000000..e390986f45f868749fed5f2588129e36e5b7648e Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_16.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_17.png b/Image Spheres Bleues Finales/one_sphere_17.png new file mode 100644 index 0000000000000000000000000000000000000000..8afd0f9c17c33fd652b280ee181d3c86670d179f Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_17.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_18.png b/Image Spheres Bleues Finales/one_sphere_18.png new file mode 100644 index 0000000000000000000000000000000000000000..69796b92e5285fa51e17e99a1289bd539d89b09b Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_18.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_19.png b/Image Spheres Bleues Finales/one_sphere_19.png new file mode 100644 index 0000000000000000000000000000000000000000..8da1f245887a624e00f8d9ea5df8631e16938cc4 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_19.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_2.png b/Image Spheres Bleues Finales/one_sphere_2.png new file mode 100644 index 0000000000000000000000000000000000000000..51918d04c54084c2df865d90eee76edf87b546b1 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_2.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_20.png b/Image Spheres Bleues Finales/one_sphere_20.png new file mode 100644 index 0000000000000000000000000000000000000000..51918d04c54084c2df865d90eee76edf87b546b1 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_20.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_21.png b/Image Spheres Bleues Finales/one_sphere_21.png new file mode 100644 index 0000000000000000000000000000000000000000..c4872118fcb7e1eb80e6f4ce336ece1f40cf9205 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_21.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_22.png b/Image Spheres Bleues Finales/one_sphere_22.png new file mode 100644 index 0000000000000000000000000000000000000000..a87529f204b59d1a2b92d215299b0b0f3ab1a65b Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_22.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_23.png b/Image Spheres Bleues Finales/one_sphere_23.png new file mode 100644 index 0000000000000000000000000000000000000000..c0b7e90805217eb2b1433570bb27aa9440c88949 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_23.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_24.png b/Image Spheres Bleues Finales/one_sphere_24.png new file mode 100644 index 0000000000000000000000000000000000000000..4532b18b69cb337b270a2a75707496c59a6541d8 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_24.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_25.png b/Image Spheres Bleues Finales/one_sphere_25.png new file mode 100644 index 0000000000000000000000000000000000000000..f15632db4a500439417310c441dac26572e1a9a2 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_25.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_26.png b/Image Spheres Bleues Finales/one_sphere_26.png new file mode 100644 index 0000000000000000000000000000000000000000..9bfc64ae7b3294adeb6414d740ed2789af61c066 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_26.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_27.png b/Image Spheres Bleues Finales/one_sphere_27.png new file mode 100644 index 0000000000000000000000000000000000000000..8897b8da77ca08fdfcd2f8d3175ce7626d292fb8 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_27.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_28.png b/Image Spheres Bleues Finales/one_sphere_28.png new file mode 100644 index 0000000000000000000000000000000000000000..73a32950a319bef19219177bfa1879f9a0d962cc Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_28.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_29.png b/Image Spheres Bleues Finales/one_sphere_29.png new file mode 100644 index 0000000000000000000000000000000000000000..6bef26ca58f0d97752d1e452a5ae9c124a592633 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_29.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_3.png b/Image Spheres Bleues Finales/one_sphere_3.png new file mode 100644 index 0000000000000000000000000000000000000000..c4872118fcb7e1eb80e6f4ce336ece1f40cf9205 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_3.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_30.png b/Image Spheres Bleues Finales/one_sphere_30.png new file mode 100644 index 0000000000000000000000000000000000000000..2d0730142eefd57f9f0080283309f87bfc65ec23 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_30.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_31.png b/Image Spheres Bleues Finales/one_sphere_31.png new file mode 100644 index 0000000000000000000000000000000000000000..7ad2f34e76762f7d78fa618011cc0f6ea5096dfc Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_31.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_32.png b/Image Spheres Bleues Finales/one_sphere_32.png new file mode 100644 index 0000000000000000000000000000000000000000..dca03fa9579460e0ebf8446992d465efdcf0beea Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_32.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_33.png b/Image Spheres Bleues Finales/one_sphere_33.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6fcc7ceec2b227cea6d9c5255d1d32d96e3a13 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_33.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_34.png b/Image Spheres Bleues Finales/one_sphere_34.png new file mode 100644 index 0000000000000000000000000000000000000000..e390986f45f868749fed5f2588129e36e5b7648e Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_34.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_35.png b/Image Spheres Bleues Finales/one_sphere_35.png new file mode 100644 index 0000000000000000000000000000000000000000..8afd0f9c17c33fd652b280ee181d3c86670d179f Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_35.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_4.png b/Image Spheres Bleues Finales/one_sphere_4.png new file mode 100644 index 0000000000000000000000000000000000000000..a87529f204b59d1a2b92d215299b0b0f3ab1a65b Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_4.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_5.png b/Image Spheres Bleues Finales/one_sphere_5.png new file mode 100644 index 0000000000000000000000000000000000000000..c0b7e90805217eb2b1433570bb27aa9440c88949 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_5.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_6.png b/Image Spheres Bleues Finales/one_sphere_6.png new file mode 100644 index 0000000000000000000000000000000000000000..4532b18b69cb337b270a2a75707496c59a6541d8 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_6.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_7.png b/Image Spheres Bleues Finales/one_sphere_7.png new file mode 100644 index 0000000000000000000000000000000000000000..f15632db4a500439417310c441dac26572e1a9a2 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_7.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_8.png b/Image Spheres Bleues Finales/one_sphere_8.png new file mode 100644 index 0000000000000000000000000000000000000000..9bfc64ae7b3294adeb6414d740ed2789af61c066 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_8.png differ diff --git a/Image Spheres Bleues Finales/one_sphere_9.png b/Image Spheres Bleues Finales/one_sphere_9.png new file mode 100644 index 0000000000000000000000000000000000000000..8897b8da77ca08fdfcd2f8d3175ce7626d292fb8 Binary files /dev/null and b/Image Spheres Bleues Finales/one_sphere_9.png differ diff --git a/__pycache__/light.cpython-33.pyc b/__pycache__/light.cpython-33.pyc index 25de9666d344f0b6096dd800e61ad58c1f75cdfd..c77724b75049cb6a0d785ea1e3d97504f7b9d1f0 100644 Binary files a/__pycache__/light.cpython-33.pyc and b/__pycache__/light.cpython-33.pyc differ diff --git a/light.py b/light.py index 674fb4ea1105b6b63f1b27715bc37f765bd15f15..9fd5fd25c60e8702a5c83e26930b085d0c3aeeed 100644 --- a/light.py +++ b/light.py @@ -13,13 +13,13 @@ def phong_illuminate(light, position, normal, object, viewer): R = 2*(L*N)*N - L V = (viewer - position).normalized() - if (N*L) <= 0: - return 0*position - i = ((kd*(L*N) + ks*(R*V)**alpha)) + i = ((kd*(max(L*N, 0)) + ks*(max(0, R*V))**alpha)) if i < 0: i = 0 - elif i > 1: - i = 1 +# print(-1) +# elif i > 1: +# i = 1 +# print(1) return i*(light.color ** object.material.color) diff --git a/script_one_sphere.py b/script_one_sphere.py index eeec468916dc9534f061f79d1aa18c7423655a0e..f92e8dc7c1c9092daa2ad7d2d527b612178ae327 100644 --- a/script_one_sphere.py +++ b/script_one_sphere.py @@ -5,12 +5,12 @@ from raytracer import raytracer_render from matplotlib.image import imsave from math import cos, sin, pi -camera = Camera(200,200,2) -materiau_sphere = Material(Vector((0,0,1)), .5, .3, .7, 20, 1) +camera = Camera(400,400,2) +materiau_sphere = Material(Vector((0,0,1)), .1, .1, .1, 10, 1) sphere = Sphere(Vector([0,0,3]), 1, materiau_sphere) for theta in range(36): - a = 3*cos(theta*pi/18) - b = 3*sin(theta*pi/18) + a = 4*cos(theta*pi/18) + b = 4*sin(theta*pi/18) lumiere = Spotlight(Vector((0, a, 3+b)), Vector((1,1,1))) lumiere_2 = Spotlight(Vector((0, -a, 3-b)), Vector((1,1,1))) scene = Scene()