From 956058a32dfa3f26a20bc65fa83ac916fde073ab Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Sat, 28 Jun 2025 21:54:06 +0000 Subject: [PATCH] correct use of pointer and fix mistake (#394) * correct use of pointer and fix mistake * remove CM_WeirdLength * Update Game.cpp * Update Game.cpp --------- Co-authored-by: MegaMech --- src/engine/Cup.cpp | 4 +- src/engine/Cup.h | 6 +-- src/engine/ModelLoader.cpp | 6 +-- src/engine/ModelLoader.h | 4 +- src/engine/World.cpp | 15 +++--- src/engine/World.h | 8 +-- src/port/Game.cpp | 98 +++++++++++++++++----------------- src/port/ui/ContentBrowser.cpp | 12 ++--- src/port/ui/ContentBrowser.h | 4 +- 9 files changed, 78 insertions(+), 79 deletions(-) diff --git a/src/engine/Cup.cpp b/src/engine/Cup.cpp index ec9e6c913..36e192723 100644 --- a/src/engine/Cup.cpp +++ b/src/engine/Cup.cpp @@ -1,7 +1,7 @@ #include "Cup.h" #include "courses/Course.h" -Cup::Cup(std::string id, const char* name, std::vector courses) { +Cup::Cup(std::string id, const char* name, std::vector> courses) { Id = id; Name = name; Courses = courses; @@ -30,7 +30,7 @@ void Cup::SetCourse(size_t position) { CursorPosition = position; } -Course* Cup::GetCourse() { +std::shared_ptr Cup::GetCourse() { return Courses[CursorPosition]; } diff --git a/src/engine/Cup.h b/src/engine/Cup.h index 0b477824f..a38563bb0 100644 --- a/src/engine/Cup.h +++ b/src/engine/Cup.h @@ -13,15 +13,15 @@ public: const char* Name; u8 *Thumbnail; size_t CursorPosition = 0; // Course index in cup - std::vector Courses; + std::vector> Courses; - explicit Cup(std::string id, const char* name, std::vector courses); + explicit Cup(std::string id, const char* name, std::vector> courses); virtual void ShuffleCourses(); virtual void Next(); virtual void Previous(); virtual void SetCourse(size_t position); - virtual Course* GetCourse(); + virtual std::shared_ptr GetCourse(); virtual size_t GetSize(); }; \ No newline at end of file diff --git a/src/engine/ModelLoader.cpp b/src/engine/ModelLoader.cpp index 1c41a8ca9..b73d98aee 100644 --- a/src/engine/ModelLoader.cpp +++ b/src/engine/ModelLoader.cpp @@ -18,7 +18,7 @@ void ModelLoader::Load() { _hasRan = true; // Set to track processed courses - std::unordered_set processedCourses; + std::unordered_set> processedCourses; for (auto& list : _deferredList) { // Check if the course has already been processed @@ -34,8 +34,8 @@ void ModelLoader::Load() { } } -void ModelLoader::Extract(Course* course) { - Course* saveCourse = gWorldInstance.CurrentCourse; +void ModelLoader::Extract(std::shared_ptr course) { + std::shared_ptr saveCourse = gWorldInstance.CurrentCourse; gWorldInstance.CurrentCourse = course; // Quick hack so that `get_texture` will find the right textures. size_t vtxSize = (ResourceGetSizeByName(course->vtx) / sizeof(CourseVtx)) * sizeof(Vtx); diff --git a/src/engine/ModelLoader.h b/src/engine/ModelLoader.h index e89c7c457..0bc233706 100644 --- a/src/engine/ModelLoader.h +++ b/src/engine/ModelLoader.h @@ -37,7 +37,7 @@ class ModelLoader { public: struct LoadModelList { - Course* course; + std::shared_ptr course; Gfx* gfxBuffer; // buffer for output gfx size_t gfxBufferSize; @@ -55,7 +55,7 @@ private: }; - void Extract(Course* course); + void Extract(std::shared_ptr course); void UpdateVtx(LoadModelList list); std::vector _deferredList; diff --git a/src/engine/World.cpp b/src/engine/World.cpp index 88c6717c6..68ca27343 100644 --- a/src/engine/World.cpp +++ b/src/engine/World.cpp @@ -26,13 +26,12 @@ World::~World() { CM_CleanWorld(); } -Course* CurrentCourse; +std::shared_ptr CurrentCourse; Cup* CurrentCup; -Course* World::AddCourse(std::unique_ptr course) { - Course* ptr = course.get(); - gWorldInstance.Courses.push_back(std::move(course)); - return ptr; +std::shared_ptr World::AddCourse(std::shared_ptr course) { + gWorldInstance.Courses.push_back(course); + return course; } void World::AddCup(Cup* cup) { @@ -99,7 +98,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].get(); + CurrentCourse = Courses[i]; break; } } @@ -112,7 +111,7 @@ void World::NextCourse() { } else { CourseIndex = 0; } - gWorldInstance.CurrentCourse = Courses[CourseIndex].get(); + gWorldInstance.CurrentCourse = Courses[CourseIndex]; } void World::PreviousCourse() { @@ -121,7 +120,7 @@ void World::PreviousCourse() { } else { CourseIndex = Courses.size() - 1; } - gWorldInstance.CurrentCourse = Courses[CourseIndex].get(); + gWorldInstance.CurrentCourse = Courses[CourseIndex]; } AActor* World::AddActor(AActor* actor) { diff --git a/src/engine/World.h b/src/engine/World.h index f32cf00ff..fd56fa031 100644 --- a/src/engine/World.h +++ b/src/engine/World.h @@ -54,7 +54,7 @@ public: explicit World(); ~World(); - Course* AddCourse(std::unique_ptr course); + std::shared_ptr AddCourse(std::shared_ptr course); AActor* AddActor(AActor* actor); struct Actor* AddBaseActor(); @@ -100,7 +100,7 @@ public: void SetCourseByType() { for (const auto& course : Courses) { if (dynamic_cast(course.get())) { - CurrentCourse = course.get(); + CurrentCourse = course; return; } } @@ -112,7 +112,7 @@ public: Matrix Mtx; - Course* CurrentCourse; + std::shared_ptr CurrentCourse; Cup* CurrentCup; std::vector Cups; @@ -132,7 +132,7 @@ public: std::vector> Crossings; // Holds all available courses - std::vector> Courses; + std::vector> Courses; size_t CourseIndex = 0; // For browsing courses. private: diff --git a/src/port/Game.cpp b/src/port/Game.cpp index 5a529e9bf..a54109ccc 100644 --- a/src/port/Game.cpp +++ b/src/port/Game.cpp @@ -73,7 +73,7 @@ extern "C" void Timer_Update(); // Create the world instance World gWorldInstance; -std::unique_ptr gPodiumCeremony; +std::shared_ptr gPodiumCeremony; Cup* gMushroomCup; Cup* gFlowerCup; @@ -91,28 +91,28 @@ s32 gTrophyIndex = NULL; void CustomEngineInit() { /* Add all courses to the global course list */ - Course* mario = gWorldInstance.AddCourse(std::make_unique()); - Course* choco = gWorldInstance.AddCourse(std::make_unique()); - Course* bowser = gWorldInstance.AddCourse(std::make_unique()); - Course* banshee = gWorldInstance.AddCourse(std::make_unique()); - Course* yoshi = gWorldInstance.AddCourse(std::make_unique()); - Course* frappe = gWorldInstance.AddCourse(std::make_unique()); - Course* koopa = gWorldInstance.AddCourse(std::make_unique()); - Course* royal = gWorldInstance.AddCourse(std::make_unique()); - Course* luigi = gWorldInstance.AddCourse(std::make_unique()); - Course* mooMoo = gWorldInstance.AddCourse(std::make_unique()); - Course* toads = gWorldInstance.AddCourse(std::make_unique()); - Course* kalimari = gWorldInstance.AddCourse(std::make_unique()); - Course* sherbet = gWorldInstance.AddCourse(std::make_unique()); - Course* rainbow = gWorldInstance.AddCourse(std::make_unique()); - Course* wario = gWorldInstance.AddCourse(std::make_unique()); - Course* block = gWorldInstance.AddCourse(std::make_unique()); - Course* skyscraper = gWorldInstance.AddCourse(std::make_unique()); - Course* doubleDeck = gWorldInstance.AddCourse(std::make_unique()); - Course* dkJungle = gWorldInstance.AddCourse(std::make_unique()); - Course* bigDonut = gWorldInstance.AddCourse(std::make_unique()); -// Course* harbour = gWorldInstance.AddCourse(std::make_unique()); - Course* testCourse = gWorldInstance.AddCourse(std::make_unique()); + std::shared_ptr mario = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr choco = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr bowser = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr banshee = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr yoshi = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr frappe = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr koopa = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr royal = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr luigi = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr mooMoo = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr toads = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr kalimari = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr sherbet = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr rainbow = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr wario = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr block = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr skyscraper = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr doubleDeck = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr dkJungle = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr bigDonut = gWorldInstance.AddCourse(std::make_shared()); +// std::shared_ptr harbour = gWorldInstance.AddCourse(std::make_shared()); + std::shared_ptr testCourse = gWorldInstance.AddCourse(std::make_shared()); gPodiumCeremony = std::make_unique(); @@ -257,7 +257,7 @@ void SetCourseById(s32 course) { return; } gWorldInstance.CourseIndex = course; - gWorldInstance.CurrentCourse = gWorldInstance.Courses[gWorldInstance.CourseIndex].get(); + gWorldInstance.CurrentCourse = gWorldInstance.Courses[gWorldInstance.CourseIndex]; } void CM_VehicleCollision(s32 playerId, Player* player) { @@ -372,7 +372,7 @@ void CM_DrawStaticMeshActors() { } void CM_BeginPlay() { - Course* course = gWorldInstance.CurrentCourse; + auto course = gWorldInstance.CurrentCourse; if (course) { // Do not spawn finishline in credits or battle mode. And if bSpawnFinishline. @@ -603,7 +603,7 @@ void SetCourseFromCup() { } void* GetCourse(void) { - return gWorldInstance.CurrentCourse; + return gWorldInstance.CurrentCourse.get(); } struct Actor* CM_GetActor(size_t index) { @@ -658,7 +658,7 @@ void CM_CleanWorld(void) { delete actor; } - for (int i = 0; i < NUM_PLAYERS; i++) { + for (int i = 0; i < ARRAY_COUNT(gWorldInstance.playerBombKart); i++) { gWorldInstance.playerBombKart[i].state = PlayerBombKart::PlayerBombKartState::DISABLED; gWorldInstance.playerBombKart[i]._primAlpha = 0; } @@ -708,27 +708,27 @@ f32 CM_GetWaterLevel(Vec3f pos, Collision* collision) { } // clang-format off -bool IsMarioRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsLuigiRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsChocoMountain() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsBowsersCastle() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsBansheeBoardwalk() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsYoshiValley() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsFrappeSnowland() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsKoopaTroopaBeach() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsRoyalRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsMooMooFarm() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsToadsTurnpike() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsKalimariDesert() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsSherbetLand() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsRainbowRoad() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsWarioStadium() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsBlockFort() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsSkyscraper() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsDoubleDeck() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsDkJungle() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsBigDonut() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } -bool IsPodiumCeremony() { return dynamic_cast(gWorldInstance.CurrentCourse) != nullptr; } +bool IsMarioRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsLuigiRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsChocoMountain() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsBowsersCastle() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsBansheeBoardwalk() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsYoshiValley() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsFrappeSnowland() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsKoopaTroopaBeach() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsRoyalRaceway() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsMooMooFarm() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsToadsTurnpike() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsKalimariDesert() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsSherbetLand() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsRainbowRoad() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsWarioStadium() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsBlockFort() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsSkyscraper() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsDoubleDeck() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsDkJungle() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsBigDonut() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } +bool IsPodiumCeremony() { return dynamic_cast(gWorldInstance.CurrentCourse.get()) != nullptr; } void SelectMarioRaceway() { gWorldInstance.SetCourseByType(); } void SelectLuigiRaceway() { gWorldInstance.SetCourseByType(); } @@ -750,7 +750,7 @@ void SelectSkyscraper() { gWorldInstance.SetCourseByType(); void SelectDoubleDeck() { gWorldInstance.SetCourseByType(); } void SelectDkJungle() { gWorldInstance.SetCourseByType(); } void SelectBigDonut() { gWorldInstance.SetCourseByType(); } -void SelectPodiumCeremony() { gWorldInstance.CurrentCourse = gPodiumCeremony.get(); } +void SelectPodiumCeremony() { gWorldInstance.CurrentCourse = gPodiumCeremony; } // clang-format on void* GetMushroomCup(void) { diff --git a/src/port/ui/ContentBrowser.cpp b/src/port/ui/ContentBrowser.cpp index 03ebe8c75..2e09db01a 100644 --- a/src/port/ui/ContentBrowser.cpp +++ b/src/port/ui/ContentBrowser.cpp @@ -136,7 +136,7 @@ namespace Editor { std::string label = fmt::format("{} {}", ICON_FA_EXCLAMATION_TRIANGLE, track.Name); if (ImGui::Button(label.c_str())) { track.SceneFile = track.Dir + "/scene.json"; - gWorldInstance.CurrentCourse = track.invalidTrack.get(); + gWorldInstance.CurrentCourse = track.invalidTrack; SetSceneFile(track.Archive, track.SceneFile); SaveLevel(); Refresh = true; @@ -153,7 +153,7 @@ namespace Editor { for (auto& track : Tracks) { auto it = gWorldInstance.Courses.begin(); while (it != gWorldInstance.Courses.end()) { - if (track.course == it->get()) { + if (track.course.get() == it->get()) { it = gWorldInstance.Courses.erase(it); } else { ++it; @@ -238,11 +238,11 @@ namespace Editor { if (manager->HasFile(sceneFile)) { auto archive = manager->GetArchiveFromFile(sceneFile); - auto course = std::make_unique(); + auto course = std::make_shared(); course->LoadO2R(dir); LoadLevel(archive, course.get(), sceneFile); LoadMinimap(archive, course.get(), minimapFile); - Tracks.push_back({nullptr, course.get(), sceneFile, name, dir, archive}); + Tracks.push_back({nullptr, course, sceneFile, name, dir, archive}); gWorldInstance.Courses.push_back(std::move(course)); } else { // The track does not have a valid scene file const std::string file = dir + "/data_track_sections"; @@ -252,12 +252,12 @@ namespace Editor { // So lets add it as an uninitialized track. if (manager->HasFile(file)) { - auto course = std::make_unique(); + auto course = std::make_shared(); course->Id = (std::string("mods:") + name).c_str(); course->Props.SetText(course->Props.Name, name.c_str(), sizeof(course->Props.Name)); course->Props.SetText(course->Props.DebugName, name.c_str(), sizeof(course->Props.Name)); auto archive = manager->GetArchiveFromFile(file); - Tracks.push_back({std::move(course), nullptr, "", name, dir, archive}); + Tracks.push_back({course, nullptr, "", name, dir, archive}); } else { printf("ContentBrowser.cpp: Track '%s' missing required track files. Cannot add to game\n Missing %s/data_track_sections file\n", name.c_str(), dir.c_str()); } diff --git a/src/port/ui/ContentBrowser.h b/src/port/ui/ContentBrowser.h index 001d1a3b3..958cb4bfa 100644 --- a/src/port/ui/ContentBrowser.h +++ b/src/port/ui/ContentBrowser.h @@ -10,8 +10,8 @@ public: ~ContentBrowserWindow(); struct Tracks { - std::unique_ptr invalidTrack; // If not nullptr, user needs to create a scene file for this track. - Course* course; // A valid custom track. Used to reset the Courses array on a file system refresh. + std::shared_ptr invalidTrack; // If not nullptr, user needs to create a scene file for this track. + std::shared_ptr course; // A valid custom track. Used to reset the Courses array on a file system refresh. std::string SceneFile; std::string Name; std::string Dir; // Directory