Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/collision.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/sound/src/collision.h (modified) (4 diffs)

orxonox/branches/sound/src/collision.h

@@ -4 +4 @@
 */ 
 
-#ifndef COLLISION_H
-#define COLLISION_H
+#ifndef _COLLISION_H
+#define _COLLISION_H
 
 #include "vector.h"
@@ -14 +14 @@
 
 //! Tree structure used by the CollisionCluster
-typedef struct CC_Tree
+typedef struct CCTree
 {
   unsigned long n;
   union
   {
-  struct CC_Tree** b;
+  struct CCTree** b;
   unsigned long ID;
   } data;
   float r;
   Vector m;
-} CC_Tree;
+} CCTree;
 
 //! Basic collision detection class
@@ -42 +42 @@
 class CollisionCluster {
   
-  CC_Tree* root;
+  CCTree* root;
   
   
@@ -52 +52 @@
   int store (char* filename);
   
-  friend bool cctree_trace( const Placement* p, CC_Tree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint);
-  friend bool cctree_iterate(const Placement* pa, CC_Tree* ta, unsigned long* ahitflags, const Placement* pb, CC_Tree* tb, unsigned long* bhitflags);
-  friend bool check_trace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint);
-  friend bool check_collision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags);
+  friend bool ccTreeTrace( const Placement* p, CCTree* t, unsigned long* hitflags, const Line* trace, Vector* impactpoint);
+  friend bool ccTreeIterate(const Placement* pa, CCTree* ta, unsigned long* ahitflags, const Placement* pb, CCTree* tb, unsigned long* bhitflags);
+  friend bool checkTrace (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Line* trace, Vector* impactpoint);
+  friend bool checkCollision (const Placement* pa, const CollisionCluster* a, unsigned long* ahitflags, const Placement* pb, const CollisionCluster* b, unsigned long* bhitflags);
 };
 
-bool sphere_sphere_collision( Vector m1, float r1, Vector m2, float r2);
-bool trace_sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint);
+bool sphereSphereCollision( Vector m1, float r1, Vector m2, float r2);
+bool traceSphereCollision( Vector m, float r, const Line* l, Vector* impactpoint);
 
 void setflag( unsigned long* flags, unsigned long ID);
 
-void free_CC_Tree( CC_Tree* tree);
-CC_Tree* load_CC_Tree (FILE* stream);
-int save_CC_Tree (CC_Tree* tree, FILE* stream);
+void freeCCTree( CCTree* tree);
+CCTree* loadCCTree (FILE* stream);
+int saveCCTree (CCTree* tree, FILE* stream);
 
-#endif
+#endif /* _COLLISION_H */