Changeset 2112 in orxonox.OLD for orxonox/branches/chris/src/track.cc

Timestamp:

Jul 12, 2004, 10:28:25 PM (21 years ago)

Author:

chris

Message:

orxonox/branches/chris: Implemented quaternion class… but something is still f up… the camera keeps pointing into the wrong direction… matrix rotation calculation seems not to be my strenght…

File:

• orxonox/branches/chris/src/track.cc (modified) (2 diffs)

orxonox/branches/chris/src/track.cc

@@ -42 +42 @@
 void Track::map_camera (Location* lookat, Placement* camplc)
 {
+printf("Track|Mapping camera: %d (%f)\n", lookat->part, lookat->dist);
         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));
+        
         camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-        camplc->w = Rotation( (trace.r + (trace.a * ((lookat->dist) / l))) - camplc->r);
+        camplc->w = Quaternion((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r), Vector(0,0,1));
+        
 }
 
 bool Track::map_coords (Location* loc, Placement* plc)
 {
+printf("Track|Mapping coords: %d (%f)\n", loc->part, loc->dist);
         Line trace(*offset, *end - *offset);
         float l = trace.len ();
@@ -61 +67 @@
         }
         
-        Rotation dir(trace.a);
+        Quaternion dir(trace.a, Vector(0,0,1));
         
-        plc->r = trace.r + (trace.a * ((loc->dist) / l)) + rotate_vector( loc->pos, dir);
+        plc->r = trace.r + (trace.a * ((loc->dist) / l)) + dir.apply(loc->pos);
         plc->w = dir * loc->rot;