Merge remote-tracking branch 'origin/master' into HEAD

Author: madebr

GolDP/src/font/golfont.cpp

@@ -121,8 +121,6 @@ void GolFont::RefreshSurfaces(GolD3DRenderDevice* p_renderer)
 // STUB: GOLDP 0x100047b0
 void GolFont::VTable0x04(GolD3DRenderDevice* p_renderer, GolSurfaceFormat* p_textureFormat)
 {
-	STUB(0x100047b0);
-
 	m_textures = new PurpleDune0x7c[m_surfaceCount];
 	if (m_textures == NULL) {
 		GOL_FATALERROR(c_golErrorOutOfMemory);
@@ -226,8 +224,6 @@ void GolFont::SelectSurface(LegoU32 p_index)
 // STUB: GOLDP 0x10004c20
 void GolFont::VTable0x14(Rect* p_sourceRect, Rect* p_destRect)
 {
-	STUB(0x10004c20);
-
 	LegoS32 sourceBottom = p_sourceRect->m_bottom - 1;
 	D3DTLVERTEX vertices[4];
 

GolDP/src/render/gold3drenderdevice.cpp

@@ -1646,16 +1646,16 @@ void GolD3DRenderDevice::VTable0x70(
 	p_image->FUN_100054d0(this, p_unk0x08, &destRect, 0);
 }
 
-// STUB: GOLDP 0x10009a70
+// FUNCTION: GOLDP 0x10009a70
 void GolD3DRenderDevice::VTable0xb4(GolBillboard& p_param)
 {
 	LegoBool32 visibility[2];
 	p_param.FUN_10029fa0(m_unk0x4c.m_position, visibility);
 	if (visibility[0]) {
 		GolVec3 forward;
 		GolVec3 right;
-		GolTransformBase* orbit = m_unk0x0c->m_transform;
-		orbit->VTable0x1c(&right, &forward);
+		GolCamera* camera = m_unk0x0c;
+		camera->m_transform->VTable0x1c(&right, &forward);
 
 		forward.m_x = -forward.m_x;
 		forward.m_y = -forward.m_y;
@@ -4039,13 +4039,11 @@ void GolD3DRenderDevice::FUN_1000e930(LegoU32 p_outputFirst, LegoU32 p_firstVert
 	cache[p_vertexCount].m_unk0x10 = savedCacheIndex;
 }
 
-// STUB: GOLDP 0x1000eb90
+// FUNCTION: GOLDP 0x1000eb90
 void GolD3DRenderDevice::FUN_1000eb90(undefined4 p_firstTriangle, undefined4 p_triangleCount, undefined4)
 {
-	DuskwindBananaRelic0x24* material = m_unk0xc8530.m_material;
-	undefined4 firstTriangle = p_firstTriangle;
-	m_unk0xc854c.m_firstTriangle = firstTriangle;
-	m_unk0xc854c.m_material = material;
+	m_unk0xc854c.m_material = m_unk0xc8530.m_material;
+	m_unk0xc854c.m_firstTriangle = p_firstTriangle;
 	m_unk0xc854c.m_triangleCount = p_triangleCount;
 	m_unk0xc8524->VTable0x0c(&m_unk0xc854c);
 }

GolDP/src/scene/golbillboardex.cpp

@@ -33,7 +33,7 @@ void GolBillboard::FUN_10014e20()
 	g_billboardTexCoords[3].m_y = g_unk0x1005675c;
 }
 
-// STUB: GOLDP 0x10014e50
+// FUNCTION: GOLDP 0x10014e50
 LegoBool32 GolBillboard::FUN_10014e50(const GolVec3* p_arg1, const GolVec3* p_arg2, GolMatrix4* p_matrix)
 {
 	GolVec3 row0;
@@ -49,20 +49,37 @@ LegoBool32 GolBillboard::FUN_10014e50(const GolVec3* p_arg1, const GolVec3* p_ar
 
 	if (m_flags & c_flagBit1) {
 		row2 = &m_unk0x30;
-		LegoFloat dot = row0.m_x * row2->m_x + row0.m_y * row2->m_y + row2->m_z * row0.m_z;
-		row0.m_x -= dot * m_unk0x30.m_x;
-		row0.m_y -= dot * m_unk0x30.m_y;
-		row0.m_z -= dot * m_unk0x30.m_z;
+		LegoFloat dot = row2->m_z;
+		dot *= row0.m_z;
+		dot += row0.m_y * row2->m_y;
+		dot += row0.m_x * row2->m_x;
+		row0.m_x -= dot * row2->m_x;
+		LegoFloat projection = row2->m_y;
+		projection *= dot;
+		row0.m_y -= projection;
+		projection = row2->m_z;
+		projection *= dot;
+		row0.m_z -= projection;
 	}
 	else {
 		row2 = p_arg2;
 	}
 
 	GolMath::NormalizeVector3(row0, &row0);
 
-	row1.m_x = row2->m_y * row0.m_z - row2->m_z * row0.m_y;
-	row1.m_y = row2->m_z * row0.m_x - row2->m_x * row0.m_z;
-	row1.m_z = row2->m_x * row0.m_y - row2->m_y * row0.m_x;
+	row1.m_x = row0.m_z;
+	row1.m_x *= row2->m_y;
+	LegoFloat term = row2->m_z;
+	term *= row0.m_y;
+	row1.m_x -= term;
+	row1.m_y = row2->m_z;
+	row1.m_y *= row0.m_x;
+	row1.m_y -= row0.m_z * row2->m_x;
+	row1.m_z = row0.m_y;
+	row1.m_z *= row2->m_x;
+	term = row2->m_y;
+	term *= row0.m_x;
+	row1.m_z -= term;
 
 	p_matrix->m_m[0][0] = row0.m_x;
 	p_matrix->m_m[0][1] = row0.m_y;
@@ -82,8 +99,12 @@ LegoBool32 GolBillboard::FUN_10014e50(const GolVec3* p_arg1, const GolVec3* p_ar
 	LegoFloat halfWidth = m_width / 2.0f;
 	LegoFloat halfHeight = m_height / 2.0f;
 	p_matrix->m_m[3][0] = position.m_x - halfWidth * row1.m_x - halfHeight * row2->m_x;
-	p_matrix->m_m[3][1] = position.m_y - halfWidth * row1.m_y - halfHeight * row2->m_y;
-	p_matrix->m_m[3][2] = position.m_z - halfWidth * row1.m_z - halfHeight * row2->m_z;
+	LegoFloat offset = row2->m_y;
+	offset *= halfHeight;
+	p_matrix->m_m[3][1] = position.m_y - halfWidth * row1.m_y - offset;
+	offset = row2->m_z;
+	offset *= halfHeight;
+	p_matrix->m_m[3][2] = position.m_z - halfWidth * row1.m_z - offset;
 	p_matrix->m_m[3][3] = 1.0f;
 
 	return TRUE;

LEGORacers/src/race/cobalttrail0x140.cpp

@@ -25,6 +25,17 @@ undefined2 g_unk0x004c4814[42];
 extern const LegoFloat g_unk0x004afde0 = 10.0f;
 
 extern const LegoFloat g_ghostAnimationRateScale;
+extern const LegoFloat g_ghostSpeedScale;
+extern const LegoFloat g_raceSessionField0xf8CollisionStartOffset;
+
+// GLOBAL: LEGORACERS 0x004b02a0
+extern const LegoFloat g_cobaltTrailBaseLength = 6.5f;
+
+// GLOBAL: LEGORACERS 0x004b02a4
+extern const LegoFloat g_cobaltTrailBaseHalfWidth = 5.5f;
+
+// GLOBAL: LEGORACERS 0x004b02a8
+extern const LegoFloat g_cobaltTrailTipLength = 9.5f;
 
 // GLOBAL: LEGORACERS 0x004b02ac
 extern const LegoFloat g_unk0x004b02ac = 128.0f;
@@ -363,49 +374,70 @@ LegoU32 CobaltTrail0x140::FUN_004246d0(LegoChar* p_buffer, LegoU32 p_time)
 	return extraMinutes;
 }
 
-// STUB: LEGORACERS 0x004247d0
+// FUNCTION: LEGORACERS 0x004247d0
 void CobaltTrail0x140::FUN_004247d0(LegoS32 p_x, LegoS32 p_y, LegoFloat p_directionX, LegoFloat p_directionY)
 {
-	const LegoFloat tipLength = 9.5f;
-	const LegoFloat baseLength = 6.5f;
-	const LegoFloat baseHalfWidth = 5.5f;
-	const LegoFloat tailLength = 5.0f;
-	const LegoFloat tailHalfWidth = 4.0f;
 	const LegoFloat tailEndLength = 8.0f;
 
+	LegoU8 colorAlpha = 0xff;
 	GolRenderDevice::TexturedVertex vertices[6];
 
-	vertices[0].m_x = p_directionX * tipLength;
-	vertices[0].m_y = p_directionY * tipLength;
-	vertices[1].m_x = p_directionY * baseHalfWidth - p_directionX * baseLength;
-	vertices[1].m_y = -p_directionX * baseHalfWidth - p_directionY * baseLength;
-	vertices[2].m_x = -p_directionY * baseHalfWidth - p_directionX * baseLength;
-	vertices[2].m_y = p_directionX * baseHalfWidth - p_directionY * baseLength;
+	LegoFloat tipX = p_directionX;
+	tipX *= g_cobaltTrailTipLength;
+	vertices[0].m_x = tipX;
+	LegoFloat tipY = p_directionY;
+	tipY *= g_cobaltTrailTipLength;
+	vertices[0].m_y = tipY;
+
+	LegoFloat baseSide = p_directionY;
+	baseSide *= g_cobaltTrailBaseHalfWidth;
+	LegoFloat baseForward = p_directionX;
+	baseForward *= g_cobaltTrailBaseLength;
+	vertices[1].m_x = baseSide - baseForward;
+
+	LegoFloat baseForwardY = p_directionY;
+	baseForwardY *= g_cobaltTrailBaseLength;
+	LegoFloat baseSideX = p_directionX;
+	baseSideX *= g_cobaltTrailBaseHalfWidth;
+	vertices[1].m_y = -baseForwardY - baseSideX;
+	vertices[2].m_x = -baseForward - baseSide;
+	vertices[2].m_y = baseSideX - baseForwardY;
 
 	vertices[3].m_x = p_directionX * tailEndLength;
 	vertices[3].m_y = p_directionY * tailEndLength;
-	vertices[4].m_x = p_directionY * tailHalfWidth - p_directionX * tailLength;
-	vertices[4].m_y = -p_directionX * tailHalfWidth - p_directionY * tailLength;
-	vertices[5].m_x = -p_directionY * tailHalfWidth - p_directionX * tailLength;
-	vertices[5].m_y = p_directionX * tailHalfWidth - p_directionY * tailLength;
+	LegoFloat tailSide = p_directionY;
+	tailSide *= g_ghostSpeedScale;
+	LegoFloat tailForward = p_directionX;
+	tailForward *= g_raceSessionField0xf8CollisionStartOffset;
+	vertices[4].m_x = tailSide - tailForward;
+
+	LegoFloat tailForwardY = p_directionY;
+	tailForwardY *= g_raceSessionField0xf8CollisionStartOffset;
+	LegoFloat tailSideX = p_directionX;
+	tailSideX *= g_ghostSpeedScale;
+	vertices[4].m_y = -tailForwardY - tailSideX;
+	vertices[5].m_x = -tailForward - tailSide;
+	vertices[5].m_y = tailSideX - tailForwardY;
 
 	LegoFloat originX = static_cast<LegoFloat>(p_x);
 	LegoFloat originY = static_cast<LegoFloat>(p_y);
 	for (LegoS32 i = 0; i < sizeOfArray(vertices); i++) {
 		vertices[i].m_color.m_red = 0;
 		vertices[i].m_color.m_grn = 0;
 		vertices[i].m_color.m_blu = 0;
-		vertices[i].m_color.m_alp = 0xff;
+		vertices[i].m_color.m_alp = colorAlpha;
 		vertices[i].m_z = 0.0f;
-		vertices[i].m_x = vertices[i].m_x * m_unk0x104 + originX;
-		vertices[i].m_y = vertices[i].m_y * m_unk0x114 + originY;
+		LegoFloat scaledX = vertices[i].m_x;
+		scaledX *= m_unk0x104;
+		vertices[i].m_x = scaledX + originX;
+		vertices[i].m_y = m_unk0x114 * vertices[i].m_y + originY;
 	}
 
 	DuskwindBananaRelic0x24* material = m_unk0x118;
 	m_unk0x118 = NULL;
-	vertices[3].m_color.m_grn = 0xff;
-	vertices[4].m_color.m_grn = 0xff;
-	vertices[5].m_color.m_grn = 0xff;
+	vertices[3].m_color.m_grn = colorAlpha;
+	vertices[4].m_color.m_grn = colorAlpha;
+	vertices[5].m_color.m_grn = colorAlpha;
 	FUN_00423fc0(&vertices[1], &vertices[0], &vertices[2]);
 	FUN_00423fc0(&vertices[4], &vertices[3], &vertices[5]);
 	m_unk0x118 = material;

LEGORacers/src/race/racesessionfield0x2098.cpp

@@ -1631,10 +1631,10 @@ void RaceSession::Field0x2098::FUN_00460ad0(GolFileParser* p_parser)
 		for (token = p_parser->GetNextToken(); token != GolFileParser::e_rightCurly; token = p_parser->GetNextToken()) {
 			switch (token) {
 			case GolFileParser::e_unknown0x49:
-				params.m_unk0x14 = p_parser->ReadInteger();
+				params.m_unk0x18 = p_parser->ReadInteger();
 				break;
 			case GolFileParser::e_unknown0x4c:
-				params.m_unk0x18 = p_parser->ReadInteger();
+				params.m_unk0x14 = p_parser->ReadInteger();
 				break;
 			case GolFileParser::e_unknown0x27: {
 				LegoS32 eventIndex = p_parser->GetNextToken() - GolFileParser::e_unknown0x34;
@@ -2721,12 +2721,14 @@ void RaceSession::Field0x2098::AnimatedPartResource0x34::VTable0x04(GolVec3*)
 	}
 }
 
-// STUB: LEGORACERS 0x004635c0
+// FUNCTION: LEGORACERS 0x004635c0
 void RaceSession::Field0x2098::AnimatedPartResource0x34::VTable0x0c()
 {
 	LegoU32 state = m_state0x18;
-	LegoU32 nextState = c_state0x18One;
-	if (state != nextState) {
+	LegoU32 nextState = state;
+	LegoU32 resetState = c_state0x18One;
+	if (state != resetState) {
+		nextState = resetState;
 		GolAnimatedEntity* entity = m_unk0x20;
 		LegoS32 targetPart = m_unk0x28;
 		LegoS32 currentPart = entity->GetCurrentPartIndex();

LEGORacers/src/race/racesessionfield0x2148.cpp

@@ -2692,14 +2692,14 @@ RaceEventDispatcher0x08::Item0x2e::~Item0x2e()
 // FUNCTION: LEGORACERS 0x0048e370
 LegoS32 RaceEventDispatcher0x08::Item0x2e::ClearFields()
 {
-	m_unk0x3c = NULL;
-	m_unk0x40 = NULL;
-	m_unk0x44 = NULL;
-	m_unk0x38 = NULL;
-	m_unk0x48 = NULL;
 	m_unk0x4c[0] = 0.0f;
 	m_unk0x4c[1] = 0.0f;
 	m_unk0x4c[2] = 0.0f;
+	m_unk0x40 = NULL;
+	m_unk0x44 = NULL;
+	m_unk0x48 = NULL;
+	m_unk0x38 = NULL;
+	m_unk0x3c = NULL;
 	m_unk0x58 = 1;
 
 	return 0;

LEGORacers/src/race/racesessionfield0x27d4.cpp

@@ -519,31 +519,22 @@ void RaceSessionField0x27d4::FUN_00492680(
 	}
 }
 
-// STUB: LEGORACERS 0x004927c0
+// FUNCTION: LEGORACERS 0x004927c0
 RaceSessionField0x27d4::Item* RaceSessionField0x27d4::FUN_004927c0(LegoU32 p_unk0x04)
 {
 	LegoU32 i = 0;
 	LegoU32 count = m_count;
-	if (count) {
-		LegoU8* flags = &m_items[0].m_flags0x328;
-		do {
-			if (!(*flags & Item::c_flags0x328Bit0)) {
-				break;
-			}
-
-			i++;
-			flags += sizeof(Item);
-		} while (i < count);
+	while (i < count && m_items[i].IsActive()) {
+		i++;
 	}
 
 	if (i == count) {
 		return NULL;
 	}
 
-	Item* items = m_items;
-	items[i].FUN_00491d90(p_unk0x04);
+	m_items[i].FUN_00491d90(p_unk0x04);
 
-	return &items[i];
+	return &m_items[i];
 }
 
 // FUNCTION: LEGORACERS 0x00492820

LEGORacers/src/race/racesessionfield0x6dcfield0x238.cpp

@@ -100,7 +100,7 @@ void RacePowerupManager::Field0x238::VTable0x14()
 	m_unk0x0a8.FUN_00493e60();
 }
 
-// STUB: LEGORACERS 0x00444490
+// FUNCTION: LEGORACERS 0x00444490
 LegoS32 RacePowerupManager::Field0x238::VTable0x18(LegoU32 p_elapsedMs)
 {
 	if (m_unk0x234 & c_flags0x234Bit1) {
@@ -111,8 +111,9 @@ LegoS32 RacePowerupManager::Field0x238::VTable0x18(LegoU32 p_elapsedMs)
 		return FUN_00444820(p_elapsedMs);
 	}
 
-	LegoS32 result = RaceSessionField0x6dcField0xa8::VTable0x18(p_elapsedMs);
-	if (m_unk0x004 == 1) {
+	RaceSessionField0x6dcField0xa8::VTable0x18(p_elapsedMs);
+	LegoS32 result = m_unk0x004;
+	if (result == 1) {
 		LegoFloat elapsedMs = static_cast<LegoFloat>(m_unk0x050);
 		LegoFloat elapsed = elapsedMs / static_cast<LegoFloat>(static_cast<LegoS32>(m_unk0x054));
 		m_unk0x220 = (1.0f - elapsed) * m_unk0x21c;
@@ -138,15 +139,13 @@ void RacePowerupManager::Field0x238::FUN_00444540(const GolVec3* p_position, Leg
 	m_unk0x09c->m_unk0x018.m_unk0x044->VTable0x04(&origin);
 	origin.m_z += m_unk0x218;
 
-	GolVec3 delta;
-	delta.m_x = p_position->m_x - origin.m_x;
-	delta.m_y = p_position->m_y - origin.m_y;
-	delta.m_z = p_position->m_z - origin.m_z;
+	LegoFloat deltaX = p_position->m_x - origin.m_x;
+	LegoFloat deltaY = p_position->m_y - origin.m_y;
 
 	GolVec3 step;
-	step.m_x = delta.m_x * g_unk0x004b02e0;
-	step.m_y = delta.m_y * g_unk0x004b02e0;
-	step.m_z = delta.m_z;
+	step.m_x = deltaX * g_unk0x004b02e0;
+	step.m_y = deltaY * g_unk0x004b02e0;
+	step.m_z = p_position->m_z - origin.m_z;
 	m_unk0x0a8.FUN_00493ea0(&origin, &step);
 
 	LegoFloat elapsed = 0.0f;
@@ -177,8 +176,9 @@ LegoS32 RacePowerupManager::Field0x238::FUN_00444690(LegoU32 p_elapsedMs)
 	m_unk0x09c->m_unk0x018.m_unk0x044->VTable0x04(&position);
 	position.m_z += m_unk0x218;
 
+	GolVec3* target = &m_unk0x228;
 	if (GolMath::FUN_00449a90(
-			&m_unk0x228,
+			target,
 			&position,
 			g_unk0x004b0c98,
 			g_unk0x004b0ca0,
@@ -195,9 +195,9 @@ LegoS32 RacePowerupManager::Field0x238::FUN_00444690(LegoU32 p_elapsedMs)
 
 	LegoFloat amount = m_unk0x224 * g_unk0x004b0ca4;
 	GolVec3 delta;
-	delta.m_x = m_unk0x228.m_x - position.m_x;
-	delta.m_y = m_unk0x228.m_y - position.m_y;
-	delta.m_z = m_unk0x228.m_z - position.m_z;
+	delta.m_x = target->m_x - position.m_x;
+	delta.m_y = target->m_y - position.m_y;
+	delta.m_z = target->m_z - position.m_z;
 
 	GolVec3 step;
 	step.m_x = delta.m_x * g_unk0x004b02e0;
@@ -213,7 +213,7 @@ LegoS32 RacePowerupManager::Field0x238::FUN_00444690(LegoU32 p_elapsedMs)
 		amount = -amount;
 	}
 
-	m_unk0x0a8.FUN_00494870(&m_unk0x228, amount);
+	m_unk0x0a8.FUN_00494870(target, amount);
 	m_unk0x0a8.FUN_00494230();
 
 	return 1;