diff options
author | Robert Adams | 2012-12-14 17:03:59 -0800 |
---|---|---|
committer | Robert Adams | 2012-12-16 21:19:10 -0800 |
commit | ace1f1e9314d2e5b3cf45426225ca485649bbf96 (patch) | |
tree | 2ea8eb8066ba2d306f24850fd7d13dbfb1e25ae8 /OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |
parent | Make WebStatsModule properly handle scenes added or removed after initial sta... (diff) | |
download | opensim-SC_OLD-ace1f1e9314d2e5b3cf45426225ca485649bbf96.zip opensim-SC_OLD-ace1f1e9314d2e5b3cf45426225ca485649bbf96.tar.gz opensim-SC_OLD-ace1f1e9314d2e5b3cf45426225ca485649bbf96.tar.bz2 opensim-SC_OLD-ace1f1e9314d2e5b3cf45426225ca485649bbf96.tar.xz |
BulletSim: rip out old code for linkset child position fetching. BulletSim doesn't need to do that bookkeeping because SOG/SOP already does it.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs index ce0fbe6..2486be5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs | |||
@@ -38,6 +38,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
38 | // Each type of linkset will define the information needed for its type. | 38 | // Each type of linkset will define the information needed for its type. |
39 | public abstract class BSLinksetInfo | 39 | public abstract class BSLinksetInfo |
40 | { | 40 | { |
41 | public virtual void Clear() { } | ||
41 | } | 42 | } |
42 | 43 | ||
43 | public abstract class BSLinkset | 44 | public abstract class BSLinkset |
@@ -95,13 +96,6 @@ public abstract class BSLinkset | |||
95 | return BSPhysicsShapeType.SHAPE_UNKNOWN; | 96 | return BSPhysicsShapeType.SHAPE_UNKNOWN; |
96 | } | 97 | } |
97 | 98 | ||
98 | // Linksets move around the children so the linkset might need to compute the child position | ||
99 | public virtual OMV.Vector3 Position(BSPhysObject member) | ||
100 | { return member.RawPosition; } | ||
101 | public virtual OMV.Quaternion Orientation(BSPhysObject member) | ||
102 | { return member.RawOrientation; } | ||
103 | // TODO: does this need to be done for Velocity and RotationalVelocityy? | ||
104 | |||
105 | // We keep the prim's mass in the linkset structure since it could be dependent on other prims | 99 | // We keep the prim's mass in the linkset structure since it could be dependent on other prims |
106 | protected float m_mass; | 100 | protected float m_mass; |
107 | public float LinksetMass | 101 | public float LinksetMass |