github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-14 10:37:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Import libultraship as a submodule (#1943)

Browse source 
Co-authored-by: briaguya <briaguya>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: David Chavez <davi@dcvz.io>
This commit is contained in:
briaguya 2022-11-14 05:22:34 -05:00 • committed by GitHub
commit 3914781ebf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1067 changed files with 215 additions and 363064 deletions
Download patch file Download diff file Expand all files Collapse all files

18
soh/CMakeLists.txt
View file

@ -83,7 +83,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Sub-projects
################################################################################
if (NOT TARGET libultraship)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship ${CMAKE_BINARY_DIR}/libultraship)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../libultraship ${CMAKE_BINARY_DIR}/libultraship)
endif()
if (NOT TARGET ZAPDUtils)
@ -1719,10 +1719,24 @@ 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/binarytools
${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/misc
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/core
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/resource/types
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/audio
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/extern/Mercury
${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/libultraship/Lib/spdlog/include/
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/libultraship/Lib/Fast3D/U64/PR
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic/Fast3D/U64/PR
${CMAKE_CURRENT_SOURCE_DIR}/../libultraship/src/graphic
${CMAKE_CURRENT_SOURCE_DIR}/../ZAPDTR/ZAPDUtils
${SDL2-INCLUDE}
${SDL2-NET-INCLUDE}

2
soh/include/functions.h
View file

@ -9,7 +9,7 @@ extern "C"
{
#endif
#include "../../libultraship/libultraship/luslog.h"
#include "luslog.h"
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
#include <soh/Enhancements/randomizer/randomizer_inf.h>

2
soh/include/global.h
View file

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

2
soh/include/macros.h
View file

@ -1,7 +1,7 @@
#ifndef MACROS_H
#define MACROS_H
#include <libultraship/endianness.h>
#include <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 <libultraship/color.h>
#include <color.h>
#include "ichain.h"
#include "regs.h"

2
soh/include/z64audio.h
View file

@ -1,7 +1,7 @@
#ifndef Z64_AUDIO_H
#define Z64_AUDIO_H
#include <libultraship/endianness.h>
#include <endianness.h>
#define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))

2
soh/include/z64effect.h
View file

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

2
soh/include/z64light.h
View file

@ -4,7 +4,7 @@
#include "ultra64.h"
#include "ultra64/gbi.h"
#include "z64math.h"
#include <libultraship/color.h>
#include <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 <libultraship/color.h>
#include <color.h>
typedef struct {
f32 unk_0;

2
soh/soh/CrashHandlerExp.h
View file

@ -1,4 +1,4 @@
#include <libultraship/CrashHandler.h>
#include <CrashHandler.h>
#ifdef __cplusplus

6
soh/soh/Enhancements/controls/GameControlEditor.cpp
View file

@ -8,10 +8,10 @@
#include <ImGui/imgui.h>
#include <ImGui/imgui_internal.h>
#include <libultraship/Cvar.h>
#include <libultraship/UltraController.h>
#include <Cvar.h>
#include <UltraController.h>
#include <Utils/StringHelper.h>
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "../../UIWidgets.hpp"

4
soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
View file

@ -1,8 +1,8 @@
#include "CosmeticsEditor.h"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include <string>
#include <libultraship/Cvar.h>
#include <Cvar.h>
#include <random>
#include <algorithm>
#include <ultra64/types.h>

2
soh/soh/Enhancements/cosmetics/CosmeticsEditor.h
View file

@ -1,5 +1,5 @@
#pragma once
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#define SECTION_SIZE(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
#define RANDOMIZE_32(Max) GetRandomValue(Max);
#define CATEGORY_NPC 0

6
soh/soh/Enhancements/crowd-control/CrowdControl.cpp
View file

@ -1,9 +1,9 @@
#ifdef ENABLE_CROWD_CONTROL
#include "CrowdControl.h"
#include <libultraship/Cvar.h>
#include <libultraship/Console.h>
#include <libultraship/ImGuiImpl.h>
#include <Cvar.h>
#include <Console.h>
#include <ImGuiImpl.h>
#include <nlohmann/json.hpp>
#include <spdlog/spdlog.h>
#include <spdlog/fmt/fmt.h>

26
soh/soh/Enhancements/debugconsole.cpp
View file

@ -1,8 +1,8 @@
#include "debugconsole.h"
#include <libultraship/ImGuiImpl.h>
#include <libultraship/Utils.h>
#include <ImGuiImpl.h>
#include <Utils.h>
#include "savestates.h"
#include <libultraship/Console.h>
#include <Console.h>
#include <vector>
#include <string>
@ -14,7 +14,7 @@
#define PATH_HACK
#include <Utils/StringHelper.h>
#include <libultraship/Window.h>
#include <Window.h>
#include <ImGui/imgui_internal.h>
#undef PATH_HACK
#undef Path
@ -27,7 +27,7 @@ extern "C" {
extern PlayState* gPlayState;
}
#include <libultraship/Cvar.h>
#include <Cvar.h>
#include "overlays/actors/ovl_En_Niw/z_en_niw.h"
#define CMD_REGISTER SohImGui::GetConsole()->AddCommand
@ -974,14 +974,14 @@ static bool GetCVarHandler(std::shared_ptr<Ship::Console> Console, const std::ve
if (cvar != nullptr)
{
if (cvar->type == CVarType::S32)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %i", args[1].c_str(), cvar->value.valueS32);
else if (cvar->type == CVarType::Float)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %f", args[1].c_str(), cvar->value.valueFloat);
else if (cvar->type == CVarType::String)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %s", args[1].c_str(), cvar->value.valueStr);
else if (cvar->type == CVarType::RGBA)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %08X", args[1].c_str(), cvar->value.valueRGBA);
if (cvar->Type == CVarType::S32)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %i", args[1].c_str(), cvar->value.ValueS32);
else if (cvar->Type == CVarType::Float)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %f", args[1].c_str(), cvar->value.ValueFloat);
else if (cvar->Type == CVarType::String)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %s", args[1].c_str(), cvar->value.ValueStr);
else if (cvar->Type == CVarType::RGBA)
SohImGui::GetConsole()->SendInfoMessage("[SOH] Variable %s is %08X", args[1].c_str(), cvar->value.ValueRGBA);
}
else
{

4
soh/soh/Enhancements/debugger/actorViewer.cpp
View file

@ -1,13 +1,13 @@
#include "actorViewer.h"
#include "../../util.h"
#include "../../UIWidgets.hpp"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include <array>
#include <bit>
#include <map>
#include <string>
#include <libultraship/Cvar.h>
#include <Cvar.h>
extern "C" {
#include <z64.h>

4
soh/soh/Enhancements/debugger/colViewer.cpp
View file

@ -1,12 +1,12 @@
#include "colViewer.h"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "../../frame_interpolation.h"
#include "../../UIWidgets.hpp"
#include <vector>
#include <string>
#include <cmath>
#include <libultraship/Cvar.h>
#include <Cvar.h>
extern "C" {
#include <z64.h>

4
soh/soh/Enhancements/debugger/debugSaveEditor.cpp
View file

@ -1,7 +1,7 @@
#include "debugSaveEditor.h"
#include "../../util.h"
#include "../../OTRGlobals.h"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "../../UIWidgets.hpp"
#include <spdlog/fmt/fmt.h>
@ -9,7 +9,7 @@
#include <bit>
#include <map>
#include <string>
#include <libultraship/Cvar.h>
#include <Cvar.h>
extern "C" {
#include <z64.h>

2
soh/soh/Enhancements/gameconsole.h
View file

@ -3,7 +3,7 @@
#include <ultra64.h>
#include <z64.h>
#include <libultraship/Cvar.h>
#include <Cvar.h>
#define MAX_CVARS 2048

4
soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
View file

@ -5,8 +5,8 @@
#include "location_access.hpp"
#include "rando_main.hpp"
// #include <soh/Enhancements/randomizer.h>
#include <libultraship/Cvar.h>
#include <libultraship/Window.h>
#include <Cvar.h>
#include <Window.h>
#include <ultra64/types.h>
#define TICKS_PER_SEC 268123480.0

2
soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
View file

@ -27,7 +27,7 @@
#include <filesystem>
#include <variables.h>
#include <libultraship/Window.h>
#include <Window.h>
using json = nlohmann::json;

4
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -6,10 +6,10 @@
#include <macros.h>
#include <objects/gameplay_keep/gameplay_keep.h>
#include <functions.h>
#include <libultraship/Cvar.h>
#include <Cvar.h>
#include <textures/icon_item_static/icon_item_static.h>
#include <textures/icon_item_24_static/icon_item_24_static.h>
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include <thread>
#include "3drando/rando_main.hpp"
#include "3drando/random.hpp"

2
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
View file

@ -1,7 +1,7 @@
#include "randomizer_check_objects.h"
#include <map>
#include <string>
#include <libultraship/Cvar.h>
#include <Cvar.h>
#include "z64.h"
/*

6
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
View file

@ -1,14 +1,14 @@
#include "randomizer_item_tracker.h"
#include "../../util.h"
#include "../../OTRGlobals.h"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "../../UIWidgets.hpp"
#include <map>
#include <string>
#include <vector>
#include <libultraship/Cvar.h>
#include <libultraship/Hooks.h>
#include <Cvar.h>
#include <Hooks.h>
extern "C" {
#include <z64.h>

20
soh/soh/Enhancements/savestates.cpp
View file

@ -1,15 +1,16 @@
#include "savestates.h"
#include <libultraship/GameVersions.h>
#include <GameVersions.h>
#include <cstdio> // std::sprintf
#include "spdlog/spdlog.h"
#include <spdlog/spdlog.h>
#include <spdlog/fmt/fmt.h>
#include <soh/OTRGlobals.h>
#include <soh/OTRAudio.h>
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "z64.h"
#include "z64save.h"
@ -24,6 +25,19 @@
extern "C" PlayState* gPlayState;
template <> struct fmt::formatter<RequestType> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
template <typename FormatContext>
auto format(const RequestType& type, FormatContext& ctx) {
switch (type) {
case RequestType::SAVE: return fmt::format_to(ctx.out(), "Save");
case RequestType::LOAD: return fmt::format_to(ctx.out(), "Load");
default: return fmt::format_to(ctx.out(), "Unknown");
}
}
};
// FROM z_lights.c
// I didn't feel like moving it into a header file.
#define LIGHTS_BUFFER_SIZE 32

4
soh/soh/Enhancements/sfx-editor/SfxEditor.cpp
View file

@ -2,8 +2,8 @@
#include "sequence.h"
#include <string>
#include <map>
#include <libultraship/Cvar.h>
#include <libultraship/ImGuiImpl.h>
#include <Cvar.h>
#include <ImGuiImpl.h>
#include <functions.h>
#include "../randomizer/3drando/random.hpp"

8
soh/soh/GameMenuBar.cpp
View file

@ -11,15 +11,15 @@
#include <ImGui/imgui.h>
#define IMGUI_DEFINE_MATH_OPERATORS
#include <ImGui/imgui_internal.h>
#include <libultraship/ImGuiImpl.h>
#include <libultraship/Cvar.h>
#include <libultraship/Hooks.h>
#include <ImGuiImpl.h>
#include <Cvar.h>
#include <Hooks.h>
#include <ultra64/types.h>
#include <ultra64/pi.h>
#include <ultra64/sptask.h>
#ifdef __SWITCH__
#include <libultraship/SwitchImpl.h>
#include <port/switch/SwitchImpl.h>
#endif
#include "UIWidgets.hpp"

2
soh/soh/OTRAudio.h
View file

@ -1,4 +1,6 @@
#pragma once
#include <thread>
#include <condition_variable>
static struct {
std::thread thread;

89
soh/soh/OTRGlobals.cpp
View file

@ -5,32 +5,32 @@
#include <filesystem>
#include <fstream>
#include <libultraship/ResourceMgr.h>
#include <libultraship/DisplayList.h>
#include <libultraship/PlayerAnimation.h>
#include <libultraship/Skeleton.h>
#include <libultraship/Window.h>
#include <libultraship/GameVersions.h>
#include <ResourceMgr.h>
#include <DisplayList.h>
#include <PlayerAnimation.h>
#include <Skeleton.h>
#include <Window.h>
#include <GameVersions.h>
#include "z64animation.h"
#include "z64bgcheck.h"
#include "Enhancements/gameconsole.h"
#include <ultra64/gbi.h>
#include <libultraship/Animation.h>
#include <Animation.h>
#ifdef _WIN32
#include <Windows.h>
#else
#include <time.h>
#endif
#include <libultraship/CollisionHeader.h>
#include <libultraship/Array.h>
#include <libultraship/Cutscene.h>
#include <CollisionHeader.h>
#include <Array.h>
#include <Cutscene.h>
#include <stb/stb_image.h>
#define DRMP3_IMPLEMENTATION
#include <dr_libs/mp3.h>
#define DRWAV_IMPLEMENTATION
#include <dr_libs/wav.h>
#include <libultraship/AudioPlayer.h>
#include <AudioPlayer.h>
#include "Enhancements/controls/GameControlEditor.h"
#include "Enhancements/cosmetics/CosmeticsEditor.h"
#include "Enhancements/sfx-editor/SfxEditor.h"
@ -44,7 +44,7 @@
#include "variables.h"
#include "macros.h"
#include <Utils/StringHelper.h>
#include <libultraship/Hooks.h>
#include <Hooks.h>
#include "Enhancements/custom-message/CustomMessageManager.h"
#include <Fast3D/gfx_pc.h>
@ -57,12 +57,14 @@
#endif
#ifdef __SWITCH__
#include <libultraship/SwitchImpl.h>
#include <port/switch/SwitchImpl.h>
#elif defined(__WIIU__)
#include <libultraship/WiiUImpl.h>
#include <port/wiiu/WiiUImpl.h>
#endif
#include <libultraship/Audio.h>
#include <Audio.h>
#include "Enhancements/custom-message/CustomMessageTypes.h"
#include <functions.h>
#include "Enhancements/item-tables/ItemTableManager.h"
@ -427,12 +429,9 @@ extern "C" void InitOTR() {
ItemTableManager::Instance = new ItemTableManager();
auto t = OTRGlobals::Instance->context->GetResourceManager()->LoadFile("version");
if (!t->bHasLoadError)
if (!t->HasLoadError)
{
Ship::BinaryReader reader(t->buffer.get(), t->dwBufferSize);
Ship::Endianness endianness = (Ship::Endianness)reader.ReadUByte();
reader.SetEndianness(endianness);
uint32_t gameVersion = reader.ReadUInt32();
uint32_t gameVersion = OTRGlobals::Instance->context->GetResourceManager()->GetGameVersion();
OTRGlobals::Instance->context->GetResourceManager()->SetGameVersion(gameVersion);
}
@ -728,7 +727,7 @@ std::shared_ptr<Ship::Resource> ResourceMgr_LoadResource(const char* path) {
}
extern "C" char* ResourceMgr_LoadFileRaw(const char* resName) {
return OTRGlobals::Instance->context->GetResourceManager()->LoadFile(resName)->buffer.get();
return OTRGlobals::Instance->context->GetResourceManager()->LoadFile(resName)->Buffer.get();
}
extern "C" char* ResourceMgr_LoadFileFromDisk(const char* filePath) {
@ -794,9 +793,9 @@ extern "C" uint32_t ResourceMgr_LoadTexSizeByName(const char* texPath);
extern "C" char* ResourceMgr_LoadTexOrDListByName(const char* filePath) {
auto res = ResourceMgr_LoadResource(filePath);
if (res->resType == Ship::ResourceType::DisplayList)
if (res->ResType == Ship::ResourceType::DisplayList)
return (char*)&((std::static_pointer_cast<Ship::DisplayList>(res))->instructions[0]);
else if (res->resType == Ship::ResourceType::Array)
else if (res->ResType == Ship::ResourceType::Array)
return (char*)(std::static_pointer_cast<Ship::Array>(res))->vertices.data();
else {
std::string Path = filePath;
@ -886,8 +885,8 @@ extern "C" char* ResourceMgr_LoadArrayByName(const char* path)
extern "C" char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path) {
auto res = std::static_pointer_cast<Ship::Array>(ResourceMgr_LoadResource(path));
if (res->cachedGameAsset != nullptr)
return (char*)res->cachedGameAsset;
if (res->CachedGameAsset != nullptr)
return (char*)res->CachedGameAsset;
else
{
Vec3s* data = (Vec3s*)malloc(sizeof(Vec3s) * res->scalars.size());
@ -898,7 +897,7 @@ extern "C" char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path) {
data[(i / 3)].z = res->scalars[i + 2].s16;
}
res->cachedGameAsset = data;
res->CachedGameAsset = data;
return (char*)data;
}
@ -908,8 +907,8 @@ extern "C" CollisionHeader* ResourceMgr_LoadColByName(const char* path)
{
auto colRes = std::static_pointer_cast<Ship::CollisionHeader>(ResourceMgr_LoadResource(path));
if (colRes->cachedGameAsset != nullptr)
return (CollisionHeader*)colRes->cachedGameAsset;
if (colRes->CachedGameAsset != nullptr)
return (CollisionHeader*)colRes->CachedGameAsset;
CollisionHeader* colHeader = (CollisionHeader*)malloc(sizeof(CollisionHeader));
@ -993,7 +992,7 @@ extern "C" CollisionHeader* ResourceMgr_LoadColByName(const char* path)
colHeader->waterBoxes[i].properties = colRes->waterBoxes[i].properties;
}
colRes->cachedGameAsset = colHeader;
colRes->CachedGameAsset = colHeader;
return (CollisionHeader*)colHeader;
}
@ -1034,7 +1033,7 @@ extern "C" SoundFontSample* ReadCustomSample(const char* path) {
ExtensionEntry entry = ExtensionCache[path];
auto sampleRaw = OTRGlobals::Instance->context->GetResourceManager()->LoadFile(entry.path);
uint32_t* strem = (uint32_t*)sampleRaw->buffer.get();
uint32_t* strem = (uint32_t*)sampleRaw->Buffer.get();
uint8_t* strem2 = (uint8_t*)strem;
SoundFontSample* sampleC = new SoundFontSample;
@ -1044,7 +1043,7 @@ extern "C" SoundFontSample* ReadCustomSample(const char* path) {
drwav_uint32 sampleRate;
drwav_uint64 totalPcm;
drmp3_int16* pcmData =
drwav_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->dwBufferSize, &channels, &sampleRate, &totalPcm, NULL);
drwav_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &channels, &sampleRate, &totalPcm, NULL);
sampleC->size = totalPcm;
sampleC->sampleAddr = (uint8_t*)pcmData;
sampleC->codec = CODEC_S16;
@ -1062,7 +1061,7 @@ extern "C" SoundFontSample* ReadCustomSample(const char* path) {
drmp3_config mp3Info;
drmp3_uint64 totalPcm;
drmp3_int16* pcmData =
drmp3_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->dwBufferSize, &mp3Info, &totalPcm, NULL);
drmp3_open_memory_and_read_pcm_frames_s16(strem2, sampleRaw->BufferSize, &mp3Info, &totalPcm, NULL);
sampleC->size = totalPcm * mp3Info.channels * sizeof(short);
sampleC->sampleAddr = (uint8_t*)pcmData;
@ -1100,10 +1099,10 @@ extern "C" SoundFontSample* ResourceMgr_LoadAudioSample(const char* path)
if (sample == nullptr)
return NULL;
if (sample->cachedGameAsset != nullptr)
if (sample->CachedGameAsset != nullptr)
{
SoundFontSample* sampleC = (SoundFontSample*)sample->cachedGameAsset;
return (SoundFontSample*)sample->cachedGameAsset;
SoundFontSample* sampleC = (SoundFontSample*)sample->CachedGameAsset;
return (SoundFontSample*)sample->CachedGameAsset;
}
else
{
@ -1135,7 +1134,7 @@ extern "C" SoundFontSample* ResourceMgr_LoadAudioSample(const char* path)
for (size_t i = 0; i < sample->loop.states.size(); i++)
sampleC->loop->state[i] = sample->loop.states[i];
sample->cachedGameAsset = sampleC;
sample->CachedGameAsset = sampleC;
return sampleC;
}
}
@ -1146,9 +1145,9 @@ extern "C" SoundFont* ResourceMgr_LoadAudioSoundFont(const char* path) {
if (soundFont == nullptr)
return NULL;
if (soundFont->cachedGameAsset != nullptr)
if (soundFont->CachedGameAsset != nullptr)
{
return (SoundFont*)soundFont->cachedGameAsset;
return (SoundFont*)soundFont->CachedGameAsset;
}
else
{
@ -1260,7 +1259,7 @@ extern "C" SoundFont* ResourceMgr_LoadAudioSoundFont(const char* path) {
soundFontC->soundEffects[i].tuning = soundFont->soundEffects[i]->tuning;
}
soundFont->cachedGameAsset = soundFontC;
soundFont->CachedGameAsset = soundFontC;
return soundFontC;
}
}
@ -1286,8 +1285,8 @@ extern "C" int ResourceMgr_OTRSigCheck(char* imgData)
extern "C" AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path) {
auto res = std::static_pointer_cast<Ship::Animation>(ResourceMgr_LoadResource(path));
if (res->cachedGameAsset != nullptr)
return (AnimationHeaderCommon*)res->cachedGameAsset;
if (res->CachedGameAsset != nullptr)
return (AnimationHeaderCommon*)res->CachedGameAsset;
AnimationHeaderCommon* anim = nullptr;
@ -1346,7 +1345,7 @@ extern "C" AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path) {
anim = (AnimationHeaderCommon*)animLink;
}
res->cachedGameAsset = anim;
res->CachedGameAsset = anim;
return anim;
}
@ -1354,8 +1353,8 @@ extern "C" AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path) {
extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path) {
auto res = std::static_pointer_cast<Ship::Skeleton>(ResourceMgr_LoadResource(path));
if (res->cachedGameAsset != nullptr)
return (SkeletonHeader*)res->cachedGameAsset;
if (res->CachedGameAsset != nullptr)
return (SkeletonHeader*)res->CachedGameAsset;
SkeletonHeader* baseHeader = nullptr;
@ -1532,7 +1531,7 @@ extern "C" SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path) {
}
}
res->cachedGameAsset = baseHeader;
res->CachedGameAsset = baseHeader;
return baseHeader;
}

2
soh/soh/OTRGlobals.h
View file

@ -7,7 +7,7 @@
#include <soh/Enhancements/item-tables/ItemTableTypes.h>
#ifdef __cplusplus
#include <libultraship/Window.h>
#include <Window.h>
#include "Enhancements/savestates.h"
#include "Enhancements/randomizer/randomizer.h"

6
soh/soh/SaveManager.cpp
View file

@ -4,11 +4,11 @@
#include "z64.h"
#include "functions.h"
#include "macros.h"
#include <libultraship/Hooks.h>
#include <libultraship/Cvar.h>
#include <Hooks.h>
#include <Cvar.h>
#define NOGDI // avoid various windows defines that conflict with things in z64.h
#include "spdlog/spdlog.h"
#include <spdlog/spdlog.h>
#include <fstream>
#include <filesystem>

4
soh/soh/UIWidgets.cpp
View file

@ -9,8 +9,8 @@
#define IMGUI_DEFINE_MATH_OPERATORS
#include <ImGui/imgui_internal.h>
#include <libultraship/ImGuiImpl.h>
#include <libultraship/Cvar.h>
#include <ImGuiImpl.h>
#include <Cvar.h>
#include <ultra64/types.h>
#include "soh/Enhancements/cosmetics/CosmeticsEditor.h"

2
soh/soh/frame_interpolation.cpp
View file

@ -1,4 +1,4 @@
#include <libultraship/Cvar.h>
#include <Cvar.h>
#include <vector>
#include <map>

6
soh/soh/z_message_OTR.cpp
View file

@ -1,10 +1,10 @@
#include "OTRGlobals.h"
#include <libultraship/ResourceMgr.h>
#include <libultraship/Scene.h>
#include <ResourceMgr.h>
#include <Scene.h>
#include <Utils/StringHelper.h>
#include "global.h"
#include "vt.h"
#include <libultraship/Text.h>
#include <Text.h>
#include <message_data_static.h>
#include "Enhancements/custom-message/CustomMessageManager.h"
#include "Enhancements/custom-message/CustomMessageTypes.h"

6
soh/soh/z_play_otr.cpp
View file

@ -1,10 +1,10 @@
#include "OTRGlobals.h"
#include <libultraship/ResourceMgr.h>
#include <libultraship/Scene.h>
#include <ResourceMgr.h>
#include <Scene.h>
#include <Utils/StringHelper.h>
#include "global.h"
#include "vt.h"
#include <libultraship/Vertex.h>
#include <Vertex.h>
extern "C" void Play_InitScene(PlayState * play, s32 spawn);
extern "C" void Play_InitEnvironment(PlayState * play, s16 skyboxId);

28
soh/soh/z_scene_otr.cpp
View file

@ -1,22 +1,22 @@
#include "OTRGlobals.h"
#include <libultraship/ResourceMgr.h>
#include <libultraship/Scene.h>
#include <ResourceMgr.h>
#include <Scene.h>
#include <Utils/StringHelper.h>
#include "global.h"
#include "vt.h"
#include <libultraship/CollisionHeader.h>
#include <libultraship/DisplayList.h>
#include <libultraship/Cutscene.h>
#include <libultraship/Path.h>
#include <libultraship/Text.h>
#include <libultraship/Blob.h>
#include <CollisionHeader.h>
#include <DisplayList.h>
#include <Cutscene.h>
#include <Path.h>
#include <Text.h>
#include <Blob.h>
extern Ship::Resource* OTRPlay_LoadFile(PlayState* play, const char* fileName);
extern "C" s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId);
extern "C" RomFile sNaviMsgFiles[];
s32 OTRScene_ExecuteCommands(PlayState* play, Ship::Scene* scene);
std::shared_ptr<Ship::File> ResourceMgr_LoadFile(const char* path) {
std::shared_ptr<Ship::OtrFile> ResourceMgr_LoadFile(const char* path) {
std::string Path = path;
if (IsGameMasterQuest()) {
size_t pos = 0;
@ -121,8 +121,8 @@ bool Scene_CommandCollisionHeader(PlayState* play, Ship::SceneCommand* cmd)
CollisionHeader* colHeader = nullptr;
if (colRes->cachedGameAsset != nullptr)
colHeader = (CollisionHeader*)colRes->cachedGameAsset;
if (colRes->CachedGameAsset != nullptr)
colHeader = (CollisionHeader*)colRes->CachedGameAsset;
else
{
colHeader = (CollisionHeader*)malloc(sizeof(CollisionHeader));
@ -211,7 +211,7 @@ bool Scene_CommandCollisionHeader(PlayState* play, Ship::SceneCommand* cmd)
colHeader->waterBoxes[i].properties = colRes->waterBoxes[i].properties;
}
colRes->cachedGameAsset = colHeader;
colRes->CachedGameAsset = colHeader;
}
BgCheck_Allocate(&play->colCtx, play, colHeader);
@ -365,7 +365,7 @@ bool Scene_CommandMeshHeader(PlayState* play, Ship::SceneCommand* cmd)
play->roomCtx.curRoom.meshHeader->polygon1.single.source =
(void*)(ResourceMgr_LoadFile(otrMesh->meshes[0].images[0].sourceBackground.c_str()))
.get()
->buffer.get();
->Buffer.get();
play->roomCtx.curRoom.meshHeader->polygon1.single.siz = otrMesh->meshes[0].images[0].siz;
play->roomCtx.curRoom.meshHeader->polygon1.single.width = otrMesh->meshes[0].images[0].width;
play->roomCtx.curRoom.meshHeader->polygon1.single.height = otrMesh->meshes[0].images[0].height;
@ -385,7 +385,7 @@ bool Scene_CommandMeshHeader(PlayState* play, Ship::SceneCommand* cmd)
play->roomCtx.curRoom.meshHeader->polygon1.multi.list[i].source =
(void*)(ResourceMgr_LoadFile(otrMesh->meshes[0].images[i].sourceBackground.c_str()))
.get()
->buffer.get();
->Buffer.get();
play->roomCtx.curRoom.meshHeader->polygon1.multi.list[i].siz = otrMesh->meshes[0].images[i].siz;
play->roomCtx.curRoom.meshHeader->polygon1.multi.list[i].width = otrMesh->meshes[0].images[i].width;
play->roomCtx.curRoom.meshHeader->polygon1.multi.list[i].height =

2
soh/src/code/audio_playback.c
View file

@ -1,5 +1,5 @@
#include "global.h"
#include <libultraship/Cvar.h>
#include <Cvar.h>
extern bool gUseLegacySD;

2
soh/src/code/audio_synthesis.c
View file

@ -1,6 +1,6 @@
#include "ultra64.h"
#include "global.h"
#include <libultraship/mixer.h>
#include <mixer.h>
#define DEFAULT_LEN_1CH 0x1A0
#define DEFAULT_LEN_2CH 0x340

2
soh/src/code/code_800F9280.c
View file

@ -1,7 +1,7 @@
#include "ultra64.h"
#include "global.h"
#include <ultra64/abi.h>
#include <libultraship/mixer.h>
#include <mixer.h>
typedef struct {
u8 unk_0;

2
soh/src/code/main.c
View file

@ -3,7 +3,7 @@
#include <soh/Enhancements/bootcommands.h>
#include "soh/OTRGlobals.h"
#include <libultraship/CrashHandler.h>
#include <CrashHandler.h>
#include "soh/CrashHandlerExp.h"

2
soh/src/code/z_play.c
View file

@ -4,7 +4,7 @@
#include <string.h>
#include "soh/Enhancements/gameconsole.h"
#include <libultraship/ImGuiImpl.h>
#include <ImGuiImpl.h>
#include "soh/frame_interpolation.h"
#include "soh/Enhancements/debugconsole.h"
#include <overlays/actors/ovl_En_Niw/z_en_niw.h>

2
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View file

@ -6,7 +6,7 @@
#include "textures/parameter_static/parameter_static.h"
#include <textures/icon_item_static/icon_item_static.h>
#include "soh/frame_interpolation.h"
#include <libultraship/GameVersions.h>
#include <GameVersions.h>
#include "objects/object_mag/object_mag.h"
#include "objects/gameplay_keep/gameplay_keep.h"

2
soh/src/overlays/gamestates/ovl_title/z_title.c
View file

@ -10,7 +10,7 @@
#include "alloca.h"
#include "textures/nintendo_rogo_static/nintendo_rogo_static.h"
#include <soh/Enhancements/bootcommands.h>
#include <libultraship/GameVersions.h>
#include <GameVersions.h>
#include <soh/SaveManager.h>
#include "time.h"