Changeset 1419

Timestamp:

09/20/06 10:43:22 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Exporter.cpp (modified) (1 diff)
• HierarchyManager.h (modified) (1 diff)
• Mesh.cpp (modified) (1 diff)
• Mesh.h (modified) (3 diffs)
• PlyParser.cpp (modified) (3 diffs)
• Polygon3.cpp (modified) (3 diffs)
• ViewCellsManager.cpp (modified) (7 diffs)
• VrmlExporter.cpp (modified) (1 diff)
• X3dParser.cpp (modified) (1 diff)

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

@@ -293 +293 @@
         }
         
+        //cout << "describe:\n" << dummyMesh << endl;
+        //dummyMesh.CheckMesh();
+
         ExportMesh(&dummyMesh);
         CLEAR_CONTAINER(polys);

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

@@ -214 +214 @@
                 const bool isTermination) const;
 
+        friend ostream &operator<<(ostream &s, const HierarchyManager &hm) 
+        {
+                hm.mHierarchyStats.Print(s);
+                return s;
+        } 
+
 protected:
 

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

@@ -499 +499 @@
 }
 
+
+bool Mesh::CheckMesh() const
+{
+        VertexContainer::const_iterator vit, vit_end = mVertices.end();
+
+        for (vit = mVertices.begin(); vit != vit_end; ++ vit)
+        {
+                for (int i = 0; i < 3; ++ i)
+                {
+                        const float x = (*vit)[i];
+                        if (x != x) // nan
+                        //if (isnan((*vit)[i]))
+                        {
+                                cout << "warning: vertex is ill defined" << endl;
+                                return false;
+                        }
+                }
+        }
+        return true;
+}
+
+
+void Mesh::Print(ostream &app) const
+{
+        VertexContainer::const_iterator vit, vit_end = mVertices.end();
+
+        for (vit = mVertices.begin(); vit != vit_end; ++ vit)
+        {
+                app << (*vit) << " ";
+        }
+        app << endl;
+
+        /*FaceContainer::const_iterator fit, fit_end = mVertices.end();
+
+        for (vit = mVertices.begin(); vit != vit_end; ++ vit)
+        {
+                app << (*vit);
+        }
+        app << endl;*/
+}
+
+
 void
 Mesh::Cleanup()

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

@@ -210 +210 @@
   Vector3 GetNormal(const int idx) const;
 
-  virtual ostream &Describe(ostream &s) {
+  // $$ matt temp
+  bool CheckMesh() const;
+
+  void Print(ostream &app) const;
+
+  virtual ostream &Describe(ostream &s) const {
         return s<<"Mesh #vertices="<<(int)mVertices.size()<<" #faces="<<(int)mFaces.size();
   }
@@ -219 +224 @@
   friend Mesh *CreateMeshFromBox(const AxisAlignedBox3 &box);
 
- 
+  friend ostream& operator<< (ostream &s, const Vector3 &A);
+
 protected:
 
@@ -225 +231 @@
   int mId;
 };
+
+
+// Overload << operator for C++-style output
+inline ostream&
+operator<< (ostream &s, const Mesh &A)
+{
+        A.Print(s);
+        return s;
+}
 
 

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

@@ -182 +182 @@
                  meshProxy.IndexVertices();
            
-           Mesh *mesh = new Mesh(meshProxy.mVertices.size(),
-                                                         meshProxy.mFaces.size());
+           Mesh *mesh = new Mesh((int)meshProxy.mVertices.size(),
+                                                         (int)meshProxy.mFaces.size());
            
            
@@ -210 +210 @@
    for (int k  = 0; k < flist[i]->nverts; k++) {
          Vertex *v = vlist[flist[i]->verts[k]];
-         vc.push_back(meshProxy.mVertices.size());
+         vc.push_back((int)meshProxy.mVertices.size());
          meshProxy.mVertices.push_back(Vector3(v->x, v->y, v->z));
    }
@@ -222 +222 @@
          meshProxy.IndexVertices();
 
-   Mesh *mesh = new Mesh(meshProxy.mVertices.size(),
-                                                 meshProxy.mFaces.size());
+   Mesh *mesh = new Mesh((int)meshProxy.mVertices.size(),
+                                                 (int)meshProxy.mFaces.size());
 
    mesh->mVertices = meshProxy.mVertices;

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

@@ -67 +67 @@
         mVertices.push_back(tri.mVertices[2]);
 
+        VertexContainer::iterator it, it_end = mVertices.end();
+
+        for (it = mVertices.begin(); it != it_end;  ++ it)
+        {
+                cout << (*it) << " ";
+        }cout<<endl<<endl;
         //cout << "poly n: " << GetNormal() << " t normal: " << tri.GetNormal() << endl;
 }
@@ -584 +590 @@
         const int n = (int)mesh.mVertices.size();
 
-    //-- add the vertices
+        /////////////
+    //-- add the vertices to the mesh
+
     VertexContainer::const_iterator vit, vit_end = poly.mVertices.end();
         for (vit = poly.mVertices.begin(); vit != vit_end; ++ vit)
@@ -602 +610 @@
 
         // add indices of triangle strip
-        for (int i = 0; i < (int)indices.size(); i += 3)
-        {
-                Face *face = new Face(n + indices[i], 
-                                                          n + indices[i + 1], 
-                                                          n + indices[i + 2]);
+        for (int i = n; i < (int)indices.size() + n; i += 3)
+        {
+                Face *face = new Face(indices[i], 
+                                                          indices[i + 1], 
+                                                          indices[i + 2]);
                 mesh.AddFace(face);
         }

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

@@ -380 +380 @@
 
 
-        ////////////////////////////////////////////////
-        //
+        //////////////////////
         //-- Cast some more sampling after initial construction.
         //-- The additional rays can be used to gain
@@ -444 +443 @@
 
         ////////////////////
-        //
         //-- post processing of the initial construction
         //-- We can bottom-up merge the view cells in this step
@@ -4796 +4794 @@
 
         // print subdivision statistics
-        Debug << endl << endl;
-        mHierarchyManager->PrintHierarchyStatistics(Debug);
+        Debug << endl << endl << mHierarchyManager << endl;
+        //mHierarchyManager->PrintHierarchyStatistics(Debug);
 
         if (0)
@@ -5157 +5155 @@
         cout << "visualization using " << (int)rays.size() << " samples" << endl;
         Debug << "visualization using " << (int)rays.size() << " samples" << endl;
-        Debug << "\nOutput view cells: " << endl;
-
+        
         const bool sortedViewCells = false;
 
@@ -5169 +5166 @@
         int limit = min(leafOut, (int)mViewCells.size());
         int raysOut = 0;
+
+        cout << "\nOutput of " << limit << " view cells: " << endl;
 
         ///////////////
@@ -5234 +5233 @@
                                 //-- export objects seen from the rays
                                 Intersectable::NewMail();
-                VssRayContainer::const_iterator vcit, vcit_end = vcRays.end();
+                                
+                                VssRayContainer::const_iterator vcit, vcit_end = vcRays.end();
                                 for (vcit = vcRays.begin(); vcit != vcit_end; ++ vcit)
                                 {
@@ -5244 +5244 @@
                                         {
                                                 obj->Mail();
-                                        //      exporter->ExportIntersectable(obj);
+                                                exporter->ExportIntersectable(obj);
                                         }
                                 }

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

@@ -125 +125 @@
           const Vector3 a = (*ri)->GetOrigin();
           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 << " ,";
-          stream << b.x << " " << b.y << " " << b.z << " ,\n";
+          
+          bool isnan = false;
+
+          if ((a[0] != a[0]) || (a[1] != a[1]) || (a[2] != a[2]))
+          {
+                  cout << "error a"<<endl;
+                  isnan = true;
+          }
+
+          if ((b[0] != b[0]) || (b[1] != b[1]) || (b[2] != b[2]))
+          {
+                  cout << "error b"<<endl;
+                  isnan = true;
+          }
+
+          if (!isnan)
+          {
+                stream << a.x << " " << a.y << " " << a.z << " ,";
+                stream << b.x << " " << b.y << " " << b.z << " ,\n";
+          }
   }
 

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

@@ -255 +255 @@
                         {
                                 TriangleIntersectable *ti = new TriangleIntersectable(*tit);
+                                cout << "t: " << (*tit) << endl;
                                 mCurrentNode->mGeometry.push_back(ti);
                         }