diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 23 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 1 |
2 files changed, 20 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 879d30f..e91ee51 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -157,7 +157,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
157 | private IMesh _mesh; | 157 | private IMesh _mesh; |
158 | private PrimitiveBaseShape _pbs; | 158 | private PrimitiveBaseShape _pbs; |
159 | private OdeScene _parent_scene; | 159 | private OdeScene _parent_scene; |
160 | |||
161 | /// <summary> | ||
162 | /// The physics space which contains prim geometries | ||
163 | /// </summary> | ||
160 | public IntPtr m_targetSpace = IntPtr.Zero; | 164 | public IntPtr m_targetSpace = IntPtr.Zero; |
165 | |||
161 | public IntPtr prim_geom; | 166 | public IntPtr prim_geom; |
162 | public IntPtr prev_geom; | 167 | public IntPtr prev_geom; |
163 | public IntPtr _triMeshData; | 168 | public IntPtr _triMeshData; |
@@ -223,7 +228,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
223 | // m_tensor = parent_scene.bodyMotorJointMaxforceTensor; | 228 | // m_tensor = parent_scene.bodyMotorJointMaxforceTensor; |
224 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; | 229 | body_autodisable_frames = parent_scene.bodyFramesAutoDisable; |
225 | 230 | ||
226 | |||
227 | prim_geom = IntPtr.Zero; | 231 | prim_geom = IntPtr.Zero; |
228 | prev_geom = IntPtr.Zero; | 232 | prev_geom = IntPtr.Zero; |
229 | 233 | ||
@@ -322,6 +326,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
322 | } | 326 | } |
323 | } | 327 | } |
324 | 328 | ||
329 | /// <summary> | ||
330 | /// Set a new geometry for this prim. | ||
331 | /// </summary> | ||
332 | /// <param name="geom"></param> | ||
325 | public void SetGeom(IntPtr geom) | 333 | public void SetGeom(IntPtr geom) |
326 | { | 334 | { |
327 | prev_geom = prim_geom; | 335 | prev_geom = prim_geom; |
@@ -370,6 +378,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
370 | } | 378 | } |
371 | } | 379 | } |
372 | 380 | ||
381 | /// <summary> | ||
382 | /// Make a prim subject to physics. | ||
383 | /// </summary> | ||
373 | public void enableBody() | 384 | public void enableBody() |
374 | { | 385 | { |
375 | // Don't enable this body if we're a child prim | 386 | // Don't enable this body if we're a child prim |
@@ -745,6 +756,9 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
745 | } | 756 | } |
746 | } | 757 | } |
747 | 758 | ||
759 | /// <summary> | ||
760 | /// Stop a prim from being subject to physics. | ||
761 | /// </summary> | ||
748 | public void disableBody() | 762 | public void disableBody() |
749 | { | 763 | { |
750 | //this kills the body so things like 'mesh' can re-create it. | 764 | //this kills the body so things like 'mesh' can re-create it. |
@@ -1192,7 +1206,6 @@ Console.WriteLine("ZProcessTaints for " + Name); | |||
1192 | } | 1206 | } |
1193 | disableBody(); | 1207 | disableBody(); |
1194 | 1208 | ||
1195 | |||
1196 | if (Body != IntPtr.Zero) | 1209 | if (Body != IntPtr.Zero) |
1197 | { | 1210 | { |
1198 | _parent_scene.remActivePrim(this); | 1211 | _parent_scene.remActivePrim(this); |
@@ -1206,7 +1219,6 @@ Console.WriteLine("ZProcessTaints for " + Name); | |||
1206 | AddChildPrim(prm); | 1219 | AddChildPrim(prm); |
1207 | } | 1220 | } |
1208 | } | 1221 | } |
1209 | |||
1210 | } | 1222 | } |
1211 | 1223 | ||
1212 | private void ChildDelink(OdePrim odePrim) | 1224 | private void ChildDelink(OdePrim odePrim) |
@@ -1341,6 +1353,11 @@ Console.WriteLine("ZProcessTaints for " + Name); | |||
1341 | m_taintVelocity = Vector3.Zero; | 1353 | m_taintVelocity = Vector3.Zero; |
1342 | } | 1354 | } |
1343 | 1355 | ||
1356 | /// <summary> | ||
1357 | /// Create a geometry for the given mesh in the given target space. | ||
1358 | /// </summary> | ||
1359 | /// <param name="m_targetSpace"></param> | ||
1360 | /// <param name="_mesh">/param> | ||
1344 | public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh) | 1361 | public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh) |
1345 | { | 1362 | { |
1346 | #if SPAM | 1363 | #if SPAM |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 8a24190..3c702db 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -305,7 +305,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
305 | world = d.WorldCreate(); | 305 | world = d.WorldCreate(); |
306 | space = d.HashSpaceCreate(IntPtr.Zero); | 306 | space = d.HashSpaceCreate(IntPtr.Zero); |
307 | 307 | ||
308 | |||
309 | contactgroup = d.JointGroupCreate(0); | 308 | contactgroup = d.JointGroupCreate(0); |
310 | //contactgroup | 309 | //contactgroup |
311 | 310 | ||