Move a function

Author: bluekyu

render_pipeline/rpcore/mount_manager.hpp

@@ -11,6 +11,14 @@ class RenderPipeline;
 class RENDER_PIPELINE_DECL MountManager : public RPObject
 {
 public:
+    /**
+     * Convert virtual path to physical path.
+     *
+     * This function converts the path of Panda3D virutal file system to that of physical filesystem.
+     * If failed, this will return empty string.
+     */
+    static std::string convert_to_physical_path(const std::string& path);
+
     MountManager(RenderPipeline& pipeline);
     ~MountManager(void);
 

src/rpcore/mount_manager.cpp

@@ -1,13 +1,17 @@
 #include "render_pipeline/rpcore/mount_manager.hpp"
 
+#include <dcast.h>
 #include <filename.h>
 #include <virtualFileSystem.h>
 #include <virtualFileMountRamdisk.h>
+#include <virtualFileMountSystem.h>
 #include <config_util.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/dll/runtime_symbol_info.hpp>
 
+#include <spdlog/fmt/ostr.h>
+
 #include "render_pipeline/rppanda/stdpy/file.hpp"
 
 namespace rpcore {
@@ -297,4 +301,29 @@ void MountManager::unmount(void)
     throw std::runtime_error("TODO");
 }
 
+std::string MountManager::convert_to_physical_path(const std::string& path)
+{
+    Filename plugin_dir_in_vfs(path);
+    plugin_dir_in_vfs.standardize();
+
+    VirtualFileSystem* vfs = VirtualFileSystem::get_global_ptr();
+    for (int k=0, k_end=vfs->get_num_mounts(); k < k_end; ++k)
+    {
+        const std::string mount_point = vfs->get_mount(k)->get_mount_point().to_os_specific();
+        const std::string plugin_dir_in_vfs_string = plugin_dir_in_vfs.to_os_specific();
+
+        // /{mount_point}/...
+        if (mount_point.substr(0, 2) == std::string("$$") && plugin_dir_in_vfs_string.find(mount_point) == 1)
+        {
+            boost::filesystem::path physical_plugin_dir = DCAST(VirtualFileMountSystem, vfs->get_mount(k))->get_physical_filename().to_os_specific();
+            physical_plugin_dir /= plugin_dir_in_vfs_string.substr(1+mount_point.length());
+            return physical_plugin_dir.string();
+        }
+    }
+    
+    RPObject::global_error("MountManager", fmt::format("Cannot convert to physical path from Panda Path ({}).", path.c_str()));
+
+    return "";
+}
+
 }

src/rpcore/pluginbase/manager.cpp

@@ -2,14 +2,12 @@
 
 #include <unordered_set>
 
-#include <virtualFileSystem.h>
-#include <virtualFileMountSystem.h>
-
 #include <boost/detail/winapi/dll.hpp>
 #include <boost/dll/import.hpp>
 
 #include <spdlog/fmt/fmt.h>
 
+#include "render_pipeline/rpcore/mount_manager.hpp"
 #include "render_pipeline/rpcore/render_pipeline.hpp"
 #include "render_pipeline/rpcore/stage_manager.hpp"
 #include "render_pipeline/rpcore/pluginbase/day_setting_types.hpp"
@@ -30,8 +28,6 @@ struct PluginManager::Impl
     /** Internal method to load a plugin. */
     std::shared_ptr<BasePlugin> load_plugin(const std::string& plugin_id);
 
-    std::string convert_to_physical_path(const Filename& path) const;
-
     PluginManager& self_;
     RenderPipeline& pipeline_;
     std::string plugin_dir_;
@@ -113,31 +109,6 @@ std::shared_ptr<BasePlugin> PluginManager::Impl::load_plugin(const std::string&
     // TODO: implement
 }
 
-std::string PluginManager::Impl::convert_to_physical_path(const Filename& path) const
-{
-    Filename plugin_dir_in_vfs(path);
-    plugin_dir_in_vfs.standardize();
-
-    VirtualFileSystem* vfs = VirtualFileSystem::get_global_ptr();
-    for (int k=0, k_end=vfs->get_num_mounts(); k < k_end; ++k)
-    {
-        const std::string mount_point = vfs->get_mount(k)->get_mount_point().to_os_specific();
-        const std::string plugin_dir_in_vfs_string = plugin_dir_in_vfs.to_os_specific();
-
-        // /{mount_point}/...
-        if (mount_point.substr(0, 2) == std::string("$$") && plugin_dir_in_vfs_string.find(mount_point) == 1)
-        {
-            boost::filesystem::path physical_plugin_dir = DCAST(VirtualFileMountSystem, vfs->get_mount(k))->get_physical_filename().to_os_specific();
-            physical_plugin_dir /= plugin_dir_in_vfs_string.substr(1+mount_point.length());
-            return physical_plugin_dir.string();
-        }
-    }
-
-    self_.error(fmt::format("Cannot convert to physical path from Panda Path ({}).", path.c_str()));
-
-    return "";
-}
-
 // ************************************************************************************************
 
 PluginManager::PluginManager(RenderPipeline& pipeline): RPObject("PluginManager"), impl_(std::make_unique<Impl>(*this, pipeline))
@@ -199,7 +170,7 @@ void PluginManager::load_base_settings(const Filename& plugin_dir)
 {
     trace(fmt::format("Loading base setting from '{}'", plugin_dir.c_str()));
 
-    impl_->plugin_dir_ = impl_->convert_to_physical_path(plugin_dir);
+    impl_->plugin_dir_ = MountManager::convert_to_physical_path(plugin_dir);
     if (impl_->plugin_dir_.empty())
     {
         error(fmt::format("Cannot find plugin directory ({}).", plugin_dir.c_str()));