Changeset 3237 in orxonox.OLD for orxonox/trunk/src/collision.cc

Timestamp:

Dec 20, 2004, 1:53:52 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: working again.

File:

• orxonox/trunk/src/collision.cc (modified) (6 diffs)

orxonox/trunk/src/collision.cc

@@ -104 +104 @@
         if( (t = a->root) == NULL) return false;
         
-  return cctreeTrace( pa, t, ahitflags, trace, impactpoint);
+  return ccTreeTrace( pa, t, ahitflags, trace, impactpoint);
 }
 
@@ -124 +124 @@
   if( (tb = b->root) == NULL) return false;
   
-  return cctreeIterate(pa, ta, ahitflags, pb, tb, bhitflags);
+  return ccTreeIterate(pa, ta, ahitflags, pb, tb, bhitflags);
 }
 
@@ -176 +176 @@
 }
 
-bool cctreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags)
+bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags)
 {
   bool r = false;
@@ -203 +203 @@
         else useB = ta->data.b[ib];
         
-        r = r || cctreeIterate( pa, useA, ahitflags, pb, useB, bhitflags);
+        r = r || ccTreeIterate( pa, useA, ahitflags, pb, useB, bhitflags);
         
         if( tb->n == 0) break;
@@ -329 +329 @@
 }
 
-bool cctreetrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)
+bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint)
 {
   bool r = false;
@@ -352 +352 @@
                 for (i = 0; i < t->n; i++)
                 {
-                        r = r || cctreeTrace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i]));
+                        r = r || ccTreeTrace (p, t->data.b[i], &(hfs[i]), trace, &(ips[i]));
                 }
                 if( r)