--- a/ccdemos/spheres_shadow.cc Tue Apr 29 23:31:08 2008 +0200
+++ b/ccdemos/spheres_shadow.cc Fri May 02 13:27:47 2008 +0200
@@ -4,7 +4,7 @@
#include "common_sdl.h"
Camera cam;
-Light light(Vector3(-2.0, 10.0, -2.0), Colour(0.9, 0.9, 0.9));
+Light light(Vector(-2.0, 10.0, -2.0), Colour(0.9, 0.9, 0.9));
Float lx, ly, lz, cf;
@@ -67,34 +67,34 @@
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);
+ Box box(Vector(-10.0, -1.2, -20.0), Vector(10.0, -1.0, 0.0), &mat0a);
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);
+ Box box2(Vector(-10.0, -1.2, -20.0), Vector(10.0, 10.0, -20.2), &mat0b);
rt.addShape(&box2);
Material mat1(Colour(1.0, 0.0, 0.0));
- Sphere bigsphere(Vector3(3.0, 2.0, -7.0), 3.0, &mat1);
+ Sphere bigsphere(Vector(3.0, 2.0, -7.0), 3.0, &mat1);
rt.addShape(&bigsphere);
Material mat2(Colour(0.0, 1.0, 0.0));
- Sphere smallsphere(Vector3(-5.5, 1.5, -8.0), 2.0, &mat2);
+ Sphere smallsphere(Vector(-5.5, 1.5, -8.0), 2.0, &mat2);
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);
+ Sphere tinysphere(Vector(-1.2, 0.0, -2.0), 0.7, &mat3);
rt.addShape(&tinysphere);
top.optimize();
- cam.setEye(Vector3(-2.28908, 4.30992, 12.3051));
- cam.p = Vector3(0.0988566, -0.139543, -0.985269);
- cam.u = Vector3(-0.995004, 0, -0.0998334);
- cam.v = Vector3(0.0139311, 0.990216, -0.138846);
+ cam.setEye(Vector(-2.28908, 4.30992, 12.3051));
+ cam.p = Vector(0.0988566, -0.139543, -0.985269);
+ cam.u = Vector(-0.995004, 0, -0.0998334);
+ cam.v = Vector(0.0139311, 0.990216, -0.138846);
rt.setCamera(&cam);
w = 800;