diff options
author | Robert Adams | 2013-01-31 10:26:53 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-31 15:56:02 -0800 |
commit | ed71c939fc22059b03572fe6380fcc754c89a284 (patch) | |
tree | b10e0be30b391e0e90c855f4cf671fa42d4faf16 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |
parent | BulletSim: clean up TargetVelocity implementation by using the default defn i... (diff) | |
download | opensim-SC-ed71c939fc22059b03572fe6380fcc754c89a284.zip opensim-SC-ed71c939fc22059b03572fe6380fcc754c89a284.tar.gz opensim-SC-ed71c939fc22059b03572fe6380fcc754c89a284.tar.bz2 opensim-SC-ed71c939fc22059b03572fe6380fcc754c89a284.tar.xz |
BulletSim: make sure vehicle physical properties are set when going
physical by delaying setting until pre-step time. Change vehicle.Refresh()
to schedule the pre-step setting.
Comments and updating of TODO list.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs index 54dc458..92f6ee2 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs | |||
@@ -274,7 +274,7 @@ public sealed class BSLinksetCompound : BSLinkset | |||
274 | bool ret = false; | 274 | bool ret = false; |
275 | 275 | ||
276 | DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}", | 276 | DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}", |
277 | child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString, IsRoot(child)); | 277 | child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child)); |
278 | 278 | ||
279 | if (!IsRoot(child)) | 279 | if (!IsRoot(child)) |
280 | { | 280 | { |
@@ -382,11 +382,11 @@ public sealed class BSLinksetCompound : BSLinkset | |||
382 | { | 382 | { |
383 | try | 383 | try |
384 | { | 384 | { |
385 | // Suppress rebuilding while rebuilding | 385 | // Suppress rebuilding while rebuilding. (We know rebuilding is on only one thread.) |
386 | Rebuilding = true; | 386 | Rebuilding = true; |
387 | 387 | ||
388 | // Cause the root shape to be rebuilt as a compound object with just the root in it | 388 | // Cause the root shape to be rebuilt as a compound object with just the root in it |
389 | LinksetRoot.ForceBodyShapeRebuild(true); | 389 | LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime */); |
390 | 390 | ||
391 | // The center of mass for the linkset is the geometric center of the group. | 391 | // The center of mass for the linkset is the geometric center of the group. |
392 | // Compute a displacement for each component so it is relative to the center-of-mass. | 392 | // Compute a displacement for each component so it is relative to the center-of-mass. |