Changeset 3328 in orxonox.OLD

Timestamp:

Jan 3, 2005, 7:09:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/updater: derivation now works too for the UPointCurve

Location:

orxonox/branches/parenting/src

Files:

• curve.cc (modified) (3 diffs)
• world.cc (modified) (1 diff)

orxonox/branches/parenting/src/curve.cc

@@ -215 +215 @@
 {
   this->derivation = 0;
-  dirCurve = new UPointCurve(1);
   this->init();
 }
@@ -309 +308 @@
       tmpNode = tmpNode->next;
     }
-
-  // rebuilding the Derivation curve
-  if(this->derivation == 0)
-    {
-      tmpNode = firstNode;
-      delete dirCurve;
-      dirCurve = new UPointCurve(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;
-        }
-    }
 }
 
@@ -358 +339 @@
 Vector UPointCurve::calcDir (float t)
 {
-  return dirCurve->calcPos(t);
+  PathNode* tmpNode = firstNode;
+  Vector ret = Vector(0.0,0.0,0.0);
+  float factor = 1.0/t;
+  int k=0;
+  while(tmpNode)
+    {
+      ret.x += tmpNode->vFactor.x * factor *k;
+      ret.y += tmpNode->vFactor.y * factor *k;
+      ret.z += tmpNode->vFactor.z * factor *k;
+      factor *= t;
+      k++;
+      tmpNode = tmpNode->next;
+    }
+  ret.normalize();
+  return ret;
 }
 

orxonox/branches/parenting/src/world.cc

@@ -451 +451 @@
       printf("%f %f %f\n",testCurve->calcPos(i).x,testCurve->calcPos(i).y,testCurve->calcPos(i).z);
       glVertex3f(testCurve->calcPos(i).x, testCurve->calcPos(i).y, testCurve->calcPos(i).z);
-      //      glVertex3f(testCurve->calcPos(i).x+testCurve->calcDir(i).x, testCurve->calcPos(i).y+testCurve->calcDir(i).y, testCurve->calcPos(i).z+testCurve->calcDir(i).z);
+      glVertex3f(testCurve->calcPos(i).x+testCurve->calcDir(i).x, testCurve->calcPos(i).y+testCurve->calcDir(i).y, testCurve->calcPos(i).z+testCurve->calcDir(i).z);
     }
   glEnd();