diff options
author | Robert Adams | 2019-02-05 08:35:27 -0800 |
---|---|---|
committer | Robert Adams | 2019-02-05 08:35:27 -0800 |
commit | 52947b628019736e6f4ad20d6e75ec5ba3c37e28 (patch) | |
tree | 97244b70fec7e1270b1f87c3277bee2905cb9560 /OpenSim/Region | |
parent | Remove cut-and-paste typo in 6dof contstrain setup in XNA version of (diff) | |
download | opensim-SC-52947b628019736e6f4ad20d6e75ec5ba3c37e28.zip opensim-SC-52947b628019736e6f4ad20d6e75ec5ba3c37e28.tar.gz opensim-SC-52947b628019736e6f4ad20d6e75ec5ba3c37e28.tar.bz2 opensim-SC-52947b628019736e6f4ad20d6e75ec5ba3c37e28.tar.xz |
Remove some more cut-and-paste typos in 6dof constraint setup in XNA
version of BulletSim. Could only effect operation of flexible linksets when
using the C# version of the Bullet physics engine.
Found by Tampa and AliciaRaven and reported in Mantis 7612.
Diffstat (limited to 'OpenSim/Region')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs index 56a666a..a439cc0 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSAPIXNA.cs | |||
@@ -1882,7 +1882,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
1882 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); | 1882 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); |
1883 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); | 1883 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); |
1884 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); | 1884 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); |
1885 | frame2._origin = frame1v; | 1885 | frame2._origin = frame2v; |
1886 | 1886 | ||
1887 | constrain = new Generic6DofSpringConstraint(body1, body2, ref frame1, ref frame2, puseLinearReferenceFrameA); | 1887 | constrain = new Generic6DofSpringConstraint(body1, body2, ref frame1, ref frame2, puseLinearReferenceFrameA); |
1888 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); | 1888 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); |
@@ -1932,7 +1932,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
1932 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); | 1932 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); |
1933 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); | 1933 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); |
1934 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); | 1934 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); |
1935 | frame2._origin = frame1v; | 1935 | frame2._origin = frame2v; |
1936 | 1936 | ||
1937 | constrain = new SliderConstraint(rb1, rb2, ref frame1, ref frame2, puseLinearReferenceFrameA); | 1937 | constrain = new SliderConstraint(rb1, rb2, ref frame1, ref frame2, puseLinearReferenceFrameA); |
1938 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); | 1938 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); |
@@ -1959,7 +1959,7 @@ private sealed class BulletConstraintXNA : BulletConstraint | |||
1959 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); | 1959 | IndexedVector3 frame2v = new IndexedVector3(pframe2.X, pframe2.Y, pframe2.Z); |
1960 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); | 1960 | IndexedQuaternion frame2rot = new IndexedQuaternion(pframe2rot.X, pframe2rot.Y, pframe2rot.Z, pframe2rot.W); |
1961 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); | 1961 | IndexedMatrix frame2 = IndexedMatrix.CreateFromQuaternion(frame2rot); |
1962 | frame2._origin = frame1v; | 1962 | frame2._origin = frame2v; |
1963 | 1963 | ||
1964 | constrain = new ConeTwistConstraint(rb1, rb2, ref frame1, ref frame2); | 1964 | constrain = new ConeTwistConstraint(rb1, rb2, ref frame1, ref frame2); |
1965 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); | 1965 | world.AddConstraint(constrain, pdisableCollisionsBetweenLinkedBodies); |