diff options
| author | UbitUmarov | 2015-02-13 13:37:12 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-02-13 13:37:12 +0000 |
| commit | 99668a63e44c0cea2de2123a56c9425aa579e7e7 (patch) | |
| tree | 038a9dbafa877cd1f8d7d0c2e41a3a5b3513182b /OpenSim | |
| parent | Merge branch 'master' into ubitworkmaster (diff) | |
| download | opensim-SC-99668a63e44c0cea2de2123a56c9425aa579e7e7.zip opensim-SC-99668a63e44c0cea2de2123a56c9425aa579e7e7.tar.gz opensim-SC-99668a63e44c0cea2de2123a56c9425aa579e7e7.tar.bz2 opensim-SC-99668a63e44c0cea2de2123a56c9425aa579e7e7.tar.xz | |
fix axis locking Amotor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 2c3190f..ebaa50f 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
| @@ -1339,8 +1339,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1339 | // ODE should do this with axis relative to body 1 but seems to fail | 1339 | // ODE should do this with axis relative to body 1 but seems to fail |
| 1340 | d.JointSetAMotorAxis(Amotor, 0, 0, ax.X, ax.Y, ax.Z); | 1340 | d.JointSetAMotorAxis(Amotor, 0, 0, ax.X, ax.Y, ax.Z); |
| 1341 | d.JointSetAMotorAngle(Amotor, 0, 0); | 1341 | d.JointSetAMotorAngle(Amotor, 0, 0); |
| 1342 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.LoStop, -0.000001f); | 1342 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.LoStop, 0f); |
| 1343 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.HiStop, 0.000001f); | 1343 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.HiStop, 0f); |
| 1344 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel, 0); | 1344 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.Vel, 0); |
| 1345 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.FudgeFactor, 0.0001f); | 1345 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.FudgeFactor, 0.0001f); |
| 1346 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.Bounce, 0f); | 1346 | d.JointSetAMotorParam(Amotor, (int)d.JointParam.Bounce, 0f); |
| @@ -1356,8 +1356,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1356 | ax = (new Vector3(0, 1, 0)) * curr; | 1356 | ax = (new Vector3(0, 1, 0)) * curr; |
| 1357 | d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z); | 1357 | d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z); |
| 1358 | d.JointSetAMotorAngle(Amotor, i, 0); | 1358 | d.JointSetAMotorAngle(Amotor, i, 0); |
| 1359 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, -0.000001f); | 1359 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, 0f); |
| 1360 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0.000001f); | 1360 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0f); |
| 1361 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0); | 1361 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0); |
| 1362 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f); | 1362 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f); |
| 1363 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f); | 1363 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f); |
| @@ -1373,8 +1373,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1373 | ax = (new Vector3(0, 0, 1)) * curr; | 1373 | ax = (new Vector3(0, 0, 1)) * curr; |
| 1374 | d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z); | 1374 | d.JointSetAMotorAxis(Amotor, i, 0, ax.X, ax.Y, ax.Z); |
| 1375 | d.JointSetAMotorAngle(Amotor, i, 0); | 1375 | d.JointSetAMotorAngle(Amotor, i, 0); |
| 1376 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, -0.000001f); | 1376 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.LoStop, 0f); |
| 1377 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0.000001f); | 1377 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.HiStop, 0f); |
| 1378 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0); | 1378 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Vel, 0); |
| 1379 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f); | 1379 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.FudgeFactor, 0.0001f); |
| 1380 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f); | 1380 | d.JointSetAMotorParam(Amotor, j + (int)d.JointParam.Bounce, 0f); |