aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 17:25:03 +0000
committerDr Scofield2008-06-27 17:25:03 +0000
commit7d55dfba8addd5c580e6c7bcf4449315428b84ed (patch)
tree8426d62dc435e54e5c7c58d2fa742a3841848727 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parentdr scofield's warning safari: (diff)
downloadopensim-SC-7d55dfba8addd5c580e6c7bcf4449315428b84ed.zip
opensim-SC-7d55dfba8addd5c580e6c7bcf4449315428b84ed.tar.gz
opensim-SC-7d55dfba8addd5c580e6c7bcf4449315428b84ed.tar.bz2
opensim-SC-7d55dfba8addd5c580e6c7bcf4449315428b84ed.tar.xz
dr scofield's warnings safari:
* commenting out unused variables
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs17
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 89162a0..7f08cb4 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Physics.OdePlugin
59 59
60 private PhysicsVector _position; 60 private PhysicsVector _position;
61 private d.Vector3 _zeroPosition; 61 private d.Vector3 _zeroPosition;
62 private d.Matrix3 m_StandUpRotation; 62 // private d.Matrix3 m_StandUpRotation;
63 private bool _zeroFlag = false; 63 private bool _zeroFlag = false;
64 private bool m_lastUpdateSent = false; 64 private bool m_lastUpdateSent = false;
65 private PhysicsVector _velocity; 65 private PhysicsVector _velocity;
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.OdePlugin
92 92
93 private float m_buoyancy = 0f; 93 private float m_buoyancy = 0f;
94 94
95 private CollisionLocker ode; 95 // private CollisionLocker ode;
96 96
97 private string m_name = String.Empty; 97 private string m_name = String.Empty;
98 98
@@ -120,7 +120,7 @@ namespace OpenSim.Region.Physics.OdePlugin
120 120
121 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor) 121 public OdeCharacter(String avName, OdeScene parent_scene, PhysicsVector pos, CollisionLocker dode, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
122 { 122 {
123 ode = dode; 123 // ode = dode;
124 _velocity = new PhysicsVector(); 124 _velocity = new PhysicsVector();
125 _target_velocity = new PhysicsVector(); 125 _target_velocity = new PhysicsVector();
126 _position = pos; 126 _position = pos;
@@ -137,9 +137,9 @@ namespace OpenSim.Region.Physics.OdePlugin
137 runDivisor = rundivisor; 137 runDivisor = rundivisor;
138 138
139 139
140 m_StandUpRotation = 140 // m_StandUpRotation =
141 new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f, 141 // new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
142 0.5f); 142 // 0.5f);
143 143
144 for (int i = 0; i < 11; i++) 144 for (int i = 0; i < 11; i++)
145 { 145 {
@@ -392,7 +392,7 @@ namespace OpenSim.Region.Physics.OdePlugin
392 392
393 PhysicsVector SetSize = value; 393 PhysicsVector SetSize = value;
394 float prevCapsule = CAPSULE_LENGTH; 394 float prevCapsule = CAPSULE_LENGTH;
395 float capsuleradius = CAPSULE_RADIUS; 395 // float capsuleradius = CAPSULE_RADIUS;
396 //capsuleradius = 0.2f; 396 //capsuleradius = 0.2f;
397 397
398 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * heightFudgeFactor))); // subtract 43% of the size 398 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * heightFudgeFactor))); // subtract 43% of the size
@@ -747,7 +747,8 @@ namespace OpenSim.Region.Physics.OdePlugin
747 { 747 {
748 // we're not colliding and we're not flying so that means we're falling! 748 // we're not colliding and we're not flying so that means we're falling!
749 // m_iscolliding includes collisions with the ground. 749 // m_iscolliding includes collisions with the ground.
750 d.Vector3 pos = d.BodyGetPosition(Body); 750
751 // d.Vector3 pos = d.BodyGetPosition(Body);
751 if (_target_velocity.X > 0) 752 if (_target_velocity.X > 0)
752 { 753 {
753 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D; 754 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;