Changeset 2452 for GTP/trunk/Lib

Timestamp:

06/13/07 17:24:15 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp (modified) (1 diff)
• Preprocessing/src/Preprocessor.cpp (modified) (6 diffs)
• Preprocessing/src/main.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp

@@ -159 +159 @@
         mAssumedVisibility = assumedVisibility;
         
-        mThreshold = 0;
-
-        if (mAssumedVisibility > 0)
+        if (!mAssumedVisibility)
+        {
+                mThreshold = 0;
+        }
+        else
         {
                 mThreshold = RAND_MAX - RAND_MAX / mAssumedVisibility;

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

@@ -181 +181 @@
                                                                  vector<FaceParentInfo> *parents)
 {
-        //ifstream samplesIn(filename, ios::binary);
-        igzstream samplesIn(filename.c_str());
-        
-        if (!samplesIn.is_open())
+        //ifstream inStream(filename, ios::binary);
+        igzstream inStream(filename.c_str());
+        
+        if (!inStream.is_open())
                 return false;
 
@@ -192 +192 @@
         int numTriangles;
 
-        samplesIn.read(reinterpret_cast<char *>(&numTriangles), sizeof(int));
+        inStream.read(reinterpret_cast<char *>(&numTriangles), sizeof(int));
         root->mGeometry.reserve(numTriangles);
         cout << "loading " << numTriangles << " triangles (" 
@@ -202 +202 @@
                 Triangle3 tri;
                 
-                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 0), sizeof(Vector3));
-                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
-                samplesIn.read(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
+                inStream.read(reinterpret_cast<char *>(tri.mVertices + 0), sizeof(Vector3));
+                inStream.read(reinterpret_cast<char *>(tri.mVertices + 1), sizeof(Vector3));
+                inStream.read(reinterpret_cast<char *>(tri.mVertices + 2), sizeof(Vector3));
 
                 // end of file reached
-                if (samplesIn.eof())
+                if (inStream.eof())
                         break;
 
@@ -841 +841 @@
 
 #if USE_ASCII
-        ifstream samplesIn(fileName);
-        if (!samplesIn.is_open())
+        ifstream inStream(fileName);
+        if (!inStream.is_open())
                 return false;
 
         string buf;
-        while (!(getline(samplesIn, buf)).eof())
+        while (!(getline(inStream, buf)).eof())
         {
                 sscanf(buf.c_str(), "%f %f %f %f %f %f %d %d", 
@@ -873 +873 @@
         }
 #else
-        ifstream samplesIn(fileName, ios::binary);
-        if (!samplesIn.is_open())
+        ifstream inStream(fileName, ios::binary);
+        if (!inStream.is_open())
                 return false;
 
         while (1)
         {
-                 samplesIn.read(reinterpret_cast<char *>(&origin), sizeof(Vector3));
-                 samplesIn.read(reinterpret_cast<char *>(&termination), sizeof(Vector3));
-                 samplesIn.read(reinterpret_cast<char *>(&(sObj.mId)), sizeof(int));
-                 samplesIn.read(reinterpret_cast<char *>(&(tObj.mId)), sizeof(int));
-                
-                 if (samplesIn.eof())
+                 inStream.read(reinterpret_cast<char *>(&origin), sizeof(Vector3));
+                 inStream.read(reinterpret_cast<char *>(&termination), sizeof(Vector3));
+                 inStream.read(reinterpret_cast<char *>(&(sObj.mId)), sizeof(int));
+                 inStream.read(reinterpret_cast<char *>(&(tObj.mId)), sizeof(int));
+                
+                 if (inStream.eof())
                         break;
 
@@ -908 +908 @@
 #endif
 
-        samplesIn.close();
+        inStream.close();
 
         return true;

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

@@ -64 +64 @@
 
 
-static string ReplaceSuffix(string filename, string a, string b)
+static string ReplaceSuffix(const string &filename, const string &a, const string &b)
 {
         string result = filename;
 
         int pos = (int)filename.rfind(a, (int)filename.size() - 1);
-        if (pos == filename.size() - a.size()) {
+        if (pos == filename.size() - a.size()) 
+        {
                 result.replace(pos, a.size(), b);
         }
+
         return result;
 }
 
 
-static int SplitFilenames(const string str, vector<string> &filenames)
+static int SplitFilenames(const string &str, vector<string> &filenames)
 {
         int pos = 0;