Changeset 3364
- Timestamp:
- 02/03/10 16:54:30 (6 weeks ago)
- Location:
- plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src
- Files:
-
- 3 modified
-
PhysicsActor.hpp (modified) (1 diff)
-
PhysicsMaterial.cpp (modified) (1 diff)
-
PhysicsMaterial.hpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsActor.hpp
r3352 r3364 92 92 virtual const Math::Real getLinearDamping() const; 93 93 virtual void setLinearDamping(float _damping); 94 virtual void setAutoFreeze(bool _bFreeze);95 94 virtual void setSleepingThresholds(float _minLinearMotion, float _minAngularMotion); 96 95 virtual void setActivationState(unsigned _state); -
plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsMaterial.cpp
r3359 r3364 54 54 m_staticFriction = 1.0f; 55 55 setDynamicFriction(0.7f); 56 setCallbacks();57 56 } 58 57 -
plugins/branches/0185_GEN_PHYSICS_REFACTOR_2/ZBullet/src/PhysicsMaterial.hpp
r3292 r3364 84 84 85 85 void setMatMatrixCallback(pPhysicsMaterial_type _material, int _fptrCallback); 86 void setCallbacks();87 88 86 void generalCollisionAction(); 89 87
