mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 15:30:14 +00:00
Code Issues Projects Releases Wiki Activity

Minor gfx cleanups in some actors (#706)

Browse source 
* Minor gfx cleanups in some actors

* Fix frustum names
This commit is contained in:
Roman971 2021-02-18 01:06:07 +01:00 • committed by GitHub
parent f57e0467d2
commit 55ae8ad741
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View file

@ -73,7 +73,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
u8 alphaTable[3];
s32 i;
Vec3f eye;
Vtx(*vtxPtr)[2];
Vtx* vtxPtr;
Vec3f vec;
eye = ACTIVE_CAM->eye;
@ -98,9 +98,9 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
for (i = 0; i < 20; i++) {
vtxPtr = (Vtx(*)[2])vertices;
vtxPtr[i][0].v.cn[3] = alphaTable[((sOceffWipeAlphaIndices[i] & 0xF0) >> 4)];
vtxPtr[i][1].v.cn[3] = alphaTable[sOceffWipeAlphaIndices[i] & 0xF];
vtxPtr = sFrustumVtx;
vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[((sOceffWipeAlphaIndices[i] & 0xF0) >> 4)];
vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sOceffWipeAlphaIndices[i] & 0xF];
}
func_80093D84(globalCtx->state.gfxCtx);
@ -124,7 +124,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTextureDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, 1,
0 - scroll, scroll * (-2), 32, 32));
gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl);
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 398);
}

18
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe_gfx.c
View file

@ -1,6 +1,6 @@
#include "z_oceff_wipe.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x354D5AAC, 0xA5561C01, 0x124688B5, 0x74583231, 0x313D71D6, 0x9F5B3507, 0x104089AD, 0x748F440C, 0x408176AC,
0xB4661301, 0x2261C0BE, 0x49392533, 0x2C497FC4, 0x80451D06, 0x2466BBD0, 0x9CB85411, 0x40A09DA3, 0xB37F210B,
0x3D8AEAC7, 0x3F241930, 0x2F5591A7, 0x6441080F, 0x4191E8DB, 0xB7A76B18, 0x4094BAA0, 0x76532D22, 0x60BAFEE8,
@ -32,7 +32,7 @@ static u32 tex0[] = {
0x422B6EE0, 0xBB85480B, 0x04256799, 0x716D6D21,
};
static Vtx vertices[] = {
static Vtx sFrustumVtx[] = {
VTX(-165, 227, 0, 1229, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-206, 283, 300, 1229, 512, 0xFF, 0xFF, 0xFF, 0xA0),
VTX(0, 350, 300, 1024, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(0, 280, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00),
VTX(-294, 405, 1000, 1229, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 500, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -59,11 +59,11 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 0),
gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 15,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 0),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, 15, G_TX_NOMIRROR | G_TX_WRAP, 5,
0),
gsDPSetTileSize(1, 0, 0, (31 << 2), (31 << 2)),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
@ -74,8 +74,8 @@ static Gfx sTextureDL[] = {
gsSPEndDisplayList(),
};
static Gfx sFrustrumDl[] = {
gsSPVertex(vertices, 32, 0),
static Gfx sFrustumDL[] = {
gsSPVertex(sFrustumVtx, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),
@ -93,7 +93,7 @@ static Gfx sFrustrumDl[] = {
gsSP2Triangles(27, 28, 25, 0, 27, 25, 24, 0),
gsSP2Triangles(28, 29, 26, 0, 28, 26, 25, 0),
gsSP2Triangles(30, 31, 28, 0, 30, 28, 27, 0),
gsSPVertex(vertices + 32, 8, 0),
gsSPVertex(sFrustumVtx + 32, 8, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(4, 5, 0, 0, 4, 0, 6, 0),
gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0),