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

Fixed TGA texture loading

Browse source
This commit is contained in:
ZZYZX 2019-12-24 21:33:16 +02:00
parent 99b1770004
commit 96f2b4e94e
5 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/Core/GZBuilder/md3/ModelReader.cs
View file

@ -1655,7 +1655,6 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
//create texture
FileImageReader fir = new FileImageReader();
Bitmap bitmap = fir.ReadAsBitmap(ms);
bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
ms.Close();
if(bitmap != null)

38
Source/Core/IO/FileImageReader.cs
View file

@ -77,7 +77,10 @@ namespace CodeImp.DoomBuilder.IO
internal unsafe class FileImageReader : IImageReader
{
#region ================== APIs
#region ================== APIs
[DllImport("devil.dll")]
private static extern void ilEnable(int num);
[DllImport("devil.dll")]
private static extern void ilGenImages(int num, IntPtr images);
@ -88,6 +91,9 @@ namespace CodeImp.DoomBuilder.IO
[DllImport("devil.dll")]
private static extern void ilDeleteImages(int num, IntPtr images);
[DllImport("devil.dll")]
private static extern void ilOriginFunc(int func);
[DllImport("devil.dll")]
private static extern bool ilLoadL(uint type, IntPtr lump, uint size);
@ -102,17 +108,22 @@ namespace CodeImp.DoomBuilder.IO
[DllImport("devil.dll")]
private static extern uint ilCopyPixels(uint xoff, uint yoff, uint zoff, uint width, uint height, uint depth, uint format, uint type, IntPtr data);
//mxd. Look's like we don't need many of those...
// Matches OpenGL's right now.
//! Data formats \link Formats Formats\endlink
//private const int IL_COLOUR_INDEX = 0x1900;
//private const int IL_COLOR_INDEX = 0x1900;
//private const int IL_ALPHA = 0x1906;
//private const int IL_RGB = 0x1907;
//private const int IL_RGBA = 0x1908;
//private const int IL_BGR = 0x80E0;
private const int IL_BGRA = 0x80E1;
//
private const int IL_ORIGIN_SET = 0x0600;
private const int IL_ORIGIN_LOWER_LEFT = 0x0601;
private const int IL_ORIGIN_UPPER_LEFT = 0x0602;
//mxd. Look's like we don't need many of those...
// Matches OpenGL's right now.
//! Data formats \link Formats Formats\endlink
//private const int IL_COLOUR_INDEX = 0x1900;
//private const int IL_COLOR_INDEX = 0x1900;
//private const int IL_ALPHA = 0x1906;
//private const int IL_RGB = 0x1907;
//private const int IL_RGBA = 0x1908;
//private const int IL_BGR = 0x80E0;
private const int IL_BGRA = 0x80E1;
//private const int IL_LUMINANCE = 0x1909;
//private const int IL_LUMINANCE_ALPHA = 0x190A;
@ -497,6 +508,9 @@ namespace CodeImp.DoomBuilder.IO
}
else bytes = imagebytes;
ilEnable(IL_ORIGIN_SET);
ilOriginFunc(IL_ORIGIN_UPPER_LEFT);
fixed (byte* bptr = bytes)
{
if(!ilLoadL(imagetype, new IntPtr(bptr), (uint)bytes.Length))

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

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.0.3247")]
[assembly: AssemblyVersion("3.0.0.3248")]
[assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("e4aae17")]
[assembly: AssemblyHash("99b1770")]

BIN
Source/Core/Resources/Updater.ico Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 24 KiB

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

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