mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-30 00:46:24 -04:00
mzxrules
6b493d3f9d
* first few functions * two more almost matching functions * Rebase to NBS, get it to compile * BgCheck_RaycastFloorStaticList OK, fix-up some functions * BgCheck_SphVsStaticWall OK! and a few others * more z_bgcheck NON_MATCHINGS * OK more functions, reorganize external reference #defines * More functions OK, more struct fixes * More OKs * Decomp all the way to the end of bgcheck * All functions attempted * Rename functions * formatting, data migration * Give names to unk structs, rename some structs, fix some non-equivalent functions * WaterBox_GetSurfaceImpl OK * BgCheck_ResetPolyCheckTbl OK, improve WaterBox_GetSurface2 codegen, eliminate warnings and clean up source. * BcCheck3_BgActorInit ->BgCheck3_BgActorInit, fix warnings * pr change requests * fix crc maybe * implement more changes * implement alf's changes
105 lines
3.3 KiB
C
105 lines
3.3 KiB
C
#include "global.h"
|
|
|
|
void BgCheck2_UpdateActorPosition(CollisionContext* colCtx, s32 bgId, Actor* actor) {
|
|
MtxF prevMatrix;
|
|
MtxF prevMatrixInv;
|
|
MtxF currMatrix;
|
|
Vec3f newPos;
|
|
Vec3f posWithInv;
|
|
|
|
if (!DynaPoly_IsBgIdBgActor(bgId)) {
|
|
return;
|
|
}
|
|
|
|
SkinMatrix_SetScaleRotateYRPTranslate(
|
|
&prevMatrix, colCtx->dyna.bgActors[bgId].prevTransform.scale.x,
|
|
colCtx->dyna.bgActors[bgId].prevTransform.scale.y, colCtx->dyna.bgActors[bgId].prevTransform.scale.z,
|
|
colCtx->dyna.bgActors[bgId].prevTransform.rot.x, colCtx->dyna.bgActors[bgId].prevTransform.rot.y,
|
|
colCtx->dyna.bgActors[bgId].prevTransform.rot.z, colCtx->dyna.bgActors[bgId].prevTransform.pos.x,
|
|
colCtx->dyna.bgActors[bgId].prevTransform.pos.y, colCtx->dyna.bgActors[bgId].prevTransform.pos.z);
|
|
|
|
if (SkinMatrix_Invert(&prevMatrix, &prevMatrixInv) == 2) {
|
|
return;
|
|
}
|
|
|
|
SkinMatrix_SetScaleRotateYRPTranslate(
|
|
&currMatrix, colCtx->dyna.bgActors[bgId].curTransform.scale.x, colCtx->dyna.bgActors[bgId].curTransform.scale.y,
|
|
colCtx->dyna.bgActors[bgId].curTransform.scale.z, colCtx->dyna.bgActors[bgId].curTransform.rot.x,
|
|
colCtx->dyna.bgActors[bgId].curTransform.rot.y, colCtx->dyna.bgActors[bgId].curTransform.rot.z,
|
|
colCtx->dyna.bgActors[bgId].curTransform.pos.x, colCtx->dyna.bgActors[bgId].curTransform.pos.y,
|
|
colCtx->dyna.bgActors[bgId].curTransform.pos.z);
|
|
|
|
SkinMatrix_Vec3fMtxFMultXYZ(&prevMatrixInv, &actor->world.pos, &posWithInv);
|
|
SkinMatrix_Vec3fMtxFMultXYZ(&currMatrix, &posWithInv, &newPos);
|
|
|
|
actor->world.pos = newPos;
|
|
}
|
|
|
|
void BgCheck2_UpdateActorYRotation(CollisionContext* colCtx, s32 bgId, Actor* actor) {
|
|
s16 angleChange;
|
|
|
|
if (!DynaPoly_IsBgIdBgActor(bgId)) {
|
|
return;
|
|
}
|
|
|
|
angleChange = colCtx->dyna.bgActors[bgId].curTransform.rot.y - colCtx->dyna.bgActors[bgId].prevTransform.rot.y;
|
|
|
|
if (actor->id == 0) {
|
|
((Player*)actor)->currentYaw += angleChange;
|
|
}
|
|
|
|
actor->shape.rot.y += angleChange;
|
|
actor->world.rot.y += angleChange;
|
|
}
|
|
|
|
void BgCheck2_AttachToMesh(CollisionContext* colCtx, Actor* actor, s32 bgId) {
|
|
DynaPolyActor* meshActor;
|
|
|
|
if (!DynaPoly_IsBgIdBgActor(bgId)) {
|
|
return;
|
|
}
|
|
|
|
meshActor = DynaPoly_GetActor(colCtx, bgId);
|
|
if (meshActor != NULL) {
|
|
DynaPolyActor_SetRidingFallingState(meshActor);
|
|
|
|
if ((actor->flags & 0x4000000) == 0x4000000) {
|
|
DynaPolyActor_SetSwitchPressedState(meshActor);
|
|
}
|
|
if ((actor->flags & 0x20000) == 0x20000) {
|
|
DynaPolyActor_SetHeavySwitchPressedState(meshActor);
|
|
}
|
|
}
|
|
}
|
|
|
|
u32 BgCheck2_UpdateActorAttachedToMesh(CollisionContext* colCtx, s32 bgId, Actor* actor) {
|
|
u32 wasUpdated = 0;
|
|
DynaPolyActor* meshActor;
|
|
|
|
if (!DynaPoly_IsBgIdBgActor(bgId)) {
|
|
return 0;
|
|
}
|
|
|
|
if (colCtx->dyna.bgActorFlags[bgId] & 2 || !(colCtx->dyna.bgActorFlags[bgId] & 1)) {
|
|
return 0;
|
|
}
|
|
|
|
meshActor = DynaPoly_GetActor(colCtx, bgId);
|
|
|
|
if (meshActor == NULL) {
|
|
return 0;
|
|
}
|
|
|
|
if (meshActor->flags & 1) {
|
|
BgCheck2_UpdateActorPosition(colCtx, bgId, actor);
|
|
wasUpdated = 1;
|
|
}
|
|
|
|
if (meshActor->flags & 2) {
|
|
BgCheck2_UpdateActorYRotation(colCtx, bgId, actor);
|
|
wasUpdated = 1;
|
|
}
|
|
|
|
return wasUpdated;
|
|
}
|