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

a few more changes for hypothetical terrain PBR

Browse Source
This commit is contained in:
UbitUmarov
2024-06-10 21:02:31 +01:00
parent 183350b617
commit 65738b3766
11 changed files with 167 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
View File

@@ -68,6 +68,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
" that coordinate.",
consoleSetTerrainTexture);
m_module.Scene.AddCommand("Regions", m_module, "set terrain pbr",
"set terrain pbr <number> <uuid> [<x>] [<y>]",
"Sets the pbr <number> to <uuid>, if <x> or <y> are specified, it will only " +
"set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
" that coordinate.",
consoleSetTerrainPBR);
m_module.Scene.AddCommand("Regions", m_module, "set terrain heights",
"set terrain heights <corner> <min> <max> [<x>] [<y>]",
"Sets the terrain texture heights on corner #<corner> to <min>/<max>, if <x> or <y> are specified, it will only " +
@@ -127,6 +134,44 @@ namespace OpenSim.Region.CoreModules.World.Estate
}
}
}
protected void consoleSetTerrainPBR(string module, string[] args)
{
string num = args[3];
string uuid = args[4];
int x = (args.Length > 5 ? int.Parse(args[5]) : -1);
int y = (args.Length > 6 ? int.Parse(args[6]) : -1);
if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
{
if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
{
int corner = int.Parse(num);
UUID texture = UUID.Parse(uuid);
m_log.Debug($"[ESTATEMODULE]: Setting terrain PBR asset for {m_module.Scene.RegionInfo.RegionName} to {texture}");
switch (corner)
{
case 0:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR1 = texture;
break;
case 1:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR2 = texture;
break;
case 2:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR3 = texture;
break;
case 3:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR4 = texture;
break;
}
m_module.Scene.RegionInfo.RegionSettings.Save();
m_module.TriggerRegionInfoChange();
m_module.sendRegionHandshakeToAll();
}
}
}
protected void consoleSetWaterHeight(string module, string[] args)
{
string heightstring = args[3];

53
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -541,22 +541,45 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (texture.IsZero())
return;
switch (level)
if((remoteClient.ViewerFlags & ViewerFlags.TPBR) != 0)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
break;
default:
return;
switch (level)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainPBR1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainPBR2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainPBR3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainPBR4 = texture;
break;
default:
return;
}
}
else
{
switch (level)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
break;
default:
return;
}
}
Scene.RegionInfo.RegionSettings.Save();