Changeset 1899 in orxonox.OLD for orxonox/trunk/core/world.h

Timestamp:

May 20, 2004, 1:03:53 PM (21 years ago)

Author:

patrick

Message:

trunk/orxonox: collision detection implemented: simple spheres. all debug informations still print out to console. one enemy added, no AI, no move, waits to be killed. No kill signal implemented yet: look debug infos on console.

File:

• orxonox/trunk/core/world.h (modified) (3 diffs)

orxonox/trunk/core/world.h

@@ -6 +6 @@
 
 #include <stdlib.h>
+#include <cmath>
 
 #include "npc.h"
@@ -48 +49 @@
   envList* lastEnv;
 
-  /* a list of all shoot-amental objects */
-  struct shootList {
-    shootList* next;
-    ShootLaser* shoot;
-    int number;
-  };
-  shootList* lastShoot;
+
 
 
@@ -63 +58 @@
   bool removeNPC(NPC* npc);
   bool addEnv(Environment* env);
-  bool addShoot(ShootLaser* shoot);
 
   void drawWorld(void);
   void initEnvironement(void);
   void updateWorld(void);
+  void detectCollision(void);
   void testThaTest(void);