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

minor: remove mono compiler warnings, some code spacing adjustments

bulletsim
Justin Clark-Casey (justincc) 2011-07-30 03:56:29 +01:00
parent 9fc59e2bf2
commit 49a3740ee9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -1229,11 +1229,14 @@ namespace OpenSim.Region.Physics.OdePlugin
m_requestedUpdateFrequency = 0; m_requestedUpdateFrequency = 0;
m_eventsubscription = 0; m_eventsubscription = 0;
} }
public void AddCollisionEvent(uint CollidedWith, ContactPoint contact) public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
{ {
if (m_eventsubscription > 0) if (m_eventsubscription > 0)
{ {
// m_log.DebugFormat(
// "[PHYSICS]: Adding collision event for {0}, collidedWith {1}, contact {2}", "", CollidedWith, contact);
CollisionEventsThisFrame.addCollider(CollidedWith, contact); CollisionEventsThisFrame.addCollider(CollidedWith, contact);
} }
} }

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

@ -1457,7 +1457,6 @@ Console.WriteLine("changeadd 1");
{ {
if (m_isphysical) if (m_isphysical)
{ {
if (!m_disabled && !m_taintremove && !childPrim) if (!m_disabled && !m_taintremove && !childPrim)
{ {
if (Body == IntPtr.Zero) if (Body == IntPtr.Zero)
@ -2999,6 +2998,7 @@ Console.WriteLine("changeshape not need meshing");
{ {
if (CollisionEventsThisFrame == null) if (CollisionEventsThisFrame == null)
CollisionEventsThisFrame = new CollisionEventUpdate(); CollisionEventsThisFrame = new CollisionEventUpdate();
CollisionEventsThisFrame.addCollider(CollidedWith, contact); CollisionEventsThisFrame.addCollider(CollidedWith, contact);
} }

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

@ -100,7 +100,7 @@ namespace OpenSim.Region.Physics.OdePlugin
Rubber = 6 Rubber = 6
} }
public sealed class OdeScene : PhysicsScene public class OdeScene : PhysicsScene
{ {
private readonly ILog m_log; private readonly ILog m_log;
// private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>(); // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
@ -957,7 +957,6 @@ namespace OpenSim.Region.Physics.OdePlugin
character.SetPidStatus(true); character.SetPidStatus(true);
} }
} }
if (p1.PhysicsActorType == (int) ActorTypes.Agent) if (p1.PhysicsActorType == (int) ActorTypes.Agent)
{ {
@ -1058,9 +1057,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]); joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
m_global_contactcount++; m_global_contactcount++;
} }
} }
else else
{ {
@ -1083,7 +1080,6 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]); joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
m_global_contactcount++; m_global_contactcount++;
} }
} }
} }
@ -1295,6 +1291,7 @@ namespace OpenSim.Region.Physics.OdePlugin
//returncollisions = true; //returncollisions = true;
break; break;
case ActorTypes.Prim: case ActorTypes.Prim:
if (p1 is OdePrim) if (p1 is OdePrim)
{ {
@ -1322,6 +1319,7 @@ namespace OpenSim.Region.Physics.OdePlugin
cc2.AddCollisionEvent(obj2LocalID, contact); cc2.AddCollisionEvent(obj2LocalID, contact);
break; break;
case ActorTypes.Prim: case ActorTypes.Prim:
if (p2 is OdePrim) if (p2 is OdePrim)