mirror of
https://github.com/izzy2lost/Starship.git
synced 2026-07-05 15:19:42 -07:00
fix Electric Arc interpolation
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
#include "assets/ast_zoness.h"
|
||||
#include "port/interpolation/FrameInterpolation.h"
|
||||
#include "port/mods/PortEnhancements.h"
|
||||
#include "sf64_tagging.h"
|
||||
|
||||
// rodata
|
||||
const char D_800D7230[] = "Enm->wrk3=<%d>\n";
|
||||
@@ -363,11 +364,18 @@ void Effect_Effect389_Draw(Effect389* this) {
|
||||
for (i = 0; i < 10; i++) {
|
||||
if ((i >= this->unk_48) && (i < this->unk_46)) {
|
||||
Matrix_Push(&gGfxMatrix);
|
||||
|
||||
// @port: Tag the transform.
|
||||
FrameInterpolation_RecordOpenChild("ElectricArc1", TAG_EFFECT(this) + i);
|
||||
|
||||
Matrix_Translate(gGfxMatrix, 0.0f, -60.0f, 0.0f, MTXF_APPLY);
|
||||
Matrix_Scale(gGfxMatrix, 0.8f, 3.0f, 1.0f, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_102F5E0);
|
||||
Matrix_Pop(&gGfxMatrix);
|
||||
|
||||
// @port: Pop the transform.
|
||||
FrameInterpolation_RecordCloseChild();
|
||||
}
|
||||
Matrix_Translate(gGfxMatrix, 0.0f, -120.0f, 0.0f, MTXF_APPLY);
|
||||
Matrix_RotateZ(gGfxMatrix, D_800D1534[this->unk_4C][i] * M_DTOR, MTXF_APPLY);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#include "global.h"
|
||||
#include "assets/ast_text.h"
|
||||
#include "sf64_tagging.h"
|
||||
|
||||
char D_801619A0[100];
|
||||
|
||||
@@ -206,9 +207,6 @@ s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define TAG_LIMB_ADDRESS(ptr, data) ((((u32) (ptr) << 16) & 0xFFFF0000) | ((u32) (data) & 0x0000FFFF))
|
||||
#define TAG_LIMB(limb, data) ((u32) (0x80000000 | (TAG_LIMB_ADDRESS(limb, data))))
|
||||
|
||||
void Animation_DrawLimb(s32 mode, Limb* limb, Limb** skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw,
|
||||
PostLimbDraw postLimbDraw, void* data) {
|
||||
bool override;
|
||||
|
||||
Reference in New Issue
Block a user