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

* Apply terrain flip patch from http://opensimulator.org/mantis/view.php?id=2315 

* This allows terrain to be flipped on the x or y axis with the command "terrain flip x" (or y)
* See terrain help from the command prompt
* This is in anticipation of change the way around in which terrain raw files are imported to match that of Second Life (to reduce user confusion and improve useability)
* Thanks jonc!
0.6.1-post-fixes
Justin Clarke Casey 2008-12-09 17:00:42 +00:00
parent cb73cf1a92
commit 7c3bfdd8c9
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.txt
View File

@ -55,6 +55,7 @@ Patches
* jhurliman * jhurliman
* jimbo2120 (IBM) * jimbo2120 (IBM)
* John R Sohn (XenReborn) * John R Sohn (XenReborn)
* jonc
* Junta Kohime * Junta Kohime
* Kayne * Kayne
* Kevin Cozens * Kevin Cozens
@ -64,6 +65,7 @@ Patches
* M.Igarashi * M.Igarashi
* Mic Bowman * Mic Bowman
* mikkopa/_someone - RealXtend * mikkopa/_someone - RealXtend
* Mircea Kitsune
* nlin * nlin
* nornalbion * nornalbion
* openlifegrid.com * openlifegrid.com
@ -80,7 +82,6 @@ Patches
* Y. Nitta * Y. Nitta
* YZh * YZh
* Zha Ewry * Zha Ewry
* Mircea Kitsune
LSL Devs LSL Devs

46
OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
View File

@ -753,6 +753,47 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
CheckForTerrainUpdates(); CheckForTerrainUpdates();
} }
private void InterfaceFlipTerrain(Object[] args)
{
String direction = (String)args[0];
if( direction.ToLower().StartsWith("y"))
{
for (int x = 0; x < Constants.RegionSize; x++)
{
for (int y = 0; y < Constants.RegionSize / 2; y++)
{
double height = m_channel[x, y];
double flippedHeight = m_channel[x, (int)Constants.RegionSize - 1 - y];
m_channel[x, y] = flippedHeight;
m_channel[x, (int)Constants.RegionSize - 1 - y] = height;
}
}
}
else if (direction.ToLower().StartsWith("x"))
{
for (int y = 0; y < Constants.RegionSize; y++)
{
for (int x = 0; x < Constants.RegionSize / 2; x++)
{
double height = m_channel[x, y];
double flippedHeight = m_channel[(int)Constants.RegionSize - 1 - x, y];
m_channel[x, y] = flippedHeight;
m_channel[(int)Constants.RegionSize - 1 - x, y] = height;
}
}
}
else
{
m_log.Error("Unrecognised direction - need x or y");
}
CheckForTerrainUpdates();
}
private void InterfaceElevateTerrain(Object[] args) private void InterfaceElevateTerrain(Object[] args)
{ {
int x, y; int x, y;
@ -911,6 +952,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
Command revertRegionCommand = Command revertRegionCommand =
new Command("revert", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap."); new Command("revert", CommandIntentions.COMMAND_HAZARDOUS, InterfaceRevertTerrain, "Loads the revert map terrain into the regions heightmap.");
Command flipCommand =
new Command("flip", CommandIntentions.COMMAND_HAZARDOUS, InterfaceFlipTerrain, "Flips the current terrain about the X or Y axis");
flipCommand.AddArgument("direction", "[x|y] the direction to flip the terrain in", "String");
// Debug // Debug
Command showDebugStatsCommand = Command showDebugStatsCommand =
new Command("stats", CommandIntentions.COMMAND_STATISTICAL, InterfaceShowDebugStats, new Command("stats", CommandIntentions.COMMAND_STATISTICAL, InterfaceShowDebugStats,
@ -938,6 +983,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand); m_commander.RegisterCommand("newbrushes", experimentalBrushesCommand);
m_commander.RegisterCommand("stats", showDebugStatsCommand); m_commander.RegisterCommand("stats", showDebugStatsCommand);
m_commander.RegisterCommand("effect", pluginRunCommand); m_commander.RegisterCommand("effect", pluginRunCommand);
m_commander.RegisterCommand("flip", flipCommand);
// Add this to our scene so scripts can call these functions // Add this to our scene so scripts can call these functions
m_scene.RegisterModuleCommander("Terrain", m_commander); m_scene.RegisterModuleCommander("Terrain", m_commander);