ccdemos/common_ply.h
branchpyrit
changeset 91 9d66d323c354
parent 80 907929fa9b59
child 92 9af5c039b678
--- a/ccdemos/common_ply.h	Tue Apr 29 23:31:08 2008 +0200
+++ b/ccdemos/common_ply.h	Fri May 02 13:27:47 2008 +0200
@@ -2,10 +2,10 @@
 #include <fstream>
 #include <iomanip>
 
-void load_ply(Raytracer &rt, const char *filename, Material *mat, Vector3 scale, Vector3 transp)
+void load_ply(Raytracer &rt, const char *filename, Material *mat, Vector scale, Vector transp)
 {
 	vector<NormalVertex*> vertices;
-	vector<Vector3> normals;
+	vector<Vector> normals;
 	vector<int> vertex_face_num;
 	ifstream f(filename);
 	string token = "a";
@@ -31,7 +31,7 @@
 	}
 
 	// read vertices
-	Vector3 P;
+	Vector P;
 	int num = vertex_num;
 	while (num--)
 	{
@@ -40,7 +40,7 @@
 		P.y = scale.y*P.y + transp.y;
 		P.z = scale.z*P.z + transp.z;
 		vertices.push_back(new NormalVertex(P));
-		normals.push_back(Vector3());
+		normals.push_back(Vector());
 		vertex_face_num.push_back(0);
 		f.ignore(1000,'\n');
 	}