Rename math::convert to math::to_vec2 and math::to_vec3

projects/Core/messages/message_display.cpp

@@ -243,17 +243,17 @@ namespace core::messages {
 
         update_message_position(data, total_lines, position, 0.f);
         if (data.info.pickup_position.has_value()) {
-            const auto screen_anchor = modloader::math::convert(
+            const auto screen_anchor = modloader::math::to_vec2(
                 core::api::screen_position::get(m_screen_position.get()) + m_position.get()
             );
 
             const auto pickup_positon = data.info.pickup_position.value();
             const auto message_position = data.message->position().get();
-            const auto pickup_ui_position = world_to_ui_position_2d(modloader::math::convert(pickup_positon)) - screen_anchor;
+            const auto pickup_ui_position = world_to_ui_position_2d(modloader::math::to_vec2(pickup_positon)) - screen_anchor;
             // pickup_ui_position.y = -pickup_ui_position.y;
-            const auto distance_squared = modloader::math::distance2(pickup_ui_position, modloader::math::convert(message_position));
+            const auto distance_squared = modloader::math::distance2(pickup_ui_position, modloader::math::to_vec2(message_position));
             if (distance_squared < m_max_distance_squared_for_message_position_animation) {
-                data.message->position().set(modloader::math::convert(pickup_ui_position));
+                data.message->position().set(modloader::math::to_vec3(pickup_ui_position));
             }
         }
 

projects/Modloader/il2cpp_math.h

@@ -127,11 +127,11 @@ namespace modloader::math {
         return a * (1 - weight) + b * weight;
     }
 
-    inline app::Vector2 convert(app::Vector3 const& vec) {
+    inline app::Vector2 to_vec2(app::Vector3 const& vec) {
         return app::Vector2{ vec.x, vec.y };
     }
 
-    inline app::Vector3 convert(app::Vector2 const& vec) {
+    inline app::Vector3 to_vec3(app::Vector2 const& vec) {
         return app::Vector3{ vec.x, vec.y, 0 };
     }
 } // namespace modloader::math

projects/Randomizer/game/map/map.cpp

@@ -218,7 +218,7 @@ namespace randomizer::game::map {
         IL2CPP_INTERCEPT(GameMapUI, app::Vector2, get_FocusLocation, (app::GameMapUI* this_ptr)) {
             if (force_focus_location_to_center_once) {
                 force_focus_location_to_center_once = false;
-                return math::convert(
+                return math::to_vec2(
                     AreaMapNavigation::WorldToMapPosition(
                         this_ptr->fields.m_areaMap->fields._Navigation_k__BackingField,
                         this_ptr->fields.m_areaMap->fields._Navigation_k__BackingField->fields.m_scrollPosition

projects/Randomizer/game/spawning_and_preloading.cpp

@@ -408,7 +408,7 @@ namespace randomizer::game {
                 core::api::scenes::force_load_scene(scene_name, nullptr, true, false);
             }
 
-            teleportation::teleport_instantly(math::convert(game_seed().parser_output().meta.spawn));
+            teleportation::teleport_instantly(math::to_vec3(game_seed().parser_output().meta.spawn));
             core::api::game::player::sein()->fields.PlatformBehaviour->fields.PlatformMovement->fields.Enabled = false;
             on_new_game_late_initialization_handle = core::api::game::event_bus().register_handler(GameEvent::FixedUpdate, EventTiming::After, on_new_game_late_initialization);
 
@@ -463,7 +463,7 @@ namespace randomizer::game {
                     if (save_slots_ui != nullptr) {
                         auto save_slot_ui = SaveSlotsUI::get_CurrentSaveSlot(save_slots_ui);
 
-                        auto scene_names = core::api::scenes::get_scenes_at_position(math::convert(event.seed_meta_data->spawn));
+                        auto scene_names = core::api::scenes::get_scenes_at_position(math::to_vec3(event.seed_meta_data->spawn));
 
                         for (const auto& scene_name: scenes_to_preload) {
                             if (!scene_names.contains(scene_name)) {
@@ -496,7 +496,7 @@ namespace randomizer::game {
         if (save_slots_ui != nullptr) {
             auto save_slot_ui = SaveSlotsUI::get_CurrentSaveSlot(save_slots_ui);
 
-            auto scene_names = core::api::scenes::get_scenes_at_position(math::convert(spawn));
+            auto scene_names = core::api::scenes::get_scenes_at_position(math::to_vec3(spawn));
 
             for (const auto& scene_name: scenes_to_preload) {
                 if (!scene_names.contains(scene_name)) {

projects/Randomizer/trial.cpp

@@ -46,14 +46,14 @@ namespace randomizer {
     }
 
     void Trial::update_not_in_trial() {
-        const auto position = modloader::math::convert(core::api::game::player::get_position());
+        const auto position = modloader::math::to_vec2(core::api::game::player::get_position());
         const auto in_range = modloader::math::distance2(position, m_location) < interact_radius * interact_radius;
         if (in_range && m_input_handle == nullptr) {
             m_message_box = std::make_shared<core::api::messages::MessageBox>();
             m_message_box->use_world_coordinates().set(true);
             m_message_box->show_box().set(false);
             m_message_box->text().set("Start Trial [Interact]");
-            m_message_box->position().set(modloader::math::convert(position));
+            m_message_box->position().set(modloader::math::to_vec3(position));
             m_message_box->position().add(0, 10, 0);
             m_input_handle = input::single_input_bus().register_handler(Action::Interact, EventTiming::Before, [&](auto, auto) {
                 m_checkpoint_index = 0;
@@ -78,7 +78,7 @@ namespace randomizer {
     void Trial::update_in_trial() {
         m_timer += core::api::game::delta_time();
         const auto& [location, time] = m_checkpoints[m_checkpoint_index];
-        const auto position = modloader::math::convert(core::api::game::player::get_position());
+        const auto position = modloader::math::to_vec2(core::api::game::player::get_position());
         if (modloader::math::distance2(position, location) < interact_radius * interact_radius) {
             ++m_checkpoint_index;
             if (m_checkpoint_index == m_checkpoints.size()) {