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

BulletSim: remove warnings for unused variables.

connector_plugin
Robert Adams 2012-10-01 08:27:26 -07:00
parent 54ec8b197b
commit 5221f2421e
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
View File

@ -34,7 +34,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public class BSLinkset
{
private static string LogHeader = "[BULLETSIM LINKSET]";
// private static string LogHeader = "[BULLETSIM LINKSET]";
public BSPhysObject LinksetRoot { get; protected set; }

17
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
View File

@ -46,19 +46,13 @@ public sealed class BSPrim : BSPhysObject
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly string LogHeader = "[BULLETS PRIM]";
private IMesh _mesh;
private PrimitiveBaseShape _pbs;
private ShapeData.PhysicsShapeType _shapeType;
private ulong _meshKey;
private ulong _hullKey;
private List<ConvexResult> _hulls;
// _size is what the user passed. _scale is what we pass to the physics engine with the mesh.
// Often _scale is unity because the meshmerizer will apply _size when creating the mesh.
private OMV.Vector3 _size; // the multiplier for each mesh dimension as passed by the user
private OMV.Vector3 _scale; // the multiplier for each mesh dimension for the mesh as created by the meshmerizer
private bool _stopped;
private bool _grabbed;
private bool _isSelected;
private bool _isVolumeDetect;
@ -109,8 +103,6 @@ public sealed class BSPrim : BSPhysObject
_buoyancy = 1f;
_velocity = OMV.Vector3.Zero;
_rotationalVelocity = OMV.Vector3.Zero;
_hullKey = 0;
_meshKey = 0;
_pbs = pbs;
_isPhysical = pisPhysical;
_isVolumeDetect = false;
@ -160,8 +152,9 @@ public sealed class BSPrim : BSPhysObject
});
}
// No one uses this property.
public override bool Stopped {
get { return _stopped; }
get { return false; }
}
public override OMV.Vector3 Size {
get { return _size; }
@ -1082,15 +1075,15 @@ public sealed class BSPrim : BSPhysObject
public void FillShapeInfo(out ShapeData shape)
{
shape.ID = LocalID;
shape.Type = _shapeType;
shape.Type = ShapeData.PhysicsShapeType.SHAPE_UNKNOWN;
shape.Position = _position;
shape.Rotation = _orientation;
shape.Velocity = _velocity;
shape.Scale = _scale;
shape.Mass = _isPhysical ? _mass : 0f;
shape.Buoyancy = _buoyancy;
shape.HullKey = _hullKey;
shape.MeshKey = _meshKey;
shape.HullKey = 0;
shape.MeshKey = 0;
shape.Friction = _friction;
shape.Restitution = _restitution;
shape.Collidable = (!IsPhantom) ? ShapeData.numericTrue : ShapeData.numericFalse;

2
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
View File

@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{
public class BSShapeCollection : IDisposable
{
private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
// private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
protected BSScene PhysicsScene { get; set; }