Changeset 1005

Timestamp:

06/08/06 01:48:22 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Mesh.cpp (modified) (1 diff)
• Mesh.h (modified) (1 diff)
• X3dParser.cpp (modified) (3 diffs)
• main.cpp (modified) (1 diff)

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

@@ -645 +645 @@
 
 
+Mesh::~Mesh()
+{
+        for (int i=0; i < mFaces.size(); ++ i)
+                delete mFaces[i];
+
+        DEL_PTR(mKdTree);
+}
+  
+
+void Mesh::Clear() 
+{
+        mVertices.clear();
+        mFaces.clear();
+
+        DEL_PTR(mKdTree);
+}
 
 /********************************************************/

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

@@ -104 +104 @@
   Mesh& operator=(const Mesh& m);
 
-  ~Mesh() {
-    for (int i=0; i < mFaces.size(); i++)
-      delete mFaces[i];
-  }
-  
-
-  void Clear() {
-        mVertices.clear();
-        mFaces.clear();
-  }
+  ~Mesh();
+  void Clear();
   
   void IndexVertices();

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

@@ -166 +166 @@
                         float angle;
                                 
-                        if (sscanf(ptr, "%f %f %f %f", &axis.x, &axis.y, &axis.z, &angle) == 4)
+                        if (sscanf(ptr, "%f %f %f", &axis.x, &axis.y, &axis.z, &angle) == 4)
                         {
                                 rotm = new Matrix4x4(RotationAxisMatrix(axis, angle));
@@ -274 +274 @@
         { 
                 MeshInstance *mi;
+
+                if (mCurrentMesh->mFaces.empty())
+                        cout << "warning: empy mesh" << endl;
 
                 if (!mUsingMeshDefinition) 
@@ -549 +552 @@
 
   // todo
-  if (0 && element == "Material") {
+  if (element == "Material") {
           StartMaterial(attributes);
   }

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

@@ -161 +161 @@
 
   if (app)
+  {
          returnCode = app->exec();
+        DEL_PTR(app);
+        }
 
   //-- clean up
   DEL_PTR(p);
   Environment::DelSingleton();
+  DEL_PTR(rendererWidget);
 
   MeshManager::DelSingleton();