aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules
diff options
context:
space:
mode:
authorUbitUmarov2018-12-28 13:52:59 +0000
committerUbitUmarov2018-12-28 13:52:59 +0000
commit4a73cc81dc4e03b2b7c46829cecfc0627c3fddb4 (patch)
tree6e8200b3b7a3c0465853e42bbd790a59ccd4e312 /OpenSim/Region/PhysicsModules
parentupdate pbs (diff)
downloadopensim-SC-4a73cc81dc4e03b2b7c46829cecfc0627c3fddb4.zip
opensim-SC-4a73cc81dc4e03b2b7c46829cecfc0627c3fddb4.tar.gz
opensim-SC-4a73cc81dc4e03b2b7c46829cecfc0627c3fddb4.tar.bz2
opensim-SC-4a73cc81dc4e03b2b7c46829cecfc0627c3fddb4.tar.xz
now break several things at same time... sog/sop updates, threads options,...
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs10
-rw-r--r--OpenSim/Region/PhysicsModules/BulletS/BSScene.cs12
-rw-r--r--OpenSim/Region/PhysicsModules/Ode/OdeScene.cs10
-rw-r--r--OpenSim/Region/PhysicsModules/POS/POSScene.cs10
-rw-r--r--OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs10
5 files changed, 2 insertions, 50 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
index 5ce1515..0faca55 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
@@ -229,16 +229,6 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
229 return fps; 229 return fps;
230 } 230 }
231 231
232 public override void GetResults()
233 {
234 }
235
236 public override bool IsThreaded
237 {
238 get { return (false); // for now we won't be multithreaded
239 }
240 }
241
242 public override void SetTerrain(float[] heightMap) 232 public override void SetTerrain(float[] heightMap)
243 { 233 {
244 _heightMap = heightMap; 234 _heightMap = heightMap;
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
index a53e2bc..a076d9e 100644
--- a/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
+++ b/OpenSim/Region/PhysicsModules/BulletS/BSScene.cs
@@ -352,13 +352,9 @@ namespace OpenSim.Region.PhysicsModule.BulletS
352 if (BSParam.UseSeparatePhysicsThread) 352 if (BSParam.UseSeparatePhysicsThread)
353 { 353 {
354 // The physics simulation should happen independently of the heartbeat loop 354 // The physics simulation should happen independently of the heartbeat loop
355 m_physicsThread 355 m_physicsThread = WorkManager.StartThread(
356 = WorkManager.StartThread(
357 BulletSPluginPhysicsThread, 356 BulletSPluginPhysicsThread,
358 string.Format("{0} ({1})", BulletEngineName, RegionName), 357 string.Format("{0} ({1})", BulletEngineName, RegionName));
359 ThreadPriority.Normal,
360 true,
361 true);
362 } 358 }
363 } 359 }
364 360
@@ -942,8 +938,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
942 938
943 #endregion // Simulation 939 #endregion // Simulation
944 940
945 public override void GetResults() { }
946
947 #region Terrain 941 #region Terrain
948 942
949 public override void SetTerrain(float[] heightMap) { 943 public override void SetTerrain(float[] heightMap) {
@@ -1124,8 +1118,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
1124 return topColliders; 1118 return topColliders;
1125 } 1119 }
1126 1120
1127 public override bool IsThreaded { get { return false; } }
1128
1129 #region Extensions 1121 #region Extensions
1130 public override object Extension(string pFunct, params object[] pParams) 1122 public override object Extension(string pFunct, params object[] pParams)
1131 { 1123 {
diff --git a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
index e760fa2..1b68105 100644
--- a/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
@@ -3204,16 +3204,6 @@ namespace OpenSim.Region.PhysicsModule.ODE
3204 } 3204 }
3205 } 3205 }
3206 3206
3207 public override void GetResults()
3208 {
3209 }
3210
3211 public override bool IsThreaded
3212 {
3213 // for now we won't be multithreaded
3214 get { return false; }
3215 }
3216
3217 public override void SetTerrain(float[] heightMap) 3207 public override void SetTerrain(float[] heightMap)
3218 { 3208 {
3219 if (m_worldOffset != Vector3.Zero && m_parentScene != null) 3209 if (m_worldOffset != Vector3.Zero && m_parentScene != null)
diff --git a/OpenSim/Region/PhysicsModules/POS/POSScene.cs b/OpenSim/Region/PhysicsModules/POS/POSScene.cs
index e62d876..3e278f7 100644
--- a/OpenSim/Region/PhysicsModules/POS/POSScene.cs
+++ b/OpenSim/Region/PhysicsModules/POS/POSScene.cs
@@ -297,16 +297,6 @@ namespace OpenSim.Region.PhysicsModule.POS
297 return 1.0f; 297 return 1.0f;
298 } 298 }
299 299
300 public override void GetResults()
301 {
302 }
303
304 public override bool IsThreaded
305 {
306 // for now we won't be multithreaded
307 get { return (false); }
308 }
309
310 public override void SetTerrain(float[] heightMap) 300 public override void SetTerrain(float[] heightMap)
311 { 301 {
312 _heightMap = heightMap; 302 _heightMap = heightMap;
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
index 8079e79..335e9bd 100644
--- a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs
@@ -85,11 +85,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
85 return 0f; 85 return 0f;
86 } 86 }
87 87
88 public override void GetResults()
89 {
90 m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()");
91 }
92
93 public override void SetTerrain(float[] heightMap) 88 public override void SetTerrain(float[] heightMap)
94 { 89 {
95 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 90 m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
@@ -99,11 +94,6 @@ namespace OpenSim.Region.PhysicsModules.SharedBase
99 { 94 {
100 } 95 }
101 96
102 public override bool IsThreaded
103 {
104 get { return false; }
105 }
106
107 public override void Dispose() 97 public override void Dispose()
108 { 98 {
109 } 99 }