Changeset 3015 in orxonox.OLD

Timestamp:

Nov 27, 2004, 5:38:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/bezierCurve: better algorithm

Location:

orxonox/branches/bezierTrack/src

Files:

• track.cc (modified) (1 diff)
• track.h (modified) (1 diff)
• vector.cc (modified) (2 diffs)
• vector.h (modified) (1 diff)

orxonox/branches/bezierTrack/src/track.cc

@@ -66 +66 @@
 {
   return curve.calcPos (t);
+}
+Vector Track::getDir (float t)
+{
+  return curve.calcDir (t);
 }
 

orxonox/branches/bezierTrack/src/track.h

@@ -39 +39 @@
   
   Vector getPos(float t);
+  Vector getDir (float t);
+
   
   virtual void post_enter (WorldEntity* entity);        // handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght)

orxonox/branches/bezierTrack/src/vector.cc

@@ -912 +912 @@
   PathNode* tmpNode = firstNode;
     
-  int k,kn,nn,nkn;
-  double blend,muk,munk;
-  Vector b = Vector(0.0,0.0,0.0);
-  
-  muk = 1;
-  munk = pow(1-t,(double)nodeCount);
-  
-  for (k=0; k<=nodeCount-1; k++) {
-    nn = nodeCount;
-    kn = k;
-    nkn = nodeCount - k;
-    blend = muk * munk;
-    muk *= t;
-    munk /= (1-t);
-    while (nn >= 1) {
-      blend *= nn;
-      nn--;
-      if (kn > 1) {
-        blend /= (double)kn;
-        kn--;
-      }
-      if (nkn > 1) {
-        blend /= (double)nkn;
-        nkn--;
-      }
+  Vector ret = Vector(0.0,0.0,0.0);
+  double factor;
+  
+  for (int k=0; k < nodeCount; k++) 
+    {
+      factor = ncr (nodeCount, k);
+      
+      for (int j=0; j<nodeCount-k; j++)
+        factor*=(1-t);
+      for (int j=0; j<k; j++)
+        factor*=t;
+      ret.x += factor * tmpNode->position.x;
+      ret.y += factor * tmpNode->position.y;
+      ret.z += factor * tmpNode->position.z;
+    
+    tmpNode = tmpNode->next;
     }
-    b.x += tmpNode->position.x * blend;
-    b.y += tmpNode->position.y * blend;
-    b.z += tmpNode->position.z * blend;
-
-    tmpNode = tmpNode->next;
-  }
-  return b;
+  return ret;
 }
 
@@ -964 +949 @@
   return curvePoint;
 }
+
+
+int BezierCurve::ncr(int n, int i)
+{
+  int ret = 1;
+  for (int k=1; k<=n; k++)
+    ret*=k;
+  for (int k=1; k<=i; k++)
+    ret/=k;
+  for (int k=1; k<=n-i; k++)
+    ret/=k;
+
+  return ret;
+}

orxonox/branches/bezierTrack/src/vector.h

@@ -173 +173 @@
   PathNode* currentNode; 
 
+  int ncr(int n, int i);
+
  public:
   BezierCurve (void);