Changeset 2005 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

01/21/07 22:08:23 (17 years ago)

Author:

mattausch

Message:

using large address space

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -253 +253 @@
 }
 
+#define POWERPLANT_HACK 1
 
 bool Preprocessor::LoadBinaryObj(const string filename,
@@ -279 +280 @@
         samplesIn.read(reinterpret_cast<char *>(&numTriangles), sizeof(int));
         root->mGeometry.reserve(numTriangles);
-        cout << "reserved " << numTriangles << " triangles " << endl;
-        //root->mGeometry.reserve(13000000);
-        
-        cout << "using " << numTriangles * (sizeof(TriangleIntersectable) + sizeof(TriangleIntersectable *)) / (1024 * 1024) << " MBs" << endl;
-
-        //vector<Triangle3> dummy;
-        //cout << "using " << numTriangles * sizeof(Triangle3) / (1024 * 1024) << " MBs" << endl;
-        //dummy.reserve(numTriangles);
+        cout << "loading " << numTriangles << " triangles (" 
+                 << numTriangles * (sizeof(TriangleIntersectable) + sizeof(TriangleIntersectable *)) / (1024 * 1024) << " MB)" << endl;
 
         int i = 0;
@@ -296 +291 @@
                 samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
                 samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
-                
+
                 // end of file reached
                 if (samplesIn.eof())
@@ -303 +298 @@
                 TriangleIntersectable *obj = new TriangleIntersectable(tri);
                 root->mGeometry.push_back(obj);
-                //dummy.push_back(tri);
+                
                 i ++;
         
-                if (i % 500000 == 0)
-                        cout << "idx: " << i << endl;
+                if (i % 500000 == 499999)
+                         cout<<"\r"<<i<<"/"<<numTriangles<<"\r";
         }