From 1527d42823e988bf64dd5fbfccf95f7d48b4b309 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 30 May 2023 18:28:50 +0000 Subject: [PATCH] BulletSim: some small changes to SetForce and SetTorque motors that don't seem to fix any problems. --- OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs | 3 --- OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs | 1 - OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs | 1 - 3 files changed, 5 deletions(-) diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs index 3a00d42f76..38fe352a59 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs @@ -162,9 +162,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817 // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380 - // Remove any existing axis constraint (just to be sure) - RemoveAxisLockConstraint(); - BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody, OMV.Vector3.Zero, OMV.Quaternion.Identity, false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */); diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs index 563b3862bc..0495f78535 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs @@ -73,7 +73,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS { m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName); Enabled = false; - return; } // If the object is physically active, add the hoverer prestep action diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs index c18cabf4a4..b085cd03b0 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs @@ -73,7 +73,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS { m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,disabling={1}", m_controllingPrim.LocalID, ActorName); Enabled = false; - return; } // If the object is physically active, add the hoverer prestep action