diff -r 09aedbf5f95f -r 20dee9819b17 demos/spheres_glass.py --- a/demos/spheres_glass.py Mon Apr 21 08:47:36 2008 +0200 +++ b/demos/spheres_glass.py Mon Apr 21 09:05:09 2008 +0200 @@ -7,28 +7,28 @@ rt = Raytracer() light1 = Light(position=(0.0, 4.0, -3.0), colour=(0.9, 0.3, 0.6)) -rt.addlight(light1) +rt.addLight(light1) #light2 = SphericalLight(position=(-2.0, 5.0, 1.0), radius=3.0, colour=(0.7, 1.0, 0.3)) light2 = Light(position=(-2.0, -4.0, -1.0), colour=(0.7, 1.0, 0.3)) -rt.addlight(light2) +rt.addLight(light2) light2 = Light(position=(2.0, 5.0, 1.0), colour=(0.8, 0.9, 1.0)) -rt.addlight(light2) +rt.addLight(light2) mat0 = Material(colour=(0.1, 0.2, 0.9)) box = Box(L=(-20.0, -2.2, -20.0), H=(20.0, -2.0, 20.0), material=mat0) -rt.addshape(box) +rt.addShape(box) mat1 = Material(colour=(1.0, 0.2, 0.1)) mat1.setReflectivity(0.7) bigsphere = Sphere(centre=(2.0, 1.0, -5.0), radius=2.5, material=mat1) -rt.addshape(bigsphere) +rt.addShape(bigsphere) mat2 = Material(colour=(0.1, 0.4, 0.2)) mat2.setReflectivity(0.6) smallsphere = Sphere(centre=(-4.5, 0.5, -8.0), radius=2.0, material=mat2) -rt.addshape(smallsphere) +rt.addShape(smallsphere) mat3 = Material(colour=(0.9, 0.9, 1.0)) mat3.setPhong(0.2, 1.0, 0.2) @@ -36,7 +36,7 @@ mat3.setReflectivity(0.1) for i in range(10): sph = Sphere(centre=(-5.0+i, -1.5, -4.0), radius=0.5, material=mat3) - rt.addshape(sph) + rt.addShape(sph) rendersize = (800, 600) data = rt.render(rendersize)