diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs index c0a016e..8da9687 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
60 | private btQuaternion m_bodyOrientation; | 60 | private btQuaternion m_bodyOrientation; |
61 | private btDefaultMotionState m_bodyMotionState; | 61 | private btDefaultMotionState m_bodyMotionState; |
62 | private btGeneric6DofConstraint m_aMotor; | 62 | private btGeneric6DofConstraint m_aMotor; |
63 | private PhysicsVector m_movementComparision; | 63 | // private PhysicsVector m_movementComparision; |
64 | private PhysicsVector m_position; | 64 | private PhysicsVector m_position; |
65 | private PhysicsVector m_zeroPosition; | 65 | private PhysicsVector m_zeroPosition; |
66 | private bool m_zeroFlag = false; | 66 | private bool m_zeroFlag = false; |
@@ -95,15 +95,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
95 | public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing) | 95 | public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing) |
96 | private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes. | 96 | private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes. |
97 | private bool m_taintRemove = false; | 97 | private bool m_taintRemove = false; |
98 | private bool m_taintedPosition = false; | 98 | // private bool m_taintedPosition = false; |
99 | private PhysicsVector m_taintedPosition_value; | 99 | // private PhysicsVector m_taintedPosition_value; |
100 | private PhysicsVector m_taintedForce; | 100 | private PhysicsVector m_taintedForce; |
101 | 101 | ||
102 | private float m_buoyancy = 0f; | 102 | private float m_buoyancy = 0f; |
103 | 103 | ||
104 | // private CollisionLocker ode; | 104 | // private CollisionLocker ode; |
105 | 105 | ||
106 | private string m_name = String.Empty; | 106 | // private string m_name = String.Empty; |
107 | 107 | ||
108 | private bool[] m_colliderarr = new bool[11]; | 108 | private bool[] m_colliderarr = new bool[11]; |
109 | private bool[] m_colliderGroundarr = new bool[11]; | 109 | private bool[] m_colliderGroundarr = new bool[11]; |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
113 | private BulletDotNETScene m_parent_scene; | 113 | private BulletDotNETScene m_parent_scene; |
114 | 114 | ||
115 | public int m_eventsubscription = 0; | 115 | public int m_eventsubscription = 0; |
116 | private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate(); | 116 | // private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate(); |
117 | 117 | ||
118 | public BulletDotNETCharacter(string avName, BulletDotNETScene parent_scene, PhysicsVector pos, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor) | 118 | public BulletDotNETCharacter(string avName, BulletDotNETScene parent_scene, PhysicsVector pos, PhysicsVector size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor) |
119 | { | 119 | { |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
147 | 147 | ||
148 | m_parent_scene.AddPhysicsActorTaint(this); | 148 | m_parent_scene.AddPhysicsActorTaint(this); |
149 | 149 | ||
150 | m_name = avName; | 150 | // m_name = avName; |
151 | tempVector1 = new btVector3(0, 0, 0); | 151 | tempVector1 = new btVector3(0, 0, 0); |
152 | tempVector2 = new btVector3(0, 0, 0); | 152 | tempVector2 = new btVector3(0, 0, 0); |
153 | tempVector3 = new btVector3(0, 0, 0); | 153 | tempVector3 = new btVector3(0, 0, 0); |
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
159 | 159 | ||
160 | tempQuat1 = new btQuaternion(0, 0, 0, 1); | 160 | tempQuat1 = new btQuaternion(0, 0, 0, 1); |
161 | tempTrans1 = new btTransform(tempQuat1, tempVector1); | 161 | tempTrans1 = new btTransform(tempQuat1, tempVector1); |
162 | m_movementComparision = new PhysicsVector(0, 0, 0); | 162 | // m_movementComparision = new PhysicsVector(0, 0, 0); |
163 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); | 163 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); |
164 | 164 | ||
165 | 165 | ||
@@ -327,9 +327,9 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
327 | get { return m_position; } | 327 | get { return m_position; } |
328 | set | 328 | set |
329 | { | 329 | { |
330 | m_taintedPosition_value = value; | 330 | // m_taintedPosition_value = value; |
331 | m_position = value; | 331 | m_position = value; |
332 | m_taintedPosition = true; | 332 | // m_taintedPosition = true; |
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
@@ -772,7 +772,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
772 | 772 | ||
773 | tempQuat1 = new btQuaternion(0, 0, 0, 1); | 773 | tempQuat1 = new btQuaternion(0, 0, 0, 1); |
774 | tempTrans1 = new btTransform(tempQuat1, tempVector1); | 774 | tempTrans1 = new btTransform(tempQuat1, tempVector1); |
775 | m_movementComparision = new PhysicsVector(0, 0, 0); | 775 | // m_movementComparision = new PhysicsVector(0, 0, 0); |
776 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); | 776 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); |
777 | } | 777 | } |
778 | 778 | ||
@@ -803,7 +803,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
803 | 803 | ||
804 | tempQuat1 = new btQuaternion(0, 0, 0, 1); | 804 | tempQuat1 = new btQuaternion(0, 0, 0, 1); |
805 | tempTrans1 = new btTransform(tempQuat1, tempVector1); | 805 | tempTrans1 = new btTransform(tempQuat1, tempVector1); |
806 | m_movementComparision = new PhysicsVector(0, 0, 0); | 806 | // m_movementComparision = new PhysicsVector(0, 0, 0); |
807 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); | 807 | m_CapsuleOrientationAxis = new btVector3(1, 0, 1); |
808 | 808 | ||
809 | AvatarGeomAndBodyCreation(m_position.X, m_position.Y, | 809 | AvatarGeomAndBodyCreation(m_position.X, m_position.Y, |