Changeset 3013 in orxonox.OLD for orxonox/branches/bezierTrack/src/track.cc

Timestamp:

Nov 27, 2004, 12:45:12 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: Location→r ,→w to →pos →dir. (otherwise noone gets the sense of them again.)

File:

• orxonox/branches/bezierTrack/src/track.cc (modified) (5 diffs)

orxonox/branches/bezierTrack/src/track.cc

@@ -48 +48 @@
 }
 
-void Track::addPoint (Vector& point)
+void Track::addPoint (Vector point)
 {
   curve.addNode(point);
@@ -56 +56 @@
 
 
-void Track::addHotPoint (Vector& hotPoint)
+void Track::addHotPoint (Vector hotPoint)
 {
 
@@ -74 +74 @@
 void Track::map_camera (Location* lookat, Placement* camplc)
 {
-  t+=.001;
+  t+=.0001;
   if (t> 1) t =0;
   //  Line trace(*offset, *end - *offset);
@@ -81 +81 @@
   //  float r = (lookat->dist)*PI / l;
   // camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-  camplc->r = curve.calcPos(t) + (curve.calcDir(t)* ((lookat->dist-10)/t)) + Vector(0,0,5.0);
+  camplc->pos = curve.calcPos(t) + (curve.calcDir(t)* ((lookat->dist-10.0)/t)) + Vector(-10,0,0);
                                  
   Vector w(0.0,0.0,0.0);
   //  w=Vector(0,0,0) - ((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r));
-  w = Vector(0,0,0) - (((curve.calcPos(t)) + ((curve.calcDir(t)) * ((lookat->dist) / t)) - camplc->r));
-
+  w = Vector(0,0,0) - (((curve.calcPos(t)) + ((curve.calcDir(t)) * ((lookat->dist) / t)) - camplc->pos));
   //Vector up(0.0,sin(r),cos(r)); // corrupt...
   Vector up(0.0, 0.0, 1.0);
 
-  camplc->w = Quaternion(w, up);
+  camplc->rot = Quaternion(w, up);
 
   //printf("\n------\nup vector: [%f, %f, %f]\n", up.x, up.y, up.z);
@@ -128 +127 @@
         Quaternion dir(curve.calcDir(t), Vector(0,0,1)); 
 
-        plc->r = curve.calcPos(t) + (curve.calcDir(t) * ((loc->dist) / t)) + /*dir.apply*/(loc->pos);
-        plc->w = dir * loc->rot;
+        plc->pos = curve.calcPos(t) + (curve.calcDir(t) * ((loc->dist) / t)) + /*dir.apply*/(loc->pos);
+        plc->rot = dir * loc->rot;
         
         return false;