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");

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

@ -295,7 +295,9 @@ 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);

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

@ -18,9 +18,9 @@ namespace OpenSim.world
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();
@ -58,13 +58,13 @@ namespace OpenSim.world
} }
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();
@ -87,10 +87,10 @@ namespace OpenSim.world
//backup world data //backup world data
this.storageCount++; this.storageCount++;
if(storageCount> 1200) //set to how often you want to backup if (storageCount > 1200) //set to how often you want to backup
{ {
this.Backup(); this.Backup();
storageCount =0; storageCount = 0;
} }
} }
@ -120,7 +120,7 @@ namespace OpenSim.world
} }
pluginAssembly = null; pluginAssembly = null;
this.localStorage = store; this.localStorage = store;
return(store == null); return (store == null);
} }
public void RegenerateTerrain() public void RegenerateTerrain()
@ -165,6 +165,23 @@ namespace OpenSim.world
} }
} }
public void RegenerateTerrain(bool changes, int pointx, int pointy)
{
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() public void LoadPrimsFromStorage()
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
@ -173,11 +190,11 @@ namespace OpenSim.world
public void PrimFromStorage(PrimData prim) public void PrimFromStorage(PrimData prim)
{ {
if(prim.LocalID >= this._primCount) if (prim.LocalID >= this._primCount)
{ {
_primCount = prim.LocalID + 1; _primCount = prim.LocalID + 1;
} }
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: PrimFromStorage() - Reloading prim (localId "+ prim.LocalID+ " ) from storage"); 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); Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
nPrim.CreateFromStorage(prim); nPrim.CreateFromStorage(prim);
this.Entities.Add(nPrim.uuid, nPrim); this.Entities.Add(nPrim.uuid, nPrim);
@ -188,7 +205,8 @@ namespace OpenSim.world
this.localStorage.ShutDown(); this.localStorage.ShutDown();
} }
public void SendLayerData(SimClient RemoteClient) { public void SendLayerData(SimClient RemoteClient)
{
int[] patches = new int[4]; int[] patches = new int[4];
for (int y = 0; y < 16; y++) for (int y = 0; y < 16; y++)
@ -206,11 +224,31 @@ namespace OpenSim.world
} }
} }
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) public void GetInitialPrims(SimClient RemoteClient)
{ {
foreach (libsecondlife.LLUUID UUID in Entities.Keys) foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{ {
if(Entities[UUID].ToString()== "OpenSim.world.Primitive") if (Entities[UUID].ToString() == "OpenSim.world.Primitive")
{ {
((OpenSim.world.Primitive)Entities[UUID]).UpdateClient(RemoteClient); ((OpenSim.world.Primitive)Entities[UUID]).UpdateClient(RemoteClient);
} }
@ -238,8 +276,8 @@ namespace OpenSim.world
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)
{ {
@ -255,10 +293,10 @@ namespace OpenSim.world
{ {
//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)
@ -283,7 +321,7 @@ namespace OpenSim.world
} }
} }
} }
foreach( libsecondlife.LLUUID uuid in DeRezEnts ) foreach (libsecondlife.LLUUID uuid in DeRezEnts)
{ {
lock (Entities) lock (Entities)
{ {
@ -293,7 +331,8 @@ namespace OpenSim.world
} }
public bool Backup() { public bool Backup()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: Backup() - Backing up Primitives");
foreach (libsecondlife.LLUUID UUID in Entities.Keys) foreach (libsecondlife.LLUUID UUID in Entities.Keys)