Index: /orxonox/branches/bezierTrack/src/camera.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/camera.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/camera.cc	(revision 3013)
@@ -42,7 +42,7 @@
   t = 0.0;
 
-  actual_place.r.x = 0.0;
-  actual_place.r.y = 10.0;
-  actual_place.r.z = -5.0;
+  actual_place.pos.x = 0.0;
+  actual_place.pos.y = 10.0;
+  actual_place.pos.z = -5.0;
 }
 
@@ -144,7 +144,7 @@
 
 	    Vector ursp(0.0, 0.0, 0.0);
-	    desired_place.r = /*plFocus.r -*/ ursp - res->apply(r); 
-
-	    printf("desired place is: %f, %f, %f\n", desired_place.r.x, desired_place.r.y, desired_place.r.z);
+	    desired_place.pos = /*plFocus.r -*/ ursp - res->apply(r); 
+
+	    printf("desired place is: %f, %f, %f\n", desired_place.pos.x, desired_place.pos.y, desired_place.pos.z);
 	    //plLastBPlace = *bound->get_placement();
 	  } 
@@ -159,6 +159,6 @@
 	    bound->get_lookat(&lcBound);
 	    Vector vDirection(0.0, 0.0, 1.0);
-	    vDirection = plBound->w.apply(vDirection);
-	    desired_place.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
+	    vDirection = plBound->rot.apply(vDirection);
+	    desired_place.pos = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
 	  }
 	break;
@@ -172,6 +172,6 @@
 	    Vector vDirection(0.0, 0.0, 1.0);
 	    Vector eclipticOffset(0.0, 0.0, 5.0);
-	    vDirection = plBound->w.apply(vDirection);
-	    desired_place.r = plBound->r - vDirection*10 + eclipticOffset;
+	    vDirection = plBound->rot.apply(vDirection);
+	    desired_place.pos = plBound->pos - vDirection*10 + eclipticOffset;
 	  }
 	break;
@@ -187,6 +187,6 @@
       else
 	{
-	  desired_place.r = Vector (0,0,0);
-	  desired_place.w = Quaternion (); 
+	  desired_place.pos = Vector (0,0,0);
+	  desired_place.rot = Quaternion (); 
 	}
       break;
@@ -235,9 +235,9 @@
   // rotation
   float matrix[4][4];
-  actual_place.w.conjugate().matrix (matrix);
+  actual_place.rot.conjugate().matrix (matrix);
   /* orientation and */
   glMultMatrixf ((float*)matrix);
   /*  translation */
-  glTranslatef (-actual_place.r.x, -actual_place.r.y,- actual_place.r.z);
+  glTranslatef (-actual_place.pos.x, -actual_place.pos.y,- actual_place.pos.z);
   //Placement *plBound = bound->get_placement();
 
Index: /orxonox/branches/bezierTrack/src/collision.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/collision.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/collision.cc	(revision 3013)
@@ -180,6 +180,6 @@
   bool r = false;
   int ia, ib;
-  Vector mra = pa->r + pa->w.apply(ta->m);
-  Vector mrb = pb->r + pb->w.apply(tb->m);
+  Vector mra = pa->pos + pa->rot.apply(ta->m);
+  Vector mrb = pb->pos + pb->rot.apply(tb->m);
   CC_Tree* use_a, *use_b;
   
@@ -333,5 +333,5 @@
   bool r = false;
   int i;
-  Vector mr = p->r + p->w.apply (t->m);
+  Vector mr = p->pos + p->rot.apply (t->m);
   CC_Tree* use_t;
   Vector* ips;
Index: /orxonox/branches/bezierTrack/src/coordinates.h
===================================================================
--- /orxonox/branches/bezierTrack/src/coordinates.h	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/coordinates.h	(revision 3013)
@@ -30,6 +30,6 @@
 typedef struct
 {
-  Vector r;              //!< Absolute x/y/z coordinates
-  Quaternion w;          //!< Absolute orientation
+  Vector pos;              //!< Absolute x/y/z coordinates
+  Quaternion rot;          //!< Absolute orientation
 } Placement;
 
Index: /orxonox/branches/bezierTrack/src/environment.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/environment.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/environment.cc	(revision 3013)
@@ -73,6 +73,6 @@
   float matrix[4][4];
   
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
-  get_placement()->w.matrix (matrix);
+  glTranslatef(get_placement()->pos.x,get_placement()->pos.y,get_placement()->pos.z);
+  get_placement()->rot.matrix (matrix);
   glMultMatrixf ((float*)matrix);
 
Index: /orxonox/branches/bezierTrack/src/orxonox.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/orxonox.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/orxonox.cc	(revision 3013)
@@ -100,5 +100,5 @@
   // initialize SDL
   printf("> Initializing SDL\n");
-  if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
+  if( SDL_Init (SDL_INIT_VIDEO) == -1)
     {
       printf ("Could not SDL_Init(): %s\n", SDL_GetError());
Index: /orxonox/branches/bezierTrack/src/player.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/player.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/player.cc	(revision 3013)
@@ -103,10 +103,10 @@
   float matrix[4][4];
   
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
-  get_placement()->w.matrix (matrix);
+  glTranslatef(get_placement()->pos.x,get_placement()->pos.y,get_placement()->pos.z);
+  get_placement()->rot.matrix (matrix);
   glMultMatrixf ((float*)matrix);
   
   glMatrixMode (GL_MODELVIEW);
-  glRotatef (-90, 0,1,0);
+  glRotatef (-90, 0, 1, 0);
   obj->draw();
   //  glCallList (objectList);
@@ -134,5 +134,5 @@
   /* calculate the direction in which the craft is heading  */
   Vector direction(0.0, 0.0, 1.0);
-  direction = pos->w.apply(direction);
+  direction = pos->rot.apply(direction);
   Vector orthDirection(0.0, 0.0, 1.0);
   orthDirection = orthDirection.cross(direction);
Index: /orxonox/branches/bezierTrack/src/track.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/track.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/track.cc	(revision 3013)
@@ -48,5 +48,5 @@
 }
 
-void Track::addPoint (Vector& point)
+void Track::addPoint (Vector point)
 {
   curve.addNode(point);
@@ -56,5 +56,5 @@
 
 
-void Track::addHotPoint (Vector& hotPoint)
+void Track::addHotPoint (Vector hotPoint)
 {
 
@@ -74,5 +74,5 @@
 void Track::map_camera (Location* lookat, Placement* camplc)
 {
-  t+=.001;
+  t+=.0001;
   if (t> 1) t =0;
   //  Line trace(*offset, *end - *offset);
@@ -81,14 +81,13 @@
   //  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,6 +127,6 @@
 	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;
Index: /orxonox/branches/bezierTrack/src/track.h
===================================================================
--- /orxonox/branches/bezierTrack/src/track.h	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/track.h	(revision 3013)
@@ -35,6 +35,6 @@
   virtual void init();
 
-  void addPoint (Vector& point);
-  void addHotPoint (Vector& hotPoint);
+  void addPoint (Vector point);
+  void addHotPoint (Vector hotPoint);
   
   virtual void post_enter (WorldEntity* entity);	// handle coordinate transition in here !!! (when dist < 0 or dist > lasttracklenght)
Index: /orxonox/branches/bezierTrack/src/world.cc
===================================================================
--- /orxonox/branches/bezierTrack/src/world.cc	(revision 3012)
+++ /orxonox/branches/bezierTrack/src/world.cc	(revision 3013)
@@ -100,19 +100,15 @@
 	    // create some path nodes
 	    this->pathnodes = new Vector[6];
-	    this->pathnodes[0] = Vector(0, 0, 0);
-	    this->pathnodes[1] = Vector(10, 5, 0);
-	    this->pathnodes[2] = Vector(20, 0, 0);
-	    this->pathnodes[3] = Vector(10, 3, 0);
-	    this->pathnodes[4] = Vector(50, 0, 0);
-	    this->pathnodes[5] = Vector(100, 0, 0);
-	    
-	    // create the tracks
-	    this->tracklen = 5;
+	    
+	    this->tracklen = 6;
 	    this->track = new Track();
-	    for( int i = 0; i < this->tracklen; i++)
-	      {
-		//		this->track[i] = Track( i, (i+1)%this->tracklen, &this->pathnodes[i], &this->pathnodes[(i+1)%this->tracklen]);
-		track->addPoint(this->pathnodes[i]);
-	      }
+
+	    track->addPoint (Vector(0, 0, 0));
+	    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));
+	    
 	    
 	    // create a player
@@ -130,6 +126,6 @@
 
 	    Placement* plc = new Placement;
-	    plc->r = Vector(100, 10, 10);
-	    plc->w = Quaternion();
+	    plc->pos = Vector(100, 10, 10);
+	    plc->rot = Quaternion();
 	    WorldEntity* env = new Environment();
 	    this->spawn(env, plc);
@@ -647,6 +643,6 @@
   if( plc == NULL)
     {
-      zeroPlc.r = Vector();
-      zeroPlc.w = Quaternion();
+      zeroPlc.pos = Vector();
+      zeroPlc.rot = Quaternion();
       plc = &zeroPlc;
     }
