Fix for an alpha check

VerMishelb · Oct 27, 2022 · e4e2996 · e4e2996
1 parent 9554f20
commit e4e2996
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/UVE_Preload_splitter/Targa.cpp b/UVE_Preload_splitter/Targa.cpp
@@ -163,7 +163,7 @@ void Targa::BlitRegionTransparent(const std::vector<PixelData>& _data, int x, in
 			if (!PixelIsTransparent(_data[(_x - x_from) + std::abs(_y - y_from) * w]))
 			SetPixel(_x, _y, 
 				{ 
-					(a_ == -1) ? _data[(_x - x_from) + std::abs(_y - y_from) * w].a : a_,
+					(a_ == 255) ? _data[(_x - x_from) + std::abs(_y - y_from) * w].a : a_,
 					_data[(_x - x_from) + std::abs(_y - y_from) * w].r,
 					_data[(_x - x_from) + std::abs(_y - y_from) * w].g,
 					_data[(_x - x_from) + std::abs(_y - y_from) * w].b,

diff --git a/UVE_Preload_splitter/Targa.h b/UVE_Preload_splitter/Targa.h
@@ -36,7 +36,7 @@ class Targa {
 	//The resulting region is always upside down for consistence
 	std::vector<PixelData> GetRegion(int x, int y, int w, int h, bool bottom_to_top = true) const;
 	void BlitRegion(const std::vector<PixelData>& _data, int x, int y, int w, int h, bool bottom_to_top = true);
-	void BlitRegionTransparent(const std::vector<PixelData>& _data, int x, int y, int w, int h, bool bottom_to_top = true, uint8_t a_ = -1);//Do not place pixel if it's transparent
+	void BlitRegionTransparent(const std::vector<PixelData>& _data, int x, int y, int w, int h, bool bottom_to_top = true, uint8_t a_ = 255);//Do not place pixel if it's transparent
 	bool PixelIsTransparent(const PixelData& px, bool check_alpha_only = true);
 
 	std::vector<unsigned char> data{};

diff --git a/UVE_Preload_splitter/UVE_Preload_splitter.rc b/UVE_Preload_splitter/UVE_Preload_splitter.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,1,3
- PRODUCTVERSION 2,0,1,3
+ FILEVERSION 2,0,1,4
+ PRODUCTVERSION 2,0,1,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "VerMishelb"
             VALUE "FileDescription", "An application for extracting and packing texture atlases from Ultra VGA Engine games."
-            VALUE "FileVersion", "2.0.1.3 R2"
+            VALUE "FileVersion", "2.0.1.4"
             VALUE "InternalName", "UVE_Prel.exe"
             VALUE "LegalCopyright", "Copyright (C) 2022 VerMishelb"
             VALUE "OriginalFilename", "UVE_Preload_splitter.exe"
             VALUE "ProductName", "UVE Preload splitter"
-            VALUE "ProductVersion", "2.0.1.3"
+            VALUE "ProductVersion", "2.0.1.4"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/UVE_Preload_splitter/main.cpp b/UVE_Preload_splitter/main.cpp
@@ -6,8 +6,8 @@
 #include "Debug.h"
 
 /* Don't put 0 in the beginning. */
-#define VERSION 2'00'01'03
-#define VERSION_STR "2.0.1.3"
+#define VERSION 2'00'01'04
+#define VERSION_STR "2.0.1.4"
 #define ERRMSG_NOT_ENOUGH_ARGS(x) "Incorrect " x " usage: not enough arguments.\nRun without parameters to see usage examples.\n"
 #define ERRMSG_FILE(x) "An error occurred when trying to read/write " << x << ".\n"
 #define HALF(x) ((float)(x)/2.f+1.f)
@@ -28,6 +28,9 @@ TODO
 - Proper exe name arguments system.
 - Rework pack entries to support them independantly
 
+2.0.1.4
+- Fixed alpha channel check for tranparent blitting.
+
 2.0.1.3
 - Added a colour bleeding padding option. See "--colour-padding".
 - Added --greyscale option to convert 32 bit frames to 8 bit atlas.