Changeset 8006 in orxonox.OLD

Timestamp:

May 31, 2006, 12:54:53 AM (18 years ago)

Author:

patrick

Message:

cr: working on the collision reactions itself

Location:

branches/cr/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/collision_reaction/Makefile.am (modified) (2 diffs)
• lib/collision_reaction/collision.h (modified) (1 diff)
• lib/collision_reaction/collision_reaction.cc (added)
• lib/collision_reaction/collision_reaction.h (added)
• lib/collision_reaction/cr_object_damage.cc (added)
• lib/collision_reaction/cr_object_damage.h (added)

branches/cr/src/defs/class_id.h

@@ +1 @@
+
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -250 +251 @@
   CL_COLLISION                  =    0x00000711,
   CL_COLLISION_HANDLE           =    0x00000712,
+  CL_COLLISION_REACTION         =    0X00000713,
+  CL_CR_PHYSICS_MOMENTUM        =    0X00000714,
+  CL_CR_PHYSICS_GROUND          =    0X00000715,
+  CL_CR_PHYSICS_GROUND_WALK     =    0X00000716,
+  CL_CR_OBJECT_DAMAGE          =    0X00000717,
+  CL_CR_OBJECT_PICKUP           =    0X00000718,
+  CL_CR_VERTEX_TRAFO            =    0X00000719,
+  CL_CR_SPECIAL_CALLBACK        =    0X00000720,
+
+
   CL_BV_TREE                    =    0x00701000,
   CL_BV_TREE_NODE               =    0x00702000,
-  CL_OBB_TREE                   =    0x00000714,
-  CL_OBB_TREE_NODE              =    0x00000715,
+  CL_OBB_TREE                   =    0x00000721,
+  CL_OBB_TREE_NODE              =    0x00000722,
   CL_BOUNDING_VOLUME            =    0x00710000,
   CL_OBB                        =    0x00720000,

branches/cr/src/lib/collision_reaction/Makefile.am

@@ -7 +7 @@
                      collision.cc \
                      collision_event.cc \
-                     collision_handle.cc
+                     collision_handle.cc \
+                     collision_reaction.cc \
+                     cr_object_damage.cc
 
 
@@ -15 +17 @@
                      collision_event.h \
                      collision_handle.h \
-                     cr_defs.h
+                     cr_defs.h \
+                     collision_reaction.h \
+                     cr_object_damage.h
 

branches/cr/src/lib/collision_reaction/collision.h

@@ -33 +33 @@
     /** registers a @param event CollisionEvent to take place */
     inline void registerCollisionEvent(CollisionEvent* event) { this->collisionEvents.push_back(event); }
+    /** @returns a vector of collision events */
+    inline const std::vector<CollisionEvent*>& getCollisionEvents() const { return this->collisionEvents; }
 
     void handleCollisionEvents();