Changeset 657 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

02/20/06 19:06:03 (19 years ago)

Author:

mattausch

Message:

added ogre dependencies and patched ogre sources

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• X3dParser.cpp (modified) (6 diffs)
• X3dParser.h (modified) (1 diff)
• X3dParserXerces.h (modified) (4 diffs)

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

@@ -61 +61 @@
 //  StdInParseHandlers: Constructors and Destructor
 // ---------------------------------------------------------------------------
-X3dParseHandlers::X3dParseHandlers(SceneGraphNode *root) :
+X3dParseHandlers::X3dParseHandlers(SceneGraphNode *root, const bool loadPolygonsAsMeshes):
   mElementCount(0)
   , mAttrCount(0)
   , mCharacterCount(0)
   , mSpaceCount(0)
- // , mCurrentObjectId(0)
+  , mLoadPolygonsAsMeshes(loadPolygonsAsMeshes)
 {
   mCurrentNode = root;
@@ -124 +124 @@
         if (ptr == endptr || index == -1) {
           if (vertices.size() > 2) {
-            Face *face = new Face(vertices);
-            mCurrentMesh->mFaces.push_back(face);
+                  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();
+                  }
+
           }
           vertices.clear();
@@ -163 +177 @@
                                   AttributeList&  attributes)
 {
-  int len = attributes.getLength();
-  int i;
-  VertexContainer vertices;
-  for (i=0; i < len; i++) {
-    string attrName(StrX(attributes.getName(i)).LocalForm());
-    if (attrName == "point") {
-      StrX attrValue(attributes.getValue(i));
-      const char *ptr = attrValue.LocalForm();
-      char *endptr;
-      while(1) {
-        float x = (float)strtod(ptr, &endptr);
-        if (ptr == endptr)
-          break;
-        ptr = endptr;
-        float y = (float)strtod(ptr, &endptr);
-        if (ptr == endptr)
-          break;
-        ptr = endptr;
-        float z = (float)strtod(ptr, &endptr);
-        if (ptr == endptr)
-          break;
-        ptr = endptr;
-        if (*ptr == ',')
-          ptr++;
-        Vector3 v(x, y, z);
-        vertices.push_back(v);
-      }
-      mCurrentMesh->mVertices = vertices;
-    }
-  }
+        int len = attributes.getLength();
+        
+        int i;
+        VertexContainer vertices;
+        
+        for (i=0; i < len; i++) 
+        {
+                string attrName(StrX(attributes.getName(i)).LocalForm());
+          
+                if (attrName == "point") 
+                {
+                        StrX attrValue(attributes.getValue(i));
+                  
+
+                        const char *ptr = attrValue.LocalForm();
+                        char *endptr;
+
+
+                        while(1) 
+                        {
+                                float x = (float)strtod(ptr, &endptr);
+                
+                                if (ptr == endptr)
+                                  break;
+                          
+                                ptr = endptr;
+                                
+                                float y = (float)strtod(ptr, &endptr);
+                          
+                                if (ptr == endptr)
+                                        break;
+
+                                ptr = endptr;
+                          
+                                float z = (float)strtod(ptr, &endptr);
+                                if (ptr == endptr)
+                                        break;
+                          
+                                ptr = endptr;
+                          
+                                if (*ptr == ',')
+                                        ptr ++;
+
+                                Vector3 v(x, y, z);
+                                vertices.push_back(v);
+                        }
+                        mCurrentMesh->mVertices = vertices;
+                }
+        }
 }
 
@@ -284 +317 @@
 bool
 X3dParser::ParseFile(const string filename,
-                     SceneGraphNode **root)
+                                         SceneGraphNode **root,
+                                         const bool loadPolygonsAsMeshes)
 {
   // Initialize the XML4C system
@@ -317 +351 @@
   //
   *root = new SceneGraphNode;
-  X3dParseHandlers handler(*root);
+  X3dParseHandlers handler(*root, loadPolygonsAsMeshes);
   parser->setDocumentHandler(&handler);
   parser->setErrorHandler(&handler);
@@ -389 +423 @@
 // ---------------------------------------------------------------------------
 X3dViewCellsParseHandlers::X3dViewCellsParseHandlers(ViewCellsManager *viewCellsManager, 
-                                                                                                         float viewCellHeight):
+                                                                                                         const float viewCellHeight):
 mElementCount(0), 
 mAttrCount(0), 

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

@@ -12 +12 @@
   X3dParser():Parser(), mViewCellHeight(5.0f) {}
   
-  bool ParseFile(const string filename, SceneGraphNode **root);
+  bool ParseFile(const string filename, SceneGraphNode **root, const bool loadPolygonsAsMeshes = false);
   bool ParseFile(const string filename, ViewCellsManager &viewCells);
   

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

@@ -24 +24 @@
   //  Constructors and Destructor
   // -----------------------------------------------------------------------
-  X3dParseHandlers(SceneGraphNode *root);
+  X3dParseHandlers(SceneGraphNode *root, const bool loadPolygonsAsMeshes = false);
   ~X3dParseHandlers();
   
@@ -64 +64 @@
   Mesh *mCurrentMesh;
   Material *mCurrentMaterial;
-  //int mCurrentObjectId;
+  bool mLoadPolygonsAsMeshes;
 
   // Handlers for X3D
@@ -117 +117 @@
   // -----------------------------------------------------------------------
   X3dViewCellsParseHandlers(ViewCellsManager *viewCellsManager, 
-                                                        float viewCellHeight);
+                                                        const float viewCellHeight);
   ~X3dViewCellsParseHandlers();
   
@@ -156 +156 @@
   ViewCellsManager *mViewCellsManager;
   float mViewCellHeight;
+ 
 
   VertexIndexContainer mCurrentVertexIndices;