diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-12-07 15:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-07 07:34:53 -0700 |
| commit | 02ad54ca72f5baf4614cb9b7c30f8dd780764d90 (patch) | |
| tree | bd2719a154830d4c538e0caf91eb845ddb45552d /src/engine/objects | |
| parent | eec7d650482134352b7cde4801b979ce1ed2044e (diff) | |
Refactor yaml and remove segment (#531)
* move yaml (still need to fix header path)
* fix header
* change kart to karts and add migration
* fix include
* Update migration.py
* fix common_texture_debug_font extraction
* Update torch
* update torch and header
* unduplicate texture for tumble
* Update torch
* Update migration.py
* put the sort by default
* fix replace_segmented_textures_with_o2r_textures
* Update torch
* fix yamls
* add manual_segments in data of course
* comment out replace_segmented_textures_with_o2r_textures and segment 3
* remove segment 5
* (wip) remove segment 6
still plenty of thing to do
* more vtx
* more change
* Update torch
* small fix
* Update BansheeBoardwalk.cpp
* fix blockFort
* Delete test.yaml
* fix bowser castle and simplify track sections
* fix choco mountain
* clean banshee
* fix dk jungle
* fix double deck
* fix macos
* fix error
* fix macos ci
* Update torch
* Update torch
* fix frappe snowland
* fix kalimari desert
* fix koopa troopa beach
* fix luigi raceway
* fix mario raceway and simplify thing
* fix moo moo farm
* fix rainbow road
* Update torch
* Update torch
* hopefully fix windows error
* fix a small error
* fix royal raceway (and podium in theory)
* fix sherbet_land
* fix skyscraper
* fix toads turnpike
* fix wario stadium
* fix yoshi valley
* update torch
* more clang tidy rules
* REMOVE totally SEGMENT (sorry for the PR)
* remove unused field in course and props and unused packed asset
* fix kart texture
* fix particle
* fix track section and transparency
* try fix mode extra
* fix macos build and render
* fix collision in extra
* small change and try fix windows error
* a little of clean
* more cleanup
* forget header and more clean up
* Update Makefile
* fix credits
* fix kart texture offset
* remove LoadTextures and add Unload
* fix definitevely mirror mode
* add unload but it's not perfect
* revert a bad fix
* clean no longer used python script
* fix crash with player
* being able to load the same course twice
* add a comment on DrawWater
* fix render of transparent object
* better hack
* add a proper migration instruction
* fix number
* add basic modsmanager
* add meta/mods.toml
* Update EditorMath.h
* Update ModsManager.cpp
* basic modManager (maybe I should rename it ModLoader)
* use range on dependencies
* add information about mods.toml
* fix coment
* some rename around
* Delete beta-to-v1.md
* Update migrations.md
* Update textures-pack.md
* Update modding.md
* Update modding.md
* clean yamls_old
* move to mods in engine
* rename ModsManger to ModManager
* move init and unload at the top
* rename ModsMetadata to ModMetadata
* fix header
* Update ModManager.cpp
* put core mods at top
Diffstat (limited to 'src/engine/objects')
| -rw-r--r-- | src/engine/objects/Bat.cpp | 5 | ||||
| -rw-r--r-- | src/engine/objects/BombKart.cpp | 1 | ||||
| -rw-r--r-- | src/engine/objects/Boos.cpp | 9 | ||||
| -rw-r--r-- | src/engine/objects/ChainChomp.cpp | 6 | ||||
| -rw-r--r-- | src/engine/objects/CheepCheep.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Crab.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Flagpole.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/GrandPrixBalloons.cpp | 5 | ||||
| -rw-r--r-- | src/engine/objects/Hedgehog.cpp | 5 | ||||
| -rw-r--r-- | src/engine/objects/HotAirBalloon.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Lakitu.cpp | 3 | ||||
| -rw-r--r-- | src/engine/objects/Mole.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Penguin.cpp | 2 | ||||
| -rw-r--r-- | src/engine/objects/Podium.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Seagull.cpp | 1 | ||||
| -rw-r--r-- | src/engine/objects/Snowman.cpp | 5 | ||||
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 6 | ||||
| -rw-r--r-- | src/engine/objects/TrashBin.cpp | 4 | ||||
| -rw-r--r-- | src/engine/objects/Trophy.cpp | 6 |
19 files changed, 49 insertions, 33 deletions
diff --git a/src/engine/objects/Bat.cpp b/src/engine/objects/Bat.cpp index 25c28c751..2b6f01230 100644 --- a/src/engine/objects/Bat.cpp +++ b/src/engine/objects/Bat.cpp @@ -6,8 +6,9 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/banshee_boardwalk_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/textures/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/BombKart.cpp b/src/engine/objects/BombKart.cpp index c465aea43..4ba5ff843 100644 --- a/src/engine/objects/BombKart.cpp +++ b/src/engine/objects/BombKart.cpp @@ -24,6 +24,7 @@ extern "C" { #include "code_80005FD0.h" #include "math_util_2.h" #include "collision.h" +#include <assets/models/common_data.h> extern s8 gPlayerCount; } diff --git a/src/engine/objects/Boos.cpp b/src/engine/objects/Boos.cpp index a22b0edd0..20b16355e 100644 --- a/src/engine/objects/Boos.cpp +++ b/src/engine/objects/Boos.cpp @@ -6,10 +6,11 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/banshee_boardwalk_data.h" -#include "assets/common_data.h" -#include "assets/boo_frames.h" -#include "assets/other_textures.h" +#include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/textures/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/models/common_data.h" +#include "assets/textures/boo_frames.h" +#include "assets/textures/other_textures.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/ChainChomp.cpp b/src/engine/objects/ChainChomp.cpp index 9f750831b..b9c59606d 100644 --- a/src/engine/objects/ChainChomp.cpp +++ b/src/engine/objects/ChainChomp.cpp @@ -4,8 +4,10 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/rainbow_road_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/rainbow_road/rainbow_road_data.h" +#include "assets/textures/tracks/rainbow_road/rainbow_road_data.h" +#include "assets/other/tracks/rainbow_road/rainbow_road_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/CheepCheep.cpp b/src/engine/objects/CheepCheep.cpp index a2432f57e..f52af62a1 100644 --- a/src/engine/objects/CheepCheep.cpp +++ b/src/engine/objects/CheepCheep.cpp @@ -1,8 +1,8 @@ #include "CheepCheep.h" #include "port/Game.h" -#include "assets/banshee_boardwalk_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/models/common_data.h" extern "C" { diff --git a/src/engine/objects/Crab.cpp b/src/engine/objects/Crab.cpp index 9e4e4687b..c24c07221 100644 --- a/src/engine/objects/Crab.cpp +++ b/src/engine/objects/Crab.cpp @@ -21,7 +21,9 @@ extern "C" { #include "code_80005FD0.h" #include "some_data.h" #include "ceremony_and_credits.h" -#include "assets/koopa_troopa_beach_data.h" +#include "assets/models/tracks/koopa_troopa_beach/koopa_troopa_beach_data.h" +#include "assets/textures/tracks/koopa_troopa_beach/koopa_troopa_beach_data.h" +#include "assets/models/common_data.h" } size_t OCrab::_count = 0; diff --git a/src/engine/objects/Flagpole.cpp b/src/engine/objects/Flagpole.cpp index 58581e3c9..ec7588720 100644 --- a/src/engine/objects/Flagpole.cpp +++ b/src/engine/objects/Flagpole.cpp @@ -5,8 +5,8 @@ extern "C" { #include "code_800029B0.h" #include "render_objects.h" #include "update_objects.h" -#include "assets/yoshi_valley_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/yoshi_valley/yoshi_valley_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/GrandPrixBalloons.cpp b/src/engine/objects/GrandPrixBalloons.cpp index 05ba880c6..2180f85c0 100644 --- a/src/engine/objects/GrandPrixBalloons.cpp +++ b/src/engine/objects/GrandPrixBalloons.cpp @@ -1,8 +1,9 @@ #include "GrandPrixBalloons.h" #include "port/Game.h" -#include "assets/other_textures.h" -#include "assets/common_data.h" +#include "assets/textures/other_textures.h" +#include "assets/textures/some_data.h" +#include "assets/models/common_data.h" #include "port/interpolation/FrameInterpolation.h" extern "C" { diff --git a/src/engine/objects/Hedgehog.cpp b/src/engine/objects/Hedgehog.cpp index a36853a91..a166cd348 100644 --- a/src/engine/objects/Hedgehog.cpp +++ b/src/engine/objects/Hedgehog.cpp @@ -6,8 +6,9 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/yoshi_valley_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/yoshi_valley/yoshi_valley_data.h" +#include "assets/textures/tracks/yoshi_valley/yoshi_valley_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/HotAirBalloon.cpp b/src/engine/objects/HotAirBalloon.cpp index b30c8e3ed..74de17230 100644 --- a/src/engine/objects/HotAirBalloon.cpp +++ b/src/engine/objects/HotAirBalloon.cpp @@ -5,8 +5,8 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/luigi_raceway_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/luigi_raceway/luigi_raceway_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/Lakitu.cpp b/src/engine/objects/Lakitu.cpp index 392fe9100..d4c4b18c7 100644 --- a/src/engine/objects/Lakitu.cpp +++ b/src/engine/objects/Lakitu.cpp @@ -24,7 +24,7 @@ extern "C" { #include "defines.h" #include "code_80005FD0.h" #include "collision.h" -#include "assets/bowsers_castle_data.h" +#include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h" #include "ceremony_and_credits.h" #include "objects.h" #include "update_objects.h" @@ -34,6 +34,7 @@ extern "C" { #include "race_logic.h" #include "effects.h" #include "memory.h" +#include <assets/models/common_data.h> extern s8 gPlayerCount; } diff --git a/src/engine/objects/Mole.cpp b/src/engine/objects/Mole.cpp index 9bc470f90..92d357873 100644 --- a/src/engine/objects/Mole.cpp +++ b/src/engine/objects/Mole.cpp @@ -17,9 +17,11 @@ extern "C" { #include "code_80005FD0.h" #include "some_data.h" #include "ceremony_and_credits.h" -#include "assets/moo_moo_farm_data.h" +#include "assets/models/tracks/moo_moo_farm/moo_moo_farm_data.h" +#include "assets/textures/tracks/moo_moo_farm/moo_moo_farm_data.h" #include "sounds.h" #include "external.h" +#include <assets/models/common_data.h> } #include "port/interpolation/FrameInterpolation.h" diff --git a/src/engine/objects/Penguin.cpp b/src/engine/objects/Penguin.cpp index 262446abb..27c009489 100644 --- a/src/engine/objects/Penguin.cpp +++ b/src/engine/objects/Penguin.cpp @@ -23,7 +23,7 @@ extern "C" { #include "code_80005FD0.h" #include "math_util_2.h" #include "collision.h" -#include "assets/bowsers_castle_data.h" +#include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h" #include "ceremony_and_credits.h" #include "objects.h" #include "update_objects.h" diff --git a/src/engine/objects/Podium.cpp b/src/engine/objects/Podium.cpp index d5e09d799..621ba91ab 100644 --- a/src/engine/objects/Podium.cpp +++ b/src/engine/objects/Podium.cpp @@ -1,5 +1,5 @@ #include "Podium.h" -#include "assets/ceremony_data.h" +#include "assets/models/ceremony_data.h" extern "C" { #include "main.h" @@ -10,7 +10,7 @@ extern "C" { #include "podium_ceremony_actors.h" #include "math_util.h" #include "math_util_2.h" -#include "assets/common_data.h" +#include "assets/models/common_data.h" #include "some_data.h" #include "code_80091440.h" #include "code_80086E70.h" diff --git a/src/engine/objects/Seagull.cpp b/src/engine/objects/Seagull.cpp index 61a7f39ca..8eff07740 100644 --- a/src/engine/objects/Seagull.cpp +++ b/src/engine/objects/Seagull.cpp @@ -21,6 +21,7 @@ extern "C" { #include "code_80005FD0.h" #include "some_data.h" #include "ceremony_and_credits.h" +#include "assets/models/common_data.h" extern SplineData D_800E6034; extern SplineData D_800E60F0; extern SplineData D_800E61B4; diff --git a/src/engine/objects/Snowman.cpp b/src/engine/objects/Snowman.cpp index dd98e2df0..6e6335f2c 100644 --- a/src/engine/objects/Snowman.cpp +++ b/src/engine/objects/Snowman.cpp @@ -4,8 +4,9 @@ extern "C" { #include "render_objects.h" #include "update_objects.h" -#include "assets/frappe_snowland_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/frappe_snowland/frappe_snowland_data.h" +#include "assets/textures/tracks/frappe_snowland/frappe_snowland_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index b597f26ba..324f32cfb 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -26,12 +26,14 @@ extern "C" { #include "code_80005FD0.h" #include "math_util_2.h" #include "collision.h" -#include "assets/bowsers_castle_data.h" +#include "assets/models/tracks/bowsers_castle/bowsers_castle_data.h" +#include "assets/textures/tracks/bowsers_castle/bowsers_castle_data.h" #include "ceremony_and_credits.h" #include "objects.h" #include "update_objects.h" #include "render_objects.h" #include "some_data.h" +#include "assets/models/common_data.h" extern s8 gPlayerCount; } @@ -758,7 +760,7 @@ void OThwomp::Draw(s32 cameraId) { void OThwomp::DrawModel(s32 objectIndex) { if ((gObjectList[objectIndex].state >= 2) && (func_80072354(objectIndex, 0x00000040) != 0)) { - FrameInterpolation_RecordOpenChild("Thwomp_Main", (uintptr_t) TAG_THWOMP(this)); + FrameInterpolation_RecordOpenChild("Thwomp_Main", TAG_THWOMP(this)); func_8004A7AC(objectIndex, 1.75f); rsp_set_matrix_transformation(gObjectList[objectIndex].pos, gObjectList[objectIndex].orientation, gObjectList[objectIndex].sizeScaling); diff --git a/src/engine/objects/TrashBin.cpp b/src/engine/objects/TrashBin.cpp index 871151b8f..954b9491a 100644 --- a/src/engine/objects/TrashBin.cpp +++ b/src/engine/objects/TrashBin.cpp @@ -10,8 +10,8 @@ extern "C" { #include "code_800029B0.h" #include "render_objects.h" #include "update_objects.h" -#include "assets/banshee_boardwalk_data.h" -#include "assets/common_data.h" +#include "assets/models/tracks/banshee_boardwalk/banshee_boardwalk_data.h" +#include "assets/models/common_data.h" #include "math_util.h" #include "math_util_2.h" #include "code_80086E70.h" diff --git a/src/engine/objects/Trophy.cpp b/src/engine/objects/Trophy.cpp index ba5435953..865ccc822 100644 --- a/src/engine/objects/Trophy.cpp +++ b/src/engine/objects/Trophy.cpp @@ -1,6 +1,6 @@ #include "Trophy.h" -#include "assets/common_data.h" -#include "assets/data_segment2.h" +#include "assets/models/common_data.h" +#include "assets/models/data_segment2.h" #include "port/Game.h" extern "C" { @@ -8,7 +8,7 @@ extern "C" { #include "defines.h" #include "update_objects.h" #include "code_80057C60.h" -#include "assets/ceremony_data.h" +#include "assets/models/ceremony_data.h" #include "podium_ceremony_actors.h" #include "engine/particles/StarEmitter.h" #include "math_util.h" |
