Changeset 658 for GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp

Timestamp:

02/21/06 09:51:03 (18 years ago)

Author:

mattausch

Message:

added switch for loading polys as meshes

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/X3dParser.cpp

@@ -90 +90 @@
 X3dParseHandlers::EndShape()
 {
-  if (mCurrentMesh->mFaces.size()) {
-    mCurrentMesh->Preprocess();
-    // make an instance of this mesh
-    MeshInstance *mi = new MeshInstance(mCurrentMesh);
-    mCurrentNode->mGeometry.push_back(mi);
-        // set the object id to a unique value
-        //mi->SetId(mCurrentObjectId ++);
-  } else {
-    cout<<"X";
-    delete mCurrentMesh;
-  }
-  mCurrentMesh = NULL;
-}
-
+        if (mLoadPolygonsAsMeshes)
+        {
+                vector<VertexIndexContainer>::const_iterator it, it_end = mCurrentVertexIndices.end();
+
+                for (it = mCurrentVertexIndices.begin(); it != it_end; ++ it)
+                {
+                        // only one face per mesh
+                        Mesh *mesh = new Mesh();
+
+                        // add vertices
+                        for (int i = 0; i < (int)(*it).size(); ++ i)
+                        {
+                                mesh->mVertices.push_back(mCurrentVertices[(*it)[i]]);
+                                
+                        }
+                        
+                        mesh->mFaces.push_back(new Face(0,1,2));
+                        mesh->Preprocess();
+                        // make an instance of this mesh
+                        MeshInstance *mi = new MeshInstance(mesh);
+                        mCurrentNode->mGeometry.push_back(mi);
+
+                }
+
+                delete mCurrentMesh;
+                mCurrentVertices.clear();
+                mCurrentVertexIndices.clear();
+        }
+        else
+        {
+ 
+                if (mCurrentMesh->mFaces.size()) 
+                {
+                        mCurrentMesh->Preprocess();
+                        // make an instance of this mesh
+                        MeshInstance *mi = new MeshInstance(mCurrentMesh);
+                        mCurrentNode->mGeometry.push_back(mi);
+                        // set the object id to a unique value
+                        //mi->SetId(mCurrentObjectId ++);
+                } 
+                else 
+                {
+                        cout<<"X";
+                        delete mCurrentMesh;
+                }
+                mCurrentMesh = NULL;
+        }
+}
 void
 X3dParseHandlers::StartIndexedFaceSet(
@@ -126 +160 @@
                   Face *face = new Face(vertices);
 
-                   mCurrentMesh->mFaces.push_back(face);
-
-                   // every polygon is a mesh => store in mesh instance and create new mesh
-                  if (mLoadPolygonsAsMeshes)
-                  {
-                          mCurrentMesh->Preprocess();
-
-                          // make an instance of this mesh
-                          MeshInstance *mi = new MeshInstance(mCurrentMesh);
-                          mCurrentNode->mGeometry.push_back(mi);
-
-                          mCurrentMesh = new Mesh();
-                  }
-
+                   if (!mLoadPolygonsAsMeshes)
+                   {
+                           mCurrentMesh->mFaces.push_back(face);
+                   }
+                   else
+                   // every polygon is a mesh
+                   {
+                           mCurrentVertexIndices.push_back(vertices);
+                   }
           }
+
           vertices.clear();
           if (ptr == endptr)
@@ -223 +253 @@
                                 vertices.push_back(v);
                         }
-                        mCurrentMesh->mVertices = vertices;
+                        if (mLoadPolygonsAsMeshes)
+                        {
+                                mCurrentVertices = vertices;
+                        }
+                        else
+                        {
+                                mCurrentMesh->mVertices = vertices;
+                        }
                 }
         }
@@ -243 +280 @@
   if (element == "Shape") {
     cout<<"+";
-    mCurrentMesh = new Mesh;
+        mCurrentMesh = new Mesh;
   }