Changeset 1001 for GTP/trunk/Lib/Vis/Preprocessing/src/VrmlExporter.cpp

Timestamp:

06/05/06 23:14:04 (18 years ago)

Author:

mattausch

Message:

added mesh instance support
improved support for occlusion queries + other extensions

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VrmlExporter.cpp (modified) (10 diffs)

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

@@ -24 +24 @@
 }
 
+
 VrmlExporter::~VrmlExporter()
 {
@@ -31 +32 @@
 
 bool VrmlExporter::ExportRays(const RayContainer &rays,
-                                                const float length,
-                                                const RgbColor &color)
+                                                          const float length,
+                                                          const RgbColor &color)
 {
   RayContainer::const_iterator ri = rays.begin();
@@ -115 +116 @@
   for (; ri != rays.end(); ri++) {
     const Vector3 a = (*ri)->GetOrigin();
-        //const Vector3 b = (*ri)->mTerminationObject ? (*ri)->GetTermination() : a + 1000 * Normalize((*ri)->GetDir());
-        const Vector3 b = (*ri)->GetTermination(); // matt: change again!!
+        const Vector3 b = (*ri)->mTerminationObject ? (*ri)->GetTermination() : a + 1000 * Normalize((*ri)->GetDir());
+        //const Vector3 b = (*ri)->GetTermination(); // matt: change back!!
 
     stream<<a.x<<" "<<a.y<<" "<<a.z<<" ,";
@@ -152 +153 @@
 }
 
+
 void VrmlExporter::ExportIntersectable(Intersectable *object)
 {
         switch (object->Type()) 
         {
-        
         case Intersectable::MESH_INSTANCE:
+                ExportMeshInstance((MeshInstance *)object);
+                break;
         case Intersectable::TRANSFORMED_MESH_INSTANCE:
-                ExportMeshInstance((MeshInstance *)object);
+                ExportTransformedMeshInstance(dynamic_cast<TransformedMeshInstance *>(object));
                 break;
         case Intersectable::VIEW_CELL:
@@ -180 +183 @@
 
 
+void VrmlExporter::ExportTransformedMeshInstance(TransformedMeshInstance *mi)
+{
+        Mesh mesh(*mi->GetMesh());
+
+        Matrix4x4 m;
+        mi->GetWorldTransform(m);
+        mesh.ApplyTransformation(m);
+
+        ExportMesh(&mesh);
+}
+
+
 void VrmlExporter::ExportViewCells(const ViewCellContainer &viewCells)
 {
@@ -189 +204 @@
         }
 }
+
 
 void VrmlExporter::ExportBspLeaves(const BspTree &tree, const int maxPvs)
@@ -290 +306 @@
         stream << "}" << endl; // end material
         stream << "}" << endl; // end apperance
-        //stream << "}" << endl; // end shape
-
+        
 
         // wireframe modes => set indexed lines
@@ -314 +329 @@
         {
                 Face *face = *fi;
-          
+         
                 VertexIndexContainer::const_iterator vi = face->mVertexIndices.begin();
-          
-                for (; vi != face->mVertexIndices.end(); vi++)
+         
+                for (; vi != face->mVertexIndices.end(); ++ vi)
                 {
                         stream << *vi << " ";
@@ -331 +346 @@
 
         stream << "]" << endl; // end coordIndex
-        
+
 
         stream << "coord Coordinate {" << endl;
@@ -385 +400 @@
         stream << "}" << endl; // end material
         stream << "}" << endl; // end apperance
-        //stream << "}" << endl; // end shape
-
+        
 
         // wireframe modes => set indexed lines