Changeset 5231 in orxonox.OLD for trunk

Timestamp:

Sep 24, 2005, 12:11:28 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: hunted a valgrind error msg in the curve class, restructured the code to delete only local variables not external

Location:

trunk/src/lib/math

Files:

• curve.cc (modified) (2 diffs)
• curve.h (modified) (1 diff)

trunk/src/lib/math/curve.cc

@@ -38 +38 @@
 Curve::Curve()
 {
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-}
+  this->nodeCount = 0;
+  this->localTime = 0;
+  this->derivation = 0;
+  this->dirCurve = NULL;
+  this->firstNode = new PathNode();
+  this->currentNode = firstNode;
+
+  this->firstNode->position = Vector (.0, .0, .0);
+  this->firstNode->number = 0;
+  this->firstNode->next = 0; // not sure if this really points to NULL!!
+}
+
+
+Curve::~Curve()
+{
+  PathNode* pn = this->firstNode;
+  PathNode* unusedPN;
+  while( pn != NULL)
+  {
+    unusedPN = pn;
+    pn = pn->next;
+    delete unusedPN;
+  }
+
+  if (dirCurve)
+    delete dirCurve;
+
+}
+
 
 /**
@@ -171 +192 @@
 BezierCurve::~BezierCurve()
 {
-  PathNode* tmpNode;
-  currentNode = firstNode;
-  while (tmpNode != 0)
-    {
-      tmpNode = currentNode;
-      currentNode = currentNode->next;
-      delete tmpNode;
-    }
-  if (dirCurve)
-    delete dirCurve;
+
 }
 

trunk/src/lib/math/curve.h

@@ -37 +37 @@
  public:
   Curve();
+  virtual ~Curve();
 
   void addNode(const Vector& newNode);