Changeset 2112 in orxonox.OLD for orxonox/branches/chris/src/collision.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/collision.cc (modified) (2 diffs)

orxonox/branches/chris/src/collision.cc

@@ -180 +180 @@
   bool r = false;
   int ia, ib;
-  Vector mra = pa->r + rotate_vector( ta->m, pa->w);
-  Vector mrb = pb->r + rotate_vector( tb->m, pb->w);
+  Vector mra = pa->r + pa->w.apply(ta->m);
+  Vector mrb = pb->r + pb->w.apply(tb->m);
   CC_Tree* use_a, *use_b;
   
@@ -333 +333 @@
   bool r = false;
   int i;
-  Vector mr = p->r + rotate_vector( t->m, p->w);
+  Vector mr = p->r + p->w.apply (t->m);
   CC_Tree* use_t;
   Vector* ips;