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

Some very basic terraforming, can raise and lower the terrain, but currently only a very basic brush algorithm (and can't change the brushes size)

0.1-prestable
MW 2007-03-30 16:50:19 +00:00
parent ef4cae5587
commit bcae0bce85
4 changed files with 286 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenSim.RegionServer/SimClient.cs
View File

@ -424,6 +424,38 @@ namespace OpenSim
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet"); //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Received DeRezObject packet");
m_world.DeRezObject((DeRezObjectPacket)Pack, this); m_world.DeRezObject((DeRezObjectPacket)Pack, this);
break; break;
case PacketType.ModifyLand:
ModifyLandPacket modify = (ModifyLandPacket)Pack;
switch (modify.ModifyBlock.Action)
{
case 1:
if (modify.ParcelData.Length > 0)
{
int mody = (int) modify.ParcelData[0].North;
int modx = (int) modify.ParcelData[0].West;
this.m_world.LandMap[(mody * 256) + modx -1 ] += 0.1f;
this.m_world.LandMap[(mody * 256) + modx] += 0.2f;
this.m_world.LandMap[(mody * 256) + modx + 1] += 0.1f;
this.m_world.LandMap[((mody+1) * 256) + modx] += 0.1f;
this.m_world.LandMap[((mody -1) * 256) + modx] += 0.1f;
m_world.RegenerateTerrain(true, modx, mody);
}
break;
case 2:
if (modify.ParcelData.Length > 0)
{
int mody = (int)modify.ParcelData[0].North;
int modx = (int)modify.ParcelData[0].West;
this.m_world.LandMap[(mody * 256) + modx - 1] -= 0.1f;
this.m_world.LandMap[(mody * 256) + modx] -= 0.2f;
this.m_world.LandMap[(mody * 256) + modx + 1] -= 0.1f;
this.m_world.LandMap[((mody + 1) * 256) + modx] -= 0.1f;
this.m_world.LandMap[((mody - 1) * 256) + modx] -= 0.1f;
m_world.RegenerateTerrain(true, modx, mody);
}
break;
}
break;
} }
} }

2
OpenSim.RegionServer/world/Avatar.cs
View File

@ -506,7 +506,7 @@ namespace OpenSim.world
handshake.RegionInfo.TerrainStartHeight11 = 10; handshake.RegionInfo.TerrainStartHeight11 = 10;
handshake.RegionInfo.SimAccess = 13; handshake.RegionInfo.SimAccess = 13;
handshake.RegionInfo.WaterHeight = 20; handshake.RegionInfo.WaterHeight = 20;
handshake.RegionInfo.RegionFlags = 72458694; handshake.RegionInfo.RegionFlags = 72458694 -32;
handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");

6
OpenSim.RegionServer/world/Primitive.cs
View File

@ -295,13 +295,15 @@ namespace OpenSim.world
objupdate.ObjectData[0].PSBlock = new byte[0]; objupdate.ObjectData[0].PSBlock = new byte[0];
objupdate.ObjectData[0].ExtraParams = new byte[1]; objupdate.ObjectData[0].ExtraParams = new byte[1];
objupdate.ObjectData[0].MediaURL = new byte[0]; objupdate.ObjectData[0].MediaURL = new byte[0];
objupdate.ObjectData[0].NameValue = new byte[0]; objupdate.ObjectData[0].NameValue = new byte[2];
objupdate.ObjectData[0].NameValue[0] = (byte)'t';
objupdate.ObjectData[0].NameValue[1] = (byte)'o';
objupdate.ObjectData[0].Text = new byte[0]; objupdate.ObjectData[0].Text = new byte[0];
objupdate.ObjectData[0].TextColor = new byte[4]; objupdate.ObjectData[0].TextColor = new byte[4];
objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0); objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0); objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
objupdate.ObjectData[0].Material = 3; objupdate.ObjectData[0].Material = 3;
objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456; objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
objupdate.ObjectData[0].TextureAnim = new byte[0]; objupdate.ObjectData[0].TextureAnim = new byte[0];
objupdate.ObjectData[0].Sound = LLUUID.Zero; objupdate.ObjectData[0].Sound = LLUUID.Zero;
LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

459
OpenSim.RegionServer/world/World.cs
View File

@ -12,20 +12,20 @@ using OpenSim.Framework.Terrain;
namespace OpenSim.world namespace OpenSim.world
{ {
public class World : ILocalStorageReceiver public class World : ILocalStorageReceiver
{ {
public object LockPhysicsEngine = new object(); public object LockPhysicsEngine = new object();
public Dictionary<libsecondlife.LLUUID, Entity> Entities; public Dictionary<libsecondlife.LLUUID, Entity> Entities;
public float[] LandMap; public float[] LandMap;
public ScriptEngine Scripts; public ScriptEngine Scripts;
public uint _localNumber=0; public uint _localNumber = 0;
private PhysicsScene phyScene; private PhysicsScene phyScene;
private float timeStep= 0.1f; private float timeStep = 0.1f;
private libsecondlife.TerrainManager TerrainManager; private libsecondlife.TerrainManager TerrainManager;
public ILocalStorage localStorage; public ILocalStorage localStorage;
private Random Rand = new Random(); private Random Rand = new Random();
private uint _primCount = 702000; private uint _primCount = 702000;
private int storageCount; private int storageCount;
private Dictionary<uint, SimClient> m_clientThreads; private Dictionary<uint, SimClient> m_clientThreads;
private ulong m_regionHandle; private ulong m_regionHandle;
private string m_regionName; private string m_regionName;
@ -38,90 +38,90 @@ namespace OpenSim.world
m_regionName = regionName; m_regionName = regionName;
m_cfg = cfg; m_cfg = cfg;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating new entitities instance");
Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
TerrainManager = new TerrainManager(new SecondLife()); TerrainManager = new TerrainManager(new SecondLife());
Avatar.SetupTemplate("avatar-template.dat"); Avatar.SetupTemplate("avatar-template.dat");
// MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
// Initialise this only after the world has loaded // Initialise this only after the world has loaded
// Scripts = new ScriptEngine(this); // Scripts = new ScriptEngine(this);
Avatar.LoadAnims(); Avatar.LoadAnims();
} }
public PhysicsScene PhysScene public PhysicsScene PhysScene
{ {
set set
{ {
this.phyScene = value; this.phyScene = value;
} }
get get
{ {
return(this.phyScene); return (this.phyScene);
} }
} }
public void Update() public void Update()
{ {
if(this.phyScene.IsThreaded) if (this.phyScene.IsThreaded)
{ {
this.phyScene.GetResults(); this.phyScene.GetResults();
} }
foreach (libsecondlife.LLUUID UUID in Entities.Keys) foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{ {
Entities[UUID].addForces(); Entities[UUID].addForces();
} }
lock (this.LockPhysicsEngine) lock (this.LockPhysicsEngine)
{ {
this.phyScene.Simulate(timeStep); this.phyScene.Simulate(timeStep);
} }
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
Entities[UUID].update();
}
//backup world data
this.storageCount++;
if(storageCount> 1200) //set to how often you want to backup
{
this.Backup();
storageCount =0;
}
}
public bool LoadStorageDLL(string dllName) foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{ {
Assembly pluginAssembly = Assembly.LoadFrom(dllName); Entities[UUID].update();
ILocalStorage store = null; }
foreach (Type pluginType in pluginAssembly.GetTypes()) //backup world data
{ this.storageCount++;
if (pluginType.IsPublic) if (storageCount > 1200) //set to how often you want to backup
{ {
if (!pluginType.IsAbstract) this.Backup();
{ storageCount = 0;
Type typeInterface = pluginType.GetInterface("ILocalStorage", true); }
}
if (typeInterface != null)
{ public bool LoadStorageDLL(string dllName)
ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); {
store = plug; Assembly pluginAssembly = Assembly.LoadFrom(dllName);
break; ILocalStorage store = null;
}
foreach (Type pluginType in pluginAssembly.GetTypes())
typeInterface = null; {
} if (pluginType.IsPublic)
} {
} if (!pluginType.IsAbstract)
pluginAssembly = null; {
this.localStorage = store; Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
return(store == null);
} if (typeInterface != null)
{
ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
store = plug;
break;
}
typeInterface = null;
}
}
}
pluginAssembly = null;
this.localStorage = store;
return (store == null);
}
public void RegenerateTerrain() public void RegenerateTerrain()
{ {
@ -164,144 +164,183 @@ namespace OpenSim.world
Entities[UUID].LandRenegerated(); Entities[UUID].LandRenegerated();
} }
} }
public void LoadPrimsFromStorage()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
this.localStorage.LoadPrimitives(this);
}
public void PrimFromStorage(PrimData prim)
{
if(prim.LocalID >= this._primCount)
{
_primCount = prim.LocalID + 1;
}
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage");
Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
nPrim.CreateFromStorage(prim);
this.Entities.Add(nPrim.uuid, nPrim);
}
public void Close()
{
this.localStorage.ShutDown();
}
public void SendLayerData(SimClient RemoteClient) {
int[] patches = new int[4];
for (int y = 0; y < 16; y++) public void RegenerateTerrain(bool changes, int pointx, int pointy)
{
for (int x = 0; x < 16; x = x + 4)
{
patches[0] = x + 0 + y * 16;
patches[1] = x + 1 + y * 16;
patches[2] = x + 2 + y * 16;
patches[3] = x + 3 + y * 16;
Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);
RemoteClient.OutPacket(layerpack);
}
}
}
public void GetInitialPrims(SimClient RemoteClient)
{
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
if(Entities[UUID].ToString()== "OpenSim.world.Primitive")
{
((OpenSim.world.Primitive)Entities[UUID]).UpdateClient(RemoteClient);
}
}
}
public void AddViewerAgent(SimClient AgentClient)
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); if (changes)
{
lock (this.LockPhysicsEngine)
{
this.phyScene.SetTerrain(this.LandMap);
}
m_cfg.SaveMap(this.LandMap);
foreach (SimClient client in m_clientThreads.Values)
{
this.SendLayerData(pointx , pointy , client);
}
}
}
public void LoadPrimsFromStorage()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
this.localStorage.LoadPrimitives(this);
}
public void PrimFromStorage(PrimData prim)
{
if (prim.LocalID >= this._primCount)
{
_primCount = prim.LocalID + 1;
}
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");
Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
nPrim.CreateFromStorage(prim);
this.Entities.Add(nPrim.uuid, nPrim);
}
public void Close()
{
this.localStorage.ShutDown();
}
public void SendLayerData(SimClient RemoteClient)
{
int[] patches = new int[4];
for (int y = 0; y < 16; y++)
{
for (int x = 0; x < 16; x = x + 4)
{
patches[0] = x + 0 + y * 16;
patches[1] = x + 1 + y * 16;
patches[2] = x + 2 + y * 16;
patches[3] = x + 3 + y * 16;
Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);
RemoteClient.OutPacket(layerpack);
}
}
}
public void SendLayerData(int px, int py, SimClient RemoteClient)
{
int[] patches = new int[1];
int patchx, patchy;
patchx = px / 16;
/* if (patchx > 12)
{
patchx = 12;
}*/
patchy = py / 16;
patches[0] = patchx + 0 + patchy * 16;
//patches[1] = patchx + 1 + patchy * 16;
//patches[2] = patchx + 2 + patchy * 16;
//patches[3] = patchx + 3 + patchy * 16;
Packet layerpack = TerrainManager.CreateLandPacket(LandMap, patches);
RemoteClient.OutPacket(layerpack);
}
public void GetInitialPrims(SimClient RemoteClient)
{
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
if (Entities[UUID].ToString() == "OpenSim.world.Primitive")
{
((OpenSim.world.Primitive)Entities[UUID]).UpdateClient(RemoteClient);
}
}
}
public void AddViewerAgent(SimClient AgentClient)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle); Avatar NewAvatar = new Avatar(AgentClient, this, m_regionName, m_clientThreads, m_regionHandle);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake "); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
NewAvatar.SendRegionHandshake(this); NewAvatar.SendRegionHandshake(this);
PhysicsVector pVec = new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z); PhysicsVector pVec = new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z);
lock (this.LockPhysicsEngine) lock (this.LockPhysicsEngine)
{ {
NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec); NewAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
} }
this.Entities.Add(AgentClient.AgentID, NewAvatar); this.Entities.Add(AgentClient.AgentID, NewAvatar);
} }
public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient) public void AddNewPrim(ObjectAddPacket addPacket, SimClient AgentClient)
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: AddNewPrim() - Creating new prim");
Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount); prim.CreateFromPacket(addPacket, AgentClient.AgentID, this._primCount);
PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z); PhysicsVector pVec = new PhysicsVector(prim.position.X, prim.position.Y, prim.position.Z);
PhysicsVector pSize = new PhysicsVector( 0.255f, 0.255f, 0.255f); PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f);
if(OpenSim.world.Avatar.PhysicsEngineFlying) if (OpenSim.world.Avatar.PhysicsEngineFlying)
{ {
lock (this.LockPhysicsEngine) lock (this.LockPhysicsEngine)
{ {
prim.PhysActor = this.phyScene.AddPrim(pVec, pSize); prim.PhysActor = this.phyScene.AddPrim(pVec, pSize);
} }
} }
//prim.PhysicsEnabled = true; //prim.PhysicsEnabled = true;
this.Entities.Add(prim.uuid, prim); this.Entities.Add(prim.uuid, prim);
this._primCount++; this._primCount++;
} }
public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient) public void DeRezObject(DeRezObjectPacket DeRezPacket, SimClient AgentClient)
{ {
//Needs to delete object from physics at a later date //Needs to delete object from physics at a later date
libsecondlife.LLUUID [] DeRezEnts; libsecondlife.LLUUID[] DeRezEnts;
DeRezEnts = new libsecondlife.LLUUID[ DeRezPacket.ObjectData.Length ]; DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];
int i = 0; int i = 0;
foreach( DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData ) foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
{ {
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
foreach (Entity ent in this.Entities.Values) foreach (Entity ent in this.Entities.Values)
{ {
if (ent.localid == Data.ObjectLocalID) if (ent.localid == Data.ObjectLocalID)
{ {
DeRezEnts[i++] = ent.uuid; DeRezEnts[i++] = ent.uuid;
this.localStorage.RemovePrim(ent.uuid); this.localStorage.RemovePrim(ent.uuid);
KillObjectPacket kill = new KillObjectPacket(); KillObjectPacket kill = new KillObjectPacket();
kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
kill.ObjectData[0].ID = ent.localid; kill.ObjectData[0].ID = ent.localid;
foreach (SimClient client in m_clientThreads.Values) foreach (SimClient client in m_clientThreads.Values)
{ {
client.OutPacket(kill); client.OutPacket(kill);
} }
//Uncommenting this means an old UUID will be re-used, thus crashing the asset server //Uncommenting this means an old UUID will be re-used, thus crashing the asset server
//Uncomment when prim/object UUIDs are random or such //Uncomment when prim/object UUIDs are random or such
//2007-03-22 - Randomskk //2007-03-22 - Randomskk
//this._primCount--; //this._primCount--;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Deleted UUID " + ent.uuid);
} }
} }
} }
foreach( libsecondlife.LLUUID uuid in DeRezEnts ) foreach (libsecondlife.LLUUID uuid in DeRezEnts)
{ {
lock (Entities) lock (Entities)
{ {
Entities.Remove(uuid); Entities.Remove(uuid);
} }
} }
}
public bool Backup()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
Entities[UUID].BackUp();
}
return true;
} }
public bool Backup() {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
Entities[UUID].BackUp();
}
return true;
}
} }
} }