diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 57e2d20..20a70b4 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Physics.Manager | |||
47 | public delegate void JointDeactivated(PhysicsJoint joint); | 47 | public delegate void JointDeactivated(PhysicsJoint joint); |
48 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" | 48 | public delegate void JointErrorMessage(PhysicsJoint joint, string message); // this refers to an "error message due to a problem", not "amount of joint constraint violation" |
49 | 49 | ||
50 | public enum RayFilterFlags:ushort | 50 | public enum RayFilterFlags : ushort |
51 | { | 51 | { |
52 | // the flags | 52 | // the flags |
53 | water = 0x01, | 53 | water = 0x01, |
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Physics.Manager | |||
64 | ClosestHit = 0x8000, | 64 | ClosestHit = 0x8000, |
65 | 65 | ||
66 | // some combinations | 66 | // some combinations |
67 | LSLPhanton = phantom | volumedtc, | 67 | LSLPhantom = phantom | volumedtc, |
68 | PrimsNonPhantom = nonphysical | physical, | 68 | PrimsNonPhantom = nonphysical | physical, |
69 | PrimsNonPhantomAgents = nonphysical | physical | agent, | 69 | PrimsNonPhantomAgents = nonphysical | physical | agent, |
70 | 70 | ||
@@ -97,13 +97,20 @@ namespace OpenSim.Region.Physics.Manager | |||
97 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 97 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
98 | 98 | ||
99 | /// <summary> | 99 | /// <summary> |
100 | /// Name of this scene. Useful in debug messages to distinguish one OdeScene instance from another. | 100 | /// A unique identifying string for this instance of the physics engine. |
101 | /// Useful in debug messages to distinguish one OdeScene instance from another. | ||
102 | /// Usually set to include the region name that the physics engine is acting for. | ||
101 | /// </summary> | 103 | /// </summary> |
102 | public string Name { get; protected set; } | 104 | public string Name { get; protected set; } |
103 | 105 | ||
106 | /// <summary> | ||
107 | /// A string identifying the family of this physics engine. Most common values returned | ||
108 | /// are "OpenDynamicsEngine" and "BulletSim" but others are possible. | ||
109 | /// </summary> | ||
110 | public string EngineType { get; protected set; } | ||
111 | |||
104 | // The only thing that should register for this event is the SceneGraph | 112 | // The only thing that should register for this event is the SceneGraph |
105 | // Anything else could cause problems. | 113 | // Anything else could cause problems. |
106 | |||
107 | public event physicsCrash OnPhysicsCrash; | 114 | public event physicsCrash OnPhysicsCrash; |
108 | 115 | ||
109 | public static PhysicsScene Null | 116 | public static PhysicsScene Null |