Changeset 3017 in orxonox.OLD for orxonox

Timestamp:

Nov 27, 2004, 8:18:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: fixed small error with k++, ++k.

Location:

orxonox/branches/bezierTrack/src

Files:

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

orxonox/branches/bezierTrack/src/track.cc

@@ -83 +83 @@
 void Track::map_camera (Location* lookat, Placement* camplc)
 {
-  t+=.0001;
-  if (t> 1) t =0;
   //  Line trace(*offset, *end - *offset);
   //  float l = trace.len ();
@@ -120 +118 @@
 bool Track::map_coords (Location* loc, Placement* plc)
 {
+  t+=.0001;
+  if (t > 1) t =0;
+  //  printf ("Pos: %f, %f, %f\n", curve.calcPos(t).x, curve.calcPos(t).y, curve.calcPos(t).z); 
   //Line trace(*offset, *end - *offset);
   //    float l = trace.len ();

orxonox/branches/bezierTrack/src/vector.cc

@@ -883 +883 @@
 void BezierCurve::addNode(const Vector& newNode)
 {
-  PathNode* tmpNode;
-  if (nodeCount == 0 )
-    tmpNode = firstNode;
-  else
+  if (nodeCount != 0 )
     {
-      tmpNode = new PathNode;
-      currentNode = currentNode->next = tmpNode;
+      currentNode = currentNode->next = new PathNode;
     }
-  tmpNode->position = newNode;
-  tmpNode->next = 0; // not sure if this really points to NULL!!
-  tmpNode->number = (++nodeCount);
+  currentNode->position = newNode;
+  currentNode->next = 0; // not sure if this really points to NULL!!
+  currentNode->number = (++nodeCount);
   return;
 }
@@ -908 +904 @@
       //      if (verbose >= 1)
       //      printf ("Please define at least 4 nodes, until now you have only defined %i.\n", nodeCount);
-      curvePoint = Vector(0,0,0);
+      return Vector(0,0,0);
     }
   PathNode* tmpNode = firstNode;
@@ -914 +910 @@
   Vector ret = Vector(0.0,0.0,0.0);
   double factor;
-  
-  for (int k=0; k < nodeCount; k++) 
+  int k=0;
+  while(tmpNode!=0)
     {
+      k++;
       factor = ncr (nodeCount, k);
       
@@ -926 +923 @@
       ret.y += factor * tmpNode->position.y;
       ret.z += factor * tmpNode->position.z;
-    
-    tmpNode = tmpNode->next;
+      
+      tmpNode = tmpNode->next;
 
     }
@@ -953 +950 @@
   ret.normalize();
 
-  return ret;
+  return Vector (0,0,0);//ret;
 }
 

orxonox/branches/bezierTrack/src/world.cc

@@ -106 +106 @@
             track->addPoint (Vector(10, 5, 0));
             track->addPoint (Vector(20, 0, 0));
-            track->addPoint (Vector(10, 3, 0));
-            track->addPoint (Vector(50, 0, 0));
-            track->addPoint (Vector(0, 0, 0));
+            track->addPoint (Vector(30, -10, 0));
+            track->addPoint (Vector(40, 5, 0));
+            track->addPoint (Vector(60, -10, 0));