aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/Region/Physics
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs4
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs22
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs16
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
-rw-r--r--OpenSim/Region/Physics/Meshing/SimpleHull.cs18
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs8
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs10
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs68
-rw-r--r--OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs2
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs2
11 files changed, 82 insertions, 76 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index b76fbbf..919910c 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
55// You can specify all values by your own or you can build default build and revision 55// You can specify all values by your own or you can build default build and revision
56// numbers with the '*' character (the default): 56// numbers with the '*' character (the default):
57 57
58[assembly : AssemblyVersion("1.0.*")] \ No newline at end of file 58[assembly : AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index f42fdf6..27ae490 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Region.Physics.BulletXPlugin
81 /// </summary> 81 /// </summary>
82 public class BulletXMaths 82 public class BulletXMaths
83 { 83 {
84 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
85
84 //Vector3 86 //Vector3
85 public static Vector3 PhysicsVectorToXnaVector3(PhysicsVector physicsVector) 87 public static Vector3 PhysicsVectorToXnaVector3(PhysicsVector physicsVector)
86 { 88 {
@@ -311,7 +313,7 @@ namespace OpenSim.Region.Physics.BulletXPlugin
311 313
312 bool needsCollision = base.NeedsCollision(bodyA, bodyB); 314 bool needsCollision = base.NeedsCollision(bodyA, bodyB);
313 315
314 //MainLog.Instance.Debug("BulletX", "A collision was detected between {0} and {1} --> {2}", nameA, nameB, 316 //m_log.Debug("[BulletX]: A collision was detected between {0} and {1} --> {2}", nameA, nameB,
315 //needsCollision); 317 //needsCollision);
316 318
317 319
diff --git a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
index a4ac54f..acaa389b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsPluginManager.cs
@@ -38,6 +38,8 @@ namespace OpenSim.Region.Physics.Manager
38 /// </summary> 38 /// </summary>
39 public class PhysicsPluginManager 39 public class PhysicsPluginManager
40 { 40 {
41 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
42
41 private Dictionary<string, IPhysicsPlugin> _PhysPlugins = new Dictionary<string, IPhysicsPlugin>(); 43 private Dictionary<string, IPhysicsPlugin> _PhysPlugins = new Dictionary<string, IPhysicsPlugin>();
42 private Dictionary<string, IMeshingPlugin> _MeshPlugins = new Dictionary<string, IMeshingPlugin>(); 44 private Dictionary<string, IMeshingPlugin> _MeshPlugins = new Dictionary<string, IMeshingPlugin>();
43 45
@@ -60,25 +62,25 @@ namespace OpenSim.Region.Physics.Manager
60 IMesher meshEngine = null; 62 IMesher meshEngine = null;
61 if (_MeshPlugins.ContainsKey(meshEngineName)) 63 if (_MeshPlugins.ContainsKey(meshEngineName))
62 { 64 {
63 MainLog.Instance.Verbose("PHYSICS", "creating meshing engine " + meshEngineName); 65 m_log.Info("[PHYSICS]: creating meshing engine " + meshEngineName);
64 meshEngine = _MeshPlugins[meshEngineName].GetMesher(); 66 meshEngine = _MeshPlugins[meshEngineName].GetMesher();
65 } 67 }
66 else 68 else
67 { 69 {
68 MainLog.Instance.Warn("PHYSICS", "couldn't find meshingEngine: {0}", meshEngineName); 70 m_log.Warn(String.Format("[PHYSICS]: couldn't find meshingEngine: {0}", meshEngineName));
69 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName)); 71 throw new ArgumentException(String.Format("couldn't find meshingEngine: {0}", meshEngineName));
70 } 72 }
71 73
72 if (_PhysPlugins.ContainsKey(physEngineName)) 74 if (_PhysPlugins.ContainsKey(physEngineName))
73 { 75 {
74 MainLog.Instance.Verbose("PHYSICS", "creating " + physEngineName); 76 m_log.Info("[PHYSICS]: creating " + physEngineName);
75 PhysicsScene result = _PhysPlugins[physEngineName].GetScene(); 77 PhysicsScene result = _PhysPlugins[physEngineName].GetScene();
76 result.Initialise(meshEngine); 78 result.Initialise(meshEngine);
77 return result; 79 return result;
78 } 80 }
79 else 81 else
80 { 82 {
81 MainLog.Instance.Warn("PHYSICS", "couldn't find physicsEngine: {0}", physEngineName); 83 m_log.Warn(String.Format("[PHYSICS]: couldn't find physicsEngine: {0}", physEngineName));
82 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName)); 84 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}", physEngineName));
83 } 85 }
84 } 86 }
@@ -89,7 +91,7 @@ namespace OpenSim.Region.Physics.Manager
89 IMeshingPlugin plugHard; 91 IMeshingPlugin plugHard;
90 plugHard = new ZeroMesherPlugin(); 92 plugHard = new ZeroMesherPlugin();
91 _MeshPlugins.Add(plugHard.GetName(), plugHard); 93 _MeshPlugins.Add(plugHard.GetName(), plugHard);
92 MainLog.Instance.Verbose("PHYSICS", "Added meshing engine: " + plugHard.GetName()); 94 m_log.Info("[PHYSICS]: Added meshing engine: " + plugHard.GetName());
93 95
94 // And now walk all assemblies (DLLs effectively) and see if they are home 96 // And now walk all assemblies (DLLs effectively) and see if they are home
95 // of a plugin that is of interest for us 97 // of a plugin that is of interest for us
@@ -120,7 +122,7 @@ namespace OpenSim.Region.Physics.Manager
120 (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 122 (IPhysicsPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
121 plug.Init(); 123 plug.Init();
122 _PhysPlugins.Add(plug.GetName(), plug); 124 _PhysPlugins.Add(plug.GetName(), plug);
123 MainLog.Instance.Verbose("PHYSICS", "Added physics engine: " + plug.GetName()); 125 m_log.Info("[PHYSICS]: Added physics engine: " + plug.GetName());
124 } 126 }
125 127
126 Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true); 128 Type meshTypeInterface = pluginType.GetInterface("IMeshingPlugin", true);
@@ -130,7 +132,7 @@ namespace OpenSim.Region.Physics.Manager
130 IMeshingPlugin plug = 132 IMeshingPlugin plug =
131 (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 133 (IMeshingPlugin) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
132 _MeshPlugins.Add(plug.GetName(), plug); 134 _MeshPlugins.Add(plug.GetName(), plug);
133 MainLog.Instance.Verbose("PHYSICS", "Added meshing engine: " + plug.GetName()); 135 m_log.Info("[PHYSICS]: Added meshing engine: " + plug.GetName());
134 } 136 }
135 137
136 physTypeInterface = null; 138 physTypeInterface = null;
@@ -147,11 +149,11 @@ namespace OpenSim.Region.Physics.Manager
147 { 149 {
148 if (isWarning) 150 if (isWarning)
149 { 151 {
150 MainLog.Instance.Warn("PHYSICS", message); 152 m_log.Warn("[PHYSICS]: " + message);
151 } 153 }
152 else 154 else
153 { 155 {
154 MainLog.Instance.Verbose("PHYSICS", message); 156 m_log.Info("[PHYSICS]: " + message);
155 } 157 }
156 } 158 }
157 159
@@ -171,4 +173,4 @@ namespace OpenSim.Region.Physics.Manager
171 string GetName(); 173 string GetName();
172 IMesher GetMesher(); 174 IMesher GetMesher();
173 } 175 }
174} \ No newline at end of file 176}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 37481f1..bd2ad99 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,6 +25,7 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
28using Axiom.Math; 29using Axiom.Math;
29using OpenSim.Framework; 30using OpenSim.Framework;
30using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
@@ -35,6 +36,8 @@ namespace OpenSim.Region.Physics.Manager
35 36
36 public abstract class PhysicsScene 37 public abstract class PhysicsScene
37 { 38 {
39 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
40
38 // The only thing that should register for this event is the InnerScene 41 // The only thing that should register for this event is the InnerScene
39 // Anything else could cause problems. 42 // Anything else could cause problems.
40 43
@@ -92,7 +95,7 @@ namespace OpenSim.Region.Physics.Manager
92 95
93 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 96 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
94 { 97 {
95 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddAvatar({0})", position); 98 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position));
96 return PhysicsActor.Null; 99 return PhysicsActor.Null;
97 } 100 }
98 101
@@ -107,7 +110,7 @@ namespace OpenSim.Region.Physics.Manager
107/* 110/*
108 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation) 111 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size, Quaternion rotation)
109 { 112 {
110 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 113 m_log.Info(String.Format("NullPhysicsScene : AddPrim({0},{1})", position, size));
111 return PhysicsActor.Null; 114 return PhysicsActor.Null;
112 } 115 }
113*/ 116*/
@@ -121,7 +124,7 @@ namespace OpenSim.Region.Physics.Manager
121 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 124 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
122 PhysicsVector size, Quaternion rotation, bool isPhysical) 125 PhysicsVector size, Quaternion rotation, bool isPhysical)
123 { 126 {
124 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); 127 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size));
125 return PhysicsActor.Null; 128 return PhysicsActor.Null;
126 } 129 }
127 130
@@ -131,20 +134,19 @@ namespace OpenSim.Region.Physics.Manager
131 134
132 public override float Simulate(float timeStep) 135 public override float Simulate(float timeStep)
133 { 136 {
134 m_workIndicator = (m_workIndicator + 1)%10; 137 m_workIndicator = (m_workIndicator + 1) % 10;
135 138
136 //MainLog.Instance.SetStatus(m_workIndicator.ToString());
137 return 0f; 139 return 0f;
138 } 140 }
139 141
140 public override void GetResults() 142 public override void GetResults()
141 { 143 {
142 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : GetResults()"); 144 m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
143 } 145 }
144 146
145 public override void SetTerrain(float[] heightMap) 147 public override void SetTerrain(float[] heightMap)
146 { 148 {
147 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 149 m_log.Info(String.Format("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length));
148 } 150 }
149 151
150 public override void DeleteTerrain() 152 public override void DeleteTerrain()
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 3217dd8..d4c9926 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -53,6 +53,8 @@ namespace OpenSim.Region.Physics.Meshing
53 53
54 public class Meshmerizer : IMesher 54 public class Meshmerizer : IMesher
55 { 55 {
56 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
57
56 // Setting baseDir to a path will enable the dumping of raw files 58 // Setting baseDir to a path will enable the dumping of raw files
57 // raw files can be imported by blender so a visual inspection of the results can be done 59 // raw files can be imported by blender so a visual inspection of the results can be done
58 // const string baseDir = "rawFiles"; 60 // const string baseDir = "rawFiles";
@@ -101,7 +103,6 @@ namespace OpenSim.Region.Physics.Meshing
101 return influenced; 103 return influenced;
102 } 104 }
103 105
104
105 private static void InsertVertices(List<Vertex> vertices, int usedForSeed, List<Triangle> triangles) 106 private static void InsertVertices(List<Vertex> vertices, int usedForSeed, List<Triangle> triangles)
106 { 107 {
107 // This is a variant of the delaunay algorithm 108 // This is a variant of the delaunay algorithm
@@ -174,7 +175,6 @@ namespace OpenSim.Region.Physics.Meshing
174 } 175 }
175 } 176 }
176 177
177
178 private static Mesh CreateBoxMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size) 178 private static Mesh CreateBoxMesh(String primName, PrimitiveBaseShape primShape, PhysicsVector size)
179 // Builds the z (+ and -) surfaces of a box shaped prim 179 // Builds the z (+ and -) surfaces of a box shaped prim
180 { 180 {
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Physics.Meshing
236 // Calculated separately to avoid errors 236 // Calculated separately to avoid errors
237 cutHull.AddVertex(legEnd); 237 cutHull.AddVertex(legEnd);
238 238
239 MainLog.Instance.Debug("Starting cutting of the hollow shape from the prim {1}", 0, primName); 239 m_log.Debug(String.Format("Starting cutting of the hollow shape from the prim {1}", 0, primName));
240 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull); 240 SimpleHull cuttedHull = SimpleHull.SubtractHull(outerHull, cutHull);
241 241
242 outerHull = cuttedHull; 242 outerHull = cuttedHull;
diff --git a/OpenSim/Region/Physics/Meshing/SimpleHull.cs b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
index 4532bda..9209860 100644
--- a/OpenSim/Region/Physics/Meshing/SimpleHull.cs
+++ b/OpenSim/Region/Physics/Meshing/SimpleHull.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Region.Physics.Meshing
42 // is defined by the hull lies inside or outside the simplex chain 42 // is defined by the hull lies inside or outside the simplex chain
43 public class SimpleHull 43 public class SimpleHull
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
46
45 private List<Vertex> vertices = new List<Vertex>(); 47 private List<Vertex> vertices = new List<Vertex>();
46 private List<Vertex> holeVertices = new List<Vertex>(); // Only used, when the hull is hollow 48 private List<Vertex> holeVertices = new List<Vertex>(); // Only used, when the hull is hollow
47 49
@@ -243,9 +245,9 @@ namespace OpenSim.Region.Physics.Meshing
243 SimpleHull otherHullClone = otherHull.Clone(); 245 SimpleHull otherHullClone = otherHull.Clone();
244 bool intersects = false; 246 bool intersects = false;
245 247
246 MainLog.Instance.Debug("State before intersection detection"); 248 m_log.Debug("State before intersection detection");
247 MainLog.Instance.Debug("The baseHull is:\n{1}", 0, baseHullClone.ToString()); 249 m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
248 MainLog.Instance.Debug("The otherHull is:\n{1}", 0, otherHullClone.ToString()); 250 m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
249 251
250 { 252 {
251 int iBase, iOther; 253 int iBase, iOther;
@@ -274,8 +276,8 @@ namespace OpenSim.Region.Physics.Meshing
274 } 276 }
275 } 277 }
276 278
277 MainLog.Instance.Debug("State after intersection detection for the base hull"); 279 m_log.Debug("State after intersection detection for the base hull");
278 MainLog.Instance.Debug("The baseHull is:\n{1}", 0, baseHullClone.ToString()); 280 m_log.Debug(String.Format("The baseHull is:\n{1}", 0, baseHullClone.ToString()));
279 281
280 { 282 {
281 int iOther, iBase; 283 int iOther, iBase;
@@ -303,8 +305,8 @@ namespace OpenSim.Region.Physics.Meshing
303 } 305 }
304 } 306 }
305 307
306 MainLog.Instance.Debug("State after intersection detection for the base hull"); 308 m_log.Debug("State after intersection detection for the base hull");
307 MainLog.Instance.Debug("The otherHull is:\n{1}", 0, otherHullClone.ToString()); 309 m_log.Debug(String.Format("The otherHull is:\n{1}", 0, otherHullClone.ToString()));
308 310
309 311
310 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone); 312 bool otherIsInBase = baseHullClone.containsPointsFrom(otherHullClone);
@@ -387,7 +389,7 @@ namespace OpenSim.Region.Physics.Meshing
387 done = true; 389 done = true;
388 } 390 }
389 391
390 MainLog.Instance.Debug("The resulting Hull is:\n{1}", 0, result.ToString()); 392 m_log.Debug(String.Format("The resulting Hull is:\n{1}", 0, result.ToString()));
391 393
392 return result; 394 return result;
393 } 395 }
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index a21b7eb..98069a0 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -56,6 +56,8 @@ namespace OpenSim.Region.Physics.OdePlugin
56 } 56 }
57 public class OdeCharacter : PhysicsActor 57 public class OdeCharacter : PhysicsActor
58 { 58 {
59 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
60
59 private PhysicsVector _position; 61 private PhysicsVector _position;
60 private d.Vector3 _zeroPosition; 62 private d.Vector3 _zeroPosition;
61 private d.Matrix3 m_StandUpRotation; 63 private d.Matrix3 m_StandUpRotation;
@@ -357,7 +359,7 @@ namespace OpenSim.Region.Physics.OdePlugin
357 //capsuleradius = 0.2f; 359 //capsuleradius = 0.2f;
358 360
359 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z*0.52f))); // subtract 43% of the size 361 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z*0.52f))); // subtract 43% of the size
360 OpenSim.Framework.Console.MainLog.Instance.Verbose("SIZE", CAPSULE_LENGTH.ToString()); 362 m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
361 d.BodyDestroy(Body); 363 d.BodyDestroy(Body);
362 364
363 _parent_scene.waitForSpaceUnlock(_parent_scene.space); 365 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
@@ -440,7 +442,7 @@ namespace OpenSim.Region.Physics.OdePlugin
440 //d.QfromR( 442 //d.QfromR(
441 //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068, 443 //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068,
442 // 444 //
443 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICSAV", "Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22); 445 //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
444 //standupStraight(); 446 //standupStraight();
445 447
446 448
@@ -479,7 +481,7 @@ namespace OpenSim.Region.Physics.OdePlugin
479 d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f); 481 d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
480 d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f); 482 d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
481 //d.Matrix3 bodyrotation = d.BodyGetRotation(Body); 483 //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
482 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICSAV", "Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22); 484 //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
483 } 485 }
484 486
485 public override PhysicsVector Force 487 public override PhysicsVector Force
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 93ba29e..690e9d3 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -37,6 +37,8 @@ namespace OpenSim.Region.Physics.OdePlugin
37{ 37{
38 public class OdePrim : PhysicsActor 38 public class OdePrim : PhysicsActor
39 { 39 {
40 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
41
40 public PhysicsVector _position; 42 public PhysicsVector _position;
41 private PhysicsVector _velocity; 43 private PhysicsVector _velocity;
42 private PhysicsVector m_lastVelocity = new PhysicsVector(0.0f, 0.0f, 0.0f); 44 private PhysicsVector m_lastVelocity = new PhysicsVector(0.0f, 0.0f, 0.0f);
@@ -530,7 +532,7 @@ namespace OpenSim.Region.Physics.OdePlugin
530 } 532 }
531 else 533 else
532 { 534 {
533 OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Failed to load a sphere bad size"); 535 m_log.Info("[PHYSICS]: Failed to load a sphere bad size");
534 _parent_scene.waitForSpaceUnlock(m_targetSpace); 536 _parent_scene.waitForSpaceUnlock(m_targetSpace);
535 prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); 537 prim_geom = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z);
536 } 538 }
@@ -683,7 +685,7 @@ namespace OpenSim.Region.Physics.OdePlugin
683 { 685 {
684 lock (m_forcelist) 686 lock (m_forcelist)
685 { 687 {
686 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "dequeing forcelist"); 688 //m_log.Info("[PHYSICS]: dequeing forcelist");
687 if (IsPhysical) 689 if (IsPhysical)
688 { 690 {
689 PhysicsVector iforce = new PhysicsVector(); 691 PhysicsVector iforce = new PhysicsVector();
@@ -747,7 +749,7 @@ namespace OpenSim.Region.Physics.OdePlugin
747 get { return _position; } 749 get { return _position; }
748 750
749 set { _position = value; 751 set { _position = value;
750 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", _position.ToString()); 752 //m_log.Info("[PHYSICS]: " + _position.ToString());
751 } 753 }
752 } 754 }
753 755
@@ -824,7 +826,7 @@ namespace OpenSim.Region.Physics.OdePlugin
824 { 826 {
825 m_forcelist.Add(force); 827 m_forcelist.Add(force);
826 m_taintforce = true; 828 m_taintforce = true;
827 //OpenSim.Framework.Console.MainLog.Instance.Verbose("PHYSICS", "Added Force:" + force.ToString() + " to prim at " + Position.ToString()); 829 //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() + " to prim at " + Position.ToString());
828 } 830 }
829 831
830 public override PhysicsVector RotationalVelocity 832 public override PhysicsVector RotationalVelocity
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index bff2c80..9cf6d50 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Region.Physics.OdePlugin
44 /// </summary> 44 /// </summary>
45 public class OdePlugin : IPhysicsPlugin 45 public class OdePlugin : IPhysicsPlugin
46 { 46 {
47 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
48
47 private OdeScene _mScene; 49 private OdeScene _mScene;
48 50
49 public OdePlugin() 51 public OdePlugin()
@@ -76,6 +78,8 @@ namespace OpenSim.Region.Physics.OdePlugin
76 78
77 public class OdeScene : PhysicsScene 79 public class OdeScene : PhysicsScene
78 { 80 {
81 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
82
79 // TODO: this should be hard-coded in some common place 83 // TODO: this should be hard-coded in some common place
80 private const uint m_regionWidth = 256; 84 private const uint m_regionWidth = 256;
81 private const uint m_regionHeight = 256; 85 private const uint m_regionHeight = 256;
@@ -284,7 +288,7 @@ namespace OpenSim.Region.Physics.OdePlugin
284 288
285 //if (id == d.GeomClassID.TriMeshClass) 289 //if (id == d.GeomClassID.TriMeshClass)
286 //{ 290 //{
287 // MainLog.Instance.Verbose("near: A collision was detected between {1} and {2}", 0, name1, name2); 291 // m_log.Info("near: A collision was detected between {1} and {2}", 0, name1, name2);
288 //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2); 292 //System.Console.WriteLine("near: A collision was detected between {1} and {2}", 0, name1, name2);
289 //} 293 //}
290 294
@@ -296,8 +300,7 @@ namespace OpenSim.Region.Physics.OdePlugin
296 } 300 }
297 catch (SEHException) 301 catch (SEHException)
298 { 302 {
299 MainLog.Instance.Error("PHYSICS", 303 m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
300 "The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
301 base.TriggerPhysicsBasedRestart(); 304 base.TriggerPhysicsBasedRestart();
302 } 305 }
303 306
@@ -352,7 +355,7 @@ namespace OpenSim.Region.Physics.OdePlugin
352 355
353 if (contacts[i].depth >= 1.00f) 356 if (contacts[i].depth >= 1.00f)
354 { 357 {
355 //MainLog.Instance.Debug("PHYSICS",contacts[i].depth.ToString()); 358 //m_log.Debug("[PHYSICS]: " +contacts[i].depth.ToString());
356 } 359 }
357 360
358 //If you interpenetrate a prim with an agent 361 //If you interpenetrate a prim with an agent
@@ -405,7 +408,7 @@ namespace OpenSim.Region.Physics.OdePlugin
405 } 408 }
406 if (contacts[i].depth >= 1.00f) 409 if (contacts[i].depth >= 1.00f)
407 { 410 {
408 //OpenSim.Framework.Console.MainLog.Instance.Verbose("P", contacts[i].depth.ToString()); 411 //m_log.Info("[P]: " + contacts[i].depth.ToString());
409 if ((p2.PhysicsActorType == (int) ActorTypes.Agent && 412 if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
410 p1.PhysicsActorType == (int) ActorTypes.Unknown) || 413 p1.PhysicsActorType == (int) ActorTypes.Unknown) ||
411 (p1.PhysicsActorType == (int) ActorTypes.Agent && 414 (p1.PhysicsActorType == (int) ActorTypes.Agent &&
@@ -654,9 +657,8 @@ namespace OpenSim.Region.Physics.OdePlugin
654 } 657 }
655 else 658 else
656 { 659 {
657 MainLog.Instance.Verbose("Physics", 660 m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
658 "Invalid Scene passed to 'removeprim from scene':" + 661 ((OdePrim) prim).m_targetSpace.ToString());
659 ((OdePrim) prim).m_targetSpace.ToString());
660 } 662 }
661 } 663 }
662 } 664 }
@@ -678,9 +680,8 @@ namespace OpenSim.Region.Physics.OdePlugin
678 } 680 }
679 else 681 else
680 { 682 {
681 MainLog.Instance.Verbose("Physics", 683 m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
682 "Invalid Scene passed to 'removeprim from scene':" + 684 ((OdePrim) prim).m_targetSpace.ToString());
683 ((OdePrim) prim).m_targetSpace.ToString());
684 } 685 }
685 } 686 }
686 } 687 }
@@ -742,9 +743,8 @@ namespace OpenSim.Region.Physics.OdePlugin
742 } 743 }
743 else 744 else
744 { 745 {
745 MainLog.Instance.Verbose("Physics", 746 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() +
746 "Invalid Scene passed to 'recalculatespace':" + currentspace.ToString() + 747 " Geom:" + geom.ToString());
747 " Geom:" + geom.ToString());
748 } 748 }
749 } 749 }
750 else 750 else
@@ -761,9 +761,8 @@ namespace OpenSim.Region.Physics.OdePlugin
761 } 761 }
762 else 762 else
763 { 763 {
764 MainLog.Instance.Verbose("Physics", 764 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
765 "Invalid Scene passed to 'recalculatespace':" + 765 sGeomIsIn.ToString() + " Geom:" + geom.ToString());
766 sGeomIsIn.ToString() + " Geom:" + geom.ToString());
767 } 766 }
768 } 767 }
769 } 768 }
@@ -787,9 +786,8 @@ namespace OpenSim.Region.Physics.OdePlugin
787 } 786 }
788 else 787 else
789 { 788 {
790 MainLog.Instance.Verbose("Physics", 789 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
791 "Invalid Scene passed to 'recalculatespace':" + 790 currentspace.ToString() + " Geom:" + geom.ToString());
792 currentspace.ToString() + " Geom:" + geom.ToString());
793 } 791 }
794 } 792 }
795 } 793 }
@@ -807,9 +805,8 @@ namespace OpenSim.Region.Physics.OdePlugin
807 } 805 }
808 else 806 else
809 { 807 {
810 MainLog.Instance.Verbose("Physics", 808 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
811 "Invalid Scene passed to 'recalculatespace':" + 809 currentspace.ToString() + " Geom:" + geom.ToString());
812 currentspace.ToString() + " Geom:" + geom.ToString());
813 } 810 }
814 } 811 }
815 else 812 else
@@ -826,9 +823,8 @@ namespace OpenSim.Region.Physics.OdePlugin
826 } 823 }
827 else 824 else
828 { 825 {
829 MainLog.Instance.Verbose("Physics", 826 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
830 "Invalid Scene passed to 'recalculatespace':" + 827 sGeomIsIn.ToString() + " Geom:" + geom.ToString());
831 sGeomIsIn.ToString() + " Geom:" + geom.ToString());
832 } 828 }
833 } 829 }
834 } 830 }
@@ -876,7 +872,7 @@ namespace OpenSim.Region.Physics.OdePlugin
876 IntPtr locationbasedspace =IntPtr.Zero; 872 IntPtr locationbasedspace =IntPtr.Zero;
877 873
878 int[] xyspace = calculateSpaceArrayItemFromPos(pos); 874 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
879 //MainLog.Instance.Verbose("Physics", "Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString()); 875 //m_log.Info("[Physics]: Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
880 locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]]; 876 locationbasedspace = staticPrimspace[xyspace[0], xyspace[1]];
881 877
882 //locationbasedspace = space; 878 //locationbasedspace = space;
@@ -970,7 +966,7 @@ namespace OpenSim.Region.Physics.OdePlugin
970 name2 = "null"; 966 name2 = "null";
971 } 967 }
972 968
973 MainLog.Instance.Verbose("TriArrayCallback: A collision was detected between {1} and {2}", 0, name1, name2); 969 m_log.Info("TriArrayCallback: A collision was detected between {1} and {2}", 0, name1, name2);
974*/ 970*/
975 return 1; 971 return 1;
976 } 972 }
@@ -984,19 +980,20 @@ namespace OpenSim.Region.Physics.OdePlugin
984 { 980 {
985 name1 = "null"; 981 name1 = "null";
986 } 982 }
983
987 if (!geom_name_map.TryGetValue(refObject, out name2)) 984 if (!geom_name_map.TryGetValue(refObject, out name2))
988 { 985 {
989 name2 = "null"; 986 name2 = "null";
990 } 987 }
991 988
992// MainLog.Instance.Verbose("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex); 989// m_log.Info("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex);
993 990
994 d.Vector3 v0 = new d.Vector3(); 991 d.Vector3 v0 = new d.Vector3();
995 d.Vector3 v1 = new d.Vector3(); 992 d.Vector3 v1 = new d.Vector3();
996 d.Vector3 v2 = new d.Vector3(); 993 d.Vector3 v2 = new d.Vector3();
997 994
998 d.GeomTriMeshGetTriangle(trimesh, 0, ref v0, ref v1, ref v2); 995 d.GeomTriMeshGetTriangle(trimesh, 0, ref v0, ref v1, ref v2);
999// MainLog.Instance.Debug("Triangle {0} is <{1},{2},{3}>, <{4},{5},{6}>, <{7},{8},{9}>", triangleIndex, v0.X, v0.Y, v0.Z, v1.X, v1.Y, v1.Z, v2.X, v2.Y, v2.Z); 996// m_log.Debug("Triangle {0} is <{1},{2},{3}>, <{4},{5},{6}>, <{7},{8},{9}>", triangleIndex, v0.X, v0.Y, v0.Z, v1.X, v1.Y, v1.Z, v2.X, v2.Y, v2.Z);
1000 997
1001 return 1; 998 return 1;
1002 } 999 }
@@ -1105,19 +1102,16 @@ namespace OpenSim.Region.Physics.OdePlugin
1105 } 1102 }
1106 catch (StackOverflowException) 1103 catch (StackOverflowException)
1107 { 1104 {
1108 MainLog.Instance.Error("PHYSICS", 1105 m_log.Error("[PHYSICS]: The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
1109 "The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
1110 base.TriggerPhysicsBasedRestart(); 1106 base.TriggerPhysicsBasedRestart();
1111 } 1107 }
1112 1108
1113 int i = 0; 1109 int i = 0;
1114 1110
1115
1116 // Figure out the Frames Per Second we're going at. 1111 // Figure out the Frames Per Second we're going at.
1117 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size 1112 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size
1118 fps = (step_time/ODE_STEPSIZE) * 1000; 1113 fps = (step_time/ODE_STEPSIZE) * 1000;
1119 1114
1120
1121 while (step_time > 0.0f) 1115 while (step_time > 0.0f)
1122 { 1116 {
1123 foreach (OdeCharacter actor in _characters) 1117 foreach (OdeCharacter actor in _characters)
@@ -1126,7 +1120,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1126 actor.collidelock = true; 1120 actor.collidelock = true;
1127 } 1121 }
1128 1122
1129
1130 collision_optimized(timeStep); 1123 collision_optimized(timeStep);
1131 d.WorldQuickStep(world, ODE_STEPSIZE); 1124 d.WorldQuickStep(world, ODE_STEPSIZE);
1132 d.JointGroupEmpty(contactgroup); 1125 d.JointGroupEmpty(contactgroup);
@@ -1178,8 +1171,8 @@ namespace OpenSim.Region.Physics.OdePlugin
1178 1171
1179 public override bool IsThreaded 1172 public override bool IsThreaded
1180 { 1173 {
1181 get { return (false); // for now we won't be multithreaded 1174 // for now we won't be multithreaded
1182 } 1175 get { return (false); }
1183 } 1176 }
1184 public float[] ResizeTerrain512NearestNeighbour(float[] heightMap) 1177 public float[] ResizeTerrain512NearestNeighbour(float[] heightMap)
1185 { 1178 {
@@ -1275,6 +1268,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1275 } 1268 }
1276 } 1269 }
1277 } 1270 }
1271
1278 //Flatten out the array 1272 //Flatten out the array
1279 int i = 0; 1273 int i = 0;
1280 for (int y = 0; y < 512; y++) 1274 for (int y = 0; y < 512; y++)
diff --git a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
index 3bb71d4..da9f587 100644
--- a/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/POSPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
55// You can specify all values by your own or you can build default build and revision 55// You can specify all values by your own or you can build default build and revision
56// numbers with the '*' character (the default): 56// numbers with the '*' character (the default):
57 57
58[assembly : AssemblyVersion("1.0.*")] \ No newline at end of file 58[assembly : AssemblyVersion("1.0.*")]
diff --git a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
index 36cb952..8e6d2a6 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
55// You can specify all values by your own or you can build default build and revision 55// You can specify all values by your own or you can build default build and revision
56// numbers with the '*' character (the default): 56// numbers with the '*' character (the default):
57 57
58[assembly : AssemblyVersion("1.0.*")] \ No newline at end of file 58[assembly : AssemblyVersion("1.0.*")]
generated by cgit v1.1 at 2024-11-19 02:42:41 +0000