--- a/ccdemos/spheres_shadow.cc Sat Apr 19 18:00:27 2008 +0200
+++ b/ccdemos/spheres_shadow.cc Sun Apr 20 16:48:24 2008 +0200
@@ -18,7 +18,7 @@
if (lz != 0.0)
light.pos.z += lz;
if (cf != 0.0)
- cam.f += cf;
+ cam.F += cf;
}
void key_callback(int key, int down)
@@ -60,35 +60,35 @@
Octree top;
rt.setTop(&top);
- rt.addlight(&light);
+ rt.addLight(&light);
//Light light2;
//light2.colour = Colour(0.7, 0.3, 0.6);
- //rt.addlight(&light2);
+ //rt.addLight(&light2);
Material mat0a(Colour(0.7, 0.7, 0.7));
mat0a. setReflectivity(0.0);
Box box(Vector3(-10.0, -1.2, -20.0), Vector3(10.0, -1.0, 0.0), &mat0a);
- rt.addshape(&box);
+ rt.addShape(&box);
Material mat0b(Colour(0.1, 0.7, 0.8));
mat0b.setReflectivity(0.7);
Box box2(Vector3(-10.0, -1.2, -20.0), Vector3(10.0, 10.0, -20.2), &mat0b);
- rt.addshape(&box2);
+ rt.addShape(&box2);
Material mat1(Colour(1.0, 0.0, 0.0));
Sphere bigsphere(Vector3(3.0, 2.0, -7.0), 3.0, &mat1);
- rt.addshape(&bigsphere);
+ rt.addShape(&bigsphere);
Material mat2(Colour(0.0, 1.0, 0.0));
Sphere smallsphere(Vector3(-5.5, 1.5, -8.0), 2.0, &mat2);
- rt.addshape(&smallsphere);
+ rt.addShape(&smallsphere);
Material mat3(Colour(0.0, 0.0, 1.0));
mat3.setReflectivity(0.1);
mat3.setTransmissivity(0.8, 1.5);
Sphere tinysphere(Vector3(-1.2, 0.0, -2.0), 0.7, &mat3);
- rt.addshape(&tinysphere);
+ rt.addShape(&tinysphere);
top.optimize();