diff options
author | Teravus Ovares | 2007-11-12 21:45:49 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-12 21:45:49 +0000 |
commit | 5952441fcc886902f7b2f72eb839ae49d2c85012 (patch) | |
tree | ff7ea06cbdaa36e14b1d14da79d5535cb0dcba14 /OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |
parent | fix compile issue on mono (diff) | |
download | opensim-SC_OLD-5952441fcc886902f7b2f72eb839ae49d2c85012.zip opensim-SC_OLD-5952441fcc886902f7b2f72eb839ae49d2c85012.tar.gz opensim-SC_OLD-5952441fcc886902f7b2f72eb839ae49d2c85012.tar.bz2 opensim-SC_OLD-5952441fcc886902f7b2f72eb839ae49d2c85012.tar.xz |
* Added a lot of Glue to help with reporting proper collisions.
* ODE - Fixed the iscolliding property to report a static true when colliding.
* Added reporting of collisions to call UpdateMovementAnimations
* Added Jump - air animation (with arms outstretched).
* Added Fall Animations
* ODE - Added a small amount of X, Y motion control while jumping or Falling
* ODE - Avatar movement animations are still a bit odd sometimes, and had to get this up there.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index 1d1c14f..3283ec0 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
@@ -196,6 +196,11 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
196 | _position = new PhysicsVector(); | 196 | _position = new PhysicsVector(); |
197 | _acceleration = new PhysicsVector(); | 197 | _acceleration = new PhysicsVector(); |
198 | } | 198 | } |
199 | public override int PhysicsActorType | ||
200 | { | ||
201 | get { return (int)ActorTypes.Agent; } | ||
202 | set { return; } | ||
203 | } | ||
199 | public override PhysicsVector RotationalVelocity | 204 | public override PhysicsVector RotationalVelocity |
200 | { | 205 | { |
201 | get { return m_rotationalVelocity; } | 206 | get { return m_rotationalVelocity; } |
@@ -222,7 +227,16 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
222 | get { return iscolliding; } | 227 | get { return iscolliding; } |
223 | set { iscolliding = value; } | 228 | set { iscolliding = value; } |
224 | } | 229 | } |
225 | 230 | public override bool CollidingGround | |
231 | { | ||
232 | get { return false; } | ||
233 | set { return; } | ||
234 | } | ||
235 | public override bool CollidingObj | ||
236 | { | ||
237 | get { return false; } | ||
238 | set { return; } | ||
239 | } | ||
226 | public override PhysicsVector Position | 240 | public override PhysicsVector Position |
227 | { | 241 | { |
228 | get { return _position; } | 242 | get { return _position; } |