kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-64'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-08 21:29:47 -05:00
parent 19774bdfdc 5ce76c4769
commit 65e383dc67
2 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/core2/code_5FD90.c
View File

@@ -224,26 +224,29 @@ bool func_802E7588(f32 arg0[3], f32 arg1, f32 arg2[3], f32 arg3) {
return (ml_distance_vec3f(arg0, arg2) < (arg1 + arg3)); return (ml_distance_vec3f(arg0, arg2) < (arg1 + arg3));
} }
void func_802E75D0(f32 p1[3], f32 p2[3], s32 boundMin[3], s32 boundMax[3], f32 diff[3]) { void calculateBoundsAndDirection(f32 startPoint[3], f32 endPoint[3], s32 minBounds[3], s32 maxBounds[3], f32 directionVector[3]) {
s32 i; s32 i;
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
if (p1[i] < p2[i]) { if (startPoint[i] < endPoint[i]) {
boundMin[i] = (s32) p1[i]; minBounds[i] = (s32) startPoint[i];
boundMax[i] = (s32) p2[i]; maxBounds[i] = (s32) endPoint[i];
} else {
boundMin[i] = (s32) p2[i];
boundMax[i] = (s32) p1[i];
} }
boundMin[i] += -1; else {
boundMax[i] += 1; minBounds[i] = (s32) endPoint[i];
} maxBounds[i] = (s32) startPoint[i];
diff[0] = (p2[0] - p1[0]);
diff[1] = (p2[1] - p1[1]);
diff[2] = (p2[2] - p1[2]);
} }
BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vertexList, f32 arg2[3], f32 arg3[3], f32 arg4[3], u32 flagFilter) { minBounds[i] += -1;
maxBounds[i] += 1;
}
directionVector[0] = (endPoint[0] - startPoint[0]);
directionVector[1] = (endPoint[1] - startPoint[1]);
directionVector[2] = (endPoint[2] - startPoint[2]);
}
BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vertexList, f32 startPoint[3], f32 endPoint[3], f32 arg4[3], u32 flagFilter) {
s32 i; s32 i;
s32 j; s32 j;
BKCollisionGeo **start_geo; BKCollisionGeo **start_geo;
@@ -255,9 +258,9 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
BKCollisionTri *i_tri; BKCollisionTri *i_tri;
Vtx *vtx_pool; Vtx *vtx_pool;
Vtx *sp164[3]; Vtx *sp164[3];
s32 sp158[3]; s32 min_bounds[3];
s32 sp14C[3]; s32 max_bounds[3];
f32 sp140[3]; f32 direction_vector[3];
Vtx *temp_a2; Vtx *temp_a2;
f32 sp130[3]; f32 sp130[3];
f32 sp124[3]; f32 sp124[3];
@@ -280,17 +283,17 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
s32 phi_a0_2; s32 phi_a0_2;
f32 pad; f32 pad;
f32 sp90[3][3]; f32 sp90[3][3];
BKCollisionTri *sp8C; BKCollisionTri *result_collision;
sp8C = NULL; result_collision = NULL;
temp_f20 = (f32) vertexList->global_norm; temp_f20 = (f32) vertexList->global_norm;
func_802E75D0(arg2, arg3, sp158, sp14C, sp140); calculateBoundsAndDirection(startPoint, endPoint, min_bounds, max_bounds, direction_vector);
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
if ((sp14C[i] <= -temp_f20) || (temp_f20 <= sp158[i])) { if ((max_bounds[i] <= -temp_f20) || (temp_f20 <= min_bounds[i])) {
return NULL; return NULL;
} }
} }
func_802E70FC(collisionList, sp158, sp14C, &start_geo, &end_geo); func_802E70FC(collisionList, min_bounds, max_bounds, &start_geo, &end_geo);
for(i_geo = start_geo; i_geo < end_geo; i_geo++){ for(i_geo = start_geo; i_geo < end_geo; i_geo++){
start_tri = (BKCollisionTri *)((BKCollisionGeo *)(collisionList + 1) + collisionList->unk10) + (*i_geo)->start_tri_index; start_tri = (BKCollisionTri *)((BKCollisionGeo *)(collisionList + 1) + collisionList->unk10) + (*i_geo)->start_tri_index;
end_tri = start_tri + (*i_geo)->tri_count; end_tri = start_tri + (*i_geo)->tri_count;
@@ -302,14 +305,14 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
sp164[0] = &vtx_pool[i_tri->unk0[0]]; sp164[0] = &vtx_pool[i_tri->unk0[0]];
sp164[1] = &vtx_pool[i_tri->unk0[1]]; sp164[1] = &vtx_pool[i_tri->unk0[1]];
sp164[2] = &vtx_pool[i_tri->unk0[2]]; sp164[2] = &vtx_pool[i_tri->unk0[2]];
if((sp164[0]->v.ob[0] < sp158[0]) && (sp164[1]->v.ob[0] < sp158[0]) && (sp164[2]->v.ob[0] < sp158[0])) continue; if((sp164[0]->v.ob[0] < min_bounds[0]) && (sp164[1]->v.ob[0] < min_bounds[0]) && (sp164[2]->v.ob[0] < min_bounds[0])) continue;
if((sp14C[0] < sp164[0]->v.ob[0]) && (sp14C[0] < sp164[1]->v.ob[0]) && (sp14C[0] < sp164[2]->v.ob[0])) continue; if((max_bounds[0] < sp164[0]->v.ob[0]) && (max_bounds[0] < sp164[1]->v.ob[0]) && (max_bounds[0] < sp164[2]->v.ob[0])) continue;
if((sp164[0]->v.ob[2] < sp158[2]) && (sp164[1]->v.ob[2] < sp158[2]) && (sp164[2]->v.ob[2] < sp158[2])) continue; if((sp164[0]->v.ob[2] < min_bounds[2]) && (sp164[1]->v.ob[2] < min_bounds[2]) && (sp164[2]->v.ob[2] < min_bounds[2])) continue;
if((sp14C[2] < sp164[0]->v.ob[2]) && (sp14C[2] < sp164[1]->v.ob[2]) && (sp14C[2] < sp164[2]->v.ob[2])) continue; if((max_bounds[2] < sp164[0]->v.ob[2]) && (max_bounds[2] < sp164[1]->v.ob[2]) && (max_bounds[2] < sp164[2]->v.ob[2])) continue;
if((sp164[0]->v.ob[1] < sp158[1]) && (sp164[1]->v.ob[1] < sp158[1]) && (sp164[2]->v.ob[1] < sp158[1])) continue; if((sp164[0]->v.ob[1] < min_bounds[1]) && (sp164[1]->v.ob[1] < min_bounds[1]) && (sp164[2]->v.ob[1] < min_bounds[1])) continue;
if((sp14C[1] < sp164[0]->v.ob[1]) && (sp14C[1] < sp164[1]->v.ob[1]) && (sp14C[1] < sp164[2]->v.ob[1])) continue; if((max_bounds[1] < sp164[0]->v.ob[1]) && (max_bounds[1] < sp164[1]->v.ob[1]) && (max_bounds[1] < sp164[2]->v.ob[1])) continue;
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
temp_a2 = &vtx_pool[i_tri->unk0[i]]; temp_a2 = &vtx_pool[i_tri->unk0[i]];
@@ -335,12 +338,14 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
spBC[1] /= 100000.0f; spBC[1] /= 100000.0f;
spBC[2] /= 100000.0f; spBC[2] /= 100000.0f;
} }
sp118[0] = arg2[0] - sp90[0][0];
sp118[1] = arg2[1] - sp90[0][1]; sp118[0] = startPoint[0] - sp90[0][0];
sp118[2] = arg2[2] - sp90[0][2]; sp118[1] = startPoint[1] - sp90[0][1];
sp10C[0] = arg3[0] - sp90[0][0]; sp118[2] = startPoint[2] - sp90[0][2];
sp10C[1] = arg3[1] - sp90[0][1];
sp10C[2] = arg3[2] - sp90[0][2]; sp10C[0] = endPoint[0] - sp90[0][0];
sp10C[1] = endPoint[1] - sp90[0][1];
sp10C[2] = endPoint[2] - sp90[0][2];
temp_f12_2 = sp118[0]*spBC[0] + sp118[1]*spBC[1] + sp118[2]*spBC[2]; temp_f12_2 = sp118[0]*spBC[0] + sp118[1]*spBC[1] + sp118[2]*spBC[2];
temp_f2_2 = sp10C[0]*spBC[0] + sp10C[1]*spBC[1] + sp10C[2]*spBC[2]; temp_f2_2 = sp10C[0]*spBC[0] + sp10C[1]*spBC[1] + sp10C[2]*spBC[2];
@@ -353,18 +358,18 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
spBC[2] = -spBC[2]; spBC[2] = -spBC[2];
} }
temp_f12_3 = spBC[0]*sp140[0] + spBC[1]*sp140[1] + spBC[2]*sp140[2]; temp_f12_3 = spBC[0]*direction_vector[0] + spBC[1]*direction_vector[1] + spBC[2]*direction_vector[2];
pad = (sp90[0][0]*spBC[0] + sp90[0][1]*spBC[1] + sp90[0][2]*spBC[2]); pad = (sp90[0][0]*spBC[0] + sp90[0][1]*spBC[1] + sp90[0][2]*spBC[2]);
if (temp_f12_3 == 0.0f) if (temp_f12_3 == 0.0f)
continue; continue;
temp_f0_2 = -((spBC[0]*arg2[0] + spBC[1]*arg2[1] + spBC[2]*arg2[2]) - pad)/ temp_f12_3; temp_f0_2 = -((spBC[0]*startPoint[0] + spBC[1]*startPoint[1] + spBC[2]*startPoint[2]) - pad)/ temp_f12_3;
if(temp_f0_2 <= 0.0f || 1.0f <= temp_f0_2) if(temp_f0_2 <= 0.0f || 1.0f <= temp_f0_2)
continue; continue;
spFC[0] = arg2[0] + (sp140[0] * temp_f0_2); spFC[0] = startPoint[0] + (direction_vector[0] * temp_f0_2);
spFC[1] = arg2[1] + (sp140[1] * temp_f0_2); spFC[1] = startPoint[1] + (direction_vector[1] * temp_f0_2);
spFC[2] = arg2[2] + (sp140[2] * temp_f0_2); spFC[2] = startPoint[2] + (direction_vector[2] * temp_f0_2);
phi_a0_2 = (ABS_F(spBC[0]) > ABS_F(spBC[1])) ? 0 : 1; phi_a0_2 = (ABS_F(spBC[0]) > ABS_F(spBC[1])) ? 0 : 1;
phi_a0_2 = (ABS_F(spBC[2]) > ABS_F(spBC[phi_a0_2])) ? 2 : phi_a0_2; phi_a0_2 = (ABS_F(spBC[2]) > ABS_F(spBC[phi_a0_2])) ? 2 : phi_a0_2;
@@ -389,18 +394,18 @@ BKCollisionTri *func_802E76B0(BKCollisionList *collisionList, BKVertexList *vert
if(1.0f < (temp_f12_4 + temp_f2_6)) if(1.0f < (temp_f12_4 + temp_f2_6))
continue; continue;
sp8C = i_tri; result_collision = i_tri;
arg3[0] = spFC[0]; endPoint[0] = spFC[0];
arg3[1] = spFC[1]; endPoint[1] = spFC[1];
arg3[2] = spFC[2]; endPoint[2] = spFC[2];
ml_vec3f_normalize_copy(arg4, spBC); ml_vec3f_normalize_copy(arg4, spBC);
func_802E75D0(arg2, arg3, sp158, sp14C, sp140); calculateBoundsAndDirection(startPoint, endPoint, min_bounds, max_bounds, direction_vector);
} }
} }
} }
func_802E6D20(sp8C, vertexList); func_802E6D20(result_collision, vertexList);
return sp8C; return result_collision;
} }
int func_802E805C(BKCollisionList *collision_list, BKVertexList *vtxList, f32 arg2[3], f32 arg3[3], f32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8){ int func_802E805C(BKCollisionList *collision_list, BKVertexList *vtxList, f32 arg2[3], f32 arg3[3], f32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8){

44
src/core2/mapModel.c
View File

@@ -448,34 +448,40 @@ f32 func_80309B24(f32 arg0[3]){
return func_80308FDC(arg0, 0xf800ff0f); return func_80308FDC(arg0, 0xf800ff0f);
} }
BKCollisionTri *func_80309B48(f32 arg0[3], f32 arg1[3], f32 arg2[3], s32 flagFilter) { BKCollisionTri *func_80309B48(f32 startPoint[3], f32 endPoint[3], f32 arg2[3], s32 flagFilter) {
BKCollisionTri *sp2C; BKCollisionTri *opaqueTri;
BKCollisionTri *temp_v0; BKCollisionTri *transparentTri;
mapModel.unk20 = 0; mapModel.unk20 = 0;
if (mapModel.collision_xlu != NULL) { if (mapModel.collision_xlu != NULL) {
if ((flagFilter & 0x80001F00) == 0x80001F00) { if ((flagFilter & 0x80001F00) == 0x80001F00) {
sp2C = NULL; opaqueTri = NULL;
} else {
sp2C = func_802E76B0(mapModel.collision_opa, model_getVtxList(mapModel.model_bin_opa), arg0, arg1, arg2, flagFilter);
}
temp_v0 = func_802E76B0(mapModel.collision_xlu, model_getVtxList(mapModel.model_bin_xlu), arg0, arg1, arg2, flagFilter);
if (temp_v0 != NULL) {
mapModel.unk20 = (s32) mapModel.model_bin_xlu;
return temp_v0;
}
if (sp2C != NULL) {
mapModel.unk20 = (s32) mapModel.model_bin_opa;
}
return sp2C;
} }
else { else {
sp2C = func_802E76B0(mapModel.collision_opa, model_getVtxList(mapModel.model_bin_opa), arg0, arg1, arg2, flagFilter); opaqueTri = func_802E76B0(mapModel.collision_opa, model_getVtxList(mapModel.model_bin_opa), startPoint, endPoint, arg2, flagFilter);
if (sp2C != NULL) { }
transparentTri = func_802E76B0(mapModel.collision_xlu, model_getVtxList(mapModel.model_bin_xlu), startPoint, endPoint, arg2, flagFilter);
if (transparentTri != NULL) {
mapModel.unk20 = (s32) mapModel.model_bin_xlu;
return transparentTri;
}
if (opaqueTri != NULL) {
mapModel.unk20 = (s32) mapModel.model_bin_opa;
}
return opaqueTri;
}
else{
opaqueTri = func_802E76B0(mapModel.collision_opa, model_getVtxList(mapModel.model_bin_opa), startPoint, endPoint, arg2, flagFilter);
if (opaqueTri != NULL) {
mapModel.unk20 = (s32) mapModel.model_bin_opa; mapModel.unk20 = (s32) mapModel.model_bin_opa;
} }
} }
return sp2C;
return opaqueTri;
} }
BKCollisionTri *func_80309C74(f32 arg0[3], f32 arg1[3], f32 arg2[3], s32 flagFilter, BKModelBin **arg4) { BKCollisionTri *func_80309C74(f32 arg0[3], f32 arg1[3], f32 arg2[3], s32 flagFilter, BKModelBin **arg4) {