diff options
author | Robert Adams | 2014-10-02 18:45:36 -0700 |
---|---|---|
committer | Robert Adams | 2014-11-30 19:52:58 -0800 |
commit | cf85ade81e38e692fe99c71386ab2c306ab77319 (patch) | |
tree | ba8dd76e62a4a989ae46f02dfe028ef0ee3d37fd /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
parent | A little more cleaning of config files. (diff) | |
download | opensim-SC_OLD-cf85ade81e38e692fe99c71386ab2c306ab77319.zip opensim-SC_OLD-cf85ade81e38e692fe99c71386ab2c306ab77319.tar.gz opensim-SC_OLD-cf85ade81e38e692fe99c71386ab2c306ab77319.tar.bz2 opensim-SC_OLD-cf85ade81e38e692fe99c71386ab2c306ab77319.tar.xz |
BulletSim: add shape and linkset rebuild scheduled flags. Add BSPrim.Incomplete flag based on rebuild flags to say when an object is being rebuilt.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index 77f69a5..e7b10fe 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -128,6 +128,7 @@ public abstract class BSLinkset | |||
128 | m_children = new Dictionary<BSPrimLinkable, BSLinkInfo>(); | 128 | m_children = new Dictionary<BSPrimLinkable, BSLinkInfo>(); |
129 | LinksetMass = parent.RawMass; | 129 | LinksetMass = parent.RawMass; |
130 | Rebuilding = false; | 130 | Rebuilding = false; |
131 | RebuildScheduled = false; | ||
131 | 132 | ||
132 | parent.ClearDisplacement(); | 133 | parent.ClearDisplacement(); |
133 | } | 134 | } |
@@ -297,8 +298,16 @@ public abstract class BSLinkset | |||
297 | 298 | ||
298 | // Flag denoting the linkset is in the process of being rebuilt. | 299 | // Flag denoting the linkset is in the process of being rebuilt. |
299 | // Used to know not the schedule a rebuild in the middle of a rebuild. | 300 | // Used to know not the schedule a rebuild in the middle of a rebuild. |
301 | // Because of potential update calls that could want to schedule another rebuild. | ||
300 | protected bool Rebuilding { get; set; } | 302 | protected bool Rebuilding { get; set; } |
301 | 303 | ||
304 | // Flag saying a linkset rebuild has been scheduled. | ||
305 | // This is turned on when the rebuild is requested and turned off when | ||
306 | // the rebuild is complete. Used to limit modifications to the | ||
307 | // linkset parameters while the linkset is in an intermediate state. | ||
308 | // Protected by a "lock(this)" on the BSLinkset object | ||
309 | public bool RebuildScheduled { get; protected set; } | ||
310 | |||
302 | // The object is going dynamic (physical). Do any setup necessary | 311 | // The object is going dynamic (physical). Do any setup necessary |
303 | // for a dynamic linkset. | 312 | // for a dynamic linkset. |
304 | // Only the state of the passed object can be modified. The rest of the linkset | 313 | // Only the state of the passed object can be modified. The rest of the linkset |