Changeset 5211 in orxonox.OLD for trunk/src/lib/math

Timestamp:

Sep 21, 2005, 2:21:41 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: valgrind mem-leak-recovered

File:

• trunk/src/lib/math/curve.cc (modified) (9 diffs)

trunk/src/lib/math/curve.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    co-programmer: Patrick Boenzli
 
-   ADD: Patrick Boenzli           B-Spline 
-
-
-   TODO: 
+   ADD: Patrick Boenzli           B-Spline
+
+
+   TODO:
      local-Time implementation
      NURBS
      tList implementation
-     
+
 */
 
@@ -33 +33 @@
 
 
-/** 
+/**
   *  default constructor for a Curve
 */
@@ -71 +71 @@
 void Curve::addNode(const Vector& newNode, unsigned int insertPosition)
 {
-
   if (this->nodeCount == 0 || insertPosition > this->nodeCount)
     return addNode(newNode);
@@ -85 +84 @@
     {
       while (tmpNode->next->number != insertPosition)
-        tmpNode= tmpNode->next;
+        tmpNode= tmpNode->next;
       insNode->next = tmpNode->next;
       tmpNode->next = insNode;
@@ -199 +198 @@
       tmpNode->factor = binCoef;
       if (tmpNode =tmpNode->next)
-        {
-          binCoef *=(n-k)/(k+1);
-          ++k;
-        }
+        {
+          binCoef *=(n-k)/(k+1);
+          ++k;
+        }
     }
 
@@ -212 +211 @@
       dirCurve = new BezierCurve(1);
       while(tmpNode->next)
-        {
-          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
-          tmpVector.x*=(float)nodeCount;
-          tmpVector.y*=(float)nodeCount;
-          tmpVector.z*=(float)nodeCount;
-          tmpVector.normalize();
-          this->dirCurve->addNode(tmpVector);
-          tmpNode = tmpNode->next;
-        }
+        {
+          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
+          tmpVector.x*=(float)nodeCount;
+          tmpVector.y*=(float)nodeCount;
+          tmpVector.z*=(float)nodeCount;
+          tmpVector.normalize();
+          this->dirCurve->addNode(tmpVector);
+          tmpNode = tmpNode->next;
+        }
     }
 }
@@ -229 +228 @@
  * @return the Position on the Path
 */
-Vector BezierCurve::calcPos(float t) 
+Vector BezierCurve::calcPos(float t)
 {
   Vector ret = Vector(0.0,0.0,0.0);
@@ -237 +236 @@
       double factor = pow(1.0-t,nodeCount-1);
       while(tmpNode)
-        {
-          ret.x += tmpNode->factor * factor * tmpNode->position.x;
-          ret.y += tmpNode->factor * factor * tmpNode->position.y;
-          ret.z += tmpNode->factor * factor * tmpNode->position.z;
-          factor *= t/(1.0-t); // same as pow but much faster.
-          
-          tmpNode = tmpNode->next;
-        }
+        {
+          ret.x += tmpNode->factor * factor * tmpNode->position.x;
+          ret.y += tmpNode->factor * factor * tmpNode->position.y;
+          ret.z += tmpNode->factor * factor * tmpNode->position.z;
+          factor *= t/(1.0-t); // same as pow but much faster.
+
+          tmpNode = tmpNode->next;
+        }
     }
   else if (nodeCount == 2)