clang formatclang-format

1 files changed, 114 insertions, 110 deletions

diff --git a/src/engine/editor/SceneManager.cpp b/src/engine/editor/SceneManager.cpp
index a2de6656c..c0ba58f2d 100644
--- a/src/engine/editor/SceneManager.cpp
+++ b/src/engine/editor/SceneManager.cpp
@@ -15,142 +15,146 @@
 
 namespace Editor {
 
-    std::shared_ptr<Ship::Archive> CurrentArchive;
-    std::string SceneFile = "";
+std::shared_ptr<Ship::Archive> CurrentArchive;
+std::string SceneFile = "";
 
-    void SaveLevel() {
-        auto props = gWorldInstance.CurrentCourse->Props;
+void SaveLevel() {
+    auto props = gWorldInstance.CurrentCourse->Props;
 
-        if ((CurrentArchive) && (!SceneFile.empty())) {
-            nlohmann::json data;
-    
-            data["Props"] = props.to_json();
+    if ((CurrentArchive) && (!SceneFile.empty())) {
+        nlohmann::json data;
 
-            nlohmann::json staticMesh;
+        data["Props"] = props.to_json();
 
-            for (const auto& mesh : gWorldInstance.StaticMeshActors) {
-                staticMesh.push_back(mesh->to_json());
-            }
-            data["StaticMeshActors"] = staticMesh;
+        nlohmann::json staticMesh;
 
-            // nlohmann::json actors;
+        for (const auto& mesh : gWorldInstance.StaticMeshActors) {
+            staticMesh.push_back(mesh->to_json());
+        }
+        data["StaticMeshActors"] = staticMesh;
 
-            // for (const auto& actor : gWorldInstance.Actors) {
-            //     actors.push_back(actor->to_json());
-            // }
-            // data["Actors"] = actors;
+        // nlohmann::json actors;
 
-            // nlohmann::json objects;
+        // for (const auto& actor : gWorldInstance.Actors) {
+        //     actors.push_back(actor->to_json());
+        // }
+        // data["Actors"] = actors;
 
-            // for (const auto& object : gWorldInstance.Objects) {
-            //     objects.push_back(object->to_json());
-            // }
-            // data["Objects"] = objects;
+        // nlohmann::json objects;
 
-            try {
-                auto dat = data.dump();
-                std::vector<uint8_t> stringify;
-                stringify.assign(dat.begin(), dat.end());
-
-                bool wrote = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->WriteFile(CurrentArchive, SceneFile, stringify);
-                if (wrote) {
-                    printf("Successfully wrote scene file!\n  Wrote: %s\n", SceneFile.c_str());
-                } else {
-                    printf("Failed to write scene file!\n");
-                }
-            } catch (const nlohmann::json::exception& e) {
-                printf("SceneManager::SaveLevel():\n  JSON error during dump: %s\n", e.what());
+        // for (const auto& object : gWorldInstance.Objects) {
+        //     objects.push_back(object->to_json());
+        // }
+        // data["Objects"] = objects;
+
+        try {
+            auto dat = data.dump();
+            std::vector<uint8_t> stringify;
+            stringify.assign(dat.begin(), dat.end());
+
+            bool wrote = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->WriteFile(
+                CurrentArchive, SceneFile, stringify);
+            if (wrote) {
+                printf("Successfully wrote scene file!\n  Wrote: %s\n", SceneFile.c_str());
+            } else {
+                printf("Failed to write scene file!\n");
             }
-        } else {
-            printf("Could not save scene file, SceneFile or CurrentArchive not set\n");
+        } catch (const nlohmann::json::exception& e) {
+            printf("SceneManager::SaveLevel():\n  JSON error during dump: %s\n", e.what());
         }
+    } else {
+        printf("Could not save scene file, SceneFile or CurrentArchive not set\n");
     }
+}
 
-    void LoadLevel(std::shared_ptr<Ship::Archive> archive, Course* course, std::string sceneFile) {
-        SceneFile = sceneFile;
+void LoadLevel(std::shared_ptr<Ship::Archive> archive, Course* course, std::string sceneFile) {
+    SceneFile = sceneFile;
 
-        if (archive) {
-            auto initData = std::make_shared<Ship::ResourceInitData>();
-            initData->Parent = archive;
-            initData->Format = RESOURCE_FORMAT_BINARY;
-            initData->ByteOrder = Ship::Endianness::Little;
-            initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json);
-            initData->ResourceVersion = 0;
+    if (archive) {
+        auto initData = std::make_shared<Ship::ResourceInitData>();
+        initData->Parent = archive;
+        initData->Format = RESOURCE_FORMAT_BINARY;
+        initData->ByteOrder = Ship::Endianness::Little;
+        initData->Type = static_cast<uint32_t>(Ship::ResourceType::Json);
+        initData->ResourceVersion = 0;
 
-            nlohmann::json data = std::static_pointer_cast<Ship::Json>(
-                GameEngine::Instance->context->GetResourceManager()->LoadResource(sceneFile, true, initData))->Data;
+        nlohmann::json data =
+            std::static_pointer_cast<Ship::Json>(
+                GameEngine::Instance->context->GetResourceManager()->LoadResource(sceneFile, true, initData))
+                ->Data;
 
-            if (data.is_null() || data.empty()) {
-                return;
-            }
+        if (data.is_null() || data.empty()) {
+            return;
+        }
 
-            // Load the Props (deserialize it)
-            if (data.contains("Props")) {
-                auto& propsJson = data["Props"];
-                try {
-                    course->Props.from_json(propsJson);
-                } catch(const std::exception& e) {
-                    std::cerr << "SceneManager::LoadLevel() Error parsing track properties: " << e.what() << std::endl;
-                    std::cerr << "  Is your scene.json file out of date?" << std::endl;
-                }
-            } else {
-                std::cerr << "Props data not found in the JSON file!" << std::endl;
+        // Load the Props (deserialize it)
+        if (data.contains("Props")) {
+            auto& propsJson = data["Props"];
+            try {
+                course->Props.from_json(propsJson);
+            } catch (const std::exception& e) {
+                std::cerr << "SceneManager::LoadLevel() Error parsing track properties: " << e.what() << std::endl;
+                std::cerr << "  Is your scene.json file out of date?" << std::endl;
             }
+        } else {
+            std::cerr << "Props data not found in the JSON file!" << std::endl;
+        }
 
-            // Load the Actors (deserialize them)
-            if (data.contains("StaticMeshActors")) {
-                auto& actorsJson = data["StaticMeshActors"];
-                gWorldInstance.StaticMeshActors.clear();  // Clear existing actors, if any
-                
-                for (const auto& actorJson : actorsJson) {
-                    Load_AddStaticMeshActor(actorJson);
-                }
-            } else {
-                std::cerr << "Actors data not found in the JSON file!" << std::endl;
+        // Load the Actors (deserialize them)
+        if (data.contains("StaticMeshActors")) {
+            auto& actorsJson = data["StaticMeshActors"];
+            gWorldInstance.StaticMeshActors.clear(); // Clear existing actors, if any
+
+            for (const auto& actorJson : actorsJson) {
+                Load_AddStaticMeshActor(actorJson);
             }
+        } else {
+            std::cerr << "Actors data not found in the JSON file!" << std::endl;
         }
     }
+}
 
-    void Load_AddStaticMeshActor(const nlohmann::json& actorJson) {
-        gWorldInstance.StaticMeshActors.push_back(new StaticMeshActor("", FVector(0, 0, 0), IRotator(0, 0, 0), FVector(1, 1, 1), "", nullptr));
-        auto actor = gWorldInstance.StaticMeshActors.back();
-        actor->from_json(actorJson);
+void Load_AddStaticMeshActor(const nlohmann::json& actorJson) {
+    gWorldInstance.StaticMeshActors.push_back(
+        new StaticMeshActor("", FVector(0, 0, 0), IRotator(0, 0, 0), FVector(1, 1, 1), "", nullptr));
+    auto actor = gWorldInstance.StaticMeshActors.back();
+    actor->from_json(actorJson);
 
-        printf("After from_json: Pos(%f, %f, %f), Name: %s, Model: %s\n", 
-        actor->Pos.x, actor->Pos.y, actor->Pos.z, actor->Name.c_str(), actor->Model.c_str());
-        gEditor.AddObject(actor->Name.c_str(), &actor->Pos, &actor->Rot, &actor->Scale, (Gfx*) nullptr, 1.0f,
-                        GameObject::CollisionType::BOUNDING_BOX, 20.0f, (int32_t*) &actor->bPendingDestroy, (int32_t) 1);
-    }
+    printf("After from_json: Pos(%f, %f, %f), Name: %s, Model: %s\n", actor->Pos.x, actor->Pos.y, actor->Pos.z,
+           actor->Name.c_str(), actor->Model.c_str());
+    gEditor.AddObject(actor->Name.c_str(), &actor->Pos, &actor->Rot, &actor->Scale, (Gfx*) nullptr, 1.0f,
+                      GameObject::CollisionType::BOUNDING_BOX, 20.0f, (int32_t*) &actor->bPendingDestroy, (int32_t) 1);
+}
 
-    void SetSceneFile(std::shared_ptr<Ship::Archive> archive, std::string sceneFile) {
-        CurrentArchive = archive;
-        SceneFile = sceneFile;
-    }
+void SetSceneFile(std::shared_ptr<Ship::Archive> archive, std::string sceneFile) {
+    CurrentArchive = archive;
+    SceneFile = sceneFile;
+}
 
-    void LoadMinimap(std::shared_ptr<Ship::Archive> archive, Course* course, std::string filePath) {
-        printf("LOADING MINIMAP %s\n", filePath.c_str());
-        if (archive) {
-            auto initData = std::make_shared<Ship::ResourceInitData>();
-            initData->Parent = archive;
-            initData->Format = RESOURCE_FORMAT_BINARY;
-            initData->ByteOrder = Ship::Endianness::Little;
-            initData->Type = static_cast<uint32_t>(MK64::ResourceType::Minimap);
-            initData->ResourceVersion = 0;
-
-            std::shared_ptr<MK64::Minimap> ptr = std::static_pointer_cast<MK64::Minimap>(
-                GameEngine::Instance->context->GetResourceManager()->LoadResource(filePath, true, initData));
-
-            if (ptr) {
-                printf("LOADED MINIMAP!\n");
-                MK64::MinimapTexture texture = ptr->Texture;
-                course->Props.Minimap.Texture = (const char*)texture.Data;
-                course->Props.Minimap.Width = texture.Width;
-                course->Props.Minimap.Height = texture.Height;
-            } else { // Fallback
-                course->Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway;
-                course->Props.Minimap.Width = ResourceGetTexWidthByName(course->Props.Minimap.Texture);
-                course->Props.Minimap.Height = ResourceGetTexHeightByName(course->Props.Minimap.Texture);
-            }
+void LoadMinimap(std::shared_ptr<Ship::Archive> archive, Course* course, std::string filePath) {
+    printf("LOADING MINIMAP %s\n", filePath.c_str());
+    if (archive) {
+        auto initData = std::make_shared<Ship::ResourceInitData>();
+        initData->Parent = archive;
+        initData->Format = RESOURCE_FORMAT_BINARY;
+        initData->ByteOrder = Ship::Endianness::Little;
+        initData->Type = static_cast<uint32_t>(MK64::ResourceType::Minimap);
+        initData->ResourceVersion = 0;
+
+        std::shared_ptr<MK64::Minimap> ptr = std::static_pointer_cast<MK64::Minimap>(
+            GameEngine::Instance->context->GetResourceManager()->LoadResource(filePath, true, initData));
+
+        if (ptr) {
+            printf("LOADED MINIMAP!\n");
+            MK64::MinimapTexture texture = ptr->Texture;
+            course->Props.Minimap.Texture = (const char*) texture.Data;
+            course->Props.Minimap.Width = texture.Width;
+            course->Props.Minimap.Height = texture.Height;
+        } else { // Fallback
+            course->Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway;
+            course->Props.Minimap.Width = ResourceGetTexWidthByName(course->Props.Minimap.Texture);
+            course->Props.Minimap.Height = ResourceGetTexHeightByName(course->Props.Minimap.Texture);
         }
     }
 }
+} // namespace Editor