mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-28 00:15:47 -04:00
77cfd399d0
* starting * a bunch * and another bunch * a bunch * Match func_800EB1DC * func_800EB4B4 * func_800EB6F8 * 2 more * fix prototype of a random kankyo function * func_800EBD60 non matching * func_800EC678 matched? * func_800EC6D4 * break * func_800ECD7C * A bunch of functions * func_800EE200 * func_800EDF78 and func_800EE0CC * func_800EDBE0 NON_MATCHING * Cutscene_Init NON_MATCHING * func_800EA324 NON_EQUIVALENT * Fix warnings * func_800EC924 NON_EQUIVALENT * Cutscene_ProcessCommands NON_EQUIVALENT * Format * Split z_demo data and import it * Import bss * Match func_800EB364 * Rename Cutscene_Command_SetTime * Improve Cutscene_ProcessCommands a bit (still not equivalent, probably) * Improve Cutscene_ProcessCommands thanks to engineer and anon * Cutscene_ProcessCommands NON_MATCHING * Name some commands * Fix * Renames based on Engineer knowledge of Audio stuff * More command names * Cutscene_Command_GiveTatlToPlayer * Some cutscene commands macros * more command macros * Macros for unknown commands * Improve Cutscene_Command_Textbox a bit * Rename stuff * Name Terminator and Camera * MOTIONBLUR * Macros for textbox commands * CS_PLAYER_ACTION_LIST * A few macro renames * Small cleaning * A bit more of cleanup * Rumble * Entrance comments in func_800EB6F8 * Some var renames * CS_CMD_FADESCREEN * More clean up * Clean functions protos * Move CutsceneStateHandler out of z64.h * Cutscene_DoNothing * Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex * And more renames * name some stuff in the cutscenecontext struct * npcActionIndex->actorActionIndex * Undo names of CS_STATE_ enum * Name Cutscene_ActorTranslate family of functions * small docs pass * sfxconvert and format * Hopefully last cleanup * Add some missing functions to actorfixer * Fix merge issues and remove trailing commas * Cutscene commands fix * Cutscene_Command_Misc improved by engineer * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Address review * bss * Match Cutscene_Command_Textbox by anon58 * Fix merge issues * Match Cutscene_Command_Misc by @hensldm * review * float time macros * fix merge issues * format * Fix building assets * fix merge issues * format * Fix * format * fix merge issues * fix * fix * format * fix issues and run format * bss * Fix conflicts, bss and formatter * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * address review and fix some stuff * fix merge problems * more fixes and format * Fixes * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Engineer suggestions * format * Elliptic review * Use dec for ShrinkWindow_SetLetterboxTarget * add a few comments * Cutscene_Command_ChooseCreditsScenes * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * format * some cleanups and some comments * change actorActionCmd from hex to dec in the codebase * minor comment on textboxcmd * ahhhh * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * brackets * minor comments * rewording * im dumb * brackets * another bracket * Dawn of the New Day * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * fixes * Cutscene_Command_TransitionFX by Anon Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
100 lines
2.4 KiB
C
100 lines
2.4 KiB
C
#ifndef _Z64LIGHT_H_
|
|
#define _Z64LIGHT_H_
|
|
|
|
#include "ultra64.h"
|
|
#include "PR/gbi.h"
|
|
#include "color.h"
|
|
|
|
typedef struct {
|
|
/* 0x00 */ u8 ambientColor[3];
|
|
/* 0x03 */ s8 diffuseDir1[3];
|
|
/* 0x06 */ u8 diffuseColor1[3];
|
|
/* 0x09 */ s8 diffusePos2[3];
|
|
/* 0x0C */ u8 diffuseColor[3];
|
|
/* 0x0F */ u8 fogColor[3];
|
|
/* 0x12 */ u16 fogNear;
|
|
/* 0x14 */ u16 fogFar;
|
|
} LightSettings; // size = 0x16
|
|
|
|
typedef struct {
|
|
/* 0x00 */ s16 ambientColor[3];
|
|
/* 0x06 */ s16 diffuseColor1[3];
|
|
/* 0x0C */ s16 diffuseColor2[3];
|
|
/* 0x12 */ s16 fogColor[3];
|
|
/* 0x18 */ s16 fogNear;
|
|
/* 0x1A */ s16 fogFar;
|
|
} EnvLightSettings; // size = 0x1C
|
|
|
|
typedef struct {
|
|
/* 0x0 */ s16 x;
|
|
/* 0x2 */ s16 y;
|
|
/* 0x4 */ s16 z;
|
|
/* 0x6 */ u8 color[3];
|
|
/* 0x9 */ u8 drawGlow;
|
|
/* 0xA */ s16 radius;
|
|
} LightPoint; // size = 0xC
|
|
|
|
typedef struct {
|
|
/* 0x0 */ s8 x;
|
|
/* 0x1 */ s8 y;
|
|
/* 0x2 */ s8 z;
|
|
/* 0x3 */ u8 color[3];
|
|
} LightDirectional; // size = 0x6
|
|
|
|
typedef union LightParams {
|
|
LightPoint point;
|
|
LightDirectional dir;
|
|
} LightParams; // size = 0xC
|
|
|
|
typedef struct LightInfo {
|
|
/* 0x0 */ u8 type;
|
|
/* 0x2 */ LightParams params;
|
|
} LightInfo; // size = 0xE
|
|
|
|
typedef struct Lights {
|
|
/* 0x00 */ u8 enablePosLights;
|
|
/* 0x01 */ u8 numLights;
|
|
/* 0x08 */ Lightsn l;
|
|
} Lights; // size = 0x80
|
|
|
|
typedef struct LightInfoPositional {
|
|
/* 0x0 */ u8 type;
|
|
/* 0x2 */ LightPoint params;
|
|
} LightInfoPositional; // size = 0xE
|
|
|
|
typedef struct LightNode {
|
|
/* 0x0 */ LightInfo* info;
|
|
/* 0x4 */ struct LightNode* prev;
|
|
/* 0x8 */ struct LightNode* next;
|
|
} LightNode; // size = 0xC
|
|
|
|
// TODO move LightsBuffer to .c file once .bss has been split
|
|
#define LIGHTS_BUFFER_SIZE 32
|
|
|
|
typedef struct LightsBuffer {
|
|
/* 0x000 */ s32 numOccupied;
|
|
/* 0x004 */ s32 searchIndex;
|
|
/* 0x008 */ LightNode lights[LIGHTS_BUFFER_SIZE];
|
|
} LightsBuffer; // size = 0x188
|
|
|
|
typedef struct LightContext {
|
|
/* 0x0 */ LightNode* listHead;
|
|
/* 0x4 */ Color_RGB8 ambient;
|
|
/* 0x7 */ u8 unk7;
|
|
/* 0x8 */ u8 unk8;
|
|
/* 0x9 */ u8 unk9;
|
|
/* 0xA */ s16 unkA;
|
|
/* 0xC */ s16 unkC;
|
|
} LightContext; // size = 0x10
|
|
|
|
typedef enum LightType {
|
|
/* 0x00 */ LIGHT_POINT_NOGLOW,
|
|
/* 0x01 */ LIGHT_DIRECTIONAL,
|
|
/* 0x02 */ LIGHT_POINT_GLOW
|
|
} LightType;
|
|
|
|
typedef void (*LightsBindFunc)(Lights* lights, LightParams* params, Vec3f* vec);
|
|
typedef void (*LightsPosBindFunc)(Lights* lights, LightParams* params, struct GlobalContext* globalCtx);
|
|
|
|
#endif
|