Changeset 3013 in orxonox.OLD for orxonox/branches/bezierTrack/src/camera.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/camera.cc (modified) (6 diffs)

orxonox/branches/bezierTrack/src/camera.cc

@@ -42 +42 @@
   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 +144 @@
 
             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 +159 @@
             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 +172 @@
             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 +187 @@
       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 +235 @@
   // 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();