aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-15 13:10:10 -0400
committerTeravus Ovares (Dan Olivares)2009-08-15 13:10:10 -0400
commit800081270020e60c612cee9521d18bb4388afdd5 (patch)
tree3a6430af74508410c5dbc94061eacdfe1cca3dc0
parentThanks jonc for a patch to ignore some Visual Studio and generated ini files. (diff)
downloadopensim-SC_OLD-800081270020e60c612cee9521d18bb4388afdd5.zip
opensim-SC_OLD-800081270020e60c612cee9521d18bb4388afdd5.tar.gz
opensim-SC_OLD-800081270020e60c612cee9521d18bb4388afdd5.tar.bz2
opensim-SC_OLD-800081270020e60c612cee9521d18bb4388afdd5.tar.xz
* part one of adding physics combining
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml1
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs10
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs9
3 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 8e85559..e38c755 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -10,6 +10,7 @@
10 <Extension path = "/OpenSim/RegionModules"> 10 <Extension path = "/OpenSim/RegionModules">
11 <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" /> 11 <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />
12 <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" /> 12 <RegionModule id="TerrainModule" type="OpenSim.Region.CoreModules.World.Terrain.TerrainModule" />
13 <RegionModule id="PhysicsCombiner" type="OpenSim.Region.CoreModules.World.Land.PhysicsCombiner" />
13 <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" /> 14 <RegionModule id="WorldMapModule" type="OpenSim.Region.CoreModules.World.WorldMap.WorldMapModule" />
14 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> 15 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
15 <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" /> 16 <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 6937a25..139f898 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -162,6 +162,16 @@ namespace OpenSim.Region.Physics.Manager
162 return false; 162 return false;
163 } 163 }
164 164
165 public virtual bool SupportsCombining()
166 {
167 return false;
168 }
169
170 public virtual void Combine(PhysicsScene pScene, Vector3 offset)
171 {
172 return;
173 }
174
165 /// <summary> 175 /// <summary>
166 /// Queue a raycast against the physics scene. 176 /// Queue a raycast against the physics scene.
167 /// The provided callback method will be called when the raycast is complete 177 /// The provided callback method will be called when the raycast is complete
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index e435ac1..81f200a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -313,6 +313,9 @@ namespace OpenSim.Region.Physics.OdePlugin
313 313
314 private volatile int m_global_contactcount = 0; 314 private volatile int m_global_contactcount = 0;
315 315
316 private Vector3 m_worldOffset = Vector3.Zero;
317 private Vector2 m_worldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
318
316 private ODERayCastRequestManager m_rayCastManager; 319 private ODERayCastRequestManager m_rayCastManager;
317 320
318 /// <summary> 321 /// <summary>
@@ -1653,6 +1656,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1653 private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation, 1656 private PhysicsActor AddPrim(String name, PhysicsVector position, PhysicsVector size, Quaternion rotation,
1654 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical) 1657 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical)
1655 { 1658 {
1659
1656 PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z); 1660 PhysicsVector pos = new PhysicsVector(position.X, position.Y, position.Z);
1657 //pos.X = position.X; 1661 //pos.X = position.X;
1658 //pos.Y = position.Y; 1662 //pos.Y = position.Y;
@@ -2555,6 +2559,9 @@ namespace OpenSim.Region.Physics.OdePlugin
2555 if (framecount >= int.MaxValue) 2559 if (framecount >= int.MaxValue)
2556 framecount = 0; 2560 framecount = 0;
2557 2561
2562 if (m_worldOffset != Vector3.Zero)
2563 return 0;
2564
2558 framecount++; 2565 framecount++;
2559 2566
2560 float fps = 0; 2567 float fps = 0;
@@ -3377,6 +3384,8 @@ namespace OpenSim.Region.Physics.OdePlugin
3377 return waterlevel; 3384 return waterlevel;
3378 } 3385 }
3379 3386
3387
3388
3380 public override void SetWaterLevel(float baseheight) 3389 public override void SetWaterLevel(float baseheight)
3381 { 3390 {
3382 waterlevel = baseheight; 3391 waterlevel = baseheight;