Changeset 3273 for GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter

Timestamp:

01/13/09 12:43:51 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.cpp (modified) (4 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/VisibilitySolutionConverter/VisibilitySolutionConverter.cpp

@@ -52 +52 @@
 {
         vector<string> triples;
+
         char *next_token;
 
@@ -60 +61 @@
         {
                 string s(pch);
-                //s += "\n",
                 triples.push_back(s);
                 
@@ -66 +66 @@
         }
 
+        // throw away last symbol (\n)
+        triples.back().resize(triples.back().size() - 1);
+
         vector<int> indices;
         vector<int> nIndices;
         vector<int> tIndices;
 
-        char seps[] = " /\t\n";
+        char seps[] = " ";
+        char seps2[] = "/";
 
         for (size_t i = 0; i < triples.size(); ++ i)
         {
-                static int dummy = 0;
-
                 size_t found;
-                found = triples[i].find_first_of(seps);
+                found = triples[i].find_first_of(seps2);
                 size_t prevfound = 0;
-                // vertex, normal, texture indices
+
+                // extract vertex, normal, texture indices
                 string str = triples[i].substr(prevfound, found);
 
                 int index = (int)strtol(str.c_str(), NULL, 10) - 1;
-
                 int tIndex = index;
                 int nIndex = index;     
                 
-                prevfound = found;
-                found = triples[i].find_first_of(seps, found + 1);  
+                // try to extract texture and normal indices
+                prevfound = found + 1;
+                found = triples[i].find_first_of(seps2, prevfound);  
 
                 if (found != string::npos)
@@ -97 +100 @@
                         if (idx > 0) tIndex = idx;
                 }
-
-                if ((found + 1) < triples[i].size())
+                
+                if (found != string::npos)
                 {
                         str = triples[i].substr(found + 1);