WebSVN – gelsvn – Diff – /trunk/src/Geometry/Polygonizer.cpp

 			if(use_normals)
+				{
 					vnormal(function, &v, &n, delta);			   /* normal */
 					(*gnormals).push_back(n);			   /* save vertex */
+				}
-			vid = gvertices->size()-1;
+			vid = int(gvertices->size()-1);
 			edges.setedge(c1->i, c1->j, c1->k, c2->i, c2->j, c2->k, vid);
 			return vid;
+		}
 										 int _bounds,
 										 vector<VERTEX>& _gvertices,
 										 vector<NORMAL>& _gnormals,
 										 vector<TRIANGLE>& _gtriangles,
 										 bool _use_normals):
+        gnormals(&_gnormals), gvertices(&_gvertices), gtriangles(&_gtriangles),
-			function(_function), size(_size), delta(_delta), bounds(_bounds),
+        function(_function), size(_size),delta(_delta), bounds(_bounds),
-			centers(HASHSIZE), corners(HASHSIZE),
+        use_normals(_use_normals), centers(HASHSIZE), corners(HASHSIZE)
-			gvertices(&_gvertices),
-			gnormals(&_gnormals),
-			gtriangles(&_gtriangles),
-			use_normals(_use_normals)
 		{}
 		void PROCESS::march(int mode, float x, float y, float z)
+		{
 			int noabort;

Subversion Repositories gelsvn