diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin')
3 files changed, 32 insertions, 32 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, |
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs index ec982c6..0d61f72 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | |||
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
62 | private Quaternion m_taintrot; | 62 | private Quaternion m_taintrot; |
63 | private PhysicsVector m_angularlock = new PhysicsVector(1f, 1f, 1f); | 63 | private PhysicsVector m_angularlock = new PhysicsVector(1f, 1f, 1f); |
64 | private PhysicsVector m_taintAngularLock = new PhysicsVector(1f, 1f, 1f); | 64 | private PhysicsVector m_taintAngularLock = new PhysicsVector(1f, 1f, 1f); |
65 | private btGeneric6DofConstraint Amotor; | 65 | // private btGeneric6DofConstraint Amotor; |
66 | 66 | ||
67 | private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0); | 67 | private PhysicsVector m_PIDTarget = new PhysicsVector(0, 0, 0); |
68 | private float m_PIDTau = 0f; | 68 | private float m_PIDTau = 0f; |
@@ -75,8 +75,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
75 | private float m_waterHeight = 0f; | 75 | private float m_waterHeight = 0f; |
76 | private float PID_D = 35f; | 76 | private float PID_D = 35f; |
77 | private float PID_G = 25f; | 77 | private float PID_G = 25f; |
78 | private float m_tensor = 5f; | 78 | // private float m_tensor = 5f; |
79 | private int body_autodisable_frames = 20; | 79 | // private int body_autodisable_frames = 20; |
80 | private IMesh primMesh = null; | 80 | private IMesh primMesh = null; |
81 | 81 | ||
82 | private bool m_usePID = false; | 82 | private bool m_usePID = false; |
@@ -90,15 +90,15 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
90 | 90 | ||
91 | private bool m_taintshape = false; | 91 | private bool m_taintshape = false; |
92 | private bool m_taintPhysics = false; | 92 | private bool m_taintPhysics = false; |
93 | private bool m_collidesLand = true; | 93 | // private bool m_collidesLand = true; |
94 | private bool m_collidesWater = false; | 94 | private bool m_collidesWater = false; |
95 | public bool m_returnCollisions = false; | 95 | public bool m_returnCollisions = false; |
96 | 96 | ||
97 | // Default we're a Geometry | 97 | // Default we're a Geometry |
98 | private CollisionCategories m_collisionCategories = (CollisionCategories.Geom); | 98 | // private CollisionCategories m_collisionCategories = (CollisionCategories.Geom); |
99 | 99 | ||
100 | // Default, Collide with Other Geometries, spaces and Bodies | 100 | // Default, Collide with Other Geometries, spaces and Bodies |
101 | private CollisionCategories m_collisionFlags = m_default_collisionFlags; | 101 | // private CollisionCategories m_collisionFlags = m_default_collisionFlags; |
102 | 102 | ||
103 | public bool m_taintremove = false; | 103 | public bool m_taintremove = false; |
104 | public bool m_taintdisable = false; | 104 | public bool m_taintdisable = false; |
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
110 | public uint m_localID = 0; | 110 | public uint m_localID = 0; |
111 | 111 | ||
112 | //public GCHandle gc; | 112 | //public GCHandle gc; |
113 | private CollisionLocker ode; | 113 | // private CollisionLocker ode; |
114 | 114 | ||
115 | private bool m_taintforce = false; | 115 | private bool m_taintforce = false; |
116 | private bool m_taintaddangularforce = false; | 116 | private bool m_taintaddangularforce = false; |
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
136 | internal bool m_isVolumeDetect = false; // If true, this prim only detects collisions but doesn't collide actively | 136 | internal bool m_isVolumeDetect = false; // If true, this prim only detects collisions but doesn't collide actively |
137 | 137 | ||
138 | private bool m_throttleUpdates = false; | 138 | private bool m_throttleUpdates = false; |
139 | private int throttleCounter = 0; | 139 | // private int throttleCounter = 0; |
140 | public int m_interpenetrationcount = 0; | 140 | public int m_interpenetrationcount = 0; |
141 | public float m_collisionscore = 0; | 141 | public float m_collisionscore = 0; |
142 | public int m_roundsUnderMotionThreshold = 0; | 142 | public int m_roundsUnderMotionThreshold = 0; |
@@ -155,7 +155,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
155 | private PhysicsVector _target_velocity; | 155 | private PhysicsVector _target_velocity; |
156 | 156 | ||
157 | public int m_eventsubscription = 0; | 157 | public int m_eventsubscription = 0; |
158 | private CollisionEventUpdate CollisionEventsThisFrame = null; | 158 | // private CollisionEventUpdate CollisionEventsThisFrame = null; |
159 | 159 | ||
160 | public volatile bool childPrim = false; | 160 | public volatile bool childPrim = false; |
161 | 161 | ||
@@ -226,8 +226,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
226 | PID_D = parent_scene.bodyPIDD; | 226 | PID_D = parent_scene.bodyPIDD; |
227 | PID_G = parent_scene.bodyPIDG; | 227 | PID_G = parent_scene.bodyPIDG; |
228 | m_density = parent_scene.geomDefaultDensity; | 228 | m_density = parent_scene.geomDefaultDensity; |
229 | m_tensor = parent_scene.bodyMotorJointMaxforceTensor; | 229 | // m_tensor = parent_scene.bodyMotorJointMaxforceTensor; |
230 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; | 230 | // body_autodisable_frames = parent_scene.bodyFramesAutoDisable; |
231 | 231 | ||
232 | prim_geom = null; | 232 | prim_geom = null; |
233 | Body = null; | 233 | Body = null; |
@@ -2146,7 +2146,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
2146 | } | 2146 | } |
2147 | else | 2147 | else |
2148 | { | 2148 | { |
2149 | bool hasTrimesh = false; | 2149 | // bool hasTrimesh = false; |
2150 | lock (childrenPrim) | 2150 | lock (childrenPrim) |
2151 | { | 2151 | { |
2152 | foreach (BulletDotNETPrim chld in childrenPrim) | 2152 | foreach (BulletDotNETPrim chld in childrenPrim) |
@@ -2154,8 +2154,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
2154 | if (chld == null) | 2154 | if (chld == null) |
2155 | continue; | 2155 | continue; |
2156 | 2156 | ||
2157 | if (chld.NeedsMeshing()) | 2157 | // if (chld.NeedsMeshing()) |
2158 | hasTrimesh = true; | 2158 | // hasTrimesh = true; |
2159 | } | 2159 | } |
2160 | } | 2160 | } |
2161 | 2161 | ||
@@ -2517,7 +2517,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
2517 | base.RequestPhysicsterseUpdate(); | 2517 | base.RequestPhysicsterseUpdate(); |
2518 | 2518 | ||
2519 | m_throttleUpdates = false; | 2519 | m_throttleUpdates = false; |
2520 | throttleCounter = 0; | 2520 | // throttleCounter = 0; |
2521 | _zeroFlag = true; | 2521 | _zeroFlag = true; |
2522 | //outofBounds = true; | 2522 | //outofBounds = true; |
2523 | } | 2523 | } |
@@ -2556,7 +2556,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
2556 | if (!m_lastUpdateSent) | 2556 | if (!m_lastUpdateSent) |
2557 | { | 2557 | { |
2558 | m_throttleUpdates = false; | 2558 | m_throttleUpdates = false; |
2559 | throttleCounter = 0; | 2559 | // throttleCounter = 0; |
2560 | m_rotationalVelocity = pv; | 2560 | m_rotationalVelocity = pv; |
2561 | 2561 | ||
2562 | if (_parent == null) | 2562 | if (_parent == null) |
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs index 0a375b2..f006cf1 100644 --- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs +++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | private string m_sceneIdentifier = string.Empty; | 47 | // private string m_sceneIdentifier = string.Empty; |
48 | 48 | ||
49 | private List<BulletDotNETCharacter> m_characters = new List<BulletDotNETCharacter>(); | 49 | private List<BulletDotNETCharacter> m_characters = new List<BulletDotNETCharacter>(); |
50 | private List<BulletDotNETPrim> m_prims = new List<BulletDotNETPrim>(); | 50 | private List<BulletDotNETPrim> m_prims = new List<BulletDotNETPrim>(); |
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
76 | private float avMovementDivisorWalk = 1.8f; | 76 | private float avMovementDivisorWalk = 1.8f; |
77 | private float avMovementDivisorRun = 0.8f; | 77 | private float avMovementDivisorRun = 0.8f; |
78 | 78 | ||
79 | private float minimumGroundFlightOffset = 3f; | 79 | // private float minimumGroundFlightOffset = 3f; |
80 | 80 | ||
81 | public bool meshSculptedPrim = true; | 81 | public bool meshSculptedPrim = true; |
82 | 82 | ||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
98 | private float[] _origheightmap; // Used for Fly height. Kitto Flora | 98 | private float[] _origheightmap; // Used for Fly height. Kitto Flora |
99 | private bool usingGImpactAlgorithm = false; | 99 | private bool usingGImpactAlgorithm = false; |
100 | 100 | ||
101 | private IConfigSource m_config; | 101 | // private IConfigSource m_config; |
102 | private readonly btVector3 worldAabbMin = new btVector3(-10f, -10f, 0); | 102 | private readonly btVector3 worldAabbMin = new btVector3(-10f, -10f, 0); |
103 | private readonly btVector3 worldAabbMax = new btVector3((int)Constants.RegionSize + 10f, (int)Constants.RegionSize + 10f, 9000); | 103 | private readonly btVector3 worldAabbMax = new btVector3((int)Constants.RegionSize + 10f, (int)Constants.RegionSize + 10f, 9000); |
104 | 104 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
107 | 107 | ||
108 | public BulletDotNETScene(string sceneIdentifier) | 108 | public BulletDotNETScene(string sceneIdentifier) |
109 | { | 109 | { |
110 | m_sceneIdentifier = sceneIdentifier; | 110 | // m_sceneIdentifier = sceneIdentifier; |
111 | VectorZero = new btVector3(0, 0, 0); | 111 | VectorZero = new btVector3(0, 0, 0); |
112 | QuatIdentity = new btQuaternion(0, 0, 0, 1); | 112 | QuatIdentity = new btQuaternion(0, 0, 0, 1); |
113 | TransZero = new btTransform(QuatIdentity, VectorZero); | 113 | TransZero = new btTransform(QuatIdentity, VectorZero); |
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin | |||
119 | public override void Initialise(IMesher meshmerizer, IConfigSource config) | 119 | public override void Initialise(IMesher meshmerizer, IConfigSource config) |
120 | { | 120 | { |
121 | mesher = meshmerizer; | 121 | mesher = meshmerizer; |
122 | m_config = config; | 122 | // m_config = config; |
123 | /* | 123 | /* |
124 | if (Environment.OSVersion.Platform == PlatformID.Unix) | 124 | if (Environment.OSVersion.Platform == PlatformID.Unix) |
125 | { | 125 | { |