Changeset 8338 in orxonox.OLD for branches/bsp_model

Timestamp:

Jun 13, 2006, 11:05:47 AM (18 years ago)

Author:

patrick

Message:

bsp: debugging: adding collision probe for better testing

Location:

branches/bsp_model/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• world_entities/WorldEntities.am (modified) (4 diffs)
• world_entities/space_ships/collision_probe.cc (added)
• world_entities/space_ships/collision_probe.h (added)

branches/bsp_model/src/defs/class_id.h

@@ -193 +193 @@
   CL_TURBINE_HOVER              =    0x0000035f,
   CL_SPECTATOR                  =    0x00000360,
+  CL_COLLISION_PROBE            =    0x00000361,
 
   // Powerups

branches/bsp_model/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -64 +64 @@
 
   collision->getEntityB()->setVelocity(Vector());
-  collision->getEntityB()->setAbsCoor(this->lastPositions[6]);
+  collision->getEntityB()->setAbsCoor(this->lastPositions[5]);
 }
 

branches/bsp_model/src/world_entities/WorldEntities.am

@@ -15 +15 @@
                 world_entities/test_entity.cc \
                 world_entities/planet.cc \
-                world_entities/bsp_entity.cc \
+                world_entities/bsp_entity.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -39 +39 @@
                 world_entities/space_ships/hover.cc \
                 world_entities/space_ships/turbine_hover.cc \
+                world_entities/space_ships/collision_probe.cc \
                 world_entities/creatures/md2_creature.cc \
                 world_entities/spectator.cc \
@@ -68 +69 @@
                 test_entity.h \
                 planet.h \
-                bsp_entity.h \
+                bsp_entity.h \
                 \
                 weapons/test_gun.h \
@@ -92 +93 @@
                 space_ships/hover.h \
                 space_ships/turbine_hover.h \
+                space_ships/collision_probe.cc \
                 creatures/md2_creature.h \
                 spectator.h \