OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: method doc

bulletsim
Justin Clark-Casey (justincc) 2011-07-31 00:43:02 +01:00
parent e08be91c84
commit f1ce17071d
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -157,7 +157,12 @@ namespace OpenSim.Region.Physics.OdePlugin
private IMesh _mesh; private IMesh _mesh;
private PrimitiveBaseShape _pbs; private PrimitiveBaseShape _pbs;
private OdeScene _parent_scene; private OdeScene _parent_scene;
/// <summary>
/// The physics space which contains prim geometries
/// </summary>
public IntPtr m_targetSpace = IntPtr.Zero; public IntPtr m_targetSpace = IntPtr.Zero;
public IntPtr prim_geom; public IntPtr prim_geom;
public IntPtr prev_geom; public IntPtr prev_geom;
public IntPtr _triMeshData; public IntPtr _triMeshData;
@ -223,7 +228,6 @@ namespace OpenSim.Region.Physics.OdePlugin
// m_tensor = parent_scene.bodyMotorJointMaxforceTensor; // m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
body_autodisable_frames = parent_scene.bodyFramesAutoDisable; body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
prim_geom = IntPtr.Zero; prim_geom = IntPtr.Zero;
prev_geom = IntPtr.Zero; prev_geom = IntPtr.Zero;
@ -322,6 +326,10 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
/// <summary>
/// Set a new geometry for this prim.
/// </summary>
/// <param name="geom"></param>
public void SetGeom(IntPtr geom) public void SetGeom(IntPtr geom)
{ {
prev_geom = prim_geom; prev_geom = prim_geom;
@ -370,6 +378,9 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
/// <summary>
/// Make a prim subject to physics.
/// </summary>
public void enableBody() public void enableBody()
{ {
// Don't enable this body if we're a child prim // Don't enable this body if we're a child prim
@ -745,6 +756,9 @@ namespace OpenSim.Region.Physics.OdePlugin
} }
} }
/// <summary>
/// Stop a prim from being subject to physics.
/// </summary>
public void disableBody() public void disableBody()
{ {
//this kills the body so things like 'mesh' can re-create it. //this kills the body so things like 'mesh' can re-create it.
@ -1192,7 +1206,6 @@ Console.WriteLine("ZProcessTaints for " + Name);
} }
disableBody(); disableBody();
if (Body != IntPtr.Zero) if (Body != IntPtr.Zero)
{ {
_parent_scene.remActivePrim(this); _parent_scene.remActivePrim(this);
@ -1206,7 +1219,6 @@ Console.WriteLine("ZProcessTaints for " + Name);
AddChildPrim(prm); AddChildPrim(prm);
} }
} }
} }
private void ChildDelink(OdePrim odePrim) private void ChildDelink(OdePrim odePrim)
@ -1341,6 +1353,11 @@ Console.WriteLine("ZProcessTaints for " + Name);
m_taintVelocity = Vector3.Zero; m_taintVelocity = Vector3.Zero;
} }
/// <summary>
/// Create a geometry for the given mesh in the given target space.
/// </summary>
/// <param name="m_targetSpace"></param>
/// <param name="_mesh">/param>
public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh) public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
{ {
#if SPAM #if SPAM

1
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -305,7 +305,6 @@ namespace OpenSim.Region.Physics.OdePlugin
world = d.WorldCreate(); world = d.WorldCreate();
space = d.HashSpaceCreate(IntPtr.Zero); space = d.HashSpaceCreate(IntPtr.Zero);
contactgroup = d.JointGroupCreate(0); contactgroup = d.JointGroupCreate(0);
//contactgroup //contactgroup