Changeset 658 for GTP

Timestamp:

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

Author:

mattausch

Message:

added switch for loading polys as meshes

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/scripts/default.env (modified) (2 diffs)
• Preprocessing/src/Environment.cpp (modified) (1 diff)
• Preprocessing/src/Parser.h (modified) (1 diff)
• Preprocessing/src/Preprocessor.cpp (modified) (3 diffs)
• Preprocessing/src/Preprocessor.h (modified) (1 diff)
• Preprocessing/src/UnigraphicsParser.cpp (modified) (1 diff)
• Preprocessing/src/UnigraphicsParser.h (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (1 diff)
• Preprocessing/src/X3dParser.cpp (modified) (4 diffs)
• Preprocessing/src/X3dParserXerces.h (modified) (2 diffs)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -13 +13 @@
 #;../data/vienna/vienna-plane.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
-#       filename ../data/atlanta/atlanta2.x3d
+        filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-        filename ../data/soda/soda5.dat
+#       filename ../data/soda/soda5.dat
 }
 
@@ -26 +26 @@
 #       type rss
         detectEmptyViewSpace true
+        loadPolygonsAsMeshes true
 }
 

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

@@ -1530 +1530 @@
                                         "false");
 
+        RegisterOption("Preprocessor.loadPolygonsAsMeshes",
+                                        optBool,
+                                        "loadPolygonsAsMeshes=",
+                                        "false");
+
         RegisterOption("Preprocessor.pvsRenderErrorSamples",
                                    optInt,

GTP/trunk/Lib/Vis/Preprocessing/src/Parser.h

@@ -14 +14 @@
   Parser() {}
 
-  virtual bool ParseFile(const string filename, SceneGraphNode **root) {return false;};
+  virtual bool ParseFile(const string filename, 
+                                                 SceneGraphNode **root, 
+                                                 const bool loadPolygonsAsMeshes = false) {return false;};
         
 };

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

@@ -28 +28 @@
   
   environment->GetBoolValue("Preprocessor.useGlDebugger", mUseGlDebugger);
+  environment->GetBoolValue("Preprocessor.loadPolygonsAsMeshes", mLoadPolygonsAsMeshes);
   environment->GetBoolValue("Preprocessor.quitOnFinish", mQuitOnFinish);
 
@@ -89 +90 @@
 
                 cout<<filename<<endl;
-                result = parser->ParseFile(filename, &mSceneGraph->mRoot);
+                result = parser->ParseFile(filename, &mSceneGraph->mRoot, mLoadPolygonsAsMeshes);
 
                 delete parser;
@@ -123 +124 @@
           mSceneGraph->CollectObjects(&mObjects);
           mSceneGraph->mRoot->UpdateBox();
+
+                Exporter *exporter = Exporter::GetExporter("testload.x3d");
+
+                if (exporter)
+                {
+                        exporter->ExportGeometry(mObjects);
+                        delete exporter;
+                }
+
         }
         

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.h

@@ -158 +158 @@
 
   bool mQuitOnFinish;
+  bool mLoadPolygonsAsMeshes;
+
 protected:
 

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

@@ -26 +26 @@
 bool
 UnigraphicsParser::ParseFile(const string filename,
-                             SceneGraphNode **proot)
+                             SceneGraphNode **proot,
+                                 const bool loadPolygonsAsMeshese)
 {
   

GTP/trunk/Lib/Vis/Preprocessing/src/UnigraphicsParser.h

@@ -15 +15 @@
   UnigraphicsParser(): Parser() {}
   
-  virtual bool ParseFile(const string filename, SceneGraphNode **root);
+  virtual bool ParseFile(const string filename, SceneGraphNode **root, const bool loadPolygonsAsMeshes = false);
   
 };

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

@@ -1051 +1051 @@
                 if (exporter)
                 {
-                        
                         if (0 && mExportRays)
                                 exporter->ExportRays(rays, RgbColor(1, 1, 1));
-
                         
                         if (mExportGeometry)

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;
   }
   

GTP/trunk/Lib/Vis/Preprocessing/src/X3dParserXerces.h

@@ -63 +63 @@
   SceneGraphNode *mCurrentNode;
   Mesh *mCurrentMesh;
+  vector<VertexIndexContainer> mCurrentVertexIndices;
+  VertexContainer mCurrentVertices;
+
   Material *mCurrentMaterial;
   bool mLoadPolygonsAsMeshes;
@@ -159 +162 @@
 
   VertexIndexContainer mCurrentVertexIndices;
-
+ 
   // Handlers for X3D
   void