diff options
| author | Teravus Ovares | 2008-04-06 06:42:54 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-04-06 06:42:54 +0000 |
| commit | 899f00b83d8ed1ffa5233cde75e5adf69d9e93a3 (patch) | |
| tree | 3bc37780305e0d30d6bc341995c6cb9c1471cb1b /OpenSim | |
| parent | Set svn:ignore (diff) | |
| download | opensim-SC-899f00b83d8ed1ffa5233cde75e5adf69d9e93a3.zip opensim-SC-899f00b83d8ed1ffa5233cde75e5adf69d9e93a3.tar.gz opensim-SC-899f00b83d8ed1ffa5233cde75e5adf69d9e93a3.tar.bz2 opensim-SC-899f00b83d8ed1ffa5233cde75e5adf69d9e93a3.tar.xz | |
* Fixed up some documentation
* Should help the sinking feeling when new avatar arrive in the scene.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index e9492a9..81126b6 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -704,7 +704,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 704 | _zeroFlag = false; | 704 | _zeroFlag = false; |
| 705 | if (m_iscolliding && !flying) | 705 | if (m_iscolliding && !flying) |
| 706 | { | 706 | { |
| 707 | // We're flying and colliding with something | 707 | // We're standing on something |
| 708 | vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D); | 708 | vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D); |
| 709 | vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D); | 709 | vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D); |
| 710 | } | 710 | } |
| @@ -716,7 +716,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 716 | } | 716 | } |
| 717 | else if (!m_iscolliding && flying) | 717 | else if (!m_iscolliding && flying) |
| 718 | { | 718 | { |
| 719 | // We're flying and colliding with something | 719 | // we're in mid air suspended |
| 720 | vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6); | 720 | vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6); |
| 721 | vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6); | 721 | vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6); |
| 722 | } | 722 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 673818a..33b9ce3 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
| @@ -1537,11 +1537,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1537 | 1537 | ||
| 1538 | while (step_time > 0.0f) | 1538 | while (step_time > 0.0f) |
| 1539 | { | 1539 | { |
| 1540 | lock (ode) | 1540 | //lock (ode) |
| 1541 | { | 1541 | //{ |
| 1542 | if (!ode.lockquery()) | 1542 | //if (!ode.lockquery()) |
| 1543 | { | 1543 | //{ |
| 1544 | ode.dlock(world); | 1544 | // ode.dlock(world); |
| 1545 | try | 1545 | try |
| 1546 | { | 1546 | { |
| 1547 | lock (_characters) | 1547 | lock (_characters) |
| @@ -1605,12 +1605,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 1605 | 1605 | ||
| 1606 | step_time -= ODE_STEPSIZE; | 1606 | step_time -= ODE_STEPSIZE; |
| 1607 | i++; | 1607 | i++; |
| 1608 | } | 1608 | //} |
| 1609 | else | 1609 | //else |
| 1610 | { | 1610 | //{ |
| 1611 | fps = 0; | 1611 | //fps = 0; |
| 1612 | } | 1612 | //} |
| 1613 | } | 1613 | //} |
| 1614 | } | 1614 | } |
| 1615 | 1615 | ||
| 1616 | lock (_characters) | 1616 | lock (_characters) |