stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-31 04:40:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: long texture names are no longer activated for Doom flat images (GZDoom doesn't support these)

Browse source
This commit is contained in:
ZZYZX 2017-01-26 09:09:22 +02:00
parent 5ebdbd12d5
commit 7de5d10c0f
5 changed files with 76 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/Core/Controls/ImageBrowserControl.cs
View file

@ -470,16 +470,13 @@ namespace CodeImp.DoomBuilder.Controls
}
// This adds an item
public void AddItem(ImageData image, string tooltip)
// [ZZ] having nice string.Empty does not justify having two functions doing the same thing, with one parameter difference.
// C# not Java.
public void AddItem(ImageData image, string tooltip = "")
{
items.Add(new ImageBrowserItem(image, tooltip, uselongtexturenames));
}
public void AddItem(ImageData image)
{
items.Add(new ImageBrowserItem(image, string.Empty, uselongtexturenames));
}
// This fills the list based on the objectname filter
private void RefillList(bool selectfirst)
{

56
Source/Core/Data/FileImage.cs
View file

@ -30,6 +30,8 @@ namespace CodeImp.DoomBuilder.Data
#region ================== Variables
private readonly int probableformat;
private readonly string _c_name;
private readonly string _c_filepathname;
#endregion
@ -38,9 +40,10 @@ namespace CodeImp.DoomBuilder.Data
// Constructor
public FileImage(string name, string filepathname, bool asflat)
{
// Initialize
// Initialize
_c_name = name; // this is used to call SetName later
_c_filepathname = filepathname; // this is used to call SetName later
this.isFlat = asflat; //mxd
SetName(name, filepathname);
if(asflat)
{
@ -54,36 +57,44 @@ namespace CodeImp.DoomBuilder.Data
this.scale.x = General.Map.Config.DefaultTextureScale;
this.scale.y = General.Map.Config.DefaultTextureScale;
}
// We have no destructor
GC.SuppressFinalize(this);
SetName(name, filepathname);
// We have no destructor
GC.SuppressFinalize(this);
}
// Constructor
public FileImage(string name, string filepathname, bool asflat, float scalex, float scaley)
{
// Initialize
this.scale.x = scalex;
// Initialize
_c_name = name; // this is used to call SetName later
_c_filepathname = filepathname; // this is used to call SetName later
this.scale.x = scalex;
this.scale.y = scaley;
this.isFlat = asflat; //mxd
SetName(name, filepathname);
probableformat = (asflat ? ImageDataFormat.DOOMFLAT : ImageDataFormat.DOOMPICTURE);
// We have no destructor
GC.SuppressFinalize(this);
SetName(name, filepathname);
// We have no destructor
GC.SuppressFinalize(this);
}
//mxd. Constructor for loading internal images
internal FileImage(string name, string filepathname)
{
// Initialize
SetName(name, filepathname, true, true);
// Initialize
_c_name = name; // this is used to call SetName later
_c_filepathname = filepathname; // this is used to call SetName later
probableformat = ImageDataFormat.DOOMPICTURE;
// We have no destructor
GC.SuppressFinalize(this);
SetName(name, filepathname, true, 1);
// We have no destructor
GC.SuppressFinalize(this);
}
#endregion
@ -94,16 +105,18 @@ namespace CodeImp.DoomBuilder.Data
//mxd: filepathname is absolute path to the image ("D:\Doom\MyCoolProject\Textures\sometexture.png")
//mxd: also, zdoom uses '/' as directory separator char.
//mxd: and doesn't recognize long texture names in a root folder / pk3/7 root
//[ZZ] and doesn't work with flats in Doom format (added SetName call to post-load to validate this)
private void SetName(string name, string filepathname)
{
SetName(name, filepathname, General.Map.Config.UseLongTextureNames, false);
SetName(name, filepathname, General.Map.Config.UseLongTextureNames, (probableformat == ImageDataFormat.DOOMFLAT) ? -1 : 0);
}
private void SetName(string name, string filepathname, bool uselongtexturenames, bool forcelongtexturename)
// prevent long texture names by forcelongtexturename=-1
private void SetName(string name, string filepathname, bool uselongtexturenames, int forcelongtexturename)
{
name = name.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
if(!uselongtexturenames || (!forcelongtexturename && string.IsNullOrEmpty(Path.GetDirectoryName(name))))
if (forcelongtexturename < 0 || !uselongtexturenames || (forcelongtexturename == 0 && string.IsNullOrEmpty(Path.GetDirectoryName(name))))
{
this.name = Path.GetFileNameWithoutExtension(name.ToUpperInvariant());
if(this.name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
@ -113,6 +126,7 @@ namespace CodeImp.DoomBuilder.Data
this.virtualname = Path.Combine(Path.GetDirectoryName(name), this.name).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
this.displayname = this.name;
this.shortname = this.name;
hasLongName = false;
}
else
{
@ -142,6 +156,8 @@ namespace CodeImp.DoomBuilder.Data
// Load file data
if(bitmap != null) bitmap.Dispose(); bitmap = null;
bool isBadForLongTextureNames = false;
MemoryStream filedata = null;
try
{
@ -159,6 +175,9 @@ namespace CodeImp.DoomBuilder.Data
IImageReader reader = ImageDataFormat.GetImageReader(filedata, probableformat, General.Map.Data.Palette);
if (!(reader is UnknownImageReader))
{
// [ZZ] check for doom flat, always short name for these
if (reader is DoomFlatReader)
isBadForLongTextureNames = true;
// Load the image
filedata.Seek(0, SeekOrigin.Begin);
try { bitmap = reader.ReadAsBitmap(filedata); }
@ -185,6 +204,9 @@ namespace CodeImp.DoomBuilder.Data
filedata.Dispose();
}
// [ZZ] validate disabled long texture names for flats. (and enabled for everything else, if our guessed format was wrong)
SetName(_c_name, _c_filepathname, General.Map.Config.UseLongTextureNames, isBadForLongTextureNames?-1:0);
// Pass on to base
base.LocalLoadImage();
}

45
Source/Core/Data/PK3FileImage.cs
View file

@ -31,6 +31,7 @@ namespace CodeImp.DoomBuilder.Data
private readonly PK3Reader datareader;
private readonly int probableformat;
private readonly string _c_filepathname;
#endregion
@ -41,8 +42,8 @@ namespace CodeImp.DoomBuilder.Data
{
// Initialize
this.datareader = datareader;
_c_filepathname = filepathname; // this is used to call SetName later
this.isFlat = asflat; //mxd
SetName(filepathname);
if(asflat)
{
@ -56,19 +57,26 @@ namespace CodeImp.DoomBuilder.Data
this.scale.x = General.Map.Config.DefaultTextureScale;
this.scale.y = General.Map.Config.DefaultTextureScale;
}
// We have no destructor
GC.SuppressFinalize(this);
SetName(filepathname);
// We have no destructor
GC.SuppressFinalize(this);
}
#endregion
#endregion
#region ================== Methods
#region ================== Methods
//mxd: filepathname is relative path to the image ("Textures\sometexture.png")
protected override void SetName(string filepathname)
//mxd: filepathname is relative path to the image ("Textures\sometexture.png")
protected override void SetName(string filepathname)
{
SetName(filepathname, (probableformat == ImageDataFormat.DOOMFLAT) ? false : General.Map.Config.UseLongTextureNames);
}
private void SetName(string filepathname, bool longtexturenames)
{
if(!General.Map.Config.UseLongTextureNames || string.IsNullOrEmpty(Path.GetDirectoryName(filepathname)))
if(!longtexturenames || string.IsNullOrEmpty(Path.GetDirectoryName(filepathname)))
{
this.name = Path.GetFileNameWithoutExtension(filepathname.ToUpperInvariant());
if(this.name.Length > DataManager.CLASIC_IMAGE_NAME_LENGTH)
@ -77,7 +85,8 @@ namespace CodeImp.DoomBuilder.Data
}
this.displayname = this.name;
this.shortname = this.name;
}
this.hasLongName = false;
}
else
{
this.name = filepathname.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
@ -106,15 +115,21 @@ namespace CodeImp.DoomBuilder.Data
// Load file data
if(bitmap != null) bitmap.Dispose(); bitmap = null;
MemoryStream filedata = datareader.LoadFile(filepathname); //mxd
if(filedata != null)
bool isBadForLongTextureNames = false;
if (filedata != null)
{
// Get a reader for the data
IImageReader reader = ImageDataFormat.GetImageReader(filedata, probableformat, General.Map.Data.Palette);
if(!(reader is UnknownImageReader))
{
// Load the image
filedata.Seek(0, SeekOrigin.Begin);
// [ZZ] check for flat type
if (reader is DoomFlatReader)
isBadForLongTextureNames = true;
// Load the image
filedata.Seek(0, SeekOrigin.Begin);
try
{
bitmap = reader.ReadAsBitmap(filedata);
@ -142,6 +157,8 @@ namespace CodeImp.DoomBuilder.Data
filedata.Dispose();
}
SetName(_c_filepathname, isBadForLongTextureNames ? false : General.Map.Config.UseLongTextureNames);
// Pass on to base
base.LocalLoadImage();
}

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2843")]
[assembly: AssemblyVersion("2.3.0.2844")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("ee93615")]
[assembly: AssemblyHash("5ebdbd1")]

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

@ -29,5 +29,5 @@ using System.Resources;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.3.0.2843")]
[assembly: AssemblyVersion("2.3.0.2844")]
[assembly: NeutralResourcesLanguageAttribute("en")]