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

Timestamp:

10/08/08 10:45:08 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• ObjConverter.cpp (modified) (13 diffs)
• ObjConverter.h (modified) (2 diffs)
• SimpleTri.cpp (added)
• SimpleTri.h (added)
• SimpleVec.cpp (added)
• SimpleVec.h (added)
• main.cpp (modified) (1 diff)

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

@@ -1 +1 @@
 #include "ObjConverter.h"
+#include "SimpleTri.h"
+#include "SimpleVec.h"
 #include "gzstream.h"
 #include <iostream>
@@ -35 +37 @@
         for (size_t i = 0; i < substrings.size(); ++ i)
         {
-                // vertex, normal and texture indices
+                // vertex, normal, texture indices
                 char *str = strtok_s(substrings[i], "/", &next_token);    
                 int index = (int)strtol(str, NULL, 10) - 1;
@@ -42 +44 @@
                 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;
-*/
+
+                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;
+                }
+
                 // store indices
                 if (index >= 0)
@@ -59 +70 @@
                 if (indices.size() > 2)
                 {
-#if 1
+#if 0
                         int idx1 = 0;
                         int idx2 = (int)indices.size() - 2;
@@ -71 +82 @@
                         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]]);
-                        faceNormals.push_back(normals[nIndices[idx3]]);
-
-                        faceTexcoords.push_back(texcoords[tIndices[idx1]]);
-                        faceTexcoords.push_back(texcoords[tIndices[idx2]]);
-                        faceTexcoords.push_back(texcoords[tIndices[idx3]]);
-                        */
+
+                        if (!normals.empty())
+                        {
+                                faceNormals.push_back(normals[nIndices[idx1]]);
+                                faceNormals.push_back(normals[nIndices[idx2]]);
+                                faceNormals.push_back(normals[nIndices[idx3]]);
+                        }
+                        else
+                        {
+                                // no face normals?
+                                const SimpleTri tri(vertices[indices[idx1]], vertices[indices[idx2]], vertices[indices[idx3]]);
+                                const SimpleVec n = tri.GetNormal();
+
+                                faceNormals.push_back(n);
+                                faceNormals.push_back(n);
+                                faceNormals.push_back(n);
+                        }
+
+                        if (!texcoords.empty())
+                        {
+                                faceTexcoords.push_back(texcoords[tIndices[idx1]]);
+                                faceTexcoords.push_back(texcoords[tIndices[idx2]]);
+                                faceTexcoords.push_back(texcoords[tIndices[idx3]]);
+                        }
                 }
         }
@@ -121 +138 @@
 
         // convert the triangles to geometry
-        geom->mVertices = new Vector3[numElements];
-        geom->mNormals = new Vector3[numElements];
+        geom->mVertices = new SimpleVec[numElements];
+        geom->mNormals = new SimpleVec[numElements];
         geom->mTexcoords = new Texcoord[numElements];
 
@@ -132 +149 @@
         for (int i = 0; i < numElements; ++ i)
         {
+#if 0
                 geom->mVertices[i].x = faceVertices[i].x;
                 geom->mVertices[i].y = -faceVertices[i].z;
                 geom->mVertices[i].z = faceVertices[i].y;
-
+        
                 geom->mNormals[i].x = faceNormals[i].x;
                 geom->mNormals[i].y = -faceNormals[i].z;
                 geom->mNormals[i].z = faceNormals[i].y;
-
+#else
+                geom->mVertices[i].x = faceVertices[i].x;
+                geom->mVertices[i].y = faceVertices[i].y;
+                geom->mVertices[i].z = faceVertices[i].z;
+        
+                geom->mNormals[i].x = faceNormals[i].x;
+                geom->mNormals[i].y = faceNormals[i].y;
+                geom->mNormals[i].z = faceNormals[i].z;
+
+#endif
                 if (i < geom->mTexcoordCount)
                 {
@@ -220 +247 @@
                                 case 'n' :
                                         sscanf(str + 2, "%f %f %f", &x, &y, &z);
-                                        normals.push_back(Vector3(x, y, z));
+                                        normals.push_back(SimpleVec(x, y, z));
                                         break;
                                 case 't':
@@ -228 +255 @@
                                 default:
                                         sscanf(str + 1, "%f %f %f", &x, &y, &z);
-                                        vertices.push_back(Vector3(x, y, z));
+                                        vertices.push_back(SimpleVec(x, y, z));
                                         //cout <<"v " << x << " " << y << " "<< z << " ";
                                 }
@@ -242 +269 @@
                                                 faceVertices, faceNormals, faceTexcoords);
 
-                                if (((line % 1000) == 999) && 
-                                        !faceVertices.empty())
+                                if (0 &&
+                                        (((line % 1000) == 999) && !faceVertices.empty()))
                                 {
                                         ++ mNumShapes;
@@ -299 +326 @@
         str.write(reinterpret_cast<char *>(&vertexCount), sizeof(int));
   
-        str.write(reinterpret_cast<char *>(geom->mVertices), sizeof(Vector3) * vertexCount);
-        str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(Vector3) * vertexCount);
+        str.write(reinterpret_cast<char *>(geom->mVertices), sizeof(SimpleVec) * vertexCount);
+        str.write(reinterpret_cast<char *>(geom->mNormals), sizeof(SimpleVec) * vertexCount);
 
         int texCoordCount = geom->mTexcoordCount;
@@ -330 +357 @@
         if (hasMaterial)
         {
-                Vector3 ambient, diffuse, black;
+                SimpleVec ambient, diffuse, black;
 
                 ambient.x = ambient.y = ambient.z = 0.2f;
@@ -337 +364 @@
 
                 // only write rgb part of the material
-                str.write(reinterpret_cast<char *>(&ambient), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&diffuse), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&black), sizeof(Vector3));
-                str.write(reinterpret_cast<char *>(&black), sizeof(Vector3));
+                str.write(reinterpret_cast<char *>(&ambient), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&diffuse), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&black), sizeof(SimpleVec));
+                str.write(reinterpret_cast<char *>(&black), sizeof(SimpleVec));
         }
 }

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

@@ -2 +2 @@
 #define _OBJCONVERTER_H
 
+#include "SimpleVec.h"
 #include <string>
 #include <vector>
 
-struct Vector3
+/*struct SimpleVec
 {
-        Vector3() {}
-        Vector3(float _x, float _y, float _z): x(_x), y(_y), z(_z) {}
+        SimpleVec() {}
+        SimpleVec(float _x, float _y, float _z): x(_x), y(_y), z(_z) {}
 
         float x, y, z;
-};
+};*/
 
-typedef std::vector<Vector3> VertexArray;
+typedef std::vector<SimpleVec> VertexArray;
 typedef std::pair<float, float> Texcoord;
 
@@ -36 +37 @@
         struct Geometry
         {
-                Vector3 *mVertices;
-                Vector3 *mNormals;
+                SimpleVec *mVertices;
+                SimpleVec *mNormals;
                 Texcoord *mTexcoords;
 

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

@@ -15 +15 @@
         cout << "converting obj to dem format" << endl;
 
-/*      if (!converter.Convert(model_path + argv[1], model_path + argv[2]))
+        if (!converter.Convert(model_path + argv[1], model_path + argv[2]))
         {
                 cerr << "conversion failed" << endl;
                 exit(0);
         }
-*/
-        //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;