mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-29 16:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Redo z_lights.c for new code base

Browse Source
This commit is contained in:
rozlette
2019-12-20 21:57:05 -06:00
parent 8f66e8c6a9
commit d605458fa5
7 changed files with 475 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/PR/gbi.h
+19 -8
View File
@@ -1259,6 +1259,16 @@ typedef struct {
char pad3;
} Light_t;
// Added for Zelda decomp
typedef struct {
unsigned char col[3]; /* diffuse light value (rgba) */
char pad1;
unsigned char colc[3]; /* copy of diffuse light value (rgba) */
char pad2;
signed short pos[3];
char unkE;
} LightPos_t;
typedef struct {
unsigned char col[3]; /* ambient light value (rgba) */
char pad1;
@@ -1272,6 +1282,7 @@ typedef struct {
typedef union {
Light_t l;
LightPos_t lPos;
long long int force_structure_alignment[2];
} Light;
@@ -1629,13 +1640,13 @@ typedef union {
}
#define gDma1p(pkt, c, s, l, p) \
{ \
_DW({ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL((c), 24, 8) | _SHIFTL((p), 16, 8) | \
_SHIFTL((l), 0, 16)); \
_g->words.w1 = (unsigned int)(s); \
}
})
#define gsDma1p(c, s, l, p) \
{ \
@@ -1645,12 +1656,12 @@ typedef union {
}
#define gDma2p(pkt, c, adrs, len, idx, ofs) \
{ \
_DW({ \
Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \
_SHIFTL((ofs)/8,8,8)|_SHIFTL((idx),0,8)); \
_g->words.w1 = (unsigned int)(adrs); \
}
})
#define gsDma2p(c, adrs, len, idx, ofs) \
{ \
(_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \
@@ -1663,7 +1674,7 @@ typedef union {
#ifdef F3DEX_GBI_2
# define gSPMatrix(pkt, m, p) \
_DW(gDma2p((pkt),G_MTX,(m),sizeof(Mtx),(p)^G_MTX_PUSH,0))
gDma2p((pkt),G_MTX,(m),sizeof(Mtx),(p)^G_MTX_PUSH,0)
# define gsSPMatrix(m, p) \
gsDma2p( G_MTX,(m),sizeof(Mtx),(p)^G_MTX_PUSH,0)
#else /* F3DEX_GBI_2 */
@@ -1727,7 +1738,7 @@ typedef union {
gsDma1p( G_MOVEMEM, (v), sizeof(Vp), G_MV_VIEWPORT)
#endif /* F3DEX_GBI_2 */
#define gSPDisplayList(pkt,dl) _DW(gDma1p(pkt,G_DL,dl,0,G_DL_PUSH))
#define gSPDisplayList(pkt,dl) gDma1p(pkt,G_DL,dl,0,G_DL_PUSH)
#define gsSPDisplayList( dl) gsDma1p( G_DL,dl,0,G_DL_PUSH)
#define gSPBranchList(pkt,dl) gDma1p(pkt,G_DL,dl,0,G_DL_NOPUSH)
@@ -2790,12 +2801,12 @@ typedef union {
#ifdef F3DEX_GBI_2
#define gSPSetOtherMode(pkt, cmd, sft, len, data) \
{ \
_DW({ \
Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL(cmd,24,8)|_SHIFTL(32-(sft)-(len),8,8)| \
_SHIFTL((len)-1,0,8)); \
_g->words.w1 = (unsigned int)(data); \
}
})
#define gsSPSetOtherMode(cmd, sft, len, data) \
{ \
include/segment.h
+2
View File
@@ -3,6 +3,8 @@
#include <PR/ultratypes.h>
extern UNK_TYPE D_04029CB0; // D_04029CB0
extern UNK_TYPE D_04029CF0; // D_04029CF0
extern UNK_TYPE D_060005D0; // D_060005D0
extern UNK_TYPE D_06001100; // D_06001100
extern UNK_TYPE D_06001228; // D_06001228
include/structs.h
+1 -2
View File
@@ -432,8 +432,7 @@ typedef struct {
/* 0x00 */ u8 enablePosLights;
/* 0x01 */ u8 numLights;
/* 0x02 */ UNK_TYPE1 pad2[6];
/* 0x08 */ Ambient ambient;
/* 0x10 */ Light lights[7];
/* 0x08 */ Lights7 lights;
} LightMapper;
typedef struct {