ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Renamed World class to Scene class

Browse Source
This commit is contained in:
MW
2007-06-12 17:45:11 +00:00
parent bb13b4df73
commit a143cf8180
15 changed files with 203 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/OpenSim.Region/Estate/EstateManager.cs
View File

@@ -45,10 +45,10 @@ namespace OpenSim.Region.Estate
/// </summary>
public class EstateManager
{
private World m_world;
private Scene m_world;
private RegionInfo m_regInfo;
public EstateManager(World world,RegionInfo reginfo)
public EstateManager(Scene world,RegionInfo reginfo)
{
m_world = world; //Estate settings found at world.m_regInfo.estateSettings
m_regInfo = reginfo;

32
OpenSim/OpenSim.Region/OpenSim.Region.csproj
View File

@@ -136,52 +136,52 @@
<Compile Include="Estate\EstateManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\World.cs">
<Compile Include="Scene\Scene.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\World.PacketHandlers.cs">
<Compile Include="Scene\Scene.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\World.Scripting.cs">
<Compile Include="Scene\Scene.Scripting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\WorldBase.cs">
<Compile Include="Scene\SceneBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\Avatar.Animations.cs">
<Compile Include="Scene\Entities\Avatar.Animations.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\Avatar.cs">
<Compile Include="Scene\Entities\Avatar.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\Avatar.Update.cs">
<Compile Include="Scene\Entities\Avatar.Update.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\Entity.cs">
<Compile Include="Scene\Entities\Entity.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\Primitive.cs">
<Compile Include="Scene\Entities\Primitive.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\Entities\SceneObject.cs">
<Compile Include="Scene\Entities\SceneObject.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\IScriptContext.cs">
<Compile Include="Scene\scripting\IScriptContext.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\IScriptEntity.cs">
<Compile Include="Scene\scripting\IScriptEntity.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\IScriptHandler.cs">
<Compile Include="Scene\scripting\IScriptHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\Script.cs">
<Compile Include="Scene\scripting\Script.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\ScriptFactory.cs">
<Compile Include="Scene\scripting\ScriptFactory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="World\scripting\Scripts\FollowRandomAvatar.cs">
<Compile Include="Scene\scripting\Scripts\FollowRandomAvatar.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

32
OpenSim/OpenSim.Region/OpenSim.Region.dll.build
View File

@@ -13,22 +13,22 @@
<sources failonempty="true">
<include name="ParcelManager.cs" />
<include name="Estate/EstateManager.cs" />
<include name="World/World.cs" />
<include name="World/World.PacketHandlers.cs" />
<include name="World/World.Scripting.cs" />
<include name="World/WorldBase.cs" />
<include name="World/Entities/Avatar.Animations.cs" />
<include name="World/Entities/Avatar.cs" />
<include name="World/Entities/Avatar.Update.cs" />
<include name="World/Entities/Entity.cs" />
<include name="World/Entities/Primitive.cs" />
<include name="World/Entities/SceneObject.cs" />
<include name="World/scripting/IScriptContext.cs" />
<include name="World/scripting/IScriptEntity.cs" />
<include name="World/scripting/IScriptHandler.cs" />
<include name="World/scripting/Script.cs" />
<include name="World/scripting/ScriptFactory.cs" />
<include name="World/scripting/Scripts/FollowRandomAvatar.cs" />
<include name="Scene/Scene.cs" />
<include name="Scene/Scene.PacketHandlers.cs" />
<include name="Scene/Scene.Scripting.cs" />
<include name="Scene/SceneBase.cs" />
<include name="Scene/Entities/Avatar.Animations.cs" />
<include name="Scene/Entities/Avatar.cs" />
<include name="Scene/Entities/Avatar.Update.cs" />
<include name="Scene/Entities/Entity.cs" />
<include name="Scene/Entities/Primitive.cs" />
<include name="Scene/Entities/SceneObject.cs" />
<include name="Scene/scripting/IScriptContext.cs" />
<include name="Scene/scripting/IScriptEntity.cs" />
<include name="Scene/scripting/IScriptHandler.cs" />
<include name="Scene/scripting/Script.cs" />
<include name="Scene/scripting/ScriptFactory.cs" />
<include name="Scene/scripting/Scripts/FollowRandomAvatar.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

8
OpenSim/OpenSim.Region/ParcelManager.cs
View File

@@ -74,13 +74,13 @@ namespace OpenSim.Region
private int lastParcelLocalID = START_PARCEL_LOCAL_ID - 1;
private int[,] parcelIDList = new int[64, 64];
private World m_world;
private Scene m_world;
private RegionInfo m_regInfo;
#endregion
#region Constructors
public ParcelManager(World world, RegionInfo reginfo)
public ParcelManager(Scene world, RegionInfo reginfo)
{
m_world = world;
@@ -497,7 +497,7 @@ namespace OpenSim.Region
{
#region Member Variables
public ParcelData parcelData = new ParcelData();
public World m_world;
public Scene m_world;
private bool[,] parcelBitmap = new bool[64, 64];
@@ -505,7 +505,7 @@ namespace OpenSim.Region
#region Constructors
public Parcel(LLUUID owner_id, bool is_group_owned, World world)
public Parcel(LLUUID owner_id, bool is_group_owned, Scene world)
{
m_world = world;
parcelData.ownerID = owner_id;

2
OpenSim/OpenSim.Region/Scene/Entities/Avatar.cs
View File

@@ -70,7 +70,7 @@ namespace OpenSim.Region
/// <param name="world"></param>
/// <param name="clientThreads"></param>
/// <param name="regionDat"></param>
public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)
public Avatar(IClientAPI theClient, Scene world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo reginfo)
{
m_world = world;

2
OpenSim/OpenSim.Region/Scene/Entities/Entity.cs
View File

@@ -44,7 +44,7 @@ namespace OpenSim.Region
protected List<Entity> children;
protected LLVector3 m_pos;
protected PhysicsActor _physActor;
protected World m_world;
protected Scene m_world;
protected string m_name;
/// <summary>

8
OpenSim/OpenSim.Region/Scene/Entities/Primitive.cs
View File

@@ -92,7 +92,7 @@ namespace OpenSim.Region
/// <param name="clientThreads"></param>
/// <param name="regionHandle"></param>
/// <param name="world"></param>
public Primitive( ulong regionHandle, World world)
public Primitive( ulong regionHandle, Scene world)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -108,7 +108,7 @@ namespace OpenSim.Region
/// <param name="addPacket"></param>
/// <param name="ownerID"></param>
/// <param name="localID"></param>
public Primitive(ulong regionHandle, World world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
public Primitive(ulong regionHandle, Scene world, ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -126,7 +126,7 @@ namespace OpenSim.Region
/// <param name="owner"></param>
/// <param name="fullID"></param>
/// <param name="localID"></param>
public Primitive( ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)
public Primitive( ulong regionHandle, Scene world, LLUUID owner, LLUUID fullID, uint localID)
{
// m_clientThreads = clientThreads;
m_regionHandle = regionHandle;
@@ -148,7 +148,7 @@ namespace OpenSim.Region
/// <param name="owner"></param>
/// <param name="localID"></param>
/// <param name="position"></param>
public Primitive( ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)
public Primitive( ulong regionHandle, Scene world, LLUUID owner, uint localID, LLVector3 position)
{
//m_clientThreads = clientThreads;
m_regionHandle = regionHandle;

2
OpenSim/OpenSim.Region/Scene/Entities/SceneObject.cs
View File

@@ -42,7 +42,7 @@ namespace OpenSim.Region
private LLUUID rootUUID;
//private Dictionary<LLUUID, Primitive> ChildPrimitives = new Dictionary<LLUUID, Primitive>();
protected Primitive rootPrimitive;
private World m_world;
private Scene m_world;
protected ulong regionHandle;
/// <summary>

2
OpenSim/OpenSim.Region/Scene/World.PacketHandlers.cs → OpenSim/OpenSim.Region/Scene/Scene.PacketHandlers.cs
View File

@@ -38,7 +38,7 @@ using OpenSim.Framework.Utilities;
namespace OpenSim.Region
{
public partial class World
public partial class Scene
{
/// <summary>
///

2
OpenSim/OpenSim.Region/Scene/World.Scripting.cs → OpenSim/OpenSim.Region/Scene/Scene.Scripting.cs
View File

@@ -37,7 +37,7 @@ using libsecondlife;
namespace OpenSim.Region
{
public partial class World
public partial class Scene
{
private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();

4
OpenSim/OpenSim.Region/Scene/World.cs → OpenSim/OpenSim.Region/Scene/Scene.cs
View File

@@ -49,7 +49,7 @@ namespace OpenSim.Region
{
public delegate bool FilterAvatarList(Avatar avatar);
public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
public partial class Scene : SceneBase, ILocalStorageReceiver, IScriptAPI
{
protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
protected Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
@@ -96,7 +96,7 @@ namespace OpenSim.Region
/// <param name="clientThreads">Dictionary to contain client threads</param>
/// <param name="regionHandle">Region Handle for this region</param>
/// <param name="regionName">Region Name for this region</param>
public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
public Scene(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen, RegionServerCommsManager commsMan)
{
try
{

2
OpenSim/OpenSim.Region/Scene/WorldBase.cs → OpenSim/OpenSim.Region/Scene/SceneBase.cs
View File

@@ -42,7 +42,7 @@ using OpenSim.Terrain;
namespace OpenSim.Region
{
public abstract class WorldBase : IWorld
public abstract class SceneBase : IWorld
{
public Dictionary<libsecondlife.LLUUID, Entity> Entities;
protected Dictionary<uint, IClientAPI> m_clientThreads;

4
OpenSim/OpenSim.Region/Scene/scripting/IScriptHandler.cs
View File

@@ -40,7 +40,7 @@ namespace OpenSim.Region.Scripting
public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
{
private World m_world;
private Scene m_world;
private Script m_script;
private Entity m_entity;
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Scripting
m_script.OnFrame(this);
}
public ScriptHandler(Script script, Entity entity, World world)
public ScriptHandler(Script script, Entity entity, Scene world)
{
m_script = script;
m_entity = entity;