Changeset 712 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

03/22/06 10:13:28 (18 years ago)

Author:

mattausch

Message:

added exporter for Vrml
added transformations to x3d loader

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• Exporter.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (1 diff)
• PreprocessorThread.cpp (modified) (1 diff)
• ViewCellsManager.cpp (modified) (8 diffs)
• VrmlExporter.cpp (added)
• VrmlExporter.h (added)
• VssPreprocessor.cpp (modified) (1 diff)
• X3dExporter.cpp (modified) (2 diffs)
• X3dParser.cpp (modified) (7 diffs)
• X3dParserXerces.h (modified) (4 diffs)

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

@@ -1241 +1241 @@
         RegisterOption("ViewCells.PostProcess.samples",
                                         optInt,
-                                        "view_cells_postprocess_samples=",
+                                        "view_cells_post_process_samples=",
                                         "200000");
 

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

@@ -1 +1 @@
 
 #include "X3dExporter.h"
-
+#include "VrmlExporter.h"
 
 Exporter *
 Exporter::GetExporter(const string filename)
 {
-  Exporter *e = NULL;
+  Exporter *exporter = NULL;
 
-  if (strstr(filename.c_str(), ".x3d")) {
-    e = new X3dExporter(filename);
-  } else {
-    cerr<<"Error: Currently unsuported export format, filename "<<filename<<endl;
+  if (strstr(filename.c_str(), ".x3d")) 
+  {
+          exporter = new X3dExporter(filename);
+  } 
+  else if (strstr(filename.c_str(), ".wrl"))
+  {
+          exporter = new VrmlExporter(filename);
   }
-  return e;
+  else
+  {
+          cerr<<"Error: Currently unsuported export format, filename " << filename << endl;
+  }
+
+  return exporter;
 }
 

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

@@ -85 +85 @@
         vector<string> filenames;
         int files = SplitFilenames(filename, filenames);
-        cout<<files<<endl;
+        cout << "number of input files: " << files << endl;
         bool result = false;
         if (files == 1) {

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

@@ -48 +48 @@
 
 
-  cerr<<"Preprocessor main finished...\n";
+  cerr << "Preprocessor main finished...\n";
   
 }

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

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 1
-#define TEST_EMPTY_VIEW_CELLS 0
+// HACK
+const static bool SAMPLE_AFTER_SUBDIVISION = true;
+const static bool TEST_EMPTY_VIEW_CELLS = false;
 
 
@@ -289 +290 @@
 
         cout << "view cell construction: casting " << mInitialSamples << " initial samples ... ";
+
         //-- construction rays => we use uniform samples for this
         CastPassSamples(mInitialSamples, 
@@ -319 +321 @@
         if (1) // export initial view cells
         {
-                cout << "exporting initial view cells (=leaves) ... ";
-                Exporter *exporter = Exporter::GetExporter("view_cells.x3d");
-
+                const char filename[] = "view_cells.wrl";
+                Exporter *exporter = Exporter::GetExporter(filename);
+
+        
                 if (exporter)
                 {
+                        cout << "exporting initial view cells (=leaves) to " << filename << " ... ";
                         if (mExportGeometry)
+                        {
                                 exporter->ExportGeometry(preprocessor->mObjects);
-
+                        }
+
+                        //exporter->SetWireframe();
                         ExportViewCellsForViz(exporter);
 
                         delete exporter;
-                }
-                cout << "finished" << endl;
+                        cout << "finished" << endl;
+                }
         }
 
@@ -340 +347 @@
         bool dirSamples = (mSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
+        // -- the main loop
         while (numSamples < n)
         {
@@ -362 +370 @@
 
                 // TODO: leak?
-                if (SAMPLE_AFTER_SUBDIVISION)
+                if (1 || SAMPLE_AFTER_SUBDIVISION)
                         ComputeSampleContributions(constructionSamples, true, false);
+
                 cout << "finished" << endl;
 
@@ -606 +615 @@
                 neighborhood.pop_back();
         
-                cout << "vc idx: " << bestViewCellIdx << endl;
+                //cout << "vc idx: " << bestViewCellIdx << endl;
                 if (!bestViewCell || !root)
                         cout << "warning!!" << endl;
@@ -1689 +1698 @@
                 mColorCode = 1;
 
-                Exporter *exporter = Exporter::GetExporter("final_view_cells.x3d");
+                Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
         
                 cout << "exporting view cells after merge (pvs size) ... ";     
@@ -3377 +3386 @@
                 int savedColorCode = mColorCode;
                 mColorCode = 0;
-                Exporter *exporter = Exporter::GetExporter("final_view_cells.x3d");
+                Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
                 
                 if (exporter)

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

@@ -715 +715 @@
 
   
-  int numExportRays = 2000;
-  //int numExportRays = 0;
+  //int numExportRays = 2000;
+  int numExportRays = 0;
 
   if (numExportRays) {

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

@@ -438 +438 @@
         stream << "</Shape>" << endl;
 }
+
 
 void X3dExporter::ExportPolygons(const PolygonContainer &polys)
@@ -1138 +1139 @@
 void X3dExporter::ExportGeometry(const ObjectContainer &objects)
 {
-#if 1
-        for (int j = 0; j < objects.size(); ++ j)
-                ExportIntersectable(objects[j]);
-#else
-        // hack
+        ObjectContainer::const_iterator oit, oit_end = objects.end();
+
+        if (1)
+        {
+                for (oit = objects.begin(); oit != oit_end; ++ oit)
+                {
+                        if (1)
+                        {
+                                SetForcedMaterial(RandomMaterial());
+                        }
+
+                        ExportIntersectable(*oit);
+                }
+
+                return;
+        }
+
+        // hack: all object exported as one mesh
         PolygonContainer polys;
-        for (int j = 0; j < objects.size(); ++ j){
-                polys.push_back(new Polygon3(dynamic_cast<MeshInstance *>(objects[j])->GetMesh()->mVertices));
+
+        for (oit = objects.begin(); oit != oit_end; ++ oit)
+        {
+                polys.push_back(new Polygon3(dynamic_cast<MeshInstance *>(*oit)->GetMesh()->mVertices));
         }
 
         Mesh dummyMesh;
-        PolygonContainer::const_iterator it, it_end = polys.end();
-
-        for (it = polys.begin(); it != it_end; ++ it)
-          {
-                (*it)->AddToMesh(dummyMesh);
-          }
+        PolygonContainer::const_iterator pit, pit_end = polys.end();
+
+        for (pit = polys.begin(); pit != pit_end; ++ pit)
+        {
+                (*pit)->AddToMesh(dummyMesh);
+        }
+        
         ExportMesh(&dummyMesh);
+
         CLEAR_CONTAINER(polys);
-#endif
 }
 

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

@@ -69 +69 @@
 {
   mCurrentNode = root;
+  // this matrix should never be removed from stack
+  //mTransformations.push(IdentityMatrix());
 }
 
 X3dParseHandlers::~X3dParseHandlers()
 {
+        if (!mTransformations.empty())
+                cout << "error: transformation stack size: " << (int)mTransformations.size() << endl;
 }
 
@@ -86 +90 @@
   if (element == "Shape")
     EndShape();
+  if (1)
+  if (element == "Transform")
+          EndTransform();
 }
 
@@ -100 +107 @@
                 (*it) = rot * (*it);        
         }
+}
+
+
+void X3dParseHandlers::ApplyTransformation(Mesh *mesh, 
+                                                                                   const Matrix4x4 &m) const
+{
+        VertexContainer::iterator it, it_end = mesh->mVertices.end();
+
+        for (it = mesh->mVertices.begin(); it != it_end; ++ it)
+        {
+                (*it) = m * (*it);        
+        }
+}
+
+
+void X3dParseHandlers::ApplyTransformations(TrafoStack trafos, Mesh *mesh) const
+{
+        while (!trafos.empty())
+        {
+                const Matrix4x4 m = trafos.top();
+                trafos.pop();
+
+                ApplyTransformation(mesh, m);
+        }
+}
+
+void X3dParseHandlers::StartTransform(AttributeList&  attributes)
+{
+        Matrix4x4 currentTransform = IdentityMatrix();
+
+        const int len = attributes.getLength();
+    
+        for (int i = 0; i < len; ++ i) 
+        {
+                string attrName(StrX(attributes.getName(i)).LocalForm());
+                        
+                StrX attrValue(attributes.getValue(i));
+                const char *ptr = attrValue.LocalForm();
+                        
+                if (attrName == "rotation") 
+                {
+                        Vector3 axis;
+                        float angle;
+                                
+                        if (sscanf(ptr, "%f %f %f %f", &axis.x, &axis.y, &axis.z, &angle) == 4)
+                        {
+                                Matrix4x4 rot = RotationAxisMatrix(axis, angle);
+                                currentTransform *= rot;
+                        }
+                }
+                else if (attrName == "translation")
+                {
+                        Vector3 transl;
+                                                        
+                        if (sscanf(ptr, "%f %f %f %f", &transl.x, &transl.y, &transl.z) == 3)
+                        {
+                                Matrix4x4 tm = TranslationMatrix(transl);
+
+                                currentTransform *= tm;
+                        }
+                }
+        }
+        
+        mTransformations.push(currentTransform);
+}
+
+
+void X3dParseHandlers::EndTransform()
+{
+        mTransformations.pop();
 }
 
@@ -125 +202 @@
                         
                         mesh->mFaces.push_back(new Face(vc));
-                        if (ROTATE_SCENE)
-                                RotateMesh(mesh);
+                        
+                        // NOTE: should rather be written into trafo of mesh instance
+                        ApplyTransformations(mTransformations, mesh);
+
                         mesh->Preprocess();
                         // make an instance of this mesh
@@ -142 +221 @@
                 if (mCurrentMesh->mFaces.size()) 
                 {
-                        // HACK
-                        if (ROTATE_SCENE)
-                                RotateMesh(mCurrentMesh);
+                        // should rather be written into the transformation
+                        // of a mesh instance
+                        ApplyTransformations(mTransformations, mCurrentMesh);
+
                         mCurrentMesh->Preprocess();
                         // make an instance of this mesh
@@ -161 +241 @@
         }
 }
+
+
 void
 X3dParseHandlers::StartIndexedFaceSet(
@@ -313 +395 @@
   if (element == "Material") {
     StartMaterial(attributes);
+  }
+if (1)
+  if (element == "Transform") {
+          StartTransform(attributes);
   }
 

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

@@ -7 +7 @@
 #include <xercesc/sax/HandlerBase.hpp>
 #include "Mesh.h"
+#include <stack>
 
 XERCES_CPP_NAMESPACE_USE
@@ -69 +70 @@
   bool mLoadPolygonsAsMeshes;
 
+  typedef stack<Matrix4x4> TrafoStack;
+
+  // stack of accumulated transformations
+  TrafoStack mTransformations;
+
   // Handlers for X3D
   void
@@ -77 +83 @@
   EndShape();
 
+  void EndTransform();
+  void StartTransform(AttributeList&  attributes);
+
   void
   StartCoordinate(
@@ -85 +94 @@
                 AttributeList&  attributes);
   
-  
+  /// applies transformation m to this mesh
+  void ApplyTransformation(Mesh *mesh, const Matrix4x4 &m) const;
+
+  /// transforms mesh using the given transformations
+  void ApplyTransformations(TrafoStack trafos, Mesh *mesh) const;
+
+
   // -----------------------------------------------------------------------
   //  Handlers for the SAX ErrorHandler interface