From 02ad54ca72f5baf4614cb9b7c30f8dd780764d90 Mon Sep 17 00:00:00 2001
From: coco875 <59367621+coco875@users.noreply.github.com>
Date: Sun, 7 Dec 2025 15:34:53 +0100
Subject: 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
---
 src/engine/World.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'src/engine/World.cpp')

diff --git a/src/engine/World.cpp b/src/engine/World.cpp
index cca7a2199..0922e6c6e 100644
--- a/src/engine/World.cpp
+++ b/src/engine/World.cpp
@@ -17,8 +17,8 @@ extern "C" {
 #include "defines.h"
 #include "audio/external.h"
 #include "menus.h"
-#include "common_data.h"
-#include "mario_raceway_data.h"
+#include "assets/models/common_data.h"
+#include "assets/models/tracks/mario_raceway/mario_raceway_data.h"
 }
 
 std::shared_ptr<Course> CurrentCourse;
@@ -41,8 +41,18 @@ void World::AddCup(Cup* cup) {
     Cups.push_back(cup);
 }
 
+void World::SetCurrentCourse(std::shared_ptr<Course> course) {
+    if (CurrentCourse) {
+        UnLoadCourse();
+    }
+    if (CurrentCourse == course) {
+        return;
+    }
+    CurrentCourse = std::move(course);
+}
+
 void World::SetCourseFromCup() {
-    CurrentCourse = CurrentCup->GetCourse();
+    SetCurrentCourse(CurrentCup->GetCourse());
 }
 
 TrainCrossing* World::AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius,
@@ -91,7 +101,7 @@ void World::SetCupIndex(size_t index) {
     CupIndex = index;
 }
 
-void World::SetCup(Cup* cup) {
+void World::SetCurrentCup(Cup* cup) {
     if (cup) {
         CurrentCup = cup;
         CurrentCup->CursorPosition = 0;
@@ -102,7 +112,7 @@ void World::SetCourse(const char* name) {
     //! @todo Use content dictionary instead
     for (size_t i = 0; i < Courses.size(); i++) {
         if (strcmp(Courses[i]->Props.Name, name) == 0) {
-            CurrentCourse = Courses[i];
+            SetCurrentCourse(Courses[i]);
             break;
         }
     }
@@ -115,7 +125,7 @@ void World::NextCourse() {
     } else {
         CourseIndex = 0;
     }
-    gWorldInstance.CurrentCourse = Courses[CourseIndex];
+    gWorldInstance.SetCurrentCourse(Courses[CourseIndex]);
 }
 
 void World::PreviousCourse() {
@@ -124,7 +134,7 @@ void World::PreviousCourse() {
     } else {
         CourseIndex = Courses.size() - 1;
     }
-    gWorldInstance.CurrentCourse = Courses[CourseIndex];
+    gWorldInstance.SetCurrentCourse(Courses[CourseIndex]);
 }
 
 AActor* World::AddActor(AActor* actor) {
-- 
cgit v1.2.3