mirror
/
SpaghettiKart
mirror of https://github.com/HarbourMasters/SpaghettiKart
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update lus (#580) 

* fix include

* Update libultraship

* fix Engine.cpp

* fix error

* Update TrackSections.h
This commit is contained in:
coco875 2025-12-08 16:25:10 +01:00 committed by GitHub
parent dbae0c3aca
commit f022183d6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
80 changed files with 162 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -389,34 +389,8 @@ endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include
${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/include/libultraship
${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/libultraship/Lib/spdlog/include/
${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/U64/PR
${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic
${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIRS}
${GLEW_INCLUDE_DIRS} ${GLEW_INCLUDE_DIRS}
${dr_libs_SOURCE_DIR} ${dr_libs_SOURCE_DIR}

2
libultraship

@ -1 +1 @@
Subproject commit d1bbd53e8a1d2a4d6cfcce588ed13aa8d0686909 Subproject commit 3ef24c3d1645fe1fc2a7065d1c2e132973ebc151

4
src/engine/editor/Editor.cpp
View File

@ -9,8 +9,8 @@
#include "Light.h" #include "Light.h"
#include "port/Engine.h" #include "port/Engine.h"
#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h> #include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "engine/actors/Ship.h" #include "engine/actors/Ship.h"
#include "port/Game.h" #include "port/Game.h"

4
src/engine/editor/EditorMath.cpp
View File

@ -10,8 +10,8 @@
#include <limits> #include <limits>
#include <cmath> #include <cmath>
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
extern "C" { extern "C" {
#include "common_structs.h" #include "common_structs.h"

4
src/engine/editor/EditorMath.h
View File

@ -6,8 +6,8 @@
#include "../CoreMath.h" #include "../CoreMath.h"
#include <vector> #include <vector>
#include "GameObject.h" #include "GameObject.h"
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
extern "C" { extern "C" {
#include "common_structs.h" #include "common_structs.h"

4
src/engine/editor/Gizmo.cpp
View File

@ -8,8 +8,8 @@
#include "Gizmo.h" #include "Gizmo.h"
#include "Collision.h" #include "Collision.h"
#include "port/Engine.h" #include "port/Engine.h"
#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h> #include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "engine/Matrix.h" #include "engine/Matrix.h"
#include "engine/Actor.h" #include "engine/Actor.h"
#include "engine/objects/Object.h" #include "engine/objects/Object.h"

4
src/engine/editor/Light.cpp
View File

@ -8,8 +8,8 @@
#include "Light.h" #include "Light.h"
#include "port/Engine.h" #include "port/Engine.h"
#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h> #include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "engine/actors/Ship.h" #include "engine/actors/Ship.h"
#include "port/Game.h" #include "port/Game.h"

4
src/engine/editor/ObjectPicker.cpp
View File

@ -8,8 +8,8 @@
#include "ObjectPicker.h" #include "ObjectPicker.h"
#include "port/Engine.h" #include "port/Engine.h"
#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h> #include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "engine/actors/Ship.h" #include "engine/actors/Ship.h"
#include "port/Game.h" #include "port/Game.h"

4
src/engine/editor/SceneManager.cpp
View File

@ -10,9 +10,9 @@
#include <optional> // Must be before json.hpp #include <optional> // Must be before json.hpp
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "port/Engine.h" #include "port/Engine.h"
#include <libultraship/src/resource/type/Json.h> #include <ship/resource/type/Json.h>
#include "port/resource/type/Minimap.h" #include "port/resource/type/Minimap.h"
#include <libultraship/src/resource/File.h> #include <ship/resource/File.h>
#include "port/resource/type/ResourceType.h" #include "port/resource/type/ResourceType.h"
#include "engine/vehicles/Train.h" #include "engine/vehicles/Train.h"

6
src/engine/mods/ModManager.cpp
View File

@ -1,7 +1,7 @@
#include "archive/Archive.h" #include "ship/resource/archive/Archive.h"
#include "ModMetadata.h" #include "ModMetadata.h"
#include "libultraship/src/resource/archive/FolderArchive.h" #include "ship/resource/archive/FolderArchive.h"
#include "libultraship/src/resource/archive/O2rArchive.h" #include "ship/resource/archive/O2rArchive.h"
#include "port/Engine.h" #include "port/Engine.h"
#include "semver.hpp" #include "semver.hpp"
#include "utils/StringHelper.h" #include "utils/StringHelper.h"

2
src/engine/tracks/SherbetLand.cpp
View File

@ -10,7 +10,7 @@
#include "assets/models/tracks/sherbet_land/sherbet_land_data.h" #include "assets/models/tracks/sherbet_land/sherbet_land_data.h"
#include "assets/other/tracks/sherbet_land/sherbet_land_data.h" #include "assets/other/tracks/sherbet_land/sherbet_land_data.h"
#include "engine/objects/Penguin.h" #include "engine/objects/Penguin.h"
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
extern "C" { extern "C" {
#include "main.h" #include "main.h"

2
src/engine/tracks/Track.cpp
View File

@ -10,7 +10,7 @@
#include "port/resource/type/TrackPathPointData.h" #include "port/resource/type/TrackPathPointData.h"
#include "engine/editor/SceneManager.h" #include "engine/editor/SceneManager.h"
#include "Registry.h" #include "Registry.h"
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
#include "align_asset_macro.h" #include "align_asset_macro.h"
extern "C" { extern "C" {

6
src/enhancements/freecam/freecam.cpp
View File

@ -1,9 +1,9 @@
#include <libultraship.h> #include <libultraship.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "port/Engine.h" #include "port/Engine.h"
#include "port/Game.h" #include "port/Game.h"
#include <controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h> #include <ship/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h>
#include <window/Window.h> #include <ship/window/Window.h>
#include "port/interpolation/FrameInterpolation.h" #include "port/interpolation/FrameInterpolation.h"
#include "engine/Matrix.h" #include "engine/Matrix.h"

51
src/port/Engine.cpp
View File

@ -1,12 +1,13 @@
#include "Engine.h" #include "Engine.h"
#include "StringHelper.h" #include "ship/utils/StringHelper.h"
#include "GameExtractor.h" #include "GameExtractor.h"
#include "mods/ModManager.h" #include "mods/ModManager.h"
#include "ui/ImguiUI.h" #include "ui/ImguiUI.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include "libultraship/src/controller/controldevice/controller/mapping/ControllerDefaultMappings.h" #include "ship/controller/controldevice/controller/mapping/ControllerDefaultMappings.h"
#include "resource/type/ResourceType.h" #include "resource/type/ResourceType.h"
#include "fast/resource/ResourceType.h"
#include "resource/importers/GenericArrayFactory.h" #include "resource/importers/GenericArrayFactory.h"
#include "resource/importers/AudioBankFactory.h" #include "resource/importers/AudioBankFactory.h"
#include "resource/importers/AudioSampleFactory.h" #include "resource/importers/AudioSampleFactory.h"
@ -22,14 +23,15 @@
#include "resource/importers/ArrayFactory.h" #include "resource/importers/ArrayFactory.h"
#include "resource/importers/MinimapFactory.h" #include "resource/importers/MinimapFactory.h"
#include "resource/importers/BetterTextureFactory.h" #include "resource/importers/BetterTextureFactory.h"
#include <Fonts.h> #include <ship/window/gui/Fonts.h>
#include "window/gui/resource/Font.h" #include "ship/window/gui/resource/Font.h"
#include "window/gui/resource/FontFactory.h" #include "ship/window/gui/resource/FontFactory.h"
#include "libultraship/controller/controldeck/ControlDeck.h"
#include "SpaghettiGui.h" #include "SpaghettiGui.h"
#include "port/interpolation/FrameInterpolation.h" #include "port/interpolation/FrameInterpolation.h"
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
// #include <Fast3D/gfx_rendering_api.h> // #include <Fast3D/gfx_rendering_api.h>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
@ -43,12 +45,12 @@ extern "C" {
bool prevAltAssets = false; bool prevAltAssets = false;
float gInterpolationStep = 0.0f; float gInterpolationStep = 0.0f;
#include <macros.h> #include <macros.h>
#include <DisplayListFactory.h> #include <fast/resource/factory/DisplayListFactory.h>
#include <TextureFactory.h> #include <fast/resource/factory/TextureFactory.h>
#include <MatrixFactory.h> #include <fast/resource/factory/MatrixFactory.h>
#include <BlobFactory.h> #include <ship/resource/factory/BlobFactory.h>
#include <VertexFactory.h> #include <fast/resource/factory/VertexFactory.h>
#include <LightFactory.h> #include <fast/resource/factory/LightFactory.h>
// #include <PngFactory.h> // #include <PngFactory.h>
#include "audio/internal.h" #include "audio/internal.h"
#include "audio/GameAudio.h" #include "audio/GameAudio.h"
@ -93,7 +95,7 @@ GameEngine::GameEngine() {
this->context->InitConsoleVariables(); // without this line the controldeck constructor failes in this->context->InitConsoleVariables(); // without this line the controldeck constructor failes in
// ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig() // ShipDeviceIndexMappingManager::UpdateControllerNamesFromConfig()
auto defaultMappings = std::make_shared<Ship::ControllerDefaultMappings>( auto defaultMappings = std::make_shared<Ship::ControllerDefaultMappings>(
// KeyboardKeyToButtonMappings // KeyboardKeyToButtonMappings
std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<Ship::KbScancode>>{ std::unordered_map<CONTROLLERBUTTONS_T, std::unordered_set<Ship::KbScancode>>{
{ BTN_A, { Ship::KbScancode::LUS_KB_SHIFT} }, { BTN_A, { Ship::KbScancode::LUS_KB_SHIFT} },
@ -146,7 +148,24 @@ GameEngine::GameEngine() {
// SDLAxisDirectionToAxisDirectionMappings - use built-in LUS defaults // SDLAxisDirectionToAxisDirectionMappings - use built-in LUS defaults
std::unordered_map<Ship::StickIndex, std::vector<std::pair<Ship::Direction, std::pair<SDL_GameControllerAxis, int32_t>>>>() std::unordered_map<Ship::StickIndex, std::vector<std::pair<Ship::Direction, std::pair<SDL_GameControllerAxis, int32_t>>>>()
); );
auto controlDeck = std::make_shared<LUS::ControlDeck>(std::vector<CONTROLLERBUTTONS_T>(), defaultMappings);
auto buttonNames = std::unordered_map<CONTROLLERBUTTONS_T, std::string>({
{ BTN_A, "A" },
{ BTN_B, "B" },
{ BTN_L, "L" },
{ BTN_R, "R" },
{ BTN_Z, "Z" },
{ BTN_START, "Start" },
{ BTN_CLEFT, "CLeft" },
{ BTN_CRIGHT, "CRight" },
{ BTN_CUP, "CUp" },
{ BTN_CDOWN, "CDown" },
{ BTN_DLEFT, "DLeft" },
{ BTN_DRIGHT, "DRight" },
{ BTN_DUP, "DUp" },
{ BTN_DDOWN, "DDown" },
});
auto controlDeck = std::make_shared<LUS::ControlDeck>(std::vector<CONTROLLERBUTTONS_T>(), defaultMappings, buttonNames);
this->context->InitResourceManager({}, {}, 3); // without this line InitWindow fails in Gui::Init() this->context->InitResourceManager({}, {}, 3); // without this line InitWindow fails in Gui::Init()
this->context->InitConsole(); // without this line the GuiWindow constructor fails in ConsoleWindow::InitElement() this->context->InitConsole(); // without this line the GuiWindow constructor fails in ConsoleWindow::InitElement()

6
src/port/Engine.h
View File

@ -10,9 +10,9 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <vector> #include <vector>
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
#include "libultraship/src/Context.h" #include "ship/Context.h"
#ifndef IDYES #ifndef IDYES
#define IDYES 6 #define IDYES 6

3
src/port/GBIMiddleware.cpp
View File

@ -1,7 +1,8 @@
#include <libultraship.h> #include <libultraship.h>
#include "Engine.h" #include "Engine.h"
#include "DisplayList.h" #include "fast/resource/type/DisplayList.h"
#include "fast/resource/ResourceType.h"
#include "resource/type/ResourceType.h" #include "resource/type/ResourceType.h"
#include "resource/type/Array.h" #include "resource/type/Array.h"
extern "C" { extern "C" {

2
src/port/Game.cpp
View File

@ -3,7 +3,7 @@
#include "Game.h" #include "Game.h"
#include "port/Engine.h" #include "port/Engine.h"
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include "engine/World.h" #include "engine/World.h"
#include "engine/tracks/Track.h" #include "engine/tracks/Track.h"
#include "engine/tracks/MarioRaceway.h" #include "engine/tracks/MarioRaceway.h"

3
src/port/GameExtractor.cpp
View File

@ -7,12 +7,11 @@
#include "GameExtractor.h" #include "GameExtractor.h"
#include <cstdio> #include <cstdio>
#include <unordered_map> #include <unordered_map>
#include <Companion.h>
#include <fstream> #include <fstream>
#include "Companion.h" #include "Companion.h"
#include "Context.h" #include "ship/Context.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include <port/Engine.h> #include <port/Engine.h>

10
src/port/SpaghettiGui.cpp
View File

@ -1,18 +1,18 @@
#include <libultraship.h> #include <libultraship.h>
#include "SpaghettiGui.h" #include "SpaghettiGui.h"
#include <libultraship/src/window/gui/Gui.h> #include <ship/window/gui/Gui.h>
#include <libultraship/src/window/Window.h> #include <ship/window/Window.h>
#ifdef __SWITCH__ #ifdef __SWITCH__
#include "ConfigVersion.h" #include "ConfigVersion.h"
#else #else
#include "Config.h" #include "ship/config/Config.h"
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <SDL_hints.h> #include <SDL_hints.h>
#include <SDL_video.h> #include <SDL_video.h>
#include "graphic/Fast3D/backends/gfx_metal.h" #include "fast/backends/gfx_metal.h"
#include <imgui_impl_metal.h> #include <imgui_impl_metal.h>
#include <imgui_impl_sdl2.h> #include <imgui_impl_sdl2.h>
#else #else
@ -31,7 +31,7 @@
#endif #endif
#if defined(ENABLE_DX11) || defined(ENABLE_DX12) #if defined(ENABLE_DX11) || defined(ENABLE_DX12)
#include <graphic/Fast3D/backends/gfx_direct3d11.h> #include <fast/backends/gfx_direct3d11.h>
#include <imgui_impl_dx11.h> #include <imgui_impl_dx11.h>
#include <imgui_impl_win32.h> #include <imgui_impl_win32.h>

4
src/port/SpaghettiGui.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include <libultraship.h> #include <libultraship.h>
#include "libultraship/src/window/gui/Gui.h" #include "ship/window/gui/Gui.h"
#include "libultraship/src/window/Window.h" #include "ship/window/Window.h"
class Gui; // <-- forward declare class Gui; // <-- forward declare
//class Window; //class Window;

2
src/port/Variables.cpp
View File

@ -1,5 +1,5 @@
#include <libultraship.h> #include <libultraship.h>
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
extern "C" { extern "C" {

4
src/port/resource/importers/ActorSpawnDataFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryActorSpawnDataV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryActorSpawnDataV0 : public Ship::ResourceFactoryBinary {

2
src/port/resource/importers/ArrayFactory.cpp
View File

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

4
src/port/resource/importers/ArrayFactory.h
View File

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

2
src/port/resource/importers/AudioBankFactory.cpp
View File

@ -1,7 +1,7 @@
#include "AudioBankFactory.h" #include "AudioBankFactory.h"
#include "../type/AudioBank.h" #include "../type/AudioBank.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
#include "ResourceUtil.h" #include "ResourceUtil.h"
std::shared_ptr<Ship::IResource> std::shared_ptr<Ship::IResource>

4
src/port/resource/importers/AudioBankFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace SM64 { namespace SM64 {
class AudioBankFactoryV0 : public Ship::ResourceFactoryBinary { class AudioBankFactoryV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/AudioSampleFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace SM64 { namespace SM64 {
class AudioSampleFactoryV0 : public Ship::ResourceFactoryBinary { class AudioSampleFactoryV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/AudioSequenceFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
#include "../type/AudioSequence.h" #include "../type/AudioSequence.h"
namespace SM64 { namespace SM64 {

8
src/port/resource/importers/BetterTextureFactory.cpp
View File

@ -1,10 +1,10 @@
#include "BetterTextureFactory.h" #include "BetterTextureFactory.h"
#include "resource/type/Texture.h" #include "fast/resource/type/Texture.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include <stb_image.h> #include <stb_image.h>
#include <Context.h> #include <ship/Context.h>
#include "resource/archive/ArchiveManager.h" #include "ship/resource/archive/ArchiveManager.h"
#include "resource/ResourceManager.h" #include "ship/resource/ResourceManager.h"
namespace MK64 { namespace MK64 {

4
src/port/resource/importers/BetterTextureFactory.h
View File

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

4
src/port/resource/importers/CPUFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryCPUV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryCPUV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/CourseVtxFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryCourseVtxV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryCourseVtxV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/GenericArrayFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace SF64 { namespace SF64 {
class ResourceFactoryBinaryGenericArrayV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryGenericArrayV0 : public Ship::ResourceFactoryBinary {

6
src/port/resource/importers/MinimapFactory.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "resource/Resource.h" #include "ship/resource/Resource.h"
#include "resource/ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
#include "resource/ResourceFactoryXML.h" #include "ship/resource/ResourceFactoryXML.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryMinimapV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryMinimapV0 : public Ship::ResourceFactoryBinary {

6
src/port/resource/importers/ResourceUtil.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
#include "libultraship/src/resource/ResourceManager.h" #include "ship/resource/ResourceManager.h"
#include "Context.h" #include "ship/Context.h"
namespace SM64 { namespace SM64 {
template <typename T> T LoadChild(uint64_t crc) { template <typename T> T LoadChild(uint64_t crc) {

6
src/port/resource/importers/TrackPathPointFactory.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
#include "ResourceFactoryXML.h" #include "ship/resource/ResourceFactoryXML.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryTrackPathPointsV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryTrackPathPointsV0 : public Ship::ResourceFactoryBinary {

2
src/port/resource/importers/TrackSectionsFactory.cpp
View File

@ -2,7 +2,7 @@
#include "../type/TrackSections.h" #include "../type/TrackSections.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "libultraship/libultra/gbi.h" #include "libultraship/libultra/gbi.h"
#include "StrHash64.h" #include "ship/utils/StrHash64.h"
#include "tinyxml2.h" #include "tinyxml2.h"
#include "src/engine/tracks/Track.h" #include "src/engine/tracks/Track.h"

6
src/port/resource/importers/TrackSectionsFactory.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
#include "resource/ResourceFactoryXML.h" #include "ship/resource/ResourceFactoryXML.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryTrackSectionsV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryTrackSectionsV0 : public Ship::ResourceFactoryBinary {

6
src/port/resource/importers/UnkActorSpawnDataFactory.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
#include "File.h" #include "ship/resource/File.h"
namespace MK64 { namespace MK64 {
class ResourceFactoryBinaryUnkActorSpawnDataV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryUnkActorSpawnDataV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/Vec3fFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace SF64 { namespace SF64 {
class ResourceFactoryBinaryVec3fV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryVec3fV0 : public Ship::ResourceFactoryBinary {

4
src/port/resource/importers/Vec3sFactory.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "Resource.h" #include "ship/resource/Resource.h"
#include "ResourceFactoryBinary.h" #include "ship/resource/ResourceFactoryBinary.h"
namespace SF64 { namespace SF64 {
class ResourceFactoryBinaryVec3sV0 : public Ship::ResourceFactoryBinary { class ResourceFactoryBinaryVec3sV0 : public Ship::ResourceFactoryBinary {

2
src/port/resource/type/Animation.h
View File

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

2
src/port/resource/type/Array.cpp
View File

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

2
src/port/resource/type/Array.h
View File

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

2
src/port/resource/type/AudioBank.h
View File

@ -2,7 +2,7 @@
#include <cstdint> #include <cstdint>
#include "AudioSample.h" #include "AudioSample.h"
#include "resource/Resource.h" #include "ship/resource/Resource.h"
struct AudioBankSound { struct AudioBankSound {
AudioBankSample *sample; AudioBankSample *sample;

2
src/port/resource/type/AudioSample.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include "resource/Resource.h" #include "ship/resource/Resource.h"
struct AdpcmLoop { struct AdpcmLoop {
uint32_t start; uint32_t start;

2
src/port/resource/type/AudioSequence.h
View File

@ -12,7 +12,7 @@ struct AudioSequenceData {
}; };
#ifdef __cplusplus #ifdef __cplusplus
#include "resource/Resource.h" #include "ship/resource/Resource.h"
namespace SM64 { namespace SM64 {
class AudioSequence : public Ship::Resource<AudioSequenceData> { class AudioSequence : public Ship::Resource<AudioSequenceData> {

2
src/port/resource/type/CPU.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "resource/Resource.h" #include "ship/resource/Resource.h"
#include <vector> #include <vector>
struct CPUBehaviour { struct CPUBehaviour {

2
src/port/resource/type/ColPoly.h
View File

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

2
src/port/resource/type/CourseVtx.h
View File

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

2
src/port/resource/type/EnvSettings.h
View File

@ -3,7 +3,7 @@
#include "Limb.h" #include "Limb.h"
#include <cstdint> #include <cstdint>
#include <Resource.h> #include <ship/resource/Resource.h>
namespace SF64 { namespace SF64 {

2
src/port/resource/type/GenericArray.h
View File

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

2
src/port/resource/type/Hitbox.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <Resource.h> #include <ship/resource/Resource.h>
namespace SF64 { namespace SF64 {
class Hitbox : public Ship::Resource<float> { class Hitbox : public Ship::Resource<float> {

2
src/port/resource/type/Limb.h
View File

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

2
src/port/resource/type/Message.h
View File

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

2
src/port/resource/type/Minimap.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "resource/Resource.h" #include "ship/resource/Resource.h"
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>

2
src/port/resource/type/ObjectInit.h
View File

@ -3,7 +3,7 @@
#include "Limb.h" #include "Limb.h"
#include <cstdint> #include <cstdint>
#include <Resource.h> #include <ship/resource/Resource.h>
namespace SF64 { namespace SF64 {

2
src/port/resource/type/Script.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
#include <Resource.h> #include <ship/resource/Resource.h>
namespace SF64 { namespace SF64 {
class Script : public Ship::Resource<uint16_t*> { class Script : public Ship::Resource<uint16_t*> {

2
src/port/resource/type/Skeleton.h
View File

@ -2,7 +2,7 @@
#include "Limb.h" #include "Limb.h"
#include <Resource.h> #include <ship/resource/Resource.h>
namespace SF64 { namespace SF64 {
class Skeleton : public Ship::Resource<LimbData*> { class Skeleton : public Ship::Resource<LimbData*> {

2
src/port/resource/type/SpawnData.h
View File

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

2
src/port/resource/type/TrackPathPointData.h
View File

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

2
src/port/resource/type/TrackSections.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "resource/Resource.h" #include "ship/resource/Resource.h"
#include <vector> #include <vector>
#include <libultra/gbi.h> #include <libultra/gbi.h>
#include "src/engine/tracks/Track.h" #include "src/engine/tracks/Track.h"

2
src/port/resource/type/UnkSpawnData.h
View File

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

2
src/port/resource/type/Vec3fArray.h
View File

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

2
src/port/resource/type/Vec3sArray.h
View File

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

2
src/port/ui/ContentBrowser.cpp
View File

@ -1,7 +1,7 @@
#include "ContentBrowser.h" #include "ContentBrowser.h"
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include "port/Engine.h" #include "port/Engine.h"
#include "SpawnParams.h" #include "SpawnParams.h"

2
src/port/ui/FreecamWindow.cpp
View File

@ -2,7 +2,7 @@
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "port/Game.h" #include "port/Game.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <imgui.h> #include <imgui.h>
#include <map> #include <map>

4
src/port/ui/ImguiUI.cpp
View File

@ -11,11 +11,11 @@
#include <spdlog/spdlog.h> #include <spdlog/spdlog.h>
#include <imgui.h> #include <imgui.h>
#define IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <imgui_internal.h> #include <imgui_internal.h>
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include "port/Engine.h" #include "port/Engine.h"
#include "PortMenu.h" #include "PortMenu.h"

4
src/port/ui/Menu.cpp
View File

@ -1,8 +1,8 @@
#include "Menu.h" #include "Menu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "port/Engine.h" #include "port/Engine.h"
#include "window/gui/GuiMenuBar.h" #include "ship/window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h" #include "ship/window/gui/GuiElement.h"
#include <variant> #include <variant>
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
#include <variant> #include <variant>

6
src/port/ui/PortMenu.cpp
View File

@ -1,10 +1,10 @@
#include "PortMenu.h" #include "PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "port/Game.h" #include "port/Game.h"
#include "window/gui/GuiMenuBar.h" #include "ship/window/gui/GuiMenuBar.h"
#include "window/gui/GuiElement.h" #include "ship/window/gui/GuiElement.h"
#include <variant> #include <variant>
#include "StringHelper.h" #include "ship/utils/StringHelper.h"
#include <spdlog/fmt/fmt.h> #include <spdlog/fmt/fmt.h>
#include <variant> #include <variant>
#include <tuple> #include <tuple>

2
src/port/ui/PortMenu.h
View File

@ -4,7 +4,7 @@
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "UIWidgets.h" #include "UIWidgets.h"
#include "Menu.h" #include "Menu.h"
#include "Fast3D/backends/gfx_rendering_api.h" #include "fast/backends/gfx_rendering_api.h"
namespace GameUI { namespace GameUI {

2
src/port/ui/Properties.cpp
View File

@ -1,7 +1,7 @@
#include "Properties.h" #include "Properties.h"
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <variant> #include <variant>
#include <imgui.h> #include <imgui.h>

4
src/port/ui/ResolutionEditor.cpp
View File

@ -3,8 +3,8 @@
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include "UIWidgets.h" #include "UIWidgets.h"
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
#include "port/Engine.h" #include "port/Engine.h"
#include "PortMenu.h" #include "PortMenu.h"

4
src/port/ui/ResolutionEditor.h
View File

@ -2,8 +2,8 @@
#define RESOLUTIONEDITOR_H #define RESOLUTIONEDITOR_H
#include <libultraship/libultraship.h> #include <libultraship/libultraship.h>
#include <graphic/Fast3D/Fast3dWindow.h> #include <fast/Fast3dWindow.h>
#include <graphic/Fast3D/interpreter.h> #include <fast/interpreter.h>
namespace GameUI { namespace GameUI {
bool IsDroppingFrames(); bool IsDroppingFrames();

2
src/port/ui/SceneExplorer.cpp
View File

@ -1,7 +1,7 @@
#include "SceneExplorer.h" #include "SceneExplorer.h"
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <imgui.h> #include <imgui.h>
#include <map> #include <map>

2
src/port/ui/Tools.cpp
View File

@ -1,7 +1,7 @@
#include "Tools.h" #include "Tools.h"
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <imgui.h> #include <imgui.h>
#include <map> #include <map>

2
src/port/ui/TrackProperties.cpp
View File

@ -1,7 +1,7 @@
#include "TrackProperties.h" #include "TrackProperties.h"
#include "port/ui/PortMenu.h" #include "port/ui/PortMenu.h"
#include "UIWidgets.h" #include "UIWidgets.h"
#include "libultraship/src/Context.h" #include "ship/Context.h"
#include <imgui.h> #include <imgui.h>
#include <map> #include <map>

2
src/racing/collision.c
View File

@ -13,7 +13,7 @@
#include <defines.h> #include <defines.h>
#include "port/Engine.h" #include "port/Engine.h"
#include "port/Game.h" #include "port/Game.h"
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
#include <stdio.h> #include <stdio.h>
#include "RaceManager.h" #include "RaceManager.h"

2
src/racing/render_courses.c
View File

@ -17,7 +17,7 @@
#include "memory.h" #include "memory.h"
#include "code_80281780.h" #include "code_80281780.h"
#include "collision.h" #include "collision.h"
#include "resourcebridge.h" #include "libultraship/bridge/resourcebridge.h"
#include "skybox_and_splitscreen.h" #include "skybox_and_splitscreen.h"
#include "courses/all_course_data.h" #include "courses/all_course_data.h"
#include "courses/all_course_packed.h" #include "courses/all_course_packed.h"

2
torch

@ -1 +1 @@
Subproject commit c3fdb5d5e3f172bdce468a6ff63fa9e496e0ce66 Subproject commit 0c6e9523b332fa8a23bb82d25ff2e2bfa8b33b1d