From f1ce17071dfed560d4785f7b2aabaf25f241f81f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sun, 31 Jul 2011 00:43:02 +0100
Subject: minor: method doc
---
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 23 ++++++++++++++++++++---
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
private IMesh _mesh;
private PrimitiveBaseShape _pbs;
private OdeScene _parent_scene;
+
+ ///
+ /// The physics space which contains prim geometries
+ ///
public IntPtr m_targetSpace = IntPtr.Zero;
+
public IntPtr prim_geom;
public IntPtr prev_geom;
public IntPtr _triMeshData;
@@ -223,7 +228,6 @@ namespace OpenSim.Region.Physics.OdePlugin
// m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
-
prim_geom = IntPtr.Zero;
prev_geom = IntPtr.Zero;
@@ -322,6 +326,10 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
+ ///
+ /// Set a new geometry for this prim.
+ ///
+ ///
public void SetGeom(IntPtr geom)
{
prev_geom = prim_geom;
@@ -370,6 +378,9 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
+ ///
+ /// Make a prim subject to physics.
+ ///
public void enableBody()
{
// Don't enable this body if we're a child prim
@@ -745,6 +756,9 @@ namespace OpenSim.Region.Physics.OdePlugin
}
}
+ ///
+ /// Stop a prim from being subject to physics.
+ ///
public void disableBody()
{
//this kills the body so things like 'mesh' can re-create it.
@@ -1192,7 +1206,6 @@ Console.WriteLine("ZProcessTaints for " + Name);
}
disableBody();
-
if (Body != IntPtr.Zero)
{
_parent_scene.remActivePrim(this);
@@ -1206,7 +1219,6 @@ Console.WriteLine("ZProcessTaints for " + Name);
AddChildPrim(prm);
}
}
-
}
private void ChildDelink(OdePrim odePrim)
@@ -1341,6 +1353,11 @@ Console.WriteLine("ZProcessTaints for " + Name);
m_taintVelocity = Vector3.Zero;
}
+ ///
+ /// Create a geometry for the given mesh in the given target space.
+ ///
+ ///
+ /// /param>
public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
{
#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
world = d.WorldCreate();
space = d.HashSpaceCreate(IntPtr.Zero);
-
contactgroup = d.JointGroupCreate(0);
//contactgroup
--
cgit v1.1