diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs | 32 |
1 files changed, 16 insertions, 16 deletions
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) |