v2: Move utility::re_game_object::get_name to REGameObject::get_name

14 call sites: obj->get_name() instead of utility::re_game_object::get_name(obj).
namespace utility::re_game_object deleted.

Author: praydog

shared/sdk/REGameObject.cpp

@@ -58,9 +58,8 @@ SystemString* REGameObject::get_name_field() const {
     return *(SystemString**)((uintptr_t)this + go_transform_offset() + sizeof(void*) * 2);
 }
 
-namespace utility::re_game_object {
-std::string get_name(REGameObject* obj) {
-    if (obj == nullptr) {
+std::string REGameObject::get_name() const {
+    if (this == nullptr) {
         return {};
     }
 
@@ -70,7 +69,7 @@ std::string get_name(REGameObject* obj) {
     static const auto get_name_fn = game_object_t != nullptr ? game_object_t->get_method("get_Name") : nullptr;
 
     if (get_name_fn != nullptr) {
-        auto str = get_name_fn->call<::SystemString*>(sdk::get_thread_context(), obj);
+        auto str = get_name_fn->call<::SystemString*>(sdk::get_thread_context(), const_cast<REGameObject*>(this));
 
         if (str != nullptr) {
             return utility::re_string::get_string(str);
@@ -79,6 +78,5 @@ std::string get_name(REGameObject* obj) {
 
     // We rely on the reflected function first because
     // this offset might change between versions.
-    return utility::re_string::get_string(obj->get_name_field());
-}
+    return utility::re_string::get_string(get_name_field());
 }

shared/sdk/REGameObject.hpp

@@ -1,9 +1,3 @@
 #pragma once
 
 #include "REManagedObject.hpp"
-
-namespace utility {
-namespace re_game_object {
-std::string get_name(::REGameObject* obj);
-}
-}

shared/sdk/Renderer.cpp

@@ -1857,7 +1857,7 @@ RECamera* layer::Scene::get_main_camera_if_possible() const {
         return nullptr;
     }
 
-    const auto name = utility::re_game_object::get_name(camera_gameobject);
+    const auto name = camera_gameobject->get_name();
 
     static const std::vector<std::string> camera_names = {
         "MainCamera",

shared/sdk/types/REGameObject.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include <string>
 #include "REManagedObject.hpp"
 
 class RETransform;
@@ -19,6 +20,8 @@ class REGameObject : public REManagedObject {
 
     static uintptr_t offset_of_transform();
     static uintptr_t offset_of_folder();
+
+    std::string get_name() const;
 #else
     RETransform* get_transform() const { return m_transform; }
     bool get_shouldDraw() const { return m_shouldDraw; }
@@ -30,6 +33,8 @@ class REGameObject : public REManagedObject {
 
     static uintptr_t offset_of_transform() { return offsetof(REGameObject, m_transform); }
     static uintptr_t offset_of_folder()    { return offsetof(REGameObject, m_folder); }
+
+    std::string get_name() const;
 #endif
 
 private:

src/mods/FirstPerson.cpp

@@ -738,7 +738,7 @@ bool FirstPerson::update_pointers_from_camera_system(RopewayCameraSystem* camera
             return false;
         }
 
-        m_player_name = utility::re_game_object::get_name(owner->get_game_object());
+        m_player_name = owner->get_game_object()->get_name();
 
         if (m_player_name.empty()) {
             return false;
@@ -760,7 +760,7 @@ bool FirstPerson::update_pointers_from_camera_system(RopewayCameraSystem* camera
             return false;
         }
 
-        if (utility::re_game_object::get_name(CAMCTRL(controller, activeCamera)->get_game_object()) == "PlayerCameraController") {
+        if (CAMCTRL(controller, activeCamera)->get_game_object()->get_name() == "PlayerCameraController") {
             m_player_camera_controller = controller;
             spdlog::info("Found PlayerCameraController {:p}", (void*)m_player_camera_controller);
         }

src/mods/Graphics.cpp

@@ -500,7 +500,7 @@ void Graphics::fix_ui_element(REComponent* gui_element) {
         return;
     }
 
-    const auto go_name = utility::re_game_object::get_name(game_object);
+    const auto go_name = game_object->get_name();
 
     if (go_name == "BlackFade") {
         return; // Don't do anything with the black fade, it should be taking over the whole screen
@@ -597,7 +597,7 @@ bool Graphics::on_pre_gui_draw_element(REComponent* gui_element, void* primitive
             }
         }
 
-        const auto name = utility::re_game_object::get_name(game_object);
+        const auto name = game_object->get_name();
         const auto name_hash = utility::hash(name);
 
         switch(name_hash) {
@@ -704,7 +704,7 @@ void Graphics::do_scope_tweaks(sdk::renderer::layer::Scene* layer) {
 
     const auto camera_gameobject = utility::re_component::get_game_object(camera);
 
-    const auto name = utility::re_game_object::get_name(camera_gameobject);
+    const auto name = camera_gameobject->get_name();
 
     if (name.empty()) {
         return;
@@ -1147,7 +1147,7 @@ void Graphics::setup_rt_component() {
         return;
     }
 
-    const auto go_name = utility::re_game_object::get_name(game_object);
+    const auto go_name = game_object->get_name();
 
     if ((!go_name.starts_with("Main") && !go_name.starts_with("main")) && !go_name.contains("DefaultCamera")) {
         return;

src/mods/VR.cpp

@@ -2368,7 +2368,7 @@ bool VR::on_pre_gui_draw_element(REComponent* gui_element, void* primitive_conte
         auto context = sdk::get_thread_context();
         const auto& gi = sdk::GameIdentity::get();
 
-        const auto name = utility::re_game_object::get_name(game_object);
+        const auto name = game_object->get_name();
         const auto name_hash = utility::hash(name);
 
         switch (name_hash) {

src/mods/tools/ChainViewer.cpp

@@ -296,7 +296,7 @@ void ChainViewer::on_frame() {
             return;
         }
 
-        auto owner_name = utility::re_game_object::get_name(owner);
+        auto owner_name = owner->get_name();
 
         if (owner_name.empty()) {
             owner_name = "";

src/mods/tools/GameObjectsDisplay.cpp

@@ -288,7 +288,7 @@ void GameObjectsDisplay::on_frame() {
             continue;
         }
 
-        auto owner_name = utility::re_game_object::get_name(owner);
+        auto owner_name = owner->get_name();
 
         if (owner_name.empty()) {
             continue;

src/mods/tools/ObjectExplorer.cpp

@@ -2560,7 +2560,7 @@ void ObjectExplorer::handle_address(Address address, int32_t offset, Address par
         context_menu(real_address);
 
         if (is_game_object) {
-            additional_text = utility::re_game_object::get_name(address.as<REGameObject*>());
+            additional_text = address.as<REGameObject*>()->get_name();
         }
         else {
             // Change name based on VMType
@@ -2778,7 +2778,7 @@ void ObjectExplorer::handle_game_object(REGameObject* game_object) {
         m_add_component_name.reserve(256);
     }
 
-    auto game_object_name = utility::re_game_object::get_name(game_object);
+    auto game_object_name = game_object->get_name();
 
     ImGui::Text("Name: %s", game_object_name.c_str());
     make_tree_offset(game_object, REGameObject::offset_of_transform(), "Transform");
@@ -2791,7 +2791,7 @@ void ObjectExplorer::handle_component(REComponent* component) {
     auto display_component_preview = [&](REComponent* comp) {
         if (comp != nullptr && comp->get_game_object() != nullptr) {
             auto prev_name = comp->get_type_name();
-            auto prev_gameobject_name = utility::re_game_object::get_name(comp->get_game_object());
+            auto prev_gameobject_name = comp->get_game_object()->get_name();
 
             auto tree_hovered = ImGui::IsItemHovered();
 
@@ -4339,7 +4339,7 @@ void ObjectExplorer::context_menu(void* address, std::optional<std::string> name
                     }
                     else {
                         auto owner = obj->get_game_object();
-                        spdlog::info("[{:s}] {:s} ({:x})", utility::re_game_object::get_name(owner), t->get_type_name(), (uintptr_t)obj);
+                        spdlog::info("[{:s}] {:s} ({:x})", owner->get_name(), t->get_type_name(), (uintptr_t)obj);
                     }
                 }