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/PhysXPlugin/PhysXPlugin.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 'OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 7652372..1396458 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -204,7 +204,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
204 | _acceleration = new PhysicsVector(); | 204 | _acceleration = new PhysicsVector(); |
205 | _character = character; | 205 | _character = character; |
206 | } | 206 | } |
207 | 207 | public override int PhysicsActorType | |
208 | { | ||
209 | get { return (int)ActorTypes.Agent; } | ||
210 | set { return; } | ||
211 | } | ||
208 | public override bool IsPhysical | 212 | public override bool IsPhysical |
209 | { | 213 | { |
210 | get { return false; } | 214 | get { return false; } |
@@ -225,6 +229,16 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
225 | get { return iscolliding; } | 229 | get { return iscolliding; } |
226 | set { iscolliding = value; } | 230 | set { iscolliding = value; } |
227 | } | 231 | } |
232 | public override bool CollidingGround | ||
233 | { | ||
234 | get { return false; } | ||
235 | set { return; } | ||
236 | } | ||
237 | public override bool CollidingObj | ||
238 | { | ||
239 | get { return false; } | ||
240 | set { return; } | ||
241 | } | ||
228 | public override PhysicsVector RotationalVelocity | 242 | public override PhysicsVector RotationalVelocity |
229 | { | 243 | { |
230 | get { return m_rotationalVelocity; } | 244 | get { return m_rotationalVelocity; } |
@@ -339,7 +353,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
339 | _acceleration = new PhysicsVector(); | 353 | _acceleration = new PhysicsVector(); |
340 | _prim = prim; | 354 | _prim = prim; |
341 | } | 355 | } |
342 | 356 | public override int PhysicsActorType | |
357 | { | ||
358 | get { return (int)ActorTypes.Prim; } | ||
359 | set { return; } | ||
360 | } | ||
343 | public override bool IsPhysical | 361 | public override bool IsPhysical |
344 | { | 362 | { |
345 | get { return false; } | 363 | get { return false; } |
@@ -365,10 +383,20 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
365 | { | 383 | { |
366 | get | 384 | get |
367 | { | 385 | { |
368 | return false; //no flying prims for you | 386 | return false; |
369 | } | 387 | } |
370 | set { } | 388 | set { } |
371 | } | 389 | } |
390 | public override bool CollidingGround | ||
391 | { | ||
392 | get { return false; } | ||
393 | set { return; } | ||
394 | } | ||
395 | public override bool CollidingObj | ||
396 | { | ||
397 | get { return false; } | ||
398 | set { return; } | ||
399 | } | ||
372 | public override PhysicsVector Position | 400 | public override PhysicsVector Position |
373 | { | 401 | { |
374 | get | 402 | get |