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

Timestamp:

01/09/09 19:50:56 (16 years ago)

Author:

mattausch

Message:

worked on powerplant loading

Location:

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

Files:

• ObjConverter.cpp (modified) (10 diffs)
• ObjConverter.h (modified) (3 diffs)
• ObjConverter2.cpp (added)
• ObjConverter2.h (added)
• main.cpp (modified) (4 diffs)

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

@@ -30 +30 @@
         {
                 string s(pch);
-                //s += "\n",
                 triples.push_back(s);
                 
@@ -104 +103 @@
                         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]]);
@@ -140 +138 @@
 {
         for (size_t i = 0; i < mGeometry.size(); ++ i)
-        {
-                delete [] mGeometry[i]->mVertices;
-                delete [] mGeometry[i]->mNormals;
-                delete [] mGeometry[i]->mTexcoords;
-
                 delete mGeometry[i];
-        }
         
         mGeometry.clear();
@@ -211 +203 @@
         
         for (size_t i = 0; i < mGeometry.size(); ++ i)
-        {
-                delete [] mGeometry[i]->mVertices;
-                delete [] mGeometry[i]->mNormals;
-                delete [] mGeometry[i]->mTexcoords;
-
                 delete mGeometry[i];
-        }
         
         mGeometry.clear();
@@ -306 +292 @@
                                         ++ mNumShapes;
 
+                                        if (!currentMat) cout << "here3" << endl;
                                         LoadShape(faceVertices, faceNormals, faceTexcoords, currentMat);
 
@@ -323 +310 @@
 
                                 currentMat = mMaterialTable[matName];
-                                cout << "matname: " << matName << endl;
+                                //cout << "matname: " << matName << endl;
                         }
 
@@ -538 +525 @@
                 Material *mat = (*it)->mMaterial;
 
+                if (!mat) cerr << "error: no material specified!!" << endl;
+
                 ofile.write(reinterpret_cast<char *>(&mat->texture), sizeof(int));
 
@@ -628 +617 @@
                 {
                         string s(pch);
-                        //s += "\n",
                         strings.push_back(s);
 
@@ -634 +622 @@
                 }
 
-                cout << endl;
-
-                
-                if ((strings.size() == 2) && (strcmp(strings[0].c_str(),"newmtl") == 0))
+                if ((strings.size() == 2) && (strcmp(strings[0].c_str(), "newmtl") == 0))
                 {
                         currentMat = new Material();
@@ -643 +628 @@
                 }
 
-                if ((strings.size() == 2) && (strcmp(strings[0].c_str(),"map_Kd") == 0))
+                if ((strings.size() == 2) && (strcmp(strings[0].c_str(), "map_Kd") == 0))
                 {
                         TextureTable::const_iterator it = mTextureTable.find(strings[1]);

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

@@ -15 +15 @@
 
 class Geometry;
+
+static std::string model_path("data/city/model/");
+
 
 typedef std::vector<SimpleVec> VertexArray;
@@ -37 +40 @@
                      // const std::string textureFilename) const;
 
-        bool LoadMaterials(const std::string &matFileName);
+        bool LoadMaterials(const std::string &mtlFilename);
 
         ~ObjConverter();
@@ -45 +48 @@
         struct Geometry
         {
+                Geometry(): 
+            mVertices(NULL),
+                mNormals(NULL),
+                mTexcoords(NULL), 
+                mMaterial(NULL), 
+                mVertexCount(0), 
+                mTexcoordCount(0)
+                {}
+
+                ~Geometry()
+                {
+                        delete [] mVertices;
+                        delete [] mNormals;
+                        delete [] mTexcoords;
+                }
+
                 SimpleVec *mVertices;
                 SimpleVec *mNormals;

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

@@ -1 @@
-#include "ObjConverter.h"
+#include "ObjConverter2.h"
 #include <iostream>
 #include <time.h>
@@ -5 +5 @@
 using namespace std;
 
-static string model_path("data/city/model/");
 
 int main(int argc, char* argv[])
@@ -11 +10 @@
         int returnCode = 0;
 
-        ObjConverter converter;
+        ObjConverter2 converter;
 
         cout << "converting obj to dem format" << endl;
-        
+#if 0   
         if (!converter.LoadMaterials(model_path + argv[3]))
         {
@@ -30 +29 @@
                 exit(0);
         }
+#else
+        
+        //const int numFiles = 879;
+        const int numFiles = 100;
+
+        vector<string> filenames;
+        const string base(model_path + argv[1]);
+
+        for (int i = 0; i < numFiles; ++ i)
+        {
+                char filename[100];
+                sprintf(filename, "%s%s%d%s", base.c_str(), ".b", i, ".obj");
+                filenames.push_back(filename);
+        }
+
+        if (!converter.Convert2(filenames, model_path + argv[2]))
+        {
+                cerr << "conversion failed" << endl;
+
+                std::cin.get();
+                exit(0);
+        }
+#endif
 
         cout << "conversion successful" << endl;
-        cout << "press any key" << std::cin.get();
+        //cout << "press any key" << std::cin.get();
 
         return 0;