Changeset 3262 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter2.cpp

Timestamp:

01/11/09 01:18:50 (16 years ago)

Author:

mattausch

Message:

working on pompeii loading. fixed bug in obj conversion

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter2.cpp (modified) (11 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter/ObjConverter2.cpp

@@ -12 +12 @@
                                                 const VertexArray &vertices, 
                                                 const VertexArray &normals, 
-                                                const vector<pair<float, float> > &texcoords,
+                                                const vector<Texcoord> &texcoords,
                                                 VertexArray &faceVertices,
                                                 VertexArray &faceNormals,
@@ -28 +28 @@
         {
                 string s(pch);
-                //s += "\n",
                 triples.push_back(s);
                 
@@ -34 +33 @@
         }
 
+        // 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;
-
+                //cout << "triple " << i << " " << triples[i] << endl;
                 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)
@@ -65 +68 @@
                         if (idx > 0) tIndex = idx;
                 }
-
-                if ((found + 1) < triples[i].size())
+                
+                if (found != string::npos)
                 {
                         str = triples[i].substr(found + 1);
@@ -80 +83 @@
                         nIndices.push_back(nIndex);
                         tIndices.push_back(tIndex);
-                }
-
+
+                        //cout << index << " " << tIndex << " " << nIndex << endl;
+                }
+
+                int idx[3];
                 // new triangle found
                 if (indices.size() > 2)
@@ -87 +93 @@
                         // change orientation of faces?
 #if 1
-                        int idx1 = 0;
-                        int idx2 = (int)indices.size() - 2;
-                        int idx3 = (int)indices.size() - 1;
+                        idx[0] = 0;
+                        idx[1] = (int)indices.size() - 2;
+                        idx[2] = (int)indices.size() - 1;
 #else
-                        int idx3 = 0;
-                        int idx2 = (int)indices.size() - 2;
-                        int idx1 = (int)indices.size() - 1;
+                        idx[2] = 0;
+                        idx[1] = (int)indices.size() - 2;
+                        idx[0] = (int)indices.size() - 1;
 #endif
-                        faceVertices.push_back(vertices[indices[idx1]]);
-                        faceVertices.push_back(vertices[indices[idx2]]);
-                        faceVertices.push_back(vertices[indices[idx3]]);
+                        for (int j = 0; j < 3; ++ j)
+                                faceVertices.push_back(vertices[indices[idx[j]]]);
 
 
                         if (!normals.empty())
                         {
-                                faceNormals.push_back(normals[nIndices[idx1]]);
-                                faceNormals.push_back(normals[nIndices[idx2]]);
-                                faceNormals.push_back(normals[nIndices[idx3]]);
+                                for (int j = 0; j < 3; ++ j)
+                                        faceNormals.push_back(normals[nIndices[idx[j]]]);
                         }
                         else
                         {
                                 // no face normals? => create normals
-                                const SimpleTri tri(vertices[indices[idx1]],
-                                                        vertices[indices[idx2]], 
-                                                                        vertices[indices[idx3]]);
+                                const SimpleTri tri(vertices[indices[idx[0]]],
+                                                        vertices[indices[idx[1]]], 
+                                                                        vertices[indices[idx[2]]]);
+
                                 const SimpleVec n = tri.GetNormal();
 
@@ -121 +126 @@
                         if (!texcoords.empty())
                         {
-                                faceTexcoords.push_back(texcoords[tIndices[idx1]]);
-                                faceTexcoords.push_back(texcoords[tIndices[idx2]]);
-                                faceTexcoords.push_back(texcoords[tIndices[idx3]]);
+                                for (int j = 0; j < 3; ++ j)
+                                {
+                                        if (tIndices[idx[j]] >= (int)texcoords.size())
+                                                cerr << "error: texcoord indices exceed array size " << texcoords.size() << " " << tIndices[idx[j]] << endl;
+                                        const int tidx = min((int)texcoords.size() - 1, tIndices[idx[j]]);
+
+                                        faceTexcoords.push_back(texcoords[tidx]);
+                                }
                         }
                 }
@@ -219 +229 @@
         }
 
-
         return true;
 }
@@ -233 +242 @@
         for (it = filenames.begin(); it != it_end; ++ it)
         {
-                cout << "\n==================\n loading file " << *it << endl;
-
-                if (!ReadFile(*it))
-                {
-                        cerr << "could not read file " << *it << endl;
-                        return false;
-                }
-        }
+                const string filename = *it;
+
+                cout << "\n==================\n loading file " << filename << endl;
+
+                if (!ReadFile(filename))
+                {
+                        cerr << "could not read file ... skipping " << filename << endl;
+                        //return false;
+                }
+        }
+
+        cout << "\n*******************\n writing file " << outputFilename << endl;
 
         if (!WriteFile(outputFilename))
@@ -279 +292 @@
         while (fgets(str, len, file) != NULL)
         {
+                //cout << "line: " << line << endl;
+
                 switch (str[0])
                 {
@@ -323 +338 @@
                                 //-- indices in the current line
 
+                                //cout << "f: " << vertices.size() << " n: " << normals.size() << " " << texcoords.size() << endl;
+
                                 LoadIndices(str, 
                                                 vertices, normals, texcoords,