Merge branch 'master' into implement-BronzeFalcon0xc8770-FUN_1000a2c0

Author: foxtacles

GolDP/include/amberlens0x344.h

@@ -17,6 +17,7 @@ class AmberLens0x344 : public AmberLensBase0x120 {
 	enum {
 		c_flagBit0 = 1 << 0,
 		c_flagBit1 = 1 << 1,
+		c_flagBit3 = 1 << 3,
 	};
 
 	AmberLens0x344();
@@ -38,7 +39,9 @@ class AmberLens0x344 : public AmberLensBase0x120 {
 	JadeOrbit0x220* GetUnk0x04() { return (JadeOrbit0x220*) m_unk0x04; }
 
 protected:
-	void FUN_10001f60(undefined*);
+	friend class BronzeFalcon0xc8770;
+
+	void FUN_10001f60(BronzeFalcon0xc8770*);
 
 	JadeOrbit0x220 m_unk0x120;       // 0x120
 	BronzeFalcon0xc8770* m_unk0x340; // 0x340

GolDP/include/amberlensbase0x120.h

@@ -38,10 +38,10 @@ class AmberLensBase0x120 {
 	undefined4 m_unk0x2c;              // 0x2c
 	LegoU32 m_flags;                   // 0x30
 	undefined m_unk0x34[0x110 - 0x34]; // 0x34
-	undefined4 m_unk0x110;             // 0x110
-	undefined4 m_unk0x114;             // 0x114
-	undefined4 m_unk0x118;             // 0x118
-	undefined4 m_unk0x11c;             // 0x11c
+	LegoS32 m_unk0x110;                // 0x110
+	LegoS32 m_unk0x114;                // 0x114
+	LegoS32 m_unk0x118;                // 0x118
+	LegoS32 m_unk0x11c;                // 0x11c
 };
 
 #endif // AMBERLENSBASE0X120_H

GolDP/include/jadeorbit0x220.h

@@ -78,7 +78,11 @@ class JadeOrbit0x220 : public JadeOrbitBase0x10 {
 	LegoFloat m_unk0xc4;               // 0xc4
 	LegoFloat m_unk0xc8;               // 0xc8
 	LegoFloat m_unk0xcc;               // 0xcc
-	undefined m_unk0xd0[0x220 - 0xd0]; // 0xd0
+	undefined m_unk0xd0[0x210 - 0xd0]; // 0xd0
+	LegoFloat m_unk0x210;              // 0x210
+	LegoFloat m_unk0x214;              // 0x214
+	LegoFloat m_unk0x218;              // 0x218
+	LegoFloat m_unk0x21c;              // 0x21c
 };
 
 #endif // JADEORBIT0X220_H

GolDP/src/amberlens0x344.cpp

@@ -1,6 +1,7 @@
 #include "amberlens0x344.h"
 
 #include "bronzefalcon0xc8770.h"
+#include "slatepeak0x58.h"
 
 DECOMP_SIZE_ASSERT(AmberLens0x344, 0x344)
 
@@ -19,11 +20,31 @@ AmberLens0x344::~AmberLens0x344()
 	}
 }
 
-// STUB: GOLDP 0x10001f60
-void AmberLens0x344::FUN_10001f60(undefined*)
+// FUNCTION: GOLDP 0x10001f60
+void AmberLens0x344::FUN_10001f60(BronzeFalcon0xc8770* p_renderer)
 {
-	// TODO
-	STUB(0x10001f60);
+	m_unk0x340 = p_renderer;
+	if (p_renderer != NULL) {
+		const SlatePeak0x58* renderTargetInfo = p_renderer->GetRenderTargetInfo();
+		if (m_unk0x11c == 0 || m_unk0x118 == 0) {
+			m_unk0x110 = 0;
+			m_unk0x114 = 0;
+			m_unk0x118 = renderTargetInfo->GetWidth();
+			m_unk0x11c = renderTargetInfo->GetHeight();
+		}
+
+		if (!(m_flags & c_flagBit3)) {
+			LegoFloat width = static_cast<LegoFloat>(m_unk0x118 - m_unk0x110);
+			LegoFloat height = static_cast<LegoFloat>(m_unk0x11c - m_unk0x114);
+			m_unk0x0c = width / height;
+		}
+
+		m_unk0x120.m_unk0x210 = static_cast<LegoFloat>(m_unk0x118 - m_unk0x110);
+		m_unk0x120.m_unk0x214 = static_cast<LegoFloat>(m_unk0x11c - m_unk0x114);
+		m_unk0x120.m_unk0x218 = static_cast<LegoFloat>(m_unk0x110);
+		m_unk0x120.m_unk0x21c = static_cast<LegoFloat>(m_unk0x114);
+		m_flags |= c_flagBit0 | c_flagBit1;
+	}
 }
 
 // STUB: GOLDP 0x10002060

GolDP/src/bronzefalcon0xc8770.cpp

@@ -1,5 +1,6 @@
 #include "bronzefalcon0xc8770.h"
 
+#include "amberlens0x344.h"
 #include "bronzefalconsurface0x5c.h"
 #include "falcondunebag0x10.h"
 #include "falcontextureformat.h"
@@ -302,16 +303,42 @@ void BronzeFalcon0xc8770::ReleaseResources()
 	STUB(0x10008680);
 }
 
-// STUB: GOLDP 0x10008740
+// FUNCTION: GOLDP 0x10008740
 void BronzeFalcon0xc8770::VTable0x18()
 {
-	STUB(0x10008740);
+	if (m_unk0x0c != NULL) {
+		m_unk0x0c->FUN_10001f60(NULL);
+		m_unk0x0c = NULL;
+	}
+
+	WhiteFalcon0x140::Destroy();
+	ReleaseResources();
+
+	BronzeFalconSurface0x5c* surface = m_unk0x30c;
+	while (surface != NULL) {
+		BronzeFalconSurface0x5c* next = surface->m_next;
+		surface->VTable0x34();
+		delete surface;
+		surface = next;
+	}
+
+	if (m_drawState != NULL) {
+		m_drawState->RemoveRenderer(this);
+	}
+
+	Reset();
+	m_unk0x04 = 0;
 }
 
-// STUB: GOLDP 0x100087b0
-void BronzeFalcon0xc8770::VTable0x20(AmberLens0x344*)
+// FUNCTION: GOLDP 0x100087b0
+void BronzeFalcon0xc8770::VTable0x20(AmberLens0x344* p_lens)
 {
-	STUB(0x100087b0);
+	if (m_unk0x0c != NULL) {
+		m_unk0x0c->FUN_10001f60(NULL);
+	}
+
+	m_unk0x0c = p_lens;
+	p_lens->FUN_10001f60(this);
 }
 
 // STUB: GOLDP 0x100087e0