Changeset 1975 in orxonox.OLD for orxonox/branches/chris/core/collision.h

Timestamp:

Jun 18, 2004, 7:56:18 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: Implemented traceing (line-sphere collision)

File:

• orxonox/branches/chris/core/collision.h (modified) (2 diffs)

orxonox/branches/chris/core/collision.h

@@ -3 +3 @@
 #define COLLISION_H
 
-#include "stdincl.h"
+#include "vector.h"
+#include "coordinates.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <strings.h>
 
 typedef struct CC_Tree
@@ -29 +33 @@
   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_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);
 };
 
 bool sphere_sphere_collision( Vector m1, float r1, Vector m2, float r2);
-bool trace_sphere_collision( Vector m, float r, Line& l, Vector* impactpoint);
+bool trace_sphere_collision( Vector m, float r, const Line* l, Vector* impactpoint);
 
 void setflag( unsigned long* flags, unsigned long ID);