Changeset 3004 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Nov 26, 2004, 11:29:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented Bezier-Diff

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/track.cc

@@ -13 +13 @@
    ### File Specific:
    main-programmer: Christian Meyer
-   co-programmer: ...
+   co-programmer: Benjamin Grauer
 */
 
@@ -75 +75 @@
   //    camplc->r = *offset + Vector(0,0,0.5);
   //    camplc->w = Quaternion (trace.a, Vector(0,0,1));
-  float r = (lookat->dist)*PI / l;
+  //  float r = (lookat->dist)*PI / l;
   camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
   
@@ -111 +111 @@
         if( loc->dist > l)
         {
-                loc->dist -= l;
+                loc->dist -= l;
                 loc->part = nextID;
                 //FIXME: loc->track = this;

orxonox/trunk/src/vector.cc

@@ -898 +898 @@
 
 /**
-   \brief calculates (and does not return) the Position on the curve
+   \brief calculates the Position on the curve
    \param t The position on the Curve (0<=t<=1)
-*/
-void BezierCurve::calcPos(float t) 
+   \return the Position on the Path
+*/
+Vector BezierCurve::calcPos(float t) 
 {
   if (nodeCount <=4)
@@ -943 +944 @@
     tmpNode = tmpNode->next;
   }
-  curvePoint = b;
-  return;
+  return b;
+}
+
+Vector BezierCurve::calcDirection (float t)
+{
+  double diff = .00000000001;
+  
+  Vector diffV = ((calcPos(t+diff) - calcPos(t))/diff);
+  diffV.normalize();
+  return diffV;
 }
 
@@ -955 +964 @@
   return curvePoint;
 }
-
-/**
-  \brief returns the position of the point on the Curve at position t
-  \param t The position on the Curve (0<=t<=1)
-  \return a Vector to the calculated position
-*/
-Vector BezierCurve::getPos(float t)
-{
-  calcPos(t);
-  return curvePoint;
-}

orxonox/trunk/src/vector.h

@@ -177 +177 @@
   ~BezierCurve (void);
   void addNode (const Vector& newNode);
-  void calcPos (float t);
+  Vector calcPos (float t);
+  Vector calcDirection (float t);
   
   Vector getPos () const;
-  Vector getPos (float t);
 };
 

orxonox/trunk/src/world.cc

@@ -428 +428 @@
     }
 
-  for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
+  //  for( int i = 0; i < tracklen; i++) track[i].tick (seconds);
 }