vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #236 from coltongit/sparkle-texture-fix 

Add minor sparkle texture fixes
This commit is contained in:
IvanDSM 2020-05-20 21:34:06 -03:00 committed by GitHub
parent 0724f0ed09 ba8345377e
commit 66c9755258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/goddard/renderer.c
View File

@ -493,6 +493,7 @@ ALIGNED8 static u8 gd_texture_sparkle_4[] = {
//! No reference to this texture. Two DL's uses the same previous texture
// instead of using this texture.
// Fixed via setting TEXTURE_FIX to 1.
ALIGNED8 static u8 gd_texture_sparkle_5[] = {
#include "textures/intro_raw/sparkle_5.rgba16.inc.c"
};
@ -569,6 +570,7 @@ static Gfx gd_dl_red_sparkle_4[] = {
gsSPBranchList(gd_dl_sparkle),
};
#ifndef TEXTURE_FIX
static Gfx gd_dl_red_sparkle_4_dup[] ={
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_red_color),
@ -576,6 +578,15 @@ static Gfx gd_dl_red_sparkle_4_dup[] ={
gsSPBranchList(gd_dl_sparkle),
};
#else
static Gfx gd_dl_red_sparkle_5[] ={
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_red_color),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
gsSPBranchList(gd_dl_sparkle),
};
#endif
static Gfx gd_dl_silver_sparkle_0[] = {
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color),
@ -611,6 +622,7 @@ static Gfx gd_dl_silver_sparkle_4[] = {
gsSPBranchList(gd_dl_sparkle),
};
#ifndef TEXTURE_FIX
static Gfx gd_dl_silver_sparkle_4_dup[] = {
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color),
@ -618,6 +630,15 @@ static Gfx gd_dl_silver_sparkle_4_dup[] = {
gsSPBranchList(gd_dl_sparkle),
};
#else
static Gfx gd_dl_silver_sparkle_5[] = {
gsDPPipeSync(),
gsSPDisplayList(gd_dl_sparkle_white_color),
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, gd_texture_sparkle_5),
gsSPBranchList(gd_dl_sparkle),
};
#endif
static Gfx *gd_red_sparkle_dl_array[] = {
gd_dl_red_sparkle_4,
gd_dl_red_sparkle_4,
@ -629,8 +650,13 @@ static Gfx *gd_red_sparkle_dl_array[] = {
gd_dl_red_sparkle_1,
gd_dl_red_sparkle_0,
gd_dl_red_sparkle_0,
#ifndef TEXTURE_FIX
gd_dl_red_sparkle_4_dup,
gd_dl_red_sparkle_4_dup,
#else
gd_dl_red_sparkle_5,
gd_dl_red_sparkle_5,
#endif
};
static Gfx *gd_silver_sparkle_dl_array[] = {
@ -644,8 +670,13 @@ static Gfx *gd_silver_sparkle_dl_array[] = {
gd_dl_silver_sparkle_1,
gd_dl_silver_sparkle_0,
gd_dl_silver_sparkle_0,
#ifndef TEXTURE_FIX
gd_dl_silver_sparkle_4_dup,
gd_dl_silver_sparkle_4_dup,
#else
gd_dl_silver_sparkle_5,
gd_dl_silver_sparkle_5,
#endif
};
static Gfx gd_texture3_dummy_aligner1[] = {