nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

update lus includes for new LUS file structure (#5820)

Browse Source 
* Bump LUS to include FileDropMgr's new registration system and initial cursor visibility changes.

* New LUS ref.

* Remove default on for cursor always visible.
Add option to camera controls next to enable mouse input for autocapture.
Set autocapture on startup.

* next LUS

* clang again

* Add "EnableMouse" CVar check to startup SetAutoCaptureMouse.

* Back to LUS main.

* lus version with fixes we need

* very wip

* get it building

* soh otr

* bump lus before fixing soh side stuff

* build

* still builds

* mac error

* bump otrexporter

* bump to lus main

* upstream otrexporter

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
This commit is contained in:
briaguya
2025-10-09 19:50:51 -04:00
committed by GitHub
parent 7700b34646
commit 57c368aa2c
121 changed files with 204 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -198,7 +198,7 @@ add_custom_target(
# copy LUS default shaders into assets/custom
COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --non-interactive --xml-root assets/xml --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake
@@ -224,7 +224,7 @@ add_custom_target(
# copy LUS default shaders into assets/custom
COMMAND ${CMAKE_COMMAND} -E rm -r -f ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/fast/shaders/ ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom/shaders/
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/OTRExporter/extract_assets.py -z "$<TARGET_FILE:ZAPD>" --norom --custom-otr-file soh.o2r "--custom-assets-path" ${CMAKE_CURRENT_SOURCE_DIR}/soh/assets/custom --port-ver "${CMAKE_PROJECT_VERSION}"
COMMAND ${CMAKE_COMMAND} -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME} -DTARGET_DIR="$<TARGET_FILE_DIR:ZAPD>" -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_BINARY_DIR} -DONLYSOHOTR=On -P ${CMAKE_CURRENT_SOURCE_DIR}/copy-existing-otrs.cmake

2
OTRExporter

Submodule OTRExporter updated: 33f20ca367...32e088e28c

2
libultraship

Submodule libultraship updated: 1972d91f0b...2782e554d9

24
soh/CMakeLists.txt
View File

@@ -319,31 +319,7 @@ endif()
target_include_directories(${PROJECT_NAME} PRIVATE assets
${CMAKE_CURRENT_SOURCE_DIR}/include/
${CMAKE_CURRENT_SOURCE_DIR}/src/
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/include
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/log
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/debug
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/menu
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/utils/binarytools
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/type
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/factory
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/audio
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/window/gui
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/config
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/libultra
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/public/bridge
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/tinyxml2
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/libjpeg/include/
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPD/resource/type
${SDL2-INCLUDE}
${SDL2-NET-INCLUDE}

2
soh/Resource.rc
View File

@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
#include <ship/resource/Resource.h>
#include "properties.h"
#define APSTUDIO_READONLY_SYMBOLS

2
soh/include/functions.h
View File

@@ -10,7 +10,7 @@ extern "C"
{
#endif
#include "luslog.h"
#include <libultraship/log/luslog.h>
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
#if defined(INCLUDE_GAME_PRINTF) && defined(_DEBUG)

2
soh/include/macros.h
View File

@@ -1,7 +1,7 @@
#ifndef MACROS_H
#define MACROS_H
#include <endianness.h>
#include <ship/utils/binarytools/endianness.h>
// Upstream TODO: Document reasoning for change
// #ifndef __GNUC__

2
soh/include/z64audio.h
View File

@@ -5,7 +5,7 @@
extern "C" {
#endif
#include <endianness.h>
#include <ship/utils/binarytools/endianness.h>
#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))

4
soh/soh/Enhancements/Presets/Presets.cpp
View File

@@ -2,11 +2,11 @@
#include <variant>
#include <string>
#include <fstream>
#include <config/Config.h>
#include <ship/config/Config.h>
#include <libultraship/classes.h>
#include <nlohmann/json.hpp>
#include <libultraship/libultraship.h>
#include <Json.h>
#include <ship/resource/type/Json.h>
#include "soh/OTRGlobals.h"
#include "soh/SohGui/MenuTypes.h"
#include "soh/SohGui/SohMenu.h"

2
soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
View File

@@ -1,4 +1,4 @@
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/ShipInit.hpp"
#include "functions.h"

2
soh/soh/Enhancements/Restorations/N64WeirdFrames/N64WeirdFrames.cpp
View File

@@ -1,4 +1,4 @@
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/ShipInit.hpp"

4
soh/soh/Enhancements/Restorations/N64WeirdFrames/WeirdAnimation.cpp
View File

@@ -1,7 +1,7 @@
#include "WeirdAnimation.h"
#include "resource/ResourceManager.h"
#include "Context.h"
#include <ship/resource/ResourceManager.h>
#include <ship/Context.h>
#include <cassert>
#include <cstring>

2
soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
View File

@@ -1,4 +1,4 @@
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/ShipInit.hpp"

2
soh/soh/Enhancements/audio/AudioCollection.cpp
View File

@@ -4,7 +4,7 @@
#include "soh/cvar_prefixes.h"
#include "soh/Notification/Notification.h"
#include <vector>
#include <utils/StringHelper.h>
#include <ship/utils/StringHelper.h>
#include <libultraship/bridge.h>
#include <libultraship/classes.h>
#include <soh/OTRGlobals.h>

2
soh/soh/Enhancements/audio/AudioEditor.cpp
View File

@@ -10,7 +10,7 @@
#include "../randomizer/3drando/random.hpp"
#include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h"
#include <utils/StringHelper.h>
#include <ship/utils/StringHelper.h>
#include "soh/SohGui/SohMenu.h"
#include "soh/SohGui/SohGui.hpp"
#include "AudioCollection.h"

5
soh/soh/Enhancements/controls/InputViewer.cpp
View File

@@ -1,8 +1,9 @@
#include "InputViewer.h"
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "libultraship/libultra/controller.h"
#include "Context.h"
#include <ship/Context.h>
#include <libultraship/controller/controldeck/ControlDeck.h>
#include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h"
#include <imgui.h>

2
soh/soh/Enhancements/controls/Mouse.cpp
View File

@@ -2,7 +2,7 @@
#include "soh/OTRGlobals.h"
#include "z64player.h"
#include "global.h"
#include <Window.h>
#include <ship/window/Window.h>
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/ShipInit.hpp"

6
soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
View File

@@ -1,13 +1,13 @@
#include "SohInputEditorWindow.h"
#include <utils/StringHelper.h>
#include "graphic/Fast3D/Fast3dWindow.h"
#include <ship/utils/StringHelper.h>
#include <fast/Fast3dWindow.h>
#include "soh/OTRGlobals.h"
#include "soh/SohGui/SohMenu.h"
#include "soh/SohGui/SohGui.hpp"
#include "z64.h"
#include "soh/cvar_prefixes.h"
#ifndef __WIIU__
#include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h"
#include <ship/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h>
#endif
#define SCALE_IMGUI_SIZE(value) ((value / 13.0f) * ImGui::GetFontSize())

8
soh/soh/Enhancements/debugconsole.cpp
View File

@@ -1,5 +1,5 @@
#include "debugconsole.h"
#include <Utils.h>
#include <ship/utils/Utils.h>
#include "savestates.h"
#include "soh/ActorDB.h"
@@ -15,10 +15,10 @@
#define Path _Path
#define PATH_HACK
#include <utils/StringHelper.h>
#include <ship/utils/StringHelper.h>
#include <Window.h>
#include <Context.h>
#include <ship/window/Window.h>
#include <ship/Context.h>
#include <imgui.h>
#include <imgui_internal.h>
#undef PATH_HACK

2
soh/soh/Enhancements/debugger/MessageViewer.h
View File

@@ -3,7 +3,7 @@
#include "z64.h"
#ifdef __cplusplus
#include "GuiWindow.h"
#include <ship/window/gui/GuiWindow.h>
#include <unordered_map>
extern "C" {
#endif

4
soh/soh/Enhancements/debugger/SohConsoleWindow.h
View File

@@ -1,8 +1,8 @@
#ifndef SOH_CONSOLE_H
#define SOH_CONSOLE_H
#include "window/gui/GuiWindow.h"
#include "window/gui/ConsoleWindow.h"
#include <ship/window/gui/GuiWindow.h>
#include <ship/window/gui/ConsoleWindow.h>
class SohConsoleWindow : public Ship::ConsoleWindow {
public:

4
soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
View File

@@ -1,8 +1,8 @@
#ifndef SOH_GFX_DEBUGGER_H
#define SOH_GFX_DEBUGGER_H
#include "window/gui/GuiWindow.h"
#include "window/gui/GfxDebuggerWindow.h"
#include <ship/window/gui/GuiWindow.h>
#include <libultraship/window/gui/GfxDebuggerWindow.h>
class SohGfxDebuggerWindow : public LUS::GfxDebuggerWindow {
public:

5
soh/soh/Enhancements/debugger/dlViewer.cpp
View File

@@ -2,8 +2,9 @@
#include "soh/util.h"
#include "soh/SohGui/UIWidgets.hpp"
#include "soh/SohGui/SohGui.hpp"
#include "ResourceManager.h"
#include "DisplayList.h"
#include <ship/resource/ResourceManager.h>
#include <fast/resource/ResourceType.h>
#include <fast/resource/type/DisplayList.h>
#include "soh/OTRGlobals.h"
#include <array>

2
soh/soh/Enhancements/kaleido.cpp
View File

@@ -16,7 +16,7 @@ extern PlayState* gPlayState;
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh_assets.h"
#include "textures/icon_item_static/icon_item_static.h"
#include "consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
#include <sstream>

2
soh/soh/Enhancements/mod_menu.cpp
View File

@@ -1,5 +1,5 @@
#include "mod_menu.h"
#include "utils/StringHelper.h"
#include <ship/utils/StringHelper.h>
#include <libultraship/classes.h>
#include "soh/SohGui/SohGui.hpp"
#include "soh/OTRGlobals.h"

2
soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
View File

@@ -5,7 +5,7 @@
#include "rando_main.hpp"
#include "../context.h"
#include <libultraship/bridge.h>
#include <Context.h>
#include <ship/Context.h>
#include <libultraship/libultra/types.h>
#include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h"

4
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View File

@@ -26,10 +26,10 @@
#include <filesystem>
#include <variables.h>
#include <Context.h>
#include <ship/Context.h>
#include <soh/OTRGlobals.h>
#include "consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
using json = nlohmann::ordered_json;
using namespace Rando;

2
soh/soh/Enhancements/randomizer/fishsanity.cpp
View File

@@ -5,7 +5,7 @@
#include "variables.h"
#include "functions.h"
#include "macros.h"
#include <consolevariablebridge.h>
#include <libultraship/bridge/consolevariablebridge.h>
extern "C" {
#include "src/overlays/actors/ovl_Fishing/z_fishing.h"

2
soh/soh/Enhancements/randomizer/logic.cpp
View File

@@ -13,7 +13,7 @@
#include "macros.h"
#include "variables.h"
#include <spdlog/spdlog.h>
#include "StringHelper.h"
#include <ship/utils/StringHelper.h>
#include "soh/resource/type/Scene.h"
#include "soh/resource/type/scenecommand/SetTransitionActorList.h"
#include "src/overlays/actors/ovl_En_Door/z_en_door.h"

2
soh/soh/Enhancements/randomizer/option.cpp
View File

@@ -1,6 +1,6 @@
#include "option.h"
#include "libultraship/bridge.h"
#include <Context.h>
#include <ship/Context.h>
#include <imgui.h>
#include "soh/SohGui/SohGui.hpp"
#include "soh/SohGui/UIWidgets.hpp"

2
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@@ -27,7 +27,7 @@
#include <functional>
#include "draw.h"
#include "soh/OTRGlobals.h"
#include "window/FileDropMgr.h"
#include <ship/window/FileDropMgr.h>
#include "soh/SohGui/UIWidgets.hpp"
#include "static_data.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"

1
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
View File

@@ -20,6 +20,7 @@
#include <vector>
#include <set>
#include <libultraship/libultraship.h>
#include <libultraship/controller/controldeck/ControlDeck.h>
#include "location.h"
#include "item_location.h"
#include "soh/Enhancements/game-interactor/GameInteractor.h"

1
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View File

@@ -4,6 +4,7 @@
#include <vector>
#include <libultraship/libultraship.h>
#include <libultraship/controller/controldeck/ControlDeck.h>
#include "randomizer_check_tracker.h"
#include "randomizer_item_tracker.h"

2
soh/soh/Enhancements/randomizer/settings.cpp
View File

@@ -8,7 +8,7 @@
#include <utility>
#include "consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
namespace Rando {
std::shared_ptr<Settings> Settings::mInstance;

2
soh/soh/Enhancements/timesplits/TimeSplits.cpp
View File

@@ -2,7 +2,7 @@
#include <fstream>
#include <filesystem>
#include "Context.h"
#include <ship/Context.h>
#include "TimeSplits.h"
#include "soh/Enhancements/gameplaystats.h"
#include "soh/SaveManager.h"

4
soh/soh/Enhancements/tts/tts.cpp
View File

@@ -2,8 +2,8 @@
#include "soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h"
#include <cassert>
#include <File.h>
#include <Json.h>
#include <ship/resource/File.h>
#include <ship/resource/type/Json.h>
#include <libultraship/classes.h>
#include <nlohmann/json.hpp>
#include <spdlog/fmt/fmt.h>

2
soh/soh/Extractor/Extract.cpp
View File

@@ -6,7 +6,7 @@
#endif
#include "Extract.h"
#include "portable-file-dialogs.h"
#include <utils/binarytools/BitConverter.h>
#include <ship/utils/binarytools/BitConverter.h>
#include "variables.h"
#ifdef unix

44
soh/soh/OTRGlobals.cpp
View File

@@ -7,10 +7,10 @@
#include <chrono>
#include "ResourceManagerHelpers.h"
#include "graphic/Fast3D/Fast3dWindow.h"
#include <File.h>
#include <DisplayList.h>
#include <Window.h>
#include <fast/Fast3dWindow.h>
#include <ship/resource/File.h>
#include <fast/resource/type/DisplayList.h>
#include <ship/window/Window.h>
#include <soh/GameVersions.h>
#include "Enhancements/gameconsole.h"
@@ -19,7 +19,7 @@
#else
#include <time.h>
#endif
#include <AudioPlayer.h>
#include <ship/audio/AudioPlayer.h>
#include "Enhancements/speechsynthesizer/SpeechSynthesizer.h"
#include "Enhancements/controls/SohInputEditorWindow.h"
#include "Enhancements/cosmetics/CosmeticsEditor.h"
@@ -40,10 +40,10 @@
#include "variables.h"
#include "z64.h"
#include "macros.h"
#include "Fonts.h"
#include "window/FileDropMgr.h"
#include "window/gui/resource/Font.h"
#include <utils/StringHelper.h>
#include <ship/window/gui/Fonts.h>
#include <ship/window/FileDropMgr.h>
#include <ship/window/gui/resource/Font.h>
#include <ship/utils/StringHelper.h>
#include "Enhancements/custom-message/CustomMessageManager.h"
#include "Enhancements/Presets/Presets.h"
#include "util.h"
@@ -52,7 +52,7 @@
#include "Extractor/Extract.h"
#endif
#include <Fast3D/interpreter.h>
#include <fast/interpreter.h>
#ifdef __APPLE__
#include <SDL_scancode.h>
@@ -86,14 +86,16 @@ Sail* Sail::Instance;
#include "Enhancements/game-interactor/GameInteractor.h"
#include "Enhancements/randomizer/draw.h"
#include <libultraship/libultraship.h>
#include <libultraship/controller/controldeck/ControlDeck.h>
#include <fast/resource/ResourceType.h>
// Resource Types/Factories
#include "resource/type/Array.h"
#include "resource/type/Blob.h"
#include "resource/type/DisplayList.h"
#include "resource/type/Matrix.h"
#include "resource/type/Texture.h"
#include "resource/type/Vertex.h"
#include "soh/resource/type/Array.h"
#include <ship/resource/type/Blob.h>
#include <fast/resource/type/DisplayList.h>
#include <fast/resource/type/Matrix.h>
#include <fast/resource/type/Texture.h>
#include <fast/resource/type/Vertex.h>
#include "soh/resource/type/SohResourceType.h"
#include "soh/resource/type/Animation.h"
#include "soh/resource/type/AudioSample.h"
@@ -107,11 +109,11 @@ Sail* Sail::Instance;
#include "soh/resource/type/Skeleton.h"
#include "soh/resource/type/SkeletonLimb.h"
#include "soh/resource/type/Text.h"
#include "resource/factory/BlobFactory.h"
#include "resource/factory/DisplayListFactory.h"
#include "resource/factory/MatrixFactory.h"
#include "resource/factory/TextureFactory.h"
#include "resource/factory/VertexFactory.h"
#include <ship/resource/factory/BlobFactory.h>
#include <fast/resource/factory/DisplayListFactory.h>
#include <fast/resource/factory/MatrixFactory.h>
#include <fast/resource/factory/TextureFactory.h>
#include <fast/resource/factory/VertexFactory.h>
#include "soh/resource/importer/ArrayFactory.h"
#include "soh/resource/importer/AnimationFactory.h"
#include "soh/resource/importer/AudioSampleFactory.h"

2
soh/soh/OTRGlobals.h
View File

@@ -21,7 +21,7 @@
#define M_SQRT1_2f 0.70710678118654752440f /* 1/sqrt(2) */
#ifdef __cplusplus
#include <Context.h>
#include <ship/Context.h>
#include "Enhancements/savestates.h"
#include "Enhancements/randomizer/randomizer.h"
#include <vector>

5
soh/soh/ResourceManagerHelpers.cpp
View File

@@ -11,8 +11,9 @@
#include "resource/type/Array.h"
#include "resource/type/Skeleton.h"
#include "resource/type/PlayerAnimation.h"
#include <Fast3D/Fast3dWindow.h>
#include <DisplayList.h>
#include <fast/Fast3dWindow.h>
#include <fast/resource/ResourceType.h>
#include <fast/resource/type/DisplayList.h>
extern "C" PlayState* gPlayState;

2
soh/soh/ResourceManagerHelpers.h
View File

@@ -10,7 +10,7 @@
#ifdef __cplusplus
#include <memory>
#include <Resource.h>
#include <ship/resource/Resource.h>
std::shared_ptr<Ship::IResource> ResourceMgr_GetResourceByNameHandlingMQ(const char* path);

4
soh/soh/SohGui/ImGuiUtils.cpp
View File

@@ -1,6 +1,6 @@
#include "ImGuiUtils.h"
#include <Context.h>
#include <Window.h>
#include <ship/Context.h>
#include <ship/window/Window.h>
#include "assets/soh_assets.h"
#include "soh/Enhancements/randomizer/rando_hash.h"

4
soh/soh/SohGui/Menu.cpp
View File

@@ -2,8 +2,8 @@
#include "UIWidgets.hpp"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/controls/SohInputEditorWindow.h"
#include "window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h"
#include <ship/window/gui/GuiMenuBar.h>
#include <ship/window/gui/GuiElement.h>
#include "SohModals.h"
#include <variant>
#include <spdlog/fmt/fmt.h>

2
soh/soh/SohGui/Menu.h
View File

@@ -2,7 +2,7 @@
#define MENU_H
#include <libultraship/libultraship.h>
#include "graphic/Fast3D/backends/gfx_rendering_api.h"
#include <fast/backends/gfx_rendering_api.h>
#include "MenuTypes.h"
namespace Ship {

4
soh/soh/SohGui/ResolutionEditor.cpp
View File

@@ -3,8 +3,8 @@
#include <libultraship/libultraship.h>
#include "soh/SohGui/UIWidgets.hpp"
#include <graphic/Fast3D/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h>
#include <fast/Fast3dWindow.h>
#include <fast/interpreter.h>
#include "soh/OTRGlobals.h"
#include "soh/SohGui/SohMenu.h"
#include "soh/SohGui/SohGui.hpp"

2
soh/soh/SohGui/SohGui.cpp
View File

@@ -13,7 +13,7 @@
#include <libultraship/libultraship.h>
#ifdef __APPLE__
#include "graphic/Fast3D/backends/gfx_metal.h"
#include <fast/backends/gfx_metal.h>
#endif
#ifdef __SWITCH__

6
soh/soh/SohGui/SohMenu.cpp
View File

@@ -1,10 +1,10 @@
#include "SohMenu.h"
#include "soh/OTRGlobals.h"
#include "soh/Enhancements/controls/SohInputEditorWindow.h"
#include "window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h"
#include <ship/window/gui/GuiMenuBar.h>
#include <ship/window/gui/GuiElement.h>
#include <variant>
#include "StringHelper.h"
#include <ship/utils/StringHelper.h>
#include <spdlog/fmt/fmt.h>
#include <tuple>

2
soh/soh/SohGui/SohMenu.h
View File

@@ -4,7 +4,7 @@
#include <libultraship/libultraship.h>
#include "UIWidgets.hpp"
#include "Menu.h"
#include "graphic/Fast3D/backends/gfx_rendering_api.h"
#include <fast/backends/gfx_rendering_api.h>
#include "soh/cvar_prefixes.h"
#include "soh/Enhancements/enhancementTypes.h"
#include "soh/Enhancements/Presets/Presets.h"

4
soh/soh/SohGui/SohMenuBar.cpp
View File

@@ -1,11 +1,11 @@
#include "SohMenuBar.h"
#include <imgui.h>
#include "regex"
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
#include <libultraship/libultraship.h>
#include "UIWidgets.hpp"
#include "include/z64audio.h"
#include "graphic/Fast3D/backends/gfx_rendering_api.h"
#include <fast/backends/gfx_rendering_api.h>
#include "soh/OTRGlobals.h"
#include "soh/SaveManager.h"
#include "z64.h"

4
soh/soh/SohGui/SohMenuBar.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include <libultraship/libultraship.h>
#include "window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h"
#include <ship/window/gui/GuiMenuBar.h>
#include <ship/window/gui/GuiElement.h>
namespace SohGui {
class SohMenuBar : public Ship::GuiMenuBar {

4
soh/soh/SohGui/SohModals.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include <libultraship/libultraship.h>
#include "window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h"
#include <ship/window/gui/GuiMenuBar.h>
#include <ship/window/gui/GuiElement.h>
class SohModalWindow final : public Ship::GuiWindow {
public:

4
soh/soh/resource/importer/AnimationFactory.cpp
View File

@@ -1,8 +1,8 @@
#include "soh/resource/importer/AnimationFactory.h"
#include "soh/resource/type/Animation.h"
#include "ResourceManager.h"
#include <ship/resource/ResourceManager.h>
#include "spdlog/spdlog.h"
#include "Context.h"
#include <ship/Context.h>
namespace SOH {
std::shared_ptr<Ship::IResource>

4
soh/soh/resource/importer/AnimationFactory.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
namespace SOH {
class ResourceFactoryBinaryAnimationV0 final : public Ship::ResourceFactoryBinary {

2
soh/soh/resource/importer/ArrayFactory.cpp
View File

@@ -1,7 +1,7 @@
#include "soh/resource/importer/ArrayFactory.h"
#include "soh/resource/type/Array.h"
#include "spdlog/spdlog.h"
#include "graphic/Fast3D/lus_gbi.h"
#include <fast/lus_gbi.h>
namespace SOH {
std::shared_ptr<Ship::IResource>

4
soh/soh/resource/importer/ArrayFactory.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "resource/Resource.h"
#include "resource/ResourceFactoryBinary.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
namespace SOH {
class ResourceFactoryBinaryArrayV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/AudioSampleFactory.cpp
View File

@@ -4,9 +4,9 @@
#include "spdlog/spdlog.h"
#include "z64.h"
#include "z64audio.h"
#include "Context.h"
#include "resource/archive/Archive.h"
#include "resource/ResourceManager.h"
#include <ship/Context.h>
#include <ship/resource/archive/Archive.h>
#include <ship/resource/ResourceManager.h>
#define DR_WAV_IMPLEMENTATION
#include <dr_wav.h>

6
soh/soh/resource/importer/AudioSampleFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinaryAudioSampleV2 final : public Ship::ResourceFactoryBinary {

8
soh/soh/resource/importer/AudioSequenceFactory.cpp
View File

@@ -2,12 +2,12 @@
#include "soh/resource/importer/AudioSoundFontFactory.h"
#include "soh/resource/type/AudioSequence.h"
#include "spdlog/spdlog.h"
#include "resource/ResourceManager.h"
#include <ship/resource/ResourceManager.h>
#include <tinyxml2.h>
#include "Context.h"
#include "resource/archive/Archive.h"
#include "BinaryWriter.h"
#include <ship/Context.h>
#include <ship/resource/archive/Archive.h>
#include <ship/utils/binarytools/BinaryWriter.h>
#include <type_traits>
namespace SOH {

6
soh/soh/resource/importer/AudioSequenceFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinaryAudioSequenceV2 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/AudioSoundFontFactory.cpp
View File

@@ -3,9 +3,9 @@
#include <tinyxml2.h>
#include <z64.h>
#include "z64audio.h"
#include "Context.h"
#include "resource/archive/Archive.h"
#include "resource/ResourceManager.h"
#include <ship/Context.h>
#include <ship/resource/archive/Archive.h>
#include <ship/resource/ResourceManager.h>
namespace SOH {
std::shared_ptr<Ship::IResource>

6
soh/soh/resource/importer/AudioSoundFontFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
#include "soh/resource/type/AudioSoundFont.h"
namespace SOH {

4
soh/soh/resource/importer/BackgroundFactory.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "resource/Resource.h"
#include "resource/ResourceFactoryBinary.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
namespace SOH {
class ResourceFactoryBinaryBackgroundV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/CollisionHeaderFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinaryCollisionHeaderV0 final : public Ship::ResourceFactoryBinary {

4
soh/soh/resource/importer/CutsceneFactory.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
namespace SOH {
class ResourceFactoryBinaryCutsceneV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/PathFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinaryPathV0 final : public Ship::ResourceFactoryBinary {

4
soh/soh/resource/importer/PlayerAnimationFactory.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
namespace SOH {
class ResourceFactoryBinaryPlayerAnimationV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/SceneFactory.h
View File

@@ -3,9 +3,9 @@
#include "soh/resource/type/Scene.h"
#include "soh/resource/type/scenecommand/SceneCommand.h"
#include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinarySceneV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/SkeletonFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinarySkeletonV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/SkeletonLimbFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinarySkeletonLimbV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/TextFactory.h
View File

@@ -1,8 +1,8 @@
#pragma once
#include "Resource.h"
#include "ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactoryBinary.h>
#include <ship/resource/ResourceFactoryXML.h>
namespace SOH {
class ResourceFactoryBinaryTextV0 final : public Ship::ResourceFactoryBinary {

6
soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
View File

@@ -1,10 +1,10 @@
#pragma once
#include <memory>
#include "Resource.h"
#include "ResourceFactory.h"
#include <ship/resource/Resource.h>
#include <ship/resource/ResourceFactory.h>
#include "soh/resource/type/scenecommand/SceneCommand.h"
#include "public/bridge/consolevariablebridge.h"
#include <libultraship/bridge/consolevariablebridge.h>
namespace SOH {
class SceneCommandFactoryBinaryV0 {

2
soh/soh/resource/logging/PathLogger.h
View File

@@ -1,4 +1,4 @@
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h"

2
soh/soh/resource/logging/SceneCommandLoggers.h
View File

@@ -1,4 +1,4 @@
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "soh/OTRGlobals.h"
#include "soh/cvar_prefixes.h"

2
soh/soh/resource/type/Animation.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
namespace SOH {

2
soh/soh/resource/type/Array.cpp
View File

@@ -1,5 +1,5 @@
#include "Array.h"
#include "graphic/Fast3D/lus_gbi.h"
#include <fast/lus_gbi.h>
namespace SOH {
Array::Array() : Resource(std::shared_ptr<Ship::ResourceInitData>()) {
}

2
soh/soh/resource/type/Array.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "resource/Resource.h"
#include <ship/resource/Resource.h>
namespace Fast {
union F3DVtx;

2
soh/soh/resource/type/AudioSample.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
namespace SOH {

2
soh/soh/resource/type/AudioSequence.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
#include "Resource.h"
#include <ship/resource/Resource.h>
namespace SOH {

2
soh/soh/resource/type/AudioSoundFont.h
View File

@@ -2,7 +2,7 @@
#include <cstdint>
#include <vector>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "soh/resource/type/AudioSample.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/Background.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "resource/Resource.h"
#include <ship/resource/Resource.h>
namespace SOH {
class Background : public Ship::Resource<uint8_t> {

2
soh/soh/resource/type/CollisionHeader.h
View File

@@ -2,7 +2,7 @@
#include <cstdint>
#include <vector>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra.h>
#include "z64math.h"

2
soh/soh/resource/type/Cutscene.h
View File

@@ -2,7 +2,7 @@
#include <vector>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
namespace SOH {

2
soh/soh/resource/type/Path.h
View File

@@ -2,7 +2,7 @@
#include <cstdint>
#include <vector>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
#include "z64math.h"

2
soh/soh/resource/type/PlayerAnimation.h
View File

@@ -2,7 +2,7 @@
#include <vector>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
namespace SOH {
class PlayerAnimation : public Ship::Resource<int16_t> {

2
soh/soh/resource/type/Scene.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "scenecommand/SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/Skeleton.cpp
View File

@@ -1,4 +1,4 @@
#include "resource/ResourceManager.h"
#include <ship/resource/ResourceManager.h>
#include "Skeleton.h"
#include "soh/OTRGlobals.h"
#include "libultraship/libultraship.h"

2
soh/soh/resource/type/Skeleton.h
View File

@@ -1,7 +1,7 @@
#pragma once
#include <cstdint>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SkeletonLimb.h"
#include <z64animation.h>

2
soh/soh/resource/type/SkeletonLimb.h
View File

@@ -1,6 +1,6 @@
#pragma once
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "libultraship/libultra.h"
#include "z64math.h"

2
soh/soh/resource/type/Text.h
View File

@@ -2,7 +2,7 @@
#include <cstdint>
#include <vector>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
namespace SOH {

2
soh/soh/resource/type/scenecommand/EndMarker.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SceneCommand.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include <libultraship/libultra/types.h>
namespace SOH {

2
soh/soh/resource/type/scenecommand/SetActorList.h
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <memory>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
// #include <libultraship/libultra/types.h>
#include "z64math.h"

2
soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <memory>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include "soh/resource/type/Scene.h"
#include "RomFile.h"

2
soh/soh/resource/type/scenecommand/SetCameraSettings.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SetCollisionHeader.h
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <memory>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "soh/resource/type/scenecommand/SceneCommand.h"
#include "soh/resource/type/CollisionHeader.h"
// #include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SetCsCamera.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SetCutscenes.h
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <memory>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "soh/resource/type/scenecommand/SceneCommand.h"
#include "soh/resource/type/Cutscene.h"
// #include <libultraship/libultra.h>

2
soh/soh/resource/type/scenecommand/SetEchoSettings.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SetEntranceList.h
View File

@@ -4,7 +4,7 @@
#include <vector>
#include <memory>
#include <string>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

2
soh/soh/resource/type/scenecommand/SetExitList.h
View File

@@ -3,7 +3,7 @@
#include <cstdint>
#include <vector>
#include <memory>
#include "Resource.h"
#include <ship/resource/Resource.h>
#include "SceneCommand.h"
#include <libultraship/libultra/types.h>

Some files were not shown because too many files have changed in this diff Show More