mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-28 19:25:27 +00:00
Match ntsc-1.2 z_skelanime.c, z_view.c, z_viszbuf.c (#2041)
This commit is contained in:
parent
70716be96d
commit
7fb9fbb4a2
3 changed files with 8 additions and 6 deletions
|
@ -41,8 +41,6 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3
|
|||
}
|
||||
}
|
||||
|
||||
if (1) {}
|
||||
|
||||
if (postLimbDraw != NULL) {
|
||||
postLimbDraw(play, limbIndex, &dList, &rot, arg);
|
||||
}
|
||||
|
@ -261,8 +259,6 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3
|
|||
}
|
||||
}
|
||||
|
||||
if (1) {}
|
||||
|
||||
if (postLimbDraw != NULL) {
|
||||
postLimbDraw(play, limbIndex, &dList, &rot, arg);
|
||||
}
|
||||
|
@ -855,9 +851,14 @@ AnimTask* AnimTaskQueue_NewTask(AnimTaskQueue* animTaskQueue, s32 type) {
|
|||
return task;
|
||||
}
|
||||
|
||||
#if PLATFORM_N64
|
||||
#define LINK_ANIMATION_OFFSET(addr, offset) \
|
||||
(((uintptr_t)_link_animetionSegmentRomStart) + SEGMENT_OFFSET(addr) + (offset))
|
||||
#else
|
||||
#define LINK_ANIMATION_OFFSET(addr, offset) \
|
||||
(((uintptr_t)_link_animetionSegmentRomStart) + ((uintptr_t)(addr)) - ((uintptr_t)_link_animetionSegmentStart) + \
|
||||
(offset))
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Creates a task which will load a single frame of animation data from the link_animetion file.
|
||||
|
|
|
@ -142,8 +142,8 @@ void View_GetViewport(View* view, Viewport* viewport) {
|
|||
|
||||
void View_ApplyLetterbox(View* view) {
|
||||
GraphicsContext* gfxCtx = view->gfxCtx;
|
||||
s32 letterboxSize;
|
||||
s32 pillarboxSize;
|
||||
s32 letterboxSize;
|
||||
s32 ulx;
|
||||
s32 uly;
|
||||
s32 lrx;
|
||||
|
@ -400,9 +400,9 @@ s32 View_ApplyPerspective(View* view) {
|
|||
}
|
||||
|
||||
s32 View_ApplyOrtho(View* view) {
|
||||
GraphicsContext* gfxCtx = view->gfxCtx;
|
||||
Vp* vp;
|
||||
Mtx* projection;
|
||||
GraphicsContext* gfxCtx = view->gfxCtx;
|
||||
|
||||
OPEN_DISPS(gfxCtx, "../z_view.c", 726);
|
||||
|
||||
|
|
|
@ -66,6 +66,7 @@ void VisZBuf_Destroy(VisZBuf* this) {
|
|||
|
||||
void VisZBuf_Draw(VisZBuf* this, Gfx** gfxP) {
|
||||
Gfx* gfx = *gfxP;
|
||||
s32 pad;
|
||||
u16* zbufFrag = D_0E000000;
|
||||
s32 fmt;
|
||||
s32 y;
|
||||
|
|
Loading…
Reference in a new issue