ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge of ubitworkvarnew with opensim/master as of 20150905.

Browse Source 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
This commit is contained in:
Robert Adams
2015-09-08 04:54:16 -07:00
parent cfcfa8f3d7 3a72e755b9
commit e5367d822b
270 changed files with 3105 additions and 5224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@@ -34,7 +34,7 @@ using OpenMetaverse.Packets;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Framework.Scenes.Types;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.PhysicsModules.SharedBase;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Framework.Scenes
@@ -121,7 +121,12 @@ namespace OpenSim.Region.Framework.Scenes
public PhysicsScene PhysicsScene
{
get { return _PhyScene; }
get
{
if (_PhyScene == null)
_PhyScene = m_parentScene.RequestModuleInterface<PhysicsScene>();
return _PhyScene;
}
set
{
// If we're not doing the initial set
@@ -172,9 +177,9 @@ namespace OpenSim.Region.Framework.Scenes
// PhysX does this (runs in the background).
if (_PhyScene.IsThreaded)
if (PhysicsScene.IsThreaded)
{
_PhyScene.GetResults();
PhysicsScene.GetResults();
}
}
@@ -214,7 +219,7 @@ namespace OpenSim.Region.Framework.Scenes
// position).
//
// Therefore, JointMoved and JointDeactivated events will be fired as a result of the following Simulate().
return _PhyScene.Simulate((float)elapsed);
return PhysicsScene.Simulate((float)elapsed);
}
protected internal void UpdateScenePresenceMovement()