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

Timestamp:

09/22/08 10:10:01 (16 years ago)

Author:

mattausch

Message:

debug version trying to find out how to speed up app

Location:

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

Files:

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

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

@@ -41 +41 @@
                 int index = (int)strtol(str, NULL, 10) - 1;
 
-                str = strtok_s(substrings[i], "/", &next_token);          
+                int tIndex = index;
+                int nIndex = index;
+
+                /*str = strtok_s(substrings[i], "/", &next_token);        
                 int tIndex = (int)strtol(str, NULL, 10) - 1;
 
                 str = strtok_s(substrings[i], "/", &next_token);          
                 int nIndex = (int)strtol(str, NULL, 10) - 1;
-
+*/
                 // store indices
                 if (index >= 0)
@@ -70 +73 @@
                         faceVertices.push_back(vertices[indices[idx2]]);
                         faceVertices.push_back(vertices[indices[idx3]]);
-                
+        
+                        Vector3 dummy(1, 0, 0);
+                        faceNormals.push_back(dummy);
+                        faceNormals.push_back(dummy);
+                        faceNormals.push_back(dummy);
+
+                        /*
+                        const Vector3 v2 = mVertices[2] - mVertices[1];
+                        Normalize(CrossProd(v2, v1));
+
                         faceNormals.push_back(normals[nIndices[idx1]]);
                         faceNormals.push_back(normals[nIndices[idx2]]);
@@ -78 +90 @@
                         faceTexcoords.push_back(texcoords[tIndices[idx2]]);
                         faceTexcoords.push_back(texcoords[tIndices[idx3]]);
+                        */
                 }
         }
@@ -129 +142 @@
                 geom->mNormals[i].z = faceNormals[i].y;
 
-                geom->mTexcoords[i].first = faceTexcoords[i].first;
-                geom->mTexcoords[i].second = faceTexcoords[i].second;
+                if (i <= geom->mTexcoordCount)
+                {
+                        geom->mTexcoords[i].first = faceTexcoords[i].first;
+                        geom->mTexcoords[i].second = faceTexcoords[i].second;
+                }
         }
 
@@ -228 +244 @@
                                                 faceVertices, faceNormals, faceTexcoords);
 
+                                if (((line % 100) == 99) && 
+                                        !faceVertices.empty())
+                                {
+                                        ++ mNumShapes;
+
+                                        LoadShape(faceVertices, faceNormals, faceTexcoords);
+
+                                        faceVertices.clear();
+                                        faceNormals.clear();
+                                        faceTexcoords.clear();
+                                }
+
                                 break;
                         }   // end face
@@ -286 +314 @@
         //-- texture
 
-        //int texId = -1;
-        int texId = 0;
+        int texId = -1;
+        //int texId = 0;
         str.write(reinterpret_cast<char *>(&texId), sizeof(int));
 
@@ -330 +358 @@
         //-- write textures
 
-        int textureCount = 1;
-        //int textureCount = 0;
+        //int textureCount = 1;
+        int textureCount = 0;
 
         ofile.write(reinterpret_cast<char *>(&textureCount), sizeof(int));

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

@@ -21 +21 @@
         }
 */
-        if (!converter.Convert(model_path + "toyplane.obj", model_path + "toyplane.dem"))
-                cerr << "conversion failed" << endl;
+        //if (!converter.Convert(model_path + "toyplane.obj", model_path + "toyplane.dem"))
+        //      cerr << "conversion failed" << endl;
 
         //if (!converter.Convert(model_path + "sky.obj", model_path + "sky.dem"))
         //      cerr << "conversion failed" << endl;
+
+        if (!converter.Convert(model_path + "city_full.obj", model_path + "city_full.dem"))
+                cerr << "conversion failed" << endl;
 
         cout << "conversion successful" << endl;