Changeset 3146 for GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Timestamp:

11/20/08 10:12:28 (16 years ago)

Author:

mattausch

Message:

normal mapping hack not working yet. found problems with ssao if the geometry is not tesselated enough (especially with smoothed
normals: one can see the underlying tesselation!

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/Converter

Files:

• ObjConverter.cpp (modified) (17 diffs)
• main.cpp (modified) (1 diff)

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

@@ -7 +7 @@
 
 using namespace std;
+
+//#define USE_TEXTURE
 
 
@@ -18 +20 @@
                                                 )
 {
-        vector<char *> substrings;
+        vector<string> triples;
 
         char *next_token;
@@ -25 +27 @@
         char *pch = strtok_s(str + 1, " ", &next_token);
 
-        while (pch != NULL)
-        {
-                substrings.push_back(pch);
+        while (pch)
+        {
+                string s(pch);
+                //s += "\n",
+                triples.push_back(s);
+                
                 pch = strtok_s(NULL, " ", &next_token);   
         }
@@ -35 +40 @@
         vector<int> tIndices;
 
-        for (size_t i = 0; i < substrings.size(); ++ i)
-        {
+        char seps[] = " /\t\n";
+
+        for (size_t i = 0; i < triples.size(); ++ i)
+        {
+                static int dummy = 0;
+
+                size_t found;
+                found = triples[i].find_first_of(seps);
+                size_t prevfound = 0;
                 // vertex, normal, texture indices
-                char *str = strtok_s(substrings[i], "/", &next_token);    
-                int index = (int)strtol(str, NULL, 10) - 1;
+                string str = triples[i].substr(prevfound, found);
+
+                int index = (int)strtol(str.c_str(), NULL, 10) - 1;
 
                 int tIndex = index;
-                int nIndex = index;
-
-                str = strtok_s(substrings[i], "/", &next_token);          
-
-                if (str != NULL)
-                {
-                        int idx = (int)strtol(str, NULL, 10) - 1;
-                        if (idx) tIndex = idx;
-                }
-                str = strtok_s(substrings[i], "/", &next_token);          
-
-                if (str != NULL)
-                {
-                        int idx = (int)strtol(str, NULL, 10) - 1;
-                        if (idx) nIndex = idx;
+                int nIndex = index;     
+                
+                prevfound = found;
+                found = triples[i].find_first_of(seps, found + 1);  
+
+                if (found != string::npos)
+                {
+                        str = triples[i].substr(prevfound, found);
+
+                        int idx = (int)strtol(str.c_str(), NULL, 10) - 1;
+                        if (idx > 0) tIndex = idx;
+                }
+
+                if ((found + 1) < triples[i].size())
+                {
+                        str = triples[i].substr(found + 1);
+
+                        int idx = (int)strtol(str.c_str(), NULL, 10) - 1;
+                        if (idx > 0) nIndex = idx;
                 }
 
@@ -84 +101 @@
                         faceVertices.push_back(vertices[indices[idx3]]);
 
+
                         if (!normals.empty())
                         {
+                                //if (dummy < 3) cout << nIndices[idx1] << " " << nIndices[idx2] << " " << nIndices[idx3] << endl;
                                 faceNormals.push_back(normals[nIndices[idx1]]);
                                 faceNormals.push_back(normals[nIndices[idx2]]);
@@ -92 +111 @@
                         else
                         {
-                                // no face normals?
-                                const SimpleTri tri(vertices[indices[idx1]], vertices[indices[idx2]], vertices[indices[idx3]]);
+                                // no face normals? => create normals
+                                const SimpleTri tri(vertices[indices[idx1]],
+                                                        vertices[indices[idx2]], 
+                                                                        vertices[indices[idx3]]);
                                 const SimpleVec n = tri.GetNormal();
 
@@ -101 +122 @@
                         }
 
+                        ++ dummy;
                         if (!texcoords.empty())
                         {
@@ -150 +172 @@
         for (int i = 0; i < numElements; ++ i)
         {
-#if 0
+#if 1
                 // convert to our camera system: change y and z
                 geom->mVertices[i].x = faceVertices[i].x;
@@ -159 +181 @@
                 geom->mNormals[i].y = -faceNormals[i].z;
                 geom->mNormals[i].z = faceNormals[i].y;
+
 #else
                 geom->mVertices[i].x = faceVertices[i].x;
@@ -169 +192 @@
 
 #endif
-                geom->mVertices[i].x += 470.398f;
-                geom->mVertices[i].y += 240.364f;
-                geom->mVertices[i].z += 182.5f;
 
                 if (i < geom->mTexcoordCount)
@@ -236 +256 @@
 
         int line = 0;
-
         const int len = 10000;
         char str[len];
@@ -242 +261 @@
         while (fgets(str, len, file) != NULL)
         {
-//              if (1)//(line % 100) == 0)
-//                      cout << "read line " << line << " " << str;
-                switch (str[0]) 
+                switch (str[0])
                 {
                 case 'v': // vertex or normal
@@ -262 +279 @@
                                 default:
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                                        vertices.push_back(SimpleVec(x, y, z));
+                                        const float scale = 5e-3f;
+                                        vertices.push_back(SimpleVec(x * scale, y * scale, z* scale));
                                         //cout <<"v " << x << " " << y << " "<< z << " ";
                                 }
@@ -305 +323 @@
                         break;
                 default:
+                        // throw away line
                         break;
                 }
@@ -346 +365 @@
         //-- texture
 
-        //int texId = -1;
+#ifdef USE_TEXTURE
         int texId = 0;
+#else
+        int texId = -1;
+#endif
+
         str.write(reinterpret_cast<char *>(&texId), sizeof(int));
 
         bool alphaTestEnabled = false;
-        bool cullFaceEnabled = false;
-        //bool cullFaceEnabled = true;
+        //bool cullFaceEnabled = false;
+        bool cullFaceEnabled = true;
 
         str.write(reinterpret_cast<char *>(&alphaTestEnabled), sizeof(bool));
@@ -368 +391 @@
                 ambient.x = ambient.y = ambient.z = 0.2f;
                 diffuse.x = diffuse.y = diffuse.z = 1.0f;
-                spec.x   = spec.y   = spec.z   =  .0f;
+                spec.x    = spec.y    = spec.z    =  .0f;
                 emm = spec;
 
@@ -391 +414 @@
         //-- write textures
 
+#ifdef USE_TEXTURE
         int textureCount = 1;
-        //int textureCount = 0;
-
+#else
+        int textureCount = 0;
+#endif
         ofile.write(reinterpret_cast<char *>(&textureCount), sizeof(int));
 

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

@@ -22 +22 @@
                 exit(0);
         }
-
+        //std::cin.get();
         cout << "conversion successful" << endl;