From 4383a148877bef2f67b4d14977dc49e29af09eb7 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sun, 27 May 2007 06:50:23 +0000 Subject: * Region Terrain textures are now loaded from the RegionInfo class rather than being hard coded in the handshake packets. * Supports: Base0-3 textures, Detail0-3 textures, Start00-11 values, Range00-11 values. * Added notes on how terrain texturing works to their definition in regionInfoBase. --- OpenSim/OpenSim.RegionServer/RegionInfoBase.cs | 38 ++++++++++++++----------- OpenSim/OpenSim.RegionServer/world/Avatar.cs | 32 ++++++++++----------- OpenSim/OpenSim.RegionServer/world/WorldBase.cs | 2 +- 3 files changed, 39 insertions(+), 33 deletions(-) (limited to 'OpenSim/OpenSim.RegionServer') diff --git a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs index afad245..6e4c110 100644 --- a/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs +++ b/OpenSim/OpenSim.RegionServer/RegionInfoBase.cs @@ -24,22 +24,28 @@ namespace OpenSim public string IPListenAddr; // Region Information - public LLUUID TerrainBase0 = new LLUUID(); // Insert default here - public LLUUID TerrainBase1 = new LLUUID(); - public LLUUID TerrainBase2 = new LLUUID(); - public LLUUID TerrainBase3 = new LLUUID(); - public LLUUID TerrainDetail0 = new LLUUID(); - public LLUUID TerrainDetail1 = new LLUUID(); - public LLUUID TerrainDetail2 = new LLUUID(); - public LLUUID TerrainDetail3 = new LLUUID(); - public float TerrainStartHeight00 = 0.0f; - public float TerrainStartHeight01 = 0.0f; - public float TerrainStartHeight10 = 0.0f; - public float TerrainStartHeight11 = 0.0f; - public float TerrainHeightRange00 = 40.0f; - public float TerrainHeightRange01 = 40.0f; - public float TerrainHeightRange10 = 40.0f; - public float TerrainHeightRange11 = 40.0f; + // Low resolution 'base' textures. No longer used. + public LLUUID TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); // Default + public LLUUID TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); // Default + public LLUUID TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); // Default + public LLUUID TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); // Default + // Higher resolution terrain textures + public LLUUID TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000"); + public LLUUID TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000"); + public LLUUID TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000"); + public LLUUID TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); + // First quad - each point is bilinearly interpolated at each meter of terrain + public float TerrainStartHeight00 = 10.0f; // NW Corner ( I think ) + public float TerrainStartHeight01 = 10.0f; // NE Corner ( I think ) + public float TerrainStartHeight10 = 10.0f; // SW Corner ( I think ) + public float TerrainStartHeight11 = 10.0f; // SE Corner ( I think ) + // Second quad - also bilinearly interpolated. + // Terrain texturing is done that: + // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] + public float TerrainHeightRange00 = 60.0f; + public float TerrainHeightRange01 = 60.0f; + public float TerrainHeightRange10 = 60.0f; + public float TerrainHeightRange11 = 60.0f; // Terrain Default (Must be in F32 Format!) public string TerrainFile = "default.r32"; diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs index 2c1ccdf..a09ce73 100644 --- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs +++ b/OpenSim/OpenSim.RegionServer/world/Avatar.cs @@ -389,14 +389,14 @@ namespace OpenSim.world OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); handshake.RegionInfo.BillableFactor = 0; handshake.RegionInfo.IsEstateManager = false; - handshake.RegionInfo.TerrainHeightRange00 = 60; - handshake.RegionInfo.TerrainHeightRange01 = 60; - handshake.RegionInfo.TerrainHeightRange10 = 60; - handshake.RegionInfo.TerrainHeightRange11 = 60; - handshake.RegionInfo.TerrainStartHeight00 = 10; - handshake.RegionInfo.TerrainStartHeight01 = 10; - handshake.RegionInfo.TerrainStartHeight10 = 10; - handshake.RegionInfo.TerrainStartHeight11 = 10; + handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00; + handshake.RegionInfo.TerrainHeightRange01 = regionInfo.m_regInfo.TerrainHeightRange01; + handshake.RegionInfo.TerrainHeightRange10 = regionInfo.m_regInfo.TerrainHeightRange10; + handshake.RegionInfo.TerrainHeightRange11 = regionInfo.m_regInfo.TerrainHeightRange11; + handshake.RegionInfo.TerrainStartHeight00 = regionInfo.m_regInfo.TerrainStartHeight00; + handshake.RegionInfo.TerrainStartHeight01 = regionInfo.m_regInfo.TerrainStartHeight01; + handshake.RegionInfo.TerrainStartHeight10 = regionInfo.m_regInfo.TerrainStartHeight10; + handshake.RegionInfo.TerrainStartHeight11 = regionInfo.m_regInfo.TerrainStartHeight11; handshake.RegionInfo.SimAccess = 13; handshake.RegionInfo.WaterHeight = m_regionWaterHeight; uint regionFlags = 72458694; @@ -407,14 +407,14 @@ namespace OpenSim.world handshake.RegionInfo.RegionFlags = regionFlags; handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0"); handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000"); - handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975"); - handshake.RegionInfo.TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3"); - handshake.RegionInfo.TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f"); - handshake.RegionInfo.TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2"); - handshake.RegionInfo.TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000"); - handshake.RegionInfo.TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000"); - handshake.RegionInfo.TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000"); - handshake.RegionInfo.TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000"); + handshake.RegionInfo.TerrainBase0 = regionInfo.m_regInfo.TerrainBase0; + handshake.RegionInfo.TerrainBase1 = regionInfo.m_regInfo.TerrainBase1; + handshake.RegionInfo.TerrainBase2 = regionInfo.m_regInfo.TerrainBase2; + handshake.RegionInfo.TerrainBase3 = regionInfo.m_regInfo.TerrainBase3; + handshake.RegionInfo.TerrainDetail0 = regionInfo.m_regInfo.TerrainDetail0; + handshake.RegionInfo.TerrainDetail1 = regionInfo.m_regInfo.TerrainDetail1; + handshake.RegionInfo.TerrainDetail2 = regionInfo.m_regInfo.TerrainDetail2; + handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3; handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs index ea71411..f8fb49d 100644 --- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs +++ b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs @@ -25,7 +25,7 @@ namespace OpenSim.world protected string m_regionName; protected InventoryCache _inventoryCache; protected AssetCache _assetCache; - protected RegionInfo m_regInfo; + public RegionInfo m_regInfo; public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine -- cgit v1.1