From 96f2b4e94e18f05b0fdd35450dc9359bfccab3e8 Mon Sep 17 00:00:00 2001 From: ZZYZX Date: Tue, 24 Dec 2019 21:33:16 +0200 Subject: [PATCH] Fixed TGA texture loading --- Source/Core/GZBuilder/md3/ModelReader.cs | 1 - Source/Core/IO/FileImageReader.cs | 38 ++++++++++++------ Source/Core/Properties/AssemblyInfo.cs | 4 +- Source/Core/Resources/Updater.ico | Bin 0 -> 24614 bytes .../BuilderModes/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 29 insertions(+), 16 deletions(-) create mode 100755 Source/Core/Resources/Updater.ico diff --git a/Source/Core/GZBuilder/md3/ModelReader.cs b/Source/Core/GZBuilder/md3/ModelReader.cs index b5693716..e6f76bfa 100755 --- a/Source/Core/GZBuilder/md3/ModelReader.cs +++ b/Source/Core/GZBuilder/md3/ModelReader.cs @@ -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) diff --git a/Source/Core/IO/FileImageReader.cs b/Source/Core/IO/FileImageReader.cs index e5fc5c0f..f4f2a6bd 100755 --- a/Source/Core/IO/FileImageReader.cs +++ b/Source/Core/IO/FileImageReader.cs @@ -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)) diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index 91eeacf9..62e8f6c2 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -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")] diff --git a/Source/Core/Resources/Updater.ico b/Source/Core/Resources/Updater.ico new file mode 100755 index 0000000000000000000000000000000000000000..766d50ba42b0e0916b7b33cf21091b7286de0d66 GIT binary patch literal 24614 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 literal 0 HcmV?d00001 diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index 804f1cb3..852a2228 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -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")]