OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

mb-throttle-test
Diva Canto 2014-09-21 09:23:15 -07:00
parent 94619cba58 2ed3a918bd
commit c4cd98bc34
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
View File

@ -43,9 +43,11 @@ public enum ConstraintType : int
SLIDER_CONSTRAINT_TYPE, SLIDER_CONSTRAINT_TYPE,
CONTACT_CONSTRAINT_TYPE, CONTACT_CONSTRAINT_TYPE,
D6_SPRING_CONSTRAINT_TYPE, D6_SPRING_CONSTRAINT_TYPE,
GEAR_CONSTRAINT_TYPE, // added in Bullet 2.82
FIXED_CONSTRAINT_TYPE, // added in Bullet 2.82
MAX_CONSTRAINT_TYPE, // last type defined by Bullet MAX_CONSTRAINT_TYPE, // last type defined by Bullet
// //
FIXED_CONSTRAINT_TYPE = 1234 // BulletSim constraint that is fixed and unmoving BS_FIXED_CONSTRAINT_TYPE = 1234 // BulletSim constraint that is fixed and unmoving
} }
// =============================================================================== // ===============================================================================

12
OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
View File

@ -78,7 +78,7 @@ public sealed class BSLinksetConstraints : BSLinkset
public override void ResetLink() public override void ResetLink()
{ {
// constraintType = ConstraintType.D6_CONSTRAINT_TYPE; // constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
constraintType = ConstraintType.FIXED_CONSTRAINT_TYPE; constraintType = ConstraintType.BS_FIXED_CONSTRAINT_TYPE;
linearLimitLow = OMV.Vector3.Zero; linearLimitLow = OMV.Vector3.Zero;
linearLimitHigh = OMV.Vector3.Zero; linearLimitHigh = OMV.Vector3.Zero;
angularLimitLow = OMV.Vector3.Zero; angularLimitLow = OMV.Vector3.Zero;
@ -115,7 +115,7 @@ public sealed class BSLinksetConstraints : BSLinkset
member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.SetLinkParameters,type={1}", member.LocalID, constraintType); member.PhysScene.DetailLog("{0},BSLinkInfoConstraint.SetLinkParameters,type={1}", member.LocalID, constraintType);
switch (constraintType) switch (constraintType)
{ {
case ConstraintType.FIXED_CONSTRAINT_TYPE: case ConstraintType.BS_FIXED_CONSTRAINT_TYPE:
case ConstraintType.D6_CONSTRAINT_TYPE: case ConstraintType.D6_CONSTRAINT_TYPE:
BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof; BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof;
if (constrain6dof != null) if (constrain6dof != null)
@ -179,7 +179,7 @@ public sealed class BSLinksetConstraints : BSLinkset
public override bool ShouldUpdateChildProperties() public override bool ShouldUpdateChildProperties()
{ {
bool ret = true; bool ret = true;
if (constraintType == ConstraintType.FIXED_CONSTRAINT_TYPE) if (constraintType == ConstraintType.BS_FIXED_CONSTRAINT_TYPE)
ret = false; ret = false;
return ret; return ret;
@ -363,7 +363,7 @@ public sealed class BSLinksetConstraints : BSLinkset
switch (linkInfo.constraintType) switch (linkInfo.constraintType)
{ {
case ConstraintType.FIXED_CONSTRAINT_TYPE: case ConstraintType.BS_FIXED_CONSTRAINT_TYPE:
case ConstraintType.D6_CONSTRAINT_TYPE: case ConstraintType.D6_CONSTRAINT_TYPE:
// Relative position normalized to the root prim // Relative position normalized to the root prim
// Essentually a vector pointing from center of rootPrim to center of li.member // Essentually a vector pointing from center of rootPrim to center of li.member
@ -536,7 +536,7 @@ public sealed class BSLinksetConstraints : BSLinkset
{ {
int requestedType = (int)pParams[2]; int requestedType = (int)pParams[2];
DetailLog("{0},BSLinksetConstraint.ChangeLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType); DetailLog("{0},BSLinksetConstraint.ChangeLinkType,requestedType={1}", LinksetRoot.LocalID, requestedType);
if (requestedType == (int)ConstraintType.FIXED_CONSTRAINT_TYPE if (requestedType == (int)ConstraintType.BS_FIXED_CONSTRAINT_TYPE
|| requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE || requestedType == (int)ConstraintType.D6_CONSTRAINT_TYPE
|| requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE || requestedType == (int)ConstraintType.D6_SPRING_CONSTRAINT_TYPE
|| requestedType == (int)ConstraintType.HINGE_CONSTRAINT_TYPE || requestedType == (int)ConstraintType.HINGE_CONSTRAINT_TYPE
@ -646,7 +646,7 @@ public sealed class BSLinksetConstraints : BSLinkset
case ExtendedPhysics.PHYS_PARAM_LINK_TYPE: case ExtendedPhysics.PHYS_PARAM_LINK_TYPE:
valueInt = (int)pParams[opIndex + 1]; valueInt = (int)pParams[opIndex + 1];
ConstraintType valueType = (ConstraintType)valueInt; ConstraintType valueType = (ConstraintType)valueInt;
if (valueType == ConstraintType.FIXED_CONSTRAINT_TYPE if (valueType == ConstraintType.BS_FIXED_CONSTRAINT_TYPE
|| valueType == ConstraintType.D6_CONSTRAINT_TYPE || valueType == ConstraintType.D6_CONSTRAINT_TYPE
|| valueType == ConstraintType.D6_SPRING_CONSTRAINT_TYPE || valueType == ConstraintType.D6_SPRING_CONSTRAINT_TYPE
|| valueType == ConstraintType.HINGE_CONSTRAINT_TYPE || valueType == ConstraintType.HINGE_CONSTRAINT_TYPE

2
bin/OpenSimDefaults.ini
View File

@ -1024,7 +1024,7 @@
; BulletEngine = "bulletxna" ; BulletEngine = "bulletxna"
; BulletSim can run on its own thread independent of the simulator's heartbeat ; BulletSim can run on its own thread independent of the simulator's heartbeat
; thread. Enabling this will nto let the physics engine slow down avatar movement, etc. ; thread. Enabling this will not let the physics engine slow down avatar movement, etc.
UseSeparatePhysicsThread = false UseSeparatePhysicsThread = false
; Terrain implementation can use either Bullet's heightField or BulletSim can build ; Terrain implementation can use either Bullet's heightField or BulletSim can build

BIN
bin/lib32/BulletSim.dll
View File

Binary file not shown.

BIN
bin/lib32/libBulletSim.so
View File

Binary file not shown.

BIN
bin/lib64/BulletSim.dll
View File

Binary file not shown.

BIN
bin/lib64/libBulletSim.so
View File

Binary file not shown.