Changeset 1327 for GTP

Timestamp:

09/07/06 18:19:15 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• IntersectableWrapper.cpp (modified) (1 diff)
• Mesh.h (modified) (1 diff)
• ObjParser.cpp (modified) (5 diffs)

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

@@ -5 +5 @@
 
 
+AxisAlignedBox3 FaceIntersectable::GetBox() const
+{       
+        return mItem->GetBoundingBox();
+}
 
+
+int FaceIntersectable::CastRay(Ray &ray)
+{       // TODO matt
+        return 0;
+}
         
+template<typename T>
+bool IntersectableWrapper<T>::IsConvex() const
+{
+        return true;
 }
+
+template<typename T>
+bool IntersectableWrapper<T>::IsWatertight() const
+{
+        return true;
+}
+
+template<typename T>
+float IntersectableWrapper<T>::IntersectionComplexity()
+{
+        return 1.0f;
+}
+
+template<typename T>
+int IntersectableWrapper<T>::NumberOfFaces() const
+{
+        return 0;
+}
+
+template<typename T>
+int IntersectableWrapper<T>::GetRandomSurfacePoint(Vector3 &point,
+                                                                                                Vector3 &normal)
+{
+        return 0;
+}
+
+template<typename T>
+int IntersectableWrapper<T>::GetRandomVisibleSurfacePoint(Vector3 &point,
+                                                                                                           Vector3 &normal,
+                                                                                                           const Vector3 &viewpoint,
+                                                                                                           const int maxTries)
+{
+        return 0;
+}
+  
+template<typename T>
+ostream &IntersectableWrapper<T>::Describe(ostream &s)
+{
+        s << mItem;
+        return s;
+}
+
+}

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

@@ -52 +52 @@
   }
   
+  AxisAlignedBox3 GetBoundingBox() const
+  {
+          VertexIndexContainer::const_iterator vit, vit_end = (int)mVertexIndices.size();
+          AxisAlignedBox3 box;
+          box.Initialize();
+
+          for (vit = mVertexIndices.begin(); vit != vit_end; ++ vit)
+          {
+                  box.Include(*vit);
+          }
+
+          return box;
+  }
+
   /// list of vertex pointers
   VertexIndexContainer mVertexIndices;  

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

@@ -109 +109 @@
 
         mesh->mFaces = faces;
-
         // can't do cleanup because coupling with kdf file for intel ray tracer
         mesh->Preprocess(false);
-
-        /*for (int i = 0; i < faces.size(); ++ i)
-        {
-                Debug << "face: ";
-
-                for (int j = 0; j < faces[i]->mVertexIndices.size(); ++ j)
-                {
-                        Debug << "i " << faces[i]->mVertexIndices[j] << " " << endl;    
-                        Debug << "v " << mesh->mVertices[faces[i]->mVertexIndices[j]] << " ";
-                }
-                Debug << endl;
-        }*/
 
         return mesh;
@@ -153 +140 @@
                 return false;
         
+        map<int, Vector3> hashTable; // table associating indices with vectors
+        
         VertexContainer vertices; // table for vertices
-        map<int, Vector3> hashTable; // table associating indices with vectors
         FaceContainer faces;
 
+        SceneGraphNode *root = new SceneGraphNode;
+
         char str[100];
-        
-        SceneGraphNode *root = new SceneGraphNode;
-
         int meshGrouping;
         Environment::GetSingleton()->GetIntValue("ObjParser.meshGrouping", meshGrouping);
@@ -172 +159 @@
                 case 'v':
                         {
-                                float x,y,z;
-                                //cout << "v";
-
+                                float x,y,z; //cout << "v";
+                                
                                 // vertex 
                                 sscanf(str + 1, "%f %f %f", &x, &y, &z);
@@ -185 +171 @@
                                 Face *face = LoadFace(str, vertices, hashTable);
                                 if (!face) break;
-#if 1
+#if 0
                                 faces.push_back(face);
                                 if (faces.size() >= nMaxFaces)
@@ -203 +189 @@
                                 }
 #else
+                                cout << "f";
                                 root->mGeometry.push_back(new FaceIntersectable(face));
                                 hashTable.clear();