ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove the use of Vector3 for axis locks on the rest of engines

Browse Source
This commit is contained in:
UbitUmarov
2015-10-21 00:15:09 +01:00
parent ce5d5fc8dc
commit deb4364f42
7 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs
View File

@@ -300,7 +300,7 @@ public sealed class BSCharacter : BSPhysObject
}
public override void LockAngularMotion(OMV.Vector3 axis) { return; }
public override void LockAngularMotion(byte axislocks) { return; }
public override OMV.Vector3 Position {
get {

10
OpenSim/Region/PhysicsModules/BulletS/BSPrim.cs
View File

@@ -280,20 +280,20 @@ public class BSPrim : BSPhysObject
});
}
public override void LockAngularMotion(OMV.Vector3 axis)
public override void LockAngularMotion(byte axislocks)
{
DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axis);
DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axislocks);
ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_UNLOCK_ANGULAR, 0f, 0f);
if (axis.X != 1)
if ((axislocks & 0x02) != 0)
{
ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_X, 0f, 0f);
}
if (axis.Y != 1)
if ((axislocks & 0x04) != 0)
{
ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Y, 0f, 0f);
}
if (axis.Z != 1)
if ((axislocks & 0x08) != 0)
{
ApplyAxisLimits(ExtendedPhysics.PHYS_AXIS_LOCK_ANGULAR_Z, 0f, 0f);
}