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

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

@ -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");
@ -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,6 +224,26 @@ 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)
@ -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)