Procházet zdrojové kódy

added CollisionHandlerFluidPusher

Darren Ranalli před 18 roky
rodič
revize
56a1e82988

+ 5 - 2
panda/src/collide/Sources.pp

@@ -12,12 +12,13 @@
   #define SOURCES \
   #define SOURCES \
     collisionEntry.I collisionEntry.h \
     collisionEntry.I collisionEntry.h \
     collisionGeom.I collisionGeom.h \
     collisionGeom.I collisionGeom.h \
-    collisionHandler.h  \
+    collisionHandler.I collisionHandler.h  \
     collisionHandlerEvent.I collisionHandlerEvent.h  \
     collisionHandlerEvent.I collisionHandlerEvent.h  \
     collisionHandlerFloor.I collisionHandlerFloor.h  \
     collisionHandlerFloor.I collisionHandlerFloor.h  \
     collisionHandlerGravity.I collisionHandlerGravity.h  \
     collisionHandlerGravity.I collisionHandlerGravity.h  \
     collisionHandlerPhysical.I collisionHandlerPhysical.h  \
     collisionHandlerPhysical.I collisionHandlerPhysical.h  \
     collisionHandlerPusher.I collisionHandlerPusher.h  \
     collisionHandlerPusher.I collisionHandlerPusher.h  \
+    collisionHandlerFluidPusher.I collisionHandlerFluidPusher.h  \
     collisionHandlerQueue.h \
     collisionHandlerQueue.h \
     collisionDSSolid.I collisionDSSolid.h \
     collisionDSSolid.I collisionDSSolid.h \
     collisionInvSphere.I collisionInvSphere.h \
     collisionInvSphere.I collisionInvSphere.h \
@@ -47,6 +48,7 @@
     collisionHandlerGravity.cxx \
     collisionHandlerGravity.cxx \
     collisionHandlerPhysical.cxx  \
     collisionHandlerPhysical.cxx  \
     collisionHandlerPusher.cxx \
     collisionHandlerPusher.cxx \
+    collisionHandlerFluidPusher.cxx \
     collisionHandlerQueue.cxx  \
     collisionHandlerQueue.cxx  \
     collisionLevelStateBase.cxx \
     collisionLevelStateBase.cxx \
     collisionLevelState.cxx \
     collisionLevelState.cxx \
@@ -70,12 +72,13 @@
   #define INSTALL_HEADERS \
   #define INSTALL_HEADERS \
     collisionEntry.I collisionEntry.h \
     collisionEntry.I collisionEntry.h \
     collisionGeom.I collisionGeom.h \
     collisionGeom.I collisionGeom.h \
-    collisionHandler.h \
+    collisionHandler.I collisionHandler.h \
     collisionHandlerEvent.I collisionHandlerEvent.h \
     collisionHandlerEvent.I collisionHandlerEvent.h \
     collisionHandlerFloor.I collisionHandlerFloor.h \
     collisionHandlerFloor.I collisionHandlerFloor.h \
     collisionHandlerGravity.I collisionHandlerGravity.h \
     collisionHandlerGravity.I collisionHandlerGravity.h \
     collisionHandlerPhysical.I collisionHandlerPhysical.h \
     collisionHandlerPhysical.I collisionHandlerPhysical.h \
     collisionHandlerPusher.I collisionHandlerPusher.h \
     collisionHandlerPusher.I collisionHandlerPusher.h \
+    collisionHandlerFluidPusher.I collisionHandlerFluidPusher.h \
     collisionHandlerQueue.h \
     collisionHandlerQueue.h \
     collisionDSSolid.I collisionDSSolid.h \
     collisionDSSolid.I collisionDSSolid.h \
     collisionInvSphere.I collisionInvSphere.h \
     collisionInvSphere.I collisionInvSphere.h \

+ 2 - 0
panda/src/collide/config_collide.cxx

@@ -24,6 +24,7 @@
 #include "collisionHandlerGravity.h"
 #include "collisionHandlerGravity.h"
 #include "collisionHandlerPhysical.h"
 #include "collisionHandlerPhysical.h"
 #include "collisionHandlerPusher.h"
 #include "collisionHandlerPusher.h"
+#include "collisionHandlerFluidPusher.h"
 #include "collisionHandlerQueue.h"
 #include "collisionHandlerQueue.h"
 #include "collisionDSSolid.h"
 #include "collisionDSSolid.h"
 #include "collisionInvSphere.h"
 #include "collisionInvSphere.h"
@@ -109,6 +110,7 @@ init_libcollide() {
   CollisionHandlerGravity::init_type();
   CollisionHandlerGravity::init_type();
   CollisionHandlerPhysical::init_type();
   CollisionHandlerPhysical::init_type();
   CollisionHandlerPusher::init_type();
   CollisionHandlerPusher::init_type();
+  CollisionHandlerFluidPusher::init_type();
   CollisionHandlerQueue::init_type();
   CollisionHandlerQueue::init_type();
   CollisionDSSolid::init_type();
   CollisionDSSolid::init_type();
   CollisionInvSphere::init_type();
   CollisionInvSphere::init_type();