github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 13:53:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Phase 1: Separate ImGui Drawing From LUS (#1310)

Browse source 
* Update LUS imported paths

* Introduce GameMenuBar

* Fix imports after LUS import paths change

* Move Randomizer

* Replace needs_save

* Migrate Developer Tools

* Migrate Cheats

* Migrate Enhancements

* Separate UIWidgets

* Add missing Hooks.cpp file

* Migrate Settings

* Remove UI methods from LUS

* Cleanup imports and exposed properties

* Cleanup more methods

* Fix project generation

* Fix CI compilation

* Remove resolved TODO
This commit is contained in:
David Chavez 2022-09-03 06:00:04 +02:00 • committed by GitHub
commit 0ce0ab1260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 2719 additions and 2552 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/include/global.h
View file

@ -6,7 +6,7 @@
#include "macros.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/gameconsole.h"
#include "Cvar.h"
#include <libultraship/Cvar.h>

2
soh/include/macros.h
View file

@ -1,7 +1,7 @@
#ifndef MACROS_H
#define MACROS_H
#include "endianness.h"
#include <libultraship/endianness.h>
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
#define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))

2
soh/include/z64.h
View file

@ -26,7 +26,7 @@
#include "z64interface.h"
#include "sequence.h"
#include "sfx.h"
#include "color.h"
#include <libultraship/color.h>
#include "ichain.h"
#include "regs.h"

6
soh/include/z64audio.h
View file

@ -1,7 +1,7 @@
#ifndef Z64_AUDIO_H
#define Z64_AUDIO_H
#include "endianness.h"
#include <libultraship/endianness.h>
#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
@ -815,7 +815,7 @@ typedef struct {
/* 0x0E */ u8 ttl; // duration after which the DMA can be discarded
} SampleDma; // size = 0x10
#include <PR/ultra64/abi.h>
#include <ultra64/abi.h>
typedef struct {
/* 0x0000 */ char unk_0000;
@ -1122,4 +1122,4 @@ float Audio_GetGameVolume(int player_id);
#ifdef __cplusplus
}
#endif
#endif
#endif

2
soh/include/z64effect.h
View file

@ -1,7 +1,7 @@
#ifndef Z64EFFECT_H
#define Z64EFFECT_H
#include "color.h"
#include <libultraship/color.h>
struct GraphicsContext;
struct GlobalContext;

2
soh/include/z64light.h
View file

@ -4,7 +4,7 @@
#include "ultra64.h"
#include "ultra64/gbi.h"
#include "z64math.h"
#include "color.h"
#include <libultraship/color.h>
typedef struct {
/* 0x0 */ s16 x;

2
soh/include/z64transition.h
View file

@ -2,7 +2,7 @@
#define Z64TRANSITION_H
#include "ultra64.h"
#include "color.h"
#include <libultraship/color.h>
typedef struct {
f32 unk_0;