aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-10-29 14:27:48 -0700
committerRobert Adams2012-11-03 21:14:08 -0700
commitbc43c7007d3d8ffc2f497a6d37004eb3d3544e00 (patch)
treedf0b6315c9ea31c48405680ecded24b29211ef79
parentBulletSim: Use Refresh/PostTaints to cause recomputing of constraint variable... (diff)
downloadopensim-SC-bc43c7007d3d8ffc2f497a6d37004eb3d3544e00.zip
opensim-SC-bc43c7007d3d8ffc2f497a6d37004eb3d3544e00.tar.gz
opensim-SC-bc43c7007d3d8ffc2f497a6d37004eb3d3544e00.tar.bz2
opensim-SC-bc43c7007d3d8ffc2f497a6d37004eb3d3544e00.tar.xz
BulletSim: code rearrangement
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs12
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs2
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
index f017cdd..65fac00 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
@@ -42,6 +42,12 @@ public abstract class BSConstraint : IDisposable
42 protected BulletConstraint m_constraint; 42 protected BulletConstraint m_constraint;
43 protected bool m_enabled = false; 43 protected bool m_enabled = false;
44 44
45 public BulletBody Body1 { get { return m_body1; } }
46 public BulletBody Body2 { get { return m_body2; } }
47 public BulletConstraint Constraint { get { return m_constraint; } }
48 public abstract ConstraintType Type { get; }
49 public bool IsEnabled { get { return m_enabled; } }
50
45 public BSConstraint() 51 public BSConstraint()
46 { 52 {
47 } 53 }
@@ -64,12 +70,6 @@ public abstract class BSConstraint : IDisposable
64 } 70 }
65 } 71 }
66 72
67 public BulletBody Body1 { get { return m_body1; } }
68 public BulletBody Body2 { get { return m_body2; } }
69 public BulletConstraint Constraint { get { return m_constraint; } }
70 public abstract ConstraintType Type { get; }
71
72
73 public virtual bool SetLinearLimits(Vector3 low, Vector3 high) 73 public virtual bool SetLinearLimits(Vector3 low, Vector3 high)
74 { 74 {
75 bool ret = false; 75 bool ret = false;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
index b9add06..a9fd826 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintCollection.cs
@@ -143,8 +143,6 @@ public sealed class BSConstraintCollection : IDisposable
143 // Return 'true' if any constraints were destroyed. 143 // Return 'true' if any constraints were destroyed.
144 public bool RemoveAndDestroyConstraint(BulletBody body1) 144 public bool RemoveAndDestroyConstraint(BulletBody body1)
145 { 145 {
146 // return BulletSimAPI.RemoveConstraintByID(m_world.ID, obj.ID);
147
148 List<BSConstraint> toRemove = new List<BSConstraint>(); 146 List<BSConstraint> toRemove = new List<BSConstraint>();
149 uint lookingID = body1.ID; 147 uint lookingID = body1.ID;
150 lock (m_constraints) 148 lock (m_constraints)