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

Timestamp:

Nov 27, 2004, 1:05:47 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: moveing possible (strange Camera-behaviour)

File:

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

orxonox/branches/bezierTrack/src/track.cc

@@ -17 +17 @@
 
 #include "track.h"
+  float t = .0;
 
 using namespace std;
@@ -25 +26 @@
 Track::Track ()
 {
-        ID = 0;
-        offset = NULL;
-        end = NULL;
-        nextID = 0;
-}
+  this->next = NULL;
+  this->previous = NULL;
 
-/**
-        \brief creates a functional base Track part
-        \param number: the ID if this Track part
-        \param next: the ID of the next Track part
-        \param start: pointer to an anchor point (Vector) representing the offset of this part
-        \param finish: pointer to an anchor point (Vector) representing the end of this part
-*/
-Track::Track (Uint32 number, Uint32 next, Vector* start, Vector* finish)
-{
-        ID = number;
-        offset = start;
-        end = finish;
-        nextID = next;
+  curve = BezierCurve();
 }
 
@@ -51 +37 @@
 Track::~Track ()
 {
+  if (next != NULL)
+    delete next;
+  if (previous != NULL)
+    delete previous;
 }
 
@@ -56 +46 @@
 {
   
+}
+
+void Track::addPoint (Vector& point)
+{
+  curve.addNode(point);
+
+  return;
+}
+
+
+void Track::addHotPoint (Vector& hotPoint)
+{
+
+  return;
 }
 
@@ -70 +74 @@
 void Track::map_camera (Location* lookat, Placement* camplc)
 {
-  Line trace(*offset, *end - *offset);
-  float l = trace.len ();
+  t+=.001;
+  if (t> 1) t =0;
+  //  Line trace(*offset, *end - *offset);
+  //  float l = trace.len ();
   
-  //    camplc->r = *offset + Vector(0,0,0.5);
-  //    camplc->w = Quaternion (trace.a, Vector(0,0,1));
-  float r = (lookat->dist)*PI / l;
-  camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-  
+  //  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);
+                                 
   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) - ((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));
+
   //Vector up(0.0,sin(r),cos(r)); // corrupt...
   Vector up(0.0, 0.0, 1.0);
@@ -105 +112 @@
 bool Track::map_coords (Location* loc, Placement* plc)
 {
-        Line trace(*offset, *end - *offset);
-        float l = trace.len ();
+  //Line trace(*offset, *end - *offset);
+  //    float l = trace.len ();
         
         /* change to the next track? */
-        if( loc->dist > l)
-        {
-                loc->dist -= l;
-                loc->part = nextID;
+        //      if( loc->dist > l)
+        //{
+        //      loc->dist -= l;
+        //      loc->part = nextID;
                 //FIXME: loc->track = this;
-                return true;
-        }
+                //return true;
+                //}
         
         /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of
          * the track */
-        Quaternion dir(trace.a, Vector(0,0,1)); 
+        Quaternion dir(curve.calcDir(t), Vector(0,0,1)); 
 
-        plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos);
+        plc->r = curve.calcPos(t) + (curve.calcDir(t) * ((loc->dist) / t)) + /*dir.apply*/(loc->pos);
         plc->w = dir * loc->rot;