diff options
author | Robert Adams | 2013-09-09 14:53:16 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 09:12:19 -0700 |
commit | c5eabb28b4c933cfacefa85381e290372fbc094e (patch) | |
tree | c79acadaa6de935d18865a1bc0d5c9162e23747a /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
parent | BulletSim: add extended physics LSL constants for axis specification. (diff) | |
download | opensim-SC-c5eabb28b4c933cfacefa85381e290372fbc094e.zip opensim-SC-c5eabb28b4c933cfacefa85381e290372fbc094e.tar.gz opensim-SC-c5eabb28b4c933cfacefa85381e290372fbc094e.tar.bz2 opensim-SC-c5eabb28b4c933cfacefa85381e290372fbc094e.tar.xz |
BulletSim: add LSL function and plumbing for setting a spring
equilibrium point in the physics engine constraint.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index 42b5c49..b47e9a8 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |||
@@ -64,7 +64,7 @@ public abstract class BSConstraint : IDisposable | |||
64 | { | 64 | { |
65 | bool success = PhysicsScene.PE.DestroyConstraint(m_world, m_constraint); | 65 | bool success = PhysicsScene.PE.DestroyConstraint(m_world, m_constraint); |
66 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", | 66 | m_world.physicsScene.DetailLog("{0},BSConstraint.Dispose,taint,id1={1},body1={2},id2={3},body2={4},success={5}", |
67 | BSScene.DetailLogZero, | 67 | m_body1.ID, |
68 | m_body1.ID, m_body1.AddrString, | 68 | m_body1.ID, m_body1.AddrString, |
69 | m_body2.ID, m_body2.AddrString, | 69 | m_body2.ID, m_body2.AddrString, |
70 | success); | 70 | success); |
@@ -77,7 +77,10 @@ public abstract class BSConstraint : IDisposable | |||
77 | { | 77 | { |
78 | bool ret = false; | 78 | bool ret = false; |
79 | if (m_enabled) | 79 | if (m_enabled) |
80 | { | ||
81 | m_world.physicsScene.DetailLog("{0},BSConstraint.SetLinearLimits,taint,low={1},high={2}", m_body1.ID, low, high); | ||
80 | ret = PhysicsScene.PE.SetLinearLimits(m_constraint, low, high); | 82 | ret = PhysicsScene.PE.SetLinearLimits(m_constraint, low, high); |
83 | } | ||
81 | return ret; | 84 | return ret; |
82 | } | 85 | } |
83 | 86 | ||
@@ -86,6 +89,7 @@ public abstract class BSConstraint : IDisposable | |||
86 | bool ret = false; | 89 | bool ret = false; |
87 | if (m_enabled) | 90 | if (m_enabled) |
88 | { | 91 | { |
92 | m_world.physicsScene.DetailLog("{0},BSConstraint.SetAngularLimits,taint,low={1},high={2}", m_body1.ID, low, high); | ||
89 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); | 93 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); |
90 | } | 94 | } |
91 | return ret; | 95 | return ret; |