stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-18 22:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: texture coordinates interpolation during linedef splitting was failing in UDMF map format when target sidedef's texture was in a sub-folder of a PK3 or Folder resource.

Browse source
This commit is contained in:
MaxED 2015-01-16 13:14:57 +00:00
parent cc4a599506
commit 290231070a
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/Core/Data/DataManager.cs
View file

@ -926,8 +926,7 @@ namespace CodeImp.DoomBuilder.Data
// This checks if a given texture is known
public bool GetTextureExists(string name)
{
long longname = Lump.MakeLongName(name);
return textures.ContainsKey(longname);
return GetTextureExists(Lump.MakeLongName(name)); //mxd
}
// This checks if a given texture is known
@ -1042,8 +1041,7 @@ namespace CodeImp.DoomBuilder.Data
// This checks if a flat is known
public bool GetFlatExists(string name)
{
long longname = Lump.MakeLongName(name);
return flats.ContainsKey(longname);
return GetFlatExists(Lump.MakeLongName(name)); //mxd
}
// This checks if a flat is known

12
Source/Core/Map/Sidedef.cs
View file

@ -656,9 +656,9 @@ namespace CodeImp.DoomBuilder.Map
this.Fields.BeforeFieldsChange();
//top
if(longtexnamehigh != MapSet.EmptyLongName && General.Map.Data.GetFlatExists(texnamehigh))
if(longtexnamehigh != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamehigh))
{
ImageData texture = General.Map.Data.GetFlatImage(texnamehigh);
ImageData texture = General.Map.Data.GetTextureImage(texnamehigh);
float scaleTop = Fields.GetValue("scalex_top", 1.0f);
float value = Fields.GetValue("offsetx_top", 0f);
@ -667,9 +667,9 @@ namespace CodeImp.DoomBuilder.Map
}
//middle
if(longtexnamemid != MapSet.EmptyLongName && General.Map.Data.GetFlatExists(texnamemid))
if(longtexnamemid != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamemid))
{
ImageData texture = General.Map.Data.GetFlatImage(texnamemid);
ImageData texture = General.Map.Data.GetTextureImage(texnamemid);
float scaleMid = Fields.GetValue("scalex_mid", 1.0f);
float value = Fields.GetValue("offsetx_mid", 0f);
@ -678,9 +678,9 @@ namespace CodeImp.DoomBuilder.Map
}
//bottom
if(longtexnamelow != MapSet.EmptyLongName && General.Map.Data.GetFlatExists(texnamelow))
if(longtexnamelow != MapSet.EmptyLongName && General.Map.Data.GetTextureExists(texnamelow))
{
ImageData texture = General.Map.Data.GetFlatImage(texnamelow);
ImageData texture = General.Map.Data.GetTextureImage(texnamelow);
float scaleLow = Fields.GetValue("scalex_bottom", 1.0f);
float value = Fields.GetValue("offsetx_bottom", 0f);