diff options
author | Robert Adams | 2013-08-08 08:36:36 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 09:11:48 -0700 |
commit | 6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151 (patch) | |
tree | f75c19351338cf7d779be76ba68b80e11bfd1e4a /OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |
parent | BulletSim: Linkset.Refresh() calls internal ScheduleRebuild() to recreate the... (diff) | |
download | opensim-SC_OLD-6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151.zip opensim-SC_OLD-6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151.tar.gz opensim-SC_OLD-6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151.tar.bz2 opensim-SC_OLD-6aee08ac3c48b55ebd8e945c8b11f17dc1ab3151.tar.xz |
BulletSim: add physChangeLinkSpring to change linkset link to be a spring constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs index 77d8246..4c384a6 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs | |||
@@ -179,7 +179,7 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
179 | // Do any filtering/modification needed for linksets. | 179 | // Do any filtering/modification needed for linksets. |
180 | public override void UpdateProperties(EntityProperties entprop) | 180 | public override void UpdateProperties(EntityProperties entprop) |
181 | { | 181 | { |
182 | if (Linkset.IsRoot(this)) | 182 | if (Linkset.IsRoot(this) || Linkset.ShouldReportPropertyUpdates(this)) |
183 | { | 183 | { |
184 | // Properties are only updated for the roots of a linkset. | 184 | // Properties are only updated for the roots of a linkset. |
185 | // TODO: this will have to change when linksets are articulated. | 185 | // TODO: this will have to change when linksets are articulated. |
@@ -316,12 +316,7 @@ public class BSPrimLinkable : BSPrimDisplaced | |||
316 | // Params: int linkNum, PhysActor linkedPrim | 316 | // Params: int linkNum, PhysActor linkedPrim |
317 | case BSScene.PhysFunctChangeLinkFixed: | 317 | case BSScene.PhysFunctChangeLinkFixed: |
318 | { | 318 | { |
319 | if (pParams.Length > 1) | 319 | Linkset.Extension(pFunct, pParams); |
320 | { | ||
321 | int linkNum = (int)pParams[0]; | ||
322 | Manager.PhysicsActor linkActor = (Manager.PhysicsActor)pParams[1]; | ||
323 | Linkset.Refresh(this); | ||
324 | } | ||
325 | break; | 320 | break; |
326 | } | 321 | } |
327 | default: | 322 | default: |