OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed Issue #161 by using PhysicsScene.Null instead of BasePhysicsScene 

* Hid NullPhysicsScene for great justice
* Fixed broken Grid build
Sugilite
lbsa71 2007-07-02 08:03:11 +00:00
parent 9ff5bb9873
commit 686f6a8331
8 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"

2
OpenSim/Grid/AssetServer/AssetHttpServer.cs
View File

@ -94,7 +94,7 @@ namespace OpenSim.Grid.AssetServer
case "application/xml":
// probably LLSD we hope, otherwise it should be ignored by the parser
responseString = ParseLLSDXML(requestBody);
responseString = ParseREST(requestBody, request.RawUrl, request.HttpMethod);
response.AddHeader("Content-type", "application/xml");
break;

4
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -14,9 +14,9 @@ using OpenSim.Region.Caches;
using OpenSim.Framework.Communications;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.ClientStack;
using OpenSim.Region.Physics.BasicPhysicsPlugin;
using System.Net;
using libsecondlife.Packets;
using OpenSim.Physics.Manager;
namespace SimpleApp
{
@ -59,7 +59,7 @@ namespace SimpleApp
BaseHttpServer httpServer = new BaseHttpServer( internalEndPoint.Port );
MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
world.PhysScene = new BasicScene();
world.PhysScene = PhysicsScene.Null;
udpServer.LocalWorld = world;
httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );

6
OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
View File

@ -140,12 +140,6 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
<Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
<Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
<Name>OpenSim.Region.Physics.Manager</Name>
<Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>

1
OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
View File

@ -31,7 +31,6 @@
<include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
<include name="../../../../bin/OpenSim.Region.Environment.dll" />
<include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
<include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
<include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
<include name="System.dll" />
<include name="System.Data.dll.dll" />

2
OpenSim/Region/Physics/Manager/PhysicsManager.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Physics.Manager
{
if (String.IsNullOrEmpty(engineName))
{
return new NullPhysicsScene();
return PhysicsScene.Null;
}
if(_plugins.ContainsKey(engineName))

74
OpenSim/Region/Physics/Manager/PhysicsScene.cs
View File

@ -53,61 +53,61 @@ namespace OpenSim.Physics.Manager
public abstract void GetResults();
public abstract void SetTerrain(float[] heightMap);
public abstract void DeleteTerrain();
public abstract bool IsThreaded
{
get;
}
}
public class NullPhysicsScene : PhysicsScene
{
private static int m_workIndicator;
public override PhysicsActor AddAvatar(PhysicsVector position)
private class NullPhysicsScene : PhysicsScene
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
private static int m_workIndicator;
public override void RemoveAvatar(PhysicsActor actor)
{
public override PhysicsActor AddAvatar(PhysicsVector position)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
}
public override void RemoveAvatar(PhysicsActor actor)
{
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
}
public override void Simulate(float timeStep)
{
m_workIndicator = (m_workIndicator + 1) % 10;
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
//OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
}
public override void Simulate(float timeStep)
{
m_workIndicator = (m_workIndicator + 1) % 10;
public override void GetResults()
{
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
}
//OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
}
public override void SetTerrain(float[] heightMap)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
public override void GetResults()
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : GetResults()");
}
public override void DeleteTerrain()
{
public override void SetTerrain(float[] heightMap)
{
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
}
public override void DeleteTerrain()
{
public override bool IsThreaded
{
get { return false; }
}
public override bool IsThreaded
{
get { return false; }
}
}
}
}

2
prebuild.xml
View File

@ -699,6 +699,7 @@
</Configuration>
<ReferencePath>../../../../bin/</ReferencePath>
<ReferencePath>../../../../bin/Physics/</ReferencePath>
<Reference name="libsecondlife.dll"/>
<Reference name="System" localCopy="false"/>
@ -709,7 +710,6 @@
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.UserManagement"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Region.Physics.BasicPhysicsPlugin"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Region.GridInterfaces.Local"/>
<Reference name="OpenSim.Framework.Servers"/>