aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
diff options
context:
space:
mode:
authoronefang2019-09-11 16:36:50 +1000
committeronefang2019-09-11 16:36:50 +1000
commit50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch)
tree52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
parentRenamed branch to SledjChisl. (diff)
parentBump to release flavour, build 0. (diff)
downloadopensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs10
1 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
index 20b337a..29685da 100644
--- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
+++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs
@@ -61,6 +61,11 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
61 get { return "basicphysics"; } 61 get { return "basicphysics"; }
62 } 62 }
63 63
64 public string Version
65 {
66 get { return "1.0"; }
67 }
68
64 public Type ReplaceableInterface 69 public Type ReplaceableInterface
65 { 70 {
66 get { return null; } 71 get { return null; }
@@ -90,6 +95,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
90 95
91 EngineType = Name; 96 EngineType = Name;
92 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName; 97 PhysicsSceneName = EngineType + "/" + scene.RegionInfo.RegionName;
98 EngineName = Name + " " + Version;
93 99
94 scene.RegisterModuleInterface<PhysicsScene>(this); 100 scene.RegisterModuleInterface<PhysicsScene>(this);
95 m_regionExtent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ); 101 m_regionExtent = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, scene.RegionInfo.RegionSizeZ);
@@ -157,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
157 { 163 {
158// Console.WriteLine("Simulating"); 164// Console.WriteLine("Simulating");
159 165
160 float fps = 0; 166// float fps = 0;
161 for (int i = 0; i < _actors.Count; ++i) 167 for (int i = 0; i < _actors.Count; ++i)
162 { 168 {
163 BasicActor actor = _actors[i]; 169 BasicActor actor = _actors[i];
@@ -220,7 +226,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics
220 actor.Velocity = actorVelocity; 226 actor.Velocity = actorVelocity;
221 } 227 }
222 228
223 return fps; 229 return 1.0f;
224 } 230 }
225 231
226 public override void GetResults() 232 public override void GetResults()