Merge branch 'master' into implement-cmb-model-part

Author: foxtacles

GolDP/include/amberhaze0x20.h

@@ -23,7 +23,7 @@ class AmberHaze0x20 : public AmberHaze0x1c {
 	// AmberHaze0x20::`vector deleting destructor'
 
 private:
-	DuskwindBananaRelic0x30* m_unk0x1c; // 0x1c
+	DuskwindBananaRelic0x30* m_items; // 0x1c
 };
 
 #endif // AMBERHAZE0X20_H

GolDP/include/amberlens0x344.h

@@ -47,7 +47,7 @@ class AmberLens0x344 : public AmberLensBase0x120 {
 	void FUN_10002860(D3DVIEWPORT2* p_viewport);
 
 	JadeOrbit0x220 m_unk0x120;       // 0x120
-	BronzeFalcon0xc8770* m_unk0x340; // 0x340
+	BronzeFalcon0xc8770* m_renderer; // 0x340
 };
 
 #endif // AMBERLENS0X344_H

GolDP/include/bronzefalcon0xc8770.h

@@ -232,8 +232,8 @@ class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
 	D3DMATERIAL m_materialParams;                                        // 0x274
 	LPDIRECT3DMATERIAL3 m_backgroundMaterial;                            // 0x2c4
 	D3DMATERIALHANDLE m_backgroundMaterialHandle;                        // 0x2c8
-	ColorRGBA m_unk0x2cc;                                                // 0x2cc
-	LegoU32 m_unk0x2d0;                                                  // 0x2d0
+	ColorRGBA m_clearColor;                                              // 0x2cc
+	LegoU32 m_clearPixelValue;                                           // 0x2d0
 	DuskwindBananaRelic0x30 m_unk0x2d4;                                  // 0x2d4
 	SlatePeak0x58* m_unk0x304;                                           // 0x304
 	SlatePeak0x58* m_renderTargetInfo;                                   // 0x308
@@ -254,7 +254,7 @@ class BronzeFalcon0xc8770 : public WhiteFalcon0x140 {
 	D3DTLVERTEX m_unk0xc53a0[(0xc83a0 - 0xc53a0) / sizeof(D3DTLVERTEX)]; // 0xc53a0
 	undefined4 m_unk0xc83a0;                                             // 0xc83a0
 	undefined4 m_unk0xc83a4;                                             // 0xc83a4
-	GoldDune0x38* m_unk0xc83a8;                                          // 0xc83a8
+	GoldDune0x38* m_currentTexture;                                      // 0xc83a8
 	undefined4 m_unk0xc83ac;                                             // 0xc83ac
 	undefined4 m_unk0xc83b0;                                             // 0xc83b0
 	Field0xc83b4 m_unk0xc83b4;                                           // 0xc83b4

GolDP/include/purpledune0x7c.h

@@ -40,7 +40,7 @@ class PurpleDune0x7c : public GoldDune0x38 {
 	undefined4 FUN_100165c0(GolCommonDrawState* p_drawState, BronzeFalcon0xc8770& p_renderer);
 	undefined4 FUN_100168c0(BronzeFalcon0xc8770& p_renderer);
 
-	LPDIRECT3DTEXTURE2 GetDirect3DTexture() const { return reinterpret_cast<LPDIRECT3DTEXTURE2>(m_unk0x4c); }
+	LPDIRECT3DTEXTURE2 GetDirect3DTexture() const { return reinterpret_cast<LPDIRECT3DTEXTURE2>(m_d3dTexture); }
 
 	// SYNTHETIC: GOLDP 0x10004aa0
 	// PurpleDune0x7c::`vector deleting destructor'
@@ -56,10 +56,10 @@ class PurpleDune0x7c : public GoldDune0x38 {
 
 	undefined4 m_unk0x38;              // 0x38
 	undefined4 m_unk0x3c;              // 0x3c
-	IPalette0x4* m_unk0x40;            // 0x40
+	IPalette0x4* m_palette;            // 0x40
 	MipmapLevel* m_mipmaps;            // 0x44
 	LPDIRECTDRAWSURFACE4 m_surface;    // 0x48
-	undefined4* m_unk0x4c;             // 0x4c
+	undefined4* m_d3dTexture;          // 0x4c
 	BronzeDuneBag0xc m_unk0x50;        // 0x50
 	GolSurfaceFormat m_textureFormat2; // 0x5c
 	undefined4 m_unk0x74;              // 0x74

GolDP/include/whitefalcon0x140.h

@@ -227,13 +227,13 @@ class WhiteFalcon0x140 {
 	// SYNTHETIC: GOLDP 0x100288b0
 	// WhiteFalcon0x140::`scalar deleting destructor'
 
-	undefined4 GetUnk0x04() { return m_unk0x04; }
+	undefined4 GetFlags() { return m_flags; }
 	AmberLens0x344* GetUnk0x0c() { return m_unk0x0c; }
 
 protected:
 	friend class GolCommonDrawState;
 
-	undefined4 m_unk0x04;                         // 0x04
+	undefined4 m_flags;                           // 0x04
 	undefined2 m_unk0x08;                         // 0x08
 	undefined2 m_unk0x0a;                         // 0x0a
 	AmberLens0x344* m_unk0x0c;                    // 0x0c

GolDP/src/amberhaze0x20.cpp

@@ -6,7 +6,7 @@
 // FUNCTION: GOLDP 0x10006680
 AmberHaze0x20::AmberHaze0x20()
 {
-	m_unk0x1c = NULL;
+	m_items = NULL;
 }
 
 // FUNCTION: GOLDP 0x100066a0
@@ -18,8 +18,8 @@ AmberHaze0x20::~AmberHaze0x20()
 // FUNCTION: GOLDP 0x10006710
 void AmberHaze0x20::VTable0x14()
 {
-	m_unk0x1c = new DuskwindBananaRelic0x30[m_numItems];
-	if (m_unk0x1c == NULL) {
+	m_items = new DuskwindBananaRelic0x30[m_numItems];
+	if (m_items == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
 	}
 }
@@ -30,7 +30,7 @@ void AmberHaze0x20::VTable0x0c()
 	LegoU32 i;
 
 	for (i = 0; i < m_numItems; i++) {
-		m_unk0x1c[i].Destroy();
+		m_items[i].Destroy();
 	}
 }
 
@@ -43,21 +43,21 @@ void AmberHaze0x20::VTable0x10()
 // FUNCTION: GOLDP 0x100067e0
 void AmberHaze0x20::Clear()
 {
-	if (m_unk0x1c != NULL) {
-		delete[] m_unk0x1c;
-		m_unk0x1c = NULL;
+	if (m_items != NULL) {
+		delete[] m_items;
+		m_items = NULL;
 	}
 	AmberHaze0x1c::Clear();
 }
 
 // FUNCTION: GOLDP 0x10006800
 DuskwindBananaRelic0x24* AmberHaze0x20::VTable0x28(LegoU32 p_index) const
 {
-	return &m_unk0x1c[p_index];
+	return &m_items[p_index];
 }
 
 // FUNCTION: GOLDP 0x10006820
 void AmberHaze0x20::VTable0x18(LegoU32 p_index)
 {
-	m_unk0x1c[p_index].FUN_10006320(*m_renderer);
+	m_items[p_index].FUN_10006320(*m_renderer);
 }

GolDP/src/amberlens0x344.cpp

@@ -9,21 +9,21 @@ DECOMP_SIZE_ASSERT(AmberLens0x344, 0x344)
 AmberLens0x344::AmberLens0x344()
 {
 	m_unk0x04 = &m_unk0x120;
-	m_unk0x340 = NULL;
+	m_renderer = NULL;
 }
 
 // FUNCTION: GOLDP 0x10001f00
 AmberLens0x344::~AmberLens0x344()
 {
-	if (m_unk0x340) {
-		m_unk0x340->VTable0x24();
+	if (m_renderer) {
+		m_renderer->VTable0x24();
 	}
 }
 
 // FUNCTION: GOLDP 0x10001f60
 void AmberLens0x344::FUN_10001f60(BronzeFalcon0xc8770* p_renderer)
 {
-	m_unk0x340 = p_renderer;
+	m_renderer = p_renderer;
 	if (p_renderer != NULL) {
 		const SlatePeak0x58* renderTargetInfo = p_renderer->GetRenderTargetInfo();
 		if (m_unk0x11c == 0 || m_unk0x118 == 0) {
@@ -128,7 +128,7 @@ void AmberLens0x344::VTable0x20(undefined4, undefined4)
 // FUNCTION: GOLDP 0x10002860
 void AmberLens0x344::FUN_10002860(D3DVIEWPORT2* p_viewport)
 {
-	const SlatePeak0x58* renderTargetInfo = m_unk0x340->GetRenderTargetInfo();
+	const SlatePeak0x58* renderTargetInfo = m_renderer->GetRenderTargetInfo();
 	p_viewport->dwX = 0;
 	p_viewport->dwY = 0;
 	p_viewport->dwWidth = renderTargetInfo->GetWidth();