mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix various small gfx issues (#1313)

Browse source 
* Fix various small gfx issues

* Use 0xFFFF instead of -1 for max prim depth

* More fixed point numbers

* scale -> texCoordScale, better cycle 2 render mode in z_title

* GFXP_CHAR_* defines renamed to SPACING

* Fix some gDPLoadMultiBlock uses
This commit is contained in:
Tharo 2022-07-30 22:49:10 +01:00 • committed by GitHub
parent afbc312024
commit 455321d2e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 695 additions and 604 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/code/z_fbdemo_circle.c
View file

@ -74,12 +74,12 @@ void TransitionCircle_Start(void* thisx) {
this->color.rgba = this->appearanceType == TCA_WAVE ? RGBA8(0, 0, 0, 255) : RGBA8(160, 160, 160, 255);
}
if (this->direction != 0) {
this->texY = 0;
this->texY = (s32)(0.0 * (1 << 2));
if (this->colorType == TCC_SPECIAL) {
this->texY = 0xFA;
this->texY = (s32)(62.5 * (1 << 2));
}
} else {
this->texY = 0x1F4;
this->texY = (s32)(125.0 * (1 << 2));
if (this->appearanceType == TCA_RIPPLE) {
Audio_PlaySfxGeneral(NA_SE_OC_SECRET_WARP_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
@ -112,20 +112,20 @@ void TransitionCircle_Update(void* thisx, s32 updateRate) {
}
}
this->texY += this->speed * 3 / updateRate;
if (this->texY >= 0x1F4) {
this->texY = 0x1F4;
if (this->texY >= (s32)(125.0 * (1 << 2))) {
this->texY = (s32)(125.0 * (1 << 2));
this->isDone = true;
}
} else {
this->texY -= this->speed * 3 / updateRate;
if (this->colorType != TCC_SPECIAL) {
if (this->texY <= 0) {
this->texY = 0;
if (this->texY <= (s32)(0.0 * (1 << 2))) {
this->texY = (s32)(0.0 * (1 << 2));
this->isDone = true;
}
} else {
if (this->texY < 0xFB) {
this->texY = 0xFA;
if (this->texY <= (s32)(62.5 * (1 << 2))) {
this->texY = (s32)(62.5 * (1 << 2));
this->isDone = true;
}
}
@ -146,7 +146,7 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP) {
this->frame ^= 1;
gDPPipeSync(gfx++);
texScroll = Gfx_BranchTexScroll(&gfx, this->texX, this->texY, 0x10, 0x40);
texScroll = Gfx_BranchTexScroll(&gfx, this->texX, this->texY, 16, 64);
gSPSegment(gfx++, 9, texScroll);
gSPSegment(gfx++, 8, this->texture);
gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba);