Start work on GolBmpFile and GolTgaFile

Author: madebr

CMakeLists.txt

@@ -77,10 +77,15 @@ option(RACERS_DECOMP_ASSERT "Assert struct size" ${MSVC_FOR_DECOMP})
 add_cxx_warning(parentheses)
 
 set(COMMON_SOURCES
+  common/src/golsurfaceformat.cpp
   common/src/golnametable.cpp
   common/src/golerror.cpp
   common/src/golfile.cpp
   common/src/golfsutil.cpp
+  common/src/golimgfile.cpp
+  common/src/golbmpfile.cpp
+  common/src/goltgafile.cpp
+  common/src/goldecompress.cpp
   common/src/golcpu.cpp
   common/src/golhashtable.cpp
   common/src/golstream.cpp
@@ -107,7 +112,6 @@ set(GOLDP_INLINE_EXPANSION_SOURCES
   GolDP/src/whitebaffoon0x50.cpp
   GolDP/src/whitefalcon0x140.cpp
   GolDP/src/duskwindbananarelic0x24.cpp
-  GolDP/src/falcontextureformat.cpp
   GolDP/src/bronzefalconsurface0x5c.cpp
   GolDP/src/falcondunebag0x10.cpp
   GolDP/src/depthbuffer0x38.cpp
@@ -156,7 +160,6 @@ add_library(goldp SHARED
   GolDP/src/azureridge0x38.cpp
   GolDP/src/amberlensbase0x120.cpp
   GolDP/src/amberlens0x344.cpp
-  GolDP/src/falcontextureformat.cpp
   GolDP/src/jadeorbit0x220.cpp
   GolDP/src/ddrawutil.cpp
   GolDP/src/jadeorbitbase0x10.cpp
@@ -186,7 +189,6 @@ add_library(goldp SHARED
   GolDP/src/softwarerenderer0x58.cpp
   GolDP/src/falcondunebag0x10.cpp
   GolDP/src/boundingshape0x2c.cpp
-  GolDP/src/moonlitcanvas0x5b0.cpp
   util/decomp.cpp
   $<TARGET_OBJECTS:common_goldp>
 )

GolDP/include/bronzedune0x4c.h

@@ -10,12 +10,12 @@
 class BronzeDune0x4c : public GoldDune0x38 {
 public:
 	BronzeDune0x4c();
-	~BronzeDune0x4c() override;                                                           // vtable+0x00
-	IPalette0x4* GetPalette() override;                                                   // vtable+0x1c
-	void VTable0x30(WhiteFalcon0x140& p_renderer, MoonlitCanvas0x5b0* p_source) override; // vtable+0x30
+	~BronzeDune0x4c() override;                                                   // vtable+0x00
+	IPalette0x4* GetPalette() override;                                           // vtable+0x1c
+	void VTable0x30(WhiteFalcon0x140& p_renderer, GolImgFile* p_source) override; // vtable+0x30
 	void VTable0x34(
 		WhiteFalcon0x140& p_renderer,
-		const FalconTextureFormat& p_textureFormat,
+		const GolSurfaceFormat& p_textureFormat,
 		LegoU32 p_width,
 		LegoU32 p_height
 	) override;                 // vtable+0x34

GolDP/include/bronzedunebag0xc.h

@@ -19,7 +19,7 @@ class BronzeDuneBag0xc : public IPalette0x4 {
 	LegoU32 GetPaletteSize() override;                                                // vtable+0x
 	virtual ~BronzeDuneBag0xc();                                                      // vtable+0x00
 
-	void FUN_1002a120(const FalconTextureFormat& p_textureFormat);
+	void FUN_1002a120(const GolSurfaceFormat& p_textureFormat);
 	void FUN_1002a1b0();
 
 	bool HasEntries() const { return m_entries != NULL; }

GolDP/include/bronzefalcon0xc8770.h

@@ -24,7 +24,7 @@ typedef void (BronzeFalcon0xc8770::*BronzeFalconDrawFunction)(undefined4, undefi
 class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
 public:
 	// SIZE 0x18
-	struct TextureFormat : public FalconTextureFormat {
+	struct TextureFormat : public GolSurfaceFormat {
 		TextureFormat();
 	};
 
@@ -38,8 +38,8 @@ class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
 	void ReleaseResources() override; // vtable+0x04
 	~BronzeFalcon0xc8770() override;  // vtable+0x08
 	void SelectTextureFormat(
-		const FalconTextureFormat& p_requestedTextureFormat,
-		FalconTextureFormat* p_actualTextureFormat,
+		const GolSurfaceFormat& p_requestedTextureFormat,
+		GolSurfaceFormat* p_actualTextureFormat,
 		LegoBool32
 	) override;                                                              // vtable+0x0c
 	GolCommonDrawState* GetDrawState() override;                             // vtable+0x10

GolDP/include/color.h

@@ -13,11 +13,17 @@ struct ColorRGBA {
 	LegoU8 m_alp; // 0x03
 };
 
+// SIZE: 0x3
+struct ColorBGR {
+	LegoU8 m_blu; // 0x00
+	LegoU8 m_grn; // 0x01
+	LegoU8 m_red; // 0x02
+};
+
 // SIZE: 0xc
 struct FColorRGB {
 	LegoFloat m_red; // 0x00
 	LegoFloat m_grn; // 0x04
 	LegoFloat m_blu; // 0x08
 };
-
 #endif // COLOR_H

GolDP/include/falcondunebag0x10.h

@@ -3,7 +3,7 @@
 
 #include "bronzedunebag0xc.h"
 #include "decomp.h"
-#include "falcontextureformat.h"
+#include "golsurfaceformat.h"
 
 #include <windows.h>
 
@@ -20,14 +20,14 @@ class FalconDuneBag0x10 : public BronzeDuneBag0xc {
 	void FUN_10014770(undefined4*);
 	void Destroy();
 
-	static void SetTextureFormat(const FalconTextureFormat& p_format);
+	static void SetTextureFormat(const GolSurfaceFormat& p_format);
 	// SYNTHETIC: GOLDP 0x100146e0
 	// FalconDuneBag0x10::`scalar deleting destructor'
 
 private:
 	LegoU16* m_unk0x0c; // 0x0c
 
-	static FalconTextureFormat g_textureFormat;
+	static GolSurfaceFormat g_textureFormat;
 };
 
 #endif // FALCONDUNEBAG0X10_H

GolDP/include/golddune0x38.h

@@ -4,7 +4,7 @@
 #include "silverdune0x30.h"
 
 class WhiteFalcon0x140;
-class MoonlitCanvas0x5b0;
+class GolImgFile;
 
 // VTABLE: GOLDP 0x1005766c
 // SIZE 0x38
@@ -20,10 +20,10 @@ class GoldDune0x38 : public SilverDune0x30 {
 	};
 	GoldDune0x38();
 
-	virtual void VTable0x30(WhiteFalcon0x140& p_renderer, MoonlitCanvas0x5b0* p_source); // vtable+0x30
+	virtual void VTable0x30(WhiteFalcon0x140& p_renderer, GolImgFile* p_source); // vtable+0x30
 	virtual void VTable0x34(
 		WhiteFalcon0x140& p_renderer,
-		const FalconTextureFormat& p_textureFormat,
+		const GolSurfaceFormat& p_textureFormat,
 		LegoU32 p_width,
 		LegoU32 p_height
 	) = 0;                         // vtable+0x34

GolDP/include/magentaribbon0x20.h

@@ -4,7 +4,7 @@
 #include "golnametable.h"
 
 class BronzeFalcon0xc8770;
-class FalconTextureFormat;
+class GolSurfaceFormat;
 class GoldDune0x38;
 
 // VTABLE: GOLDP 0x100575ac
@@ -20,7 +20,7 @@ class MagentaRibbon0x20 : public GolNameTable {
 	virtual void VTable0x14() = 0; // vtable+0x14
 	virtual void VTable0x18(
 		LegoU32 p_index,
-		const FalconTextureFormat& p_textureFormat,
+		const GolSurfaceFormat& p_textureFormat,
 		LegoU32 p_width,
 		LegoU32 p_height
 	) = 0;                                                                                              // vtable+0x18

GolDP/include/moonlitcanvas0x5b0.h

@@ -33,7 +33,7 @@ class PearlDew0x0c : public IPalette0x4 {
 	PearlDew0x0c();
 	~PearlDew0x0c();
 
-	void CreateDirectDrawPalette(class BronzeFalcon0xc8770* p_renderer, class FalconTextureFormat* p_textureFormat);
+	void CreateDirectDrawPalette(class BronzeFalcon0xc8770* p_renderer, class GolSurfaceFormat* p_textureFormat);
 	void Release();
 	void Set332PaletteEntries();