Changeset 3318 for plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsMaterial.cpp

Timestamp:

01/26/10 14:36:33 (6 months ago)

Author:

Azaezel

Message:

a bit more stubout work + exposing more errors to address. might refactor out ZenMotionState? if possible. definably will be removing ZBulletMaterial later

Files:

• plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsMaterial.cpp (modified) (1 diff)

plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsMaterial.cpp

@@ -270 +270 @@
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 static int GenericContactBegin(const ZBulletMaterial* material, const btRigidBody* body0, const btRigidBody* body1);
-static int  GenericContactProcess(const ZBulletMaterial* material, const NewtonContact* contact);
+static int  GenericContactProcess(const ZBulletMaterial* material, const btManifoldPoint* contact);
 static void GenericContactEnd(const ZBulletMaterial* material);