mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-10 21:40:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

update clang and add action (#664)

Browse Source 
* update clang and add action

* try clang on course folder only

* forget two file

* Update course_displaylists.inc.c

* forget few other file

* Update course_vertices.inc.c

* format all code while get it match

* second pass

* format other dir

* disable clang format on bad ido code

* fix some tabulation

* revert format on tool dir

* Update clang-format.yml

* ignore gbi.h

* add some read me instruction

* fix error

* format and fixing error

* Update README.md

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
2024-08-24 23:27:53 +02:00
committed by GitHub
parent 368c276e1e
commit 17a6f4bb3d
405 changed files with 190745 additions and 207588 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800AF9B0.c
+31 -28
View File
@@ -10,34 +10,39 @@
#include "math_util.h"
/*** Data ***/
Ambient D_800E8680 = {{
{31, 31, 31}, 0,
{31, 31, 31}, 0,
}};
Ambient D_800E8680 = { {
{ 31, 31, 31 },
0,
{ 31, 31, 31 },
0,
} };
Light D_800E8688 = {{
{255, 255, 255}, 0,
{255, 255, 255}, 0,
{ 40, 40, 20}, 0,
}};
Light D_800E8688 = { {
{ 255, 255, 255 },
0,
{ 255, 255, 255 },
0,
{ 40, 40, 20 },
0,
} };
/*** BSS ****/
s16 D_8018EDB0;
s16 D_8018EDB2;
s16 D_8018EDB4;
Vtx *D_8018EDB8;
Vtx *D_8018EDBC;
Vtx* D_8018EDB8;
Vtx* D_8018EDBC;
/*** utils **/
#define SQ(x) ((x) * (x))
void func_800AF9B0(void) {
D_8018EDB8 = (void *)get_next_available_memory_addr(480 * sizeof(Vtx));
D_8018EDBC = (void *)get_next_available_memory_addr(480 * sizeof(Vtx));
D_8018EDB8 = (void*) get_next_available_memory_addr(480 * sizeof(Vtx));
D_8018EDBC = (void*) get_next_available_memory_addr(480 * sizeof(Vtx));
}
// could be a normal vertex, not a color...
void func_800AF9E4(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s16 arg5, s32 arg6, s32 arg7) {
void func_800AF9E4(Vtx* arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s16 arg5, s32 arg6, s32 arg7) {
s32 r, g, b;
s32 i;
@@ -49,9 +54,9 @@ void func_800AF9E4(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s16 arg5,
(arg0 + i)->v.ob[1] = (arg2 * arg3) + arg3 - 420;
}
if (i % 2 == 0) {
(arg0 + i)->v.ob[1] += (f32)SQ(arg1) * -0.07f;
(arg0 + i)->v.ob[1] += (f32) SQ(arg1) * -0.07f;
} else {
(arg0 + i)->v.ob[1] += (f32)SQ(arg1 + 1) * -0.07f;
(arg0 + i)->v.ob[1] += (f32) SQ(arg1 + 1) * -0.07f;
}
(arg0 + i)->v.cn[0] = 0;
@@ -79,10 +84,10 @@ void func_800AF9E4(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4, s16 arg5,
gSP1Triangle(gDisplayListHead++, 3, 2, 1, 0);
}
void func_800AFC54(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]);
void func_800AFC54(Vtx* arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]);
#ifdef NON_MATCHING
// guess on Vtx type?
void func_800AFC54(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]) {
void func_800AFC54(Vtx* arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]) {
Vtx *a1, *a2, *a3;
s32 saved1, saved2, saved3;
f32 res;
@@ -97,7 +102,6 @@ void func_800AFC54(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]) {
saved2 = a2->v.ob[1];
saved3 = a2->v.ob[2];
a = saved2 - a1->v.ob[1];
e = saved3 - a1->v.ob[2];
d = a3->v.ob[1] - saved2;
@@ -105,31 +109,29 @@ void func_800AFC54(Vtx *arg0, s32 arg1, s32 arg2, s32 arg3, s16 arg4[3]) {
f = a3->v.ob[0] - saved1;
c = saved1 - a1->v.ob[0];
f14 = ((a) * (b)) - ((e) * (d));
f16 = ((e) * (f)) - ((c) * (b));
f18 = ((c) * (d)) - ((a) * (f));
res = sqrtf(SQ(f14) + SQ(f16) + SQ(f18));
if (res < 0.001) {
res = 0.001;
}
arg4[0] = f14 * (f32)(1.0 / res) * 120.0f;
arg4[1] = f16 * (f32)(1.0 / res) * 120.0f;
arg4[2] = f18 * (f32)(1.0 / res) * 120.0f;
arg4[0] = f14 * (f32) (1.0 / res) * 120.0f;
arg4[1] = f16 * (f32) (1.0 / res) * 120.0f;
arg4[2] = f18 * (f32) (1.0 / res) * 120.0f;
}
#else
GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800AFC54.s")
#endif
void func_800AFE00(Vtx *arg0, Vec3s *arg1, s32 arg2, s32 arg3) {
void func_800AFE00(Vtx* arg0, Vec3s* arg1, s32 arg2, s32 arg3) {
s32 idx1;
s32 idx2;
s32 i;
Vtx *vtx;
Vtx* vtx;
s16 sp14[2][3];
idx1 = (arg2 == 0) ? 0 : arg2 - 1;
@@ -150,7 +152,7 @@ void func_800AFE00(Vtx *arg0, Vec3s *arg1, s32 arg2, s32 arg3) {
}
}
void func_800AFF58(Vtx *arg0) {
void func_800AFF58(Vtx* arg0) {
UNUSED u32 pad88[26];
s32 i, j;
s16 sp40[12][3];
@@ -176,7 +178,8 @@ void func_800B0004(void) {
gSPLight(gDisplayListHead++, VIRTUAL_TO_PHYSICAL2(&D_800E8680), LIGHT_2);
gSPNumLights(gDisplayListHead++, NUMLIGHTS_1);
gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH);
gDPSetCombineLERP(gDisplayListHead++, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, SHADE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, SHADE);
gDPSetCombineLERP(gDisplayListHead++, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, SHADE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0,
SHADE);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BACK);
gSPSetGeometryMode(gDisplayListHead++, G_LIGHTING);