--- a/src/raytracermodule.cc	Tue Apr 29 23:31:08 2008 +0200
+++ b/src/raytracermodule.cc	Fri May 02 13:27:47 2008 +0200
@@ -122,7 +122,7 @@
 		return NULL;
 
 	v = PyObject_New(LightObject, &LightType);
-	v->light = new Light(Vector3(px, py, pz), Colour(cr, cg, cb));
+	v->light = new Light(Vector(px, py, pz), Colour(cr, cg, cb));
 	return (PyObject*)v;
 }
 
@@ -222,11 +222,11 @@
 
 	v = PyObject_New(CameraObject, &CameraType);
 	if (TLookAt)
-		v->camera = new Camera(Vector3(ex, ey, ez),
-			Vector3(lax, lay, laz), Vector3(upx, upy, upz));
+		v->camera = new Camera(Vector(ex, ey, ez),
+			Vector(lax, lay, laz), Vector(upx, upy, upz));
 	else
-		v->camera = new Camera(Vector3(ex, ey, ez),
-			Vector3(px, py, pz), Vector3(ux, uy, uz), Vector3(vx, vy, vz));
+		v->camera = new Camera(Vector(ex, ey, ez),
+			Vector(px, py, pz), Vector(ux, uy, uz), Vector(vx, vy, vz));
 	return (PyObject*)v;
 }
 
@@ -248,7 +248,7 @@
 		if (!PyArg_ParseTuple(TEye, "fff", &ex, &ey, &ez))
 			return NULL;
 
-	((CameraObject *)self)->camera->setEye(Vector3(ex, ey, ez));
+	((CameraObject *)self)->camera->setEye(Vector(ex, ey, ez));
 
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -455,7 +455,7 @@
 				return NULL;
 
 		v = PyObject_New(NormalVertexObject, &NormalVertexType);
-		v->nvertex = new NormalVertex(Vector3(vx, vy, vz), Vector3(nx, ny, nz));
+		v->nvertex = new NormalVertex(Vector(vx, vy, vz), Vector(nx, ny, nz));
 	}
 	return (PyObject*)v;
 }
@@ -477,7 +477,7 @@
 	if (!PyArg_ParseTuple(TNor, "fff", &nx, &ny, &nz))
 		return NULL;
 
-	((NormalVertexObject *)self)->nvertex->setNormal(Vector3(nx,ny,nz).normalize());
+	((NormalVertexObject *)self)->nvertex->setNormal(Vector(nx,ny,nz).normalize());
 
 	Py_INCREF(Py_None);
 	return Py_None;
@@ -567,7 +567,7 @@
 {
 	PyObject *obj;
 
-	Vector3 N = ((Triangle*)((TriangleObject *)self)->shape.shape)->getNormal();
+	Vector N = ((Triangle*)((TriangleObject *)self)->shape.shape)->getNormal();
 
 	obj = Py_BuildValue("(fff)", N.x, N.y, N.z);
 	return obj;
@@ -614,7 +614,7 @@
 		return NULL;
 
 	v = PyObject_New(SphereObject, &SphereType);
-	v->shape.shape = new Sphere(Vector3(cx, cy, cz), radius, material->material);
+	v->shape.shape = new Sphere(Vector(cx, cy, cz), radius, material->material);
 	Py_INCREF(material);
 	return (PyObject*)v;
 }
@@ -664,7 +664,7 @@
 		return NULL;
 
 	v = PyObject_New(BoxObject, &BoxType);
-	v->shape.shape = new Box(Vector3(lx, ly, lz), Vector3(hx, hy, hz), material->material);
+	v->shape.shape = new Box(Vector(lx, ly, lz), Vector(hx, hy, hz), material->material);
 	Py_INCREF(material);
 	return (PyObject*)v;
 }