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

Timestamp:

03/15/06 08:59:33 (18 years ago)

Author:

mattausch

Message:

added means for rotating scene

File:

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

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

@@ -54 +54 @@
 static SAXParser::ValSchemes    valScheme       = SAXParser::Val_Auto;
 
-
+#define ROTATE_SCENE 1
 
 
@@ -83 +83 @@
   StrX lname(name);
   string element(lname.LocalForm());
+  
   if (element == "Shape")
     EndShape();
 }
 
-// HACK
-void RotateMesh(Mesh *mesh)
-{
-        VertexContainer::const_iterator it, it_end = mesh->mVertices.end();
+
+static void RotateMesh(Mesh *mesh)
+{
+        VertexContainer::iterator it, it_end = mesh->mVertices.end();
 
         const float angle = 30.0f * PI / 180.0f;
-        const Matrix4x4 rot = RotationYMatrix(30);
+        const Matrix4x4 rot = RotationYMatrix(angle);
 
         for (it = mesh->mVertices.begin(); it != it_end; ++ it)
         {
-                const Vector3 pt = rot * (*it);
+                (*it) = rot * (*it);        
         }
 }
@@ -124 +125 @@
                         
                         mesh->mFaces.push_back(new Face(vc));
-                        if (0)
+                        //if (ROTATE_SCENE)
                                 RotateMesh(mesh);
                         mesh->Preprocess();
@@ -142 +143 @@
                 {
                         // HACK
-                        if (0)
+                        //if (ROTATE_SCENE)
                                 RotateMesh(mCurrentMesh);
                         mCurrentMesh->Preprocess();
@@ -156 +157 @@
                         delete mCurrentMesh;
                 }
+
                 mCurrentMesh = NULL;
         }
@@ -246 +248 @@
 
 
-                        while(1) 
+                        while (1) 
                         {
                                 float x = (float)strtod(ptr, &endptr);
@@ -298 +300 @@
     StartIndexedFaceSet(attributes);
   }
-
+ 
   if (element == "Shape") {
-    cout<<"+";
+    cout << "+";
         mCurrentMesh = new Mesh;
   }
@@ -503 +505 @@
   StrX lname(name);
   string element(lname.LocalForm());
+ 
   if (element == "Shape")
     EndShape();