Changeset 3013 in orxonox.OLD for orxonox/branches/bezierTrack/src/collision.cc

Timestamp:

Nov 27, 2004, 12:45:12 PM (20 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/collision.cc (modified) (2 diffs)

orxonox/branches/bezierTrack/src/collision.cc

@@ -180 +180 @@
   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 +333 @@
   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;