Improvements (isledecomp#499)

Author: foxtacles

CMakeLists.txt

@@ -134,6 +134,7 @@ set(COMMON_SOURCES
   common/src/mabmaterialanimationitem0x8.cpp
   common/src/mabmaterialanimationitem0x18.cpp
   common/src/duskwindbananarelic0x24.cpp
+  common/src/amethystbreeze0x104.cpp
   common/src/golmateriallibrary.cpp
 )
 
@@ -351,7 +352,6 @@ add_executable(legoracers WIN32
   LEGORacers/src/race/slatebridge0x68.cpp
   LEGORacers/src/race/circuitracerunner.cpp
   LEGORacers/src/race/circuitstandings.cpp
-  LEGORacers/src/util/amethystbreeze0x104.cpp
   LEGORacers/src/app/golapp.cpp
   LEGORacers/src/gol/golrenderdevice.cpp
   LEGORacers/src/model/golworlddatabase.cpp

GolDP/include/core/gol.h

@@ -45,6 +45,7 @@ class GolExport {
 	// GolExport::`scalar deleting destructor'
 
 protected:
+	// FUNCTION: GOLDP 0x10007160
 	virtual ~GolExport() {} // vtable+0x00
 
 public:

GolDP/src/camera/golscenetransformnode.cpp

@@ -113,24 +113,27 @@ void GolSceneTransformNode::VTable0x24(const GolMatrix34* p_m)
 // STUB: GOLDP 0x10014c20
 void GolSceneTransformNode::VTable0x20(const GolMatrix4& p_m)
 {
+	LegoU32 i = 0;
+
 	if (m_unk0x14 == NULL) {
-		for (LegoU32 i = 0; i < m_capacity; i++) {
-			GolTransform* obj = &m_unk0x18[i];
+		GolTransform* obj = m_unk0x18;
+		GolTransform* end = &m_unk0x18[m_capacity];
+
+		for (; obj < end; obj++) {
 			GolTransform* parent = static_cast<GolTransform*>(obj->m_unk0x04);
-			if (parent != NULL) {
-				GolMath::FUN_1002f450(obj->m_unk0x10, parent->m_unk0x90, &obj->m_unk0x90);
+			if (parent == NULL) {
+				GolMath::FUN_1002f450(obj->m_unk0x10, p_m, &obj->m_unk0x90);
 			}
 			else {
-				GolMath::FUN_1002f450(obj->m_unk0x10, p_m, &obj->m_unk0x90);
+				GolMath::FUN_1002f450(obj->m_unk0x10, parent->m_unk0x90, &obj->m_unk0x90);
 			}
 		}
 		return;
 	}
 
-	for (LegoU32 i = 0; i < m_capacity; i++) {
+	for (; i < m_capacity; i++) {
 		GolTransform* obj = &m_unk0x18[i];
 		GolTransform* parent = static_cast<GolTransform*>(obj->m_unk0x04);
-		const GolMatrix4& parentMatrix = parent != NULL ? parent->m_unk0x90 : p_m;
 
 		if (m_unk0x14->VTable0x00(i)) {
 			GolQuat rotation;
@@ -141,10 +144,20 @@ void GolSceneTransformNode::VTable0x20(const GolMatrix4& p_m)
 			position.m_y = obj->m_unk0x10.m_m[3][1];
 			position.m_z = obj->m_unk0x10.m_m[3][2];
 
-			m_unk0x14->VTable0x04(i, rotation, position, parentMatrix, &obj->m_unk0x90);
+			if (parent != NULL) {
+				m_unk0x14->VTable0x04(i, rotation, position, parent->m_unk0x90, &obj->m_unk0x90);
+			}
+			else {
+				m_unk0x14->VTable0x04(i, rotation, position, p_m, &obj->m_unk0x90);
+			}
 		}
 		else {
-			GolMath::FUN_1002f450(obj->m_unk0x10, parentMatrix, &obj->m_unk0x90);
+			if (parent != NULL) {
+				GolMath::FUN_1002f450(obj->m_unk0x10, parent->m_unk0x90, &obj->m_unk0x90);
+			}
+			else {
+				GolMath::FUN_1002f450(obj->m_unk0x10, p_m, &obj->m_unk0x90);
+			}
 		}
 	}
 }

GolDP/src/camera/goltransform.cpp

@@ -179,7 +179,9 @@ void GolTransform::VTable0x28(GolVec3* p_up, GolVec3* p_right)
 // FUNCTION: GOLDP 0x10002c10
 void GolTransform::VTable0x04(const GolVec3* p_src, GolVec3* p_dest)
 {
-	p_dest->m_x = m_unk0x10.m_m[0][0] * p_src->m_x;
+	LegoFloat product = m_unk0x10.m_m[0][0];
+	product *= p_src->m_x;
+	p_dest->m_x = product;
 	p_dest->m_y = m_unk0x10.m_m[0][1] * p_src->m_x;
 	p_dest->m_z = m_unk0x10.m_m[0][2] * p_src->m_x;
 
@@ -199,7 +201,9 @@ void GolTransform::VTable0x04(const GolVec3* p_src, GolVec3* p_dest)
 // FUNCTION: GOLDP 0x10002c90
 void GolTransform::VTable0x0c(const GolVec3* p_src, GolVec3* p_dest)
 {
-	p_dest->m_x = m_unk0x10.m_m[0][0] * p_src->m_x;
+	LegoFloat product = m_unk0x10.m_m[0][0];
+	product *= p_src->m_x;
+	p_dest->m_x = product;
 	p_dest->m_y = m_unk0x10.m_m[0][1] * p_src->m_x;
 	p_dest->m_z = m_unk0x10.m_m[0][2] * p_src->m_x;
 
@@ -265,7 +269,9 @@ void GolTransform::VTable0x08(const GolVec3* p_src, GolVec3* p_dest)
 // FUNCTION: GOLDP 0x10002dc0
 void GolTransform::VTable0x10(const GolVec3* p_src, GolVec3* p_dest)
 {
-	p_dest->m_x = m_unk0x10.m_m[0][0] * p_src->m_x;
+	LegoFloat product = m_unk0x10.m_m[0][0];
+	product *= p_src->m_x;
+	p_dest->m_x = product;
 	p_dest->m_y = m_unk0x10.m_m[1][0] * p_src->m_x;
 	p_dest->m_z = m_unk0x10.m_m[2][0] * p_src->m_x;
 

GolDP/src/font/golfont.cpp

@@ -315,7 +315,7 @@ void GolFont::CopyGlyphsToTextures(
 	LegoU32 destPitch;
 	texture->LockPixels(&destPixels, &destPitch, SilverDune0x30::c_lockRequestWrite);
 
-	for (LegoU32 i = 0; i < font->m_glyphCount; i++) {
+	for (LegoU32 i = 0; i < static_cast<LegoU32>(font->m_glyphCount); i++) {
 		if (font->m_glyphs[i].m_surfaceIndex != currentSurface) {
 			texture->UnlockPixels();
 			currentSurface = font->m_glyphs[i].m_surfaceIndex;

GolDP/src/image/whitebaffoon0x50.cpp

@@ -49,9 +49,10 @@ void WhiteBaffoon0x50::Reset()
 	m_unk0x08 = 0;
 }
 
-// STUB: GOLDP 0x1001f330
+// FUNCTION: GOLDP 0x1001f330
 void WhiteBaffoon0x50::VTable0x10()
 {
+	GolSurfaceFormat imageFormat;
 	WhiteBaffoon0x50::WhiteBaffoonImageName imageName;
 	imageName.m_name[0] = m_name[0];
 	imageName.m_name[1] = m_name[1];
@@ -64,13 +65,12 @@ void WhiteBaffoon0x50::VTable0x10()
 
 	imageFile->VTable0x08(imageName.m_chars);
 
-	GolSurfaceFormat imageFormat = imageFile->GetTextureFormat();
+	imageFormat = imageFile->GetTextureFormat();
 	m_renderer->SelectTextureFormat(imageFormat, &m_unk0x0c, m_flags & c_flagBit5);
 	m_width = imageFile->GetWidth();
 	m_height = imageFile->GetHeight();
 	FUN_1001f430();
 
-	ColorRGBA* colorKey = NULL;
 	if (m_flags & c_flagBit5) {
 		if (m_renderer->GetFlags() & GolRenderDevice::c_flagBit9) {
 			imageFile->SetUnk0x0a0(g_unk0x10057668);
@@ -79,10 +79,12 @@ void WhiteBaffoon0x50::VTable0x10()
 			imageFile->SetUnk0x0a0(m_colorKey);
 		}
 
-		colorKey = &m_colorKey;
+		imageFile->VTable0x1c(this, m_flags & c_flagBit2, &m_colorKey);
+	}
+	else {
+		imageFile->VTable0x1c(this, m_flags & c_flagBit2, NULL);
 	}
 
-	imageFile->VTable0x1c(this, m_flags & c_flagBit2, colorKey);
 	imageFile->Destroy();
 }
 

GolDP/src/render/gold3drenderdevice.cpp

@@ -4477,8 +4477,6 @@ void GolD3DRenderDevice::FUN_10010500(LegoU32 p_firstTriangle, LegoU32 p_triangl
 // STUB: GOLDP 0x100106d0
 void GolD3DRenderDevice::FUN_100106d0(undefined4 p_firstTriangle, undefined4 p_triangleCount, undefined4)
 {
-	STUB(0x100106d0);
-
 	LegoU32 firstTriangle = p_firstTriangle;
 	LegoU32 triangleCount = p_triangleCount;
 	LegoU32 commandIndex = m_unk0xc86f4;
@@ -5181,7 +5179,7 @@ void GolD3DRenderDevice::FUN_10013110(LegoU32 p_outputFirst, LegoU32 p_firstVert
 	vertexMap[0] = static_cast<LegoU16>(m_unk0xc3848);
 	m_unk0xc3848 += p_vertexCount;
 
-	for (; source < sourceEnd; source++, vertex++, vertexMap++) {
+	for (; source < sourceEnd;) {
 		vertex->sx = m_unk0xc8518->m_m[0][0] * source->m_x;
 		vertex->sy = m_unk0xc8518->m_m[0][1] * source->m_x;
 		vertex->sz = m_unk0xc8518->m_m[0][2] * source->m_x;
@@ -5205,7 +5203,10 @@ void GolD3DRenderDevice::FUN_10013110(LegoU32 p_outputFirst, LegoU32 p_firstVert
 		vertex->color = 0;
 		vertex->sx *= vertex->rhw;
 		vertex->sy *= vertex->rhw;
-		vertex->sz *= vertex->rhw;
+		source++;
+		vertex++;
+		vertexMap++;
+		vertex[-1].sz = vertex[-1].rhw * vertex[-1].sz;
 	}
 
 	vertexMap[p_vertexCount] = savedMapEntry;

LEGORacers/include/menu/screens/racermodelslot.h

@@ -50,7 +50,7 @@ class RacerModelSlot : public MenuSceneElement {
 	undefined4 m_unk0x7c;      // 0x7c
 	undefined4 m_unk0x80;      // 0x80
 	undefined4 m_unk0x84;      // 0x84
-	GolVec3 m_unk0x88;         // 0x88
+	undefined4 m_unk0x88[3];   // 0x88
 	LegoU32 m_unk0x94;         // 0x94
 	LegoU32 m_unk0x98;         // 0x98
 	LegoBool32 m_unk0x9c;      // 0x9c

LEGORacers/src/gol/golrenderdevice.cpp

@@ -84,7 +84,7 @@ DuskwindBananaRelic0x24* GolRenderDevice::FindMaterialByName(const LegoChar* p_n
 	return NULL;
 }
 
-// STUB: LEGORACERS 0x004133a0
+// FUNCTION: LEGORACERS 0x004133a0
 LegoU32 GolBillboard::FUN_10029e90(
 	MaterialTable0x0c* p_container,
 	LegoS32 p_index,
@@ -96,7 +96,7 @@ LegoU32 GolBillboard::FUN_10029e90(
 	m_positionContainer = p_container;
 	m_positionIndex = static_cast<LegoU16>(p_index);
 	LegoU32 result = VTable0x4c(
-		static_cast<DuskwindBananaRelic0x24*>(p_container->GetPosition(p_index)),
+		static_cast<DuskwindBananaRelic0x24*>(p_container->m_entries[p_index]),
 		p_width,
 		p_height,
 		p_maxDistanceSquared

LEGORacers/src/menu/menumanager.cpp

@@ -1,5 +1,6 @@
 #include "menu/menumanager.h"
 
+#include "amethystbreeze0x104.h"
 #include "audio/musicinstance.h"
 #include "camera/golcamera.h"
 #include "cmbmodelpart0x34.h"
@@ -25,7 +26,6 @@
 #include "render/goldrawstate.h"
 #include "save/memorycardsavegame.h"
 #include "surface/purpledune0x7c.h"
-#include "util/amethystbreeze0x104.h"
 
 #include <float.h>
 #include <golerror.h>