diff options
author | Teravus Ovares | 2007-11-08 00:10:40 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-08 00:10:40 +0000 |
commit | 9e9dad1cde362de093d0d7e6c3e247ff00ceac96 (patch) | |
tree | 72b364a18532ee152cfbd72df0158b8a2e001464 /OpenSim/Region/Physics/PhysXPlugin | |
parent | set svn:eol-style (diff) | |
download | opensim-SC_OLD-9e9dad1cde362de093d0d7e6c3e247ff00ceac96.zip opensim-SC_OLD-9e9dad1cde362de093d0d7e6c3e247ff00ceac96.tar.gz opensim-SC_OLD-9e9dad1cde362de093d0d7e6c3e247ff00ceac96.tar.bz2 opensim-SC_OLD-9e9dad1cde362de093d0d7e6c3e247ff00ceac96.tar.xz |
* Added Rotational Velocity reporting for Client Interpolation to Terse Updates
* Added Angular Velocity reporting for smooth-ish rotations on object collisions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 5483703..d282e9d 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -184,6 +184,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
184 | { | 184 | { |
185 | private PhysicsVector _position; | 185 | private PhysicsVector _position; |
186 | private PhysicsVector _velocity; | 186 | private PhysicsVector _velocity; |
187 | private PhysicsVector m_rotationalVelocity = PhysicsVector.Zero; | ||
187 | private PhysicsVector _acceleration; | 188 | private PhysicsVector _acceleration; |
188 | private NxCharacter _character; | 189 | private NxCharacter _character; |
189 | private bool flying; | 190 | private bool flying; |
@@ -214,7 +215,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
214 | get { return iscolliding; } | 215 | get { return iscolliding; } |
215 | set { iscolliding = value; } | 216 | set { iscolliding = value; } |
216 | } | 217 | } |
217 | 218 | public override PhysicsVector RotationalVelocity | |
219 | { | ||
220 | get { return m_rotationalVelocity; } | ||
221 | set { m_rotationalVelocity = value; } | ||
222 | } | ||
218 | public override PhysicsVector Position | 223 | public override PhysicsVector Position |
219 | { | 224 | { |
220 | get { return _position; } | 225 | get { return _position; } |
@@ -314,6 +319,7 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
314 | private PhysicsVector _position; | 319 | private PhysicsVector _position; |
315 | private PhysicsVector _velocity; | 320 | private PhysicsVector _velocity; |
316 | private PhysicsVector _acceleration; | 321 | private PhysicsVector _acceleration; |
322 | private PhysicsVector m_rotationalVelocity; | ||
317 | private NxActor _prim; | 323 | private NxActor _prim; |
318 | 324 | ||
319 | public PhysXPrim(NxActor prim) | 325 | public PhysXPrim(NxActor prim) |
@@ -329,7 +335,11 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
329 | get { return false; } | 335 | get { return false; } |
330 | set { return; } | 336 | set { return; } |
331 | } | 337 | } |
332 | 338 | public override PhysicsVector RotationalVelocity | |
339 | { | ||
340 | get { return m_rotationalVelocity; } | ||
341 | set { m_rotationalVelocity = value; } | ||
342 | } | ||
333 | public override bool Flying | 343 | public override bool Flying |
334 | { | 344 | { |
335 | get { return false; //no flying prims for you | 345 | get { return false; //no flying prims for you |