0005953: [PATCH] concerns terrain save-tile; only PNG extension should be accepted

From 2c0c593720a740b7c7a9a7c82b2c65dea0c37254 Mon Sep 17 00:00:00 2001 From: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com> Date: Tue, 3 Apr 2012 16:56:51 +0200 Subject: [PATCH] terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com> --- .../CoreModules/World/Terrain/FileLoaders/BMP.cs | 6 ++++++ .../CoreModules/World/Terrain/FileLoaders/GIF.cs | 6 ++++++ .../Terrain/FileLoaders/GenericSystemDrawing.cs | 6 ++++++ .../CoreModules/World/Terrain/FileLoaders/JPEG.cs | 6 ++++++ .../CoreModules/World/Terrain/FileLoaders/LLRAW.cs | 7 +++++++ .../CoreModules/World/Terrain/FileLoaders/PNG.cs | 6 ++++++ .../CoreModules/World/Terrain/FileLoaders/RAW32.cs | 6 ++++++ .../CoreModules/World/Terrain/FileLoaders/TIFF.cs | 6 ++++++ .../World/Terrain/FileLoaders/Terragen.cs | 6 ++++++ Region/CoreModules/World/Terrain/ITerrainLoader.cs | 4 ++++ Region/CoreModules/World/Terrain/TerrainModule.cs | 18 +++++++++++++++--- 11 files changed, 74 insertions(+), 3 deletions(-) diff --git a/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs b/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs index 90f124b..fb57c82 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/BMP.cs @@ -72,5 +72,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "BMP"; } + + //Returns true if this extension is supported for terrain save-tile + public override bool SupportsTileSave() + { + return false; + } } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs b/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs index f331b56..79cc50b 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/GIF.cs @@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "GIF"; } + + //Returns true if this extension is supported for terrain save-tile + public override bool SupportsTileSave() + { + return false; + } } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs b/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs index 58925fd..da81dc1 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs @@ -177,6 +177,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders return "SYS.DRAWING"; } + //Returns true if this extension is supported for terrain save-tile + public virtual bool SupportsTileSave() + { + return false; + } + /// <summary> /// Protected method, generates a grayscale bitmap /// image from a specified terrain channel. diff --git a/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs b/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs index 1a0d8ec..699d67a 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs @@ -91,6 +91,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders return "JPEG"; } + //Returns true if this extension is supported for terrain save-tile + public bool SupportsTileSave() + { + return false; + } + private static Bitmap CreateBitmapFromMap(ITerrainChannel map) { Bitmap gradientmapLd = new Bitmap("defaultstripe.png"); diff --git a/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs b/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs index fad7641..62d232e 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/LLRAW.cs @@ -254,5 +254,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "LL/SL RAW"; } + + //Returns true if this extension is supported for terrain save-tile + public bool SupportsTileSave() + { + return false; + } + } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs b/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs index e009ecf..c5c12ae 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/PNG.cs @@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "PNG"; } + + //Returns true if this extension is supported for terrain save-tile + public override bool SupportsTileSave() + { + return true; + } } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs b/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs index ba073ca..9fb7ef7 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/RAW32.cs @@ -173,5 +173,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "RAW32"; } + + //Returns true if this extension is supported for terrain save-tile + public bool SupportsTileSave() + { + return false; + } } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs b/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs index fc1ad33..5d2f893 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/TIFF.cs @@ -57,5 +57,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders { return "TIFF"; } + + //Returns true if this extension is supported for terrain save-tile + public bool SupportsTileSave() + { + return false; + } } } diff --git a/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs index 2f37d9d..1ebf916 100644 --- a/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs +++ b/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs @@ -323,6 +323,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders return "Terragen"; } + //Returns true if this extension is supported for terrain save-tile + public bool SupportsTileSave() + { + return false; + } + /// <summary> /// terragen SCAL floats need to be written intel ordered regardless of /// big or little endian system diff --git a/Region/CoreModules/World/Terrain/ITerrainLoader.cs b/Region/CoreModules/World/Terrain/ITerrainLoader.cs index d407617..3ba3657 100644 --- a/Region/CoreModules/World/Terrain/ITerrainLoader.cs +++ b/Region/CoreModules/World/Terrain/ITerrainLoader.cs @@ -32,6 +32,10 @@ namespace OpenSim.Region.CoreModules.World.Terrain { public interface ITerrainLoader { + // Returns true if that extension can be used for terrain save-tile + // (Look into each file in Region.CoreModules.World.Terrain.FileLoaders) + bool SupportsTileSave(); + string FileExtension { get; } ITerrainChannel LoadFile(string filename); ITerrainChannel LoadFile(string filename, int fileStartX, int fileStartY, int fileWidth, int fileHeight, int sectionWidth, int sectionHeight); diff --git a/Region/CoreModules/World/Terrain/TerrainModule.cs b/Region/CoreModules/World/Terrain/TerrainModule.cs index b3c2969..8535a5a 100644 --- a/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -93,6 +93,9 @@ namespace OpenSim.Region.CoreModules.World.Terrain /// </summary> private string m_supportedFileExtensions = ""; + //For terrain save-tile file extensions + private string m_supportFileExtensionsForTileSave = ""; + #region ICommandableModule Members public ICommander CommandInterface @@ -148,11 +151,20 @@ namespace OpenSim.Region.CoreModules.World.Terrain // Generate user-readable extensions list string supportedFilesSeparator = ""; + string supportedFilesSeparatorForTileSave = ""; + m_supportFileExtensionsForTileSave = ""; foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) { m_supportedFileExtensions += supportedFilesSeparator + loader.Key + " (" + loader.Value + ")"; supportedFilesSeparator = ", "; + + //For terrain save-tile file extensions + if (loader.Value.SupportsTileSave() == true) + { + m_supportFileExtensionsForTileSave += supportedFilesSeparatorForTileSave + loader.Key + " (" + loader.Value + ")"; + supportedFilesSeparatorForTileSave = ", "; + } } } @@ -589,7 +601,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain // this region is included in the tile request foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) { - if (filename.EndsWith(loader.Key)) + if (filename.EndsWith(loader.Key) && loader.Value.SupportsTileSave()) { lock (m_scene) { @@ -610,7 +622,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain MainConsole.Instance.OutputFormat( "ERROR: Could not save terrain from {0} to {1}. Valid file extensions are {2}", - m_scene.RegionInfo.RegionName, filename, m_supportedFileExtensions); + m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave); } /// <summary> @@ -1192,7 +1204,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain new Command("save-tile", CommandIntentions.COMMAND_HAZARDOUS, InterfaceSaveTileFile, "Saves the current heightmap to the larger file."); saveToTileCommand.AddArgument("filename", "The file you wish to save to, the file extension determines the loader to be used. Supported extensions include: " + - m_supportedFileExtensions, "String"); + m_supportFileExtensionsForTileSave, "String"); saveToTileCommand.AddArgument("file width", "The width of the file in tiles", "Integer"); saveToTileCommand.AddArgument("file height", "The height of the file in tiles", "Integer"); saveToTileCommand.AddArgument("minimum X tile", "The X region coordinate of the first section on the file", -- 1.7.9.msysgit.0

Notes
(0021181) kcozens (manager) 2012-04-01 23:47	Would it make more sense to attempt to fix the saving of tiles in other formats first before removing all but one(?) format?

(0021182) melanie (administrator) 2012-04-01 23:51	The patch has line ending issues. Only patches with UNIX line endings can be accepted. -1 in this form.

(0021183) melanie (administrator) 2012-04-01 23:51	Please post proper patch or close issue.

(0021184) Garmin Kawaguichi (reporter) 2012-04-02 09:12	@kcozens: The formats have not been removed permanently; as stated in the description I tried to run other formats without positive result (the way the command save-tile works, requires an image format that supports transparency, this eliminating half of formats; for other formats only PNG provides a true file). The patch provides a simple way to display the list of accepted formats (currently PNG); if another format is made ??operational, there is just a "false" to change to "true" in the corresponding loader.

(0021185) Garmin Kawaguichi (reporter) 2012-04-02 09:22	@melanie: I compiled OpenSimulator with MS C # 2008 Express and I used Git-gui to commit and Git-bash to generate the patch. For this patch, as in the previous (0005934), I have no means of influencing the structure of the lines. But indeed I note that this patch is weird and it shows entire files and not only changes to files. I will redo the job but using a text editor to edit files.

(0021186) Garmin Kawaguichi (reporter) 2012-04-02 11:22 edited on: 2012-04-02 21:09	A new patch file was added: 0002-terrain-save-tile-only-PNG-extension-should-be-accep.patch Ignore the previous patch: 0001-terrain save-tile only PNG extension should be accepted.patch I have not found how to remove the former file. @melanie: I used a converter Windows(CR LF) to UNIX(LF only).

(0021187) melanie (administrator) 2012-04-02 12:47	The patch is still ill-formatted. Patches should only change the lines they pertain to - your patch still replaces an entire file. This is caused by CRLF line endings. You may need to set the "autocrlf" option on your git installation and re-clone the repository. Patches with Windows line endings cannot be applied. Patches should not change unrelated whitespace, yours does. This is, again, caused by windows line endings. Patches should not contain TAB (^I) characters, but all tabs must be expanded to spaces. We require 4 spaces per tab. Your patch contains hard tabs. Patches should provide clean code written to the OpenSim coding standards. Your patch violates the coding standards by using different indentation. This may just have been a typo (one line is indented one space less than it should be). So this patch still isn't good. Sorry.

(0021190) Garmin Kawaguichi (reporter) 2012-04-03 15:09	A new patch file was added: 0003-terrain-save-tile-extensions.patch Ignore the previous patches: 0001-terrain save-tile only PNG extension should be accepted.patch & 0002-terrain-save-tile-only-PNG-extension-should-be-accep.patch

(0021191) melanie (administrator) 2012-04-03 20:20	9a9923405a95

Issue History
Date Modified	Username	Field	Change
2012-04-01 19:26	Garmin Kawaguichi	New Issue
2012-04-01 19:28	Garmin Kawaguichi	Status	new => patch included
2012-04-01 19:28	Garmin Kawaguichi	Steps to Reproduce Updated	View Revisions
2012-04-01 19:28	Garmin Kawaguichi	Additional Information Updated	View Revisions
2012-04-01 19:32	Garmin Kawaguichi	File Added: 0001-terrain save-tile only PNG extension should be accepted.patch
2012-04-01 23:47	kcozens	Note Added: 0021181
2012-04-01 23:51	melanie	Note Added: 0021182
2012-04-01 23:51	melanie	Note Added: 0021183
2012-04-01 23:51	melanie	Assigned To	=> melanie
2012-04-01 23:51	melanie	Status	patch included => patch feedback
2012-04-02 09:12	Garmin Kawaguichi	Note Added: 0021184
2012-04-02 09:22	Garmin Kawaguichi	Note Added: 0021185
2012-04-02 11:14	Garmin Kawaguichi	Git Revision	. => 6e7f13a
2012-04-02 11:14	Garmin Kawaguichi	Description Updated	View Revisions
2012-04-02 11:16	Garmin Kawaguichi	File Added: 0002-terrain-save-tile-only-PNG-extension-should-be-accep.patch
2012-04-02 11:22	Garmin Kawaguichi	Note Added: 0021186
2012-04-02 12:47	melanie	Note Added: 0021187
2012-04-02 21:09	Garmin Kawaguichi	Note Edited: 0021186	View Revisions
2012-04-03 15:06	Garmin Kawaguichi	File Added: 0003-terrain-save-tile-extensions.patch
2012-04-03 15:09	Garmin Kawaguichi	Note Added: 0021190
2012-04-03 19:05	melanie	File Deleted: 0001-terrain save-tile only PNG extension should be accepted.patch
2012-04-03 19:05	melanie	File Deleted: 0002-terrain-save-tile-only-PNG-extension-should-be-accep.patch
2012-04-03 20:20	melanie	Note Added: 0021191
2012-04-03 20:20	melanie	Status	patch feedback => resolved
2012-04-03 20:20	melanie	Resolution	open => fixed

Relationships