falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile portalGetAvgVertexPos

This commit is contained in:
Ryan Dwyer 2022-06-04 13:14:27 +10:00
parent efd8847ba8
commit 8847f6db71
3 changed files with 26 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/dlights.c
View File

@ -5275,7 +5275,7 @@ glabel func0f004c6c
/* f004ef4: 03305821 */ addu $t3,$t9,$s0
/* f004ef8: ad6f0000 */ sw $t7,0x0($t3)
/* f004efc: 8d8c1428 */ lw $t4,%lo(var80061428)($t4)
/* f004f00: 0c005f38 */ jal func00017ce0
/* f004f00: 0c005f38 */ jal portalGetAvgVertexPos
/* f004f04: 028c2821 */ addu $a1,$s4,$t4
/* f004f08: 8ea50000 */ lw $a1,0x0($s5)
/* f004f0c: 26310001 */ addiu $s1,$s1,0x1
@ -5727,7 +5727,7 @@ glabel var7f1a7de0
/* f005554: 8fbf0014 */ lw $ra,0x14($sp)
/* f005558: afa30068 */ sw $v1,0x68($sp)
/* f00555c: e7ac0050 */ swc1 $f12,0x50($sp)
/* f005560: 0c005f38 */ jal func00017ce0
/* f005560: 0c005f38 */ jal portalGetAvgVertexPos
/* f005564: e7b00064 */ swc1 $f16,0x64($sp)
/* f005568: 8fa20074 */ lw $v0,0x74($sp)
/* f00556c: c7a80044 */ lwc1 $f8,0x44($sp)
@ -5777,7 +5777,7 @@ glabel var7f1a7de0
/* f005614: 8fbf0014 */ lw $ra,0x14($sp)
/* f005618: afa30068 */ sw $v1,0x68($sp)
/* f00561c: e7ac0038 */ swc1 $f12,0x38($sp)
/* f005620: 0c005f38 */ jal func00017ce0
/* f005620: 0c005f38 */ jal portalGetAvgVertexPos
/* f005624: e7b00064 */ swc1 $f16,0x64($sp)
/* f005628: 8fa20080 */ lw $v0,0x80($sp)
/* f00562c: c7a4002c */ lwc1 $f4,0x2c($sp)

2
src/include/lib/lib_17ce0.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
u32 func00017ce0(void);
void portalGetAvgVertexPos(s32 portalnum, struct coord *avg);
void portal00017dc4(s16 *rooms, s16 roomnum);
s32 portal00017e30(s32 portalnum, struct coord *arg1, struct coord *arg2);
void portal00018148(struct coord *pos, struct coord *pos2, s16 *rooms, s16 *arg3, s16 *arg4, s32 arg5);

85
src/lib/lib_17ce0.c
View File

@ -11,69 +11,28 @@ u8 var8005ef20 = 254;
u8 var8009a4e0[456][2];
GLOBAL_ASM(
glabel func00017ce0
/* 17ce0: 3c03800a */ lui $v1,%hi(g_BgPortals)
/* 17ce4: 8c634cc8 */ lw $v1,%lo(g_BgPortals)($v1)
/* 17ce8: 000470c0 */ sll $t6,$a0,0x3
/* 17cec: 3c013f80 */ lui $at,0x3f80
/* 17cf0: 006e7821 */ addu $t7,$v1,$t6
/* 17cf4: 95f80000 */ lhu $t8,0x0($t7)
/* 17cf8: 44815000 */ mtc1 $at,$f10
/* 17cfc: 3c014f80 */ lui $at,0x4f80
/* 17d00: 03031021 */ addu $v0,$t8,$v1
/* 17d04: c4440004 */ lwc1 $f4,0x4($v0)
/* 17d08: 2443000c */ addiu $v1,$v0,0xc
/* 17d0c: 24070001 */ addiu $a3,$zero,0x1
/* 17d10: e4a40000 */ swc1 $f4,0x0($a1)
/* 17d14: c4460008 */ lwc1 $f6,0x8($v0)
/* 17d18: e4a60004 */ swc1 $f6,0x4($a1)
/* 17d1c: c448000c */ lwc1 $f8,0xc($v0)
/* 17d20: e4a80008 */ swc1 $f8,0x8($a1)
/* 17d24: 90460000 */ lbu $a2,0x0($v0)
/* 17d28: 44868000 */ mtc1 $a2,$f16
/* 17d2c: 04c10004 */ bgez $a2,.L00017d40
/* 17d30: 468084a0 */ cvt.s.w $f18,$f16
/* 17d34: 44812000 */ mtc1 $at,$f4
/* 17d38: 00000000 */ nop
/* 17d3c: 46049480 */ add.s $f18,$f18,$f4
.L00017d40:
/* 17d40: 28c10002 */ slti $at,$a2,0x2
/* 17d44: 14200013 */ bnez $at,.L00017d94
/* 17d48: 46125003 */ div.s $f0,$f10,$f18
/* 17d4c: c4a60000 */ lwc1 $f6,0x0($a1)
.L00017d50:
/* 17d50: c4680004 */ lwc1 $f8,0x4($v1)
/* 17d54: c4a40004 */ lwc1 $f4,0x4($a1)
/* 17d58: 24e70001 */ addiu $a3,$a3,0x1
/* 17d5c: 46083400 */ add.s $f16,$f6,$f8
/* 17d60: c4a60008 */ lwc1 $f6,0x8($a1)
/* 17d64: 2463000c */ addiu $v1,$v1,12
/* 17d68: e4b00000 */ swc1 $f16,0x0($a1)
/* 17d6c: c46afffc */ lwc1 $f10,-0x4($v1)
/* 17d70: 460a2480 */ add.s $f18,$f4,$f10
/* 17d74: e4b20004 */ swc1 $f18,0x4($a1)
/* 17d78: c4680000 */ lwc1 $f8,0x0($v1)
/* 17d7c: 46083400 */ add.s $f16,$f6,$f8
/* 17d80: e4b00008 */ swc1 $f16,0x8($a1)
/* 17d84: 90590000 */ lbu $t9,0x0($v0)
/* 17d88: 00f9082a */ slt $at,$a3,$t9
/* 17d8c: 5420fff0 */ bnezl $at,.L00017d50
/* 17d90: c4a60000 */ lwc1 $f6,0x0($a1)
.L00017d94:
/* 17d94: c4a40000 */ lwc1 $f4,0x0($a1)
/* 17d98: c4b20004 */ lwc1 $f18,0x4($a1)
/* 17d9c: c4a80008 */ lwc1 $f8,0x8($a1)
/* 17da0: 46002282 */ mul.s $f10,$f4,$f0
/* 17da4: 00000000 */ nop
/* 17da8: 46009182 */ mul.s $f6,$f18,$f0
/* 17dac: 00000000 */ nop
/* 17db0: 46004402 */ mul.s $f16,$f8,$f0
/* 17db4: e4aa0000 */ swc1 $f10,0x0($a1)
/* 17db8: e4a60004 */ swc1 $f6,0x4($a1)
/* 17dbc: 03e00008 */ jr $ra
/* 17dc0: e4b00008 */ swc1 $f16,0x8($a1)
);
void portalGetAvgVertexPos(s32 portalnum, struct coord *avg)
{
struct portalvertices *pvertices = (struct portalvertices *)((u32)g_BgPortals + g_BgPortals[portalnum].verticesoffset);
f32 f0;
s32 i;
avg->x = pvertices->vertices[0].x;
avg->y = pvertices->vertices[0].y;
avg->z = pvertices->vertices[0].z;
f0 = 1.0f / pvertices->count;
for (i = 1; i < pvertices->count; i++) {
avg->x += pvertices->vertices[i].x;
avg->y += pvertices->vertices[i].y;
avg->z += pvertices->vertices[i].z;
}
avg->x *= f0;
avg->y *= f0;
avg->z *= f0;
}
#if VERSION < VERSION_NTSC_1_0
bool portal00018e34nb(s32 portalnum)