Refactoring some codes.

- Add NOEXCEPT specifier.
- Reduce boost dependency.
- Fix incorrect logging.

Author: bluekyu

CMakeLists.txt

@@ -76,7 +76,7 @@ target_link_libraries(${PROJECT_NAME}
     PUBLIC Boost::boost panda3d::panda3d
 
     PRIVATE $<$<NOT:$<BOOL:${Boost_USE_STATIC_LIBS}>>:Boost::dynamic_linking>
-    Boost::filesystem Boost::system
+    Boost::filesystem
     ${FREETYPE_LIBRARIES} yaml-cpp spdlog::spdlog
 )
 
@@ -97,7 +97,7 @@ include(CMakePackageConfigHelpers)
 write_basic_package_version_file(${PACKAGE_VERSION_CONFIG_FILE}
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMajorVersion)
-configure_package_config_file("${PROJECT_SOURCE_DIR}/CMake/${PROJECT_NAME}-config.cmake.in"
+configure_package_config_file("${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}-config.cmake.in"
     ${PACKAGE_CONFIG_FILE}
     INSTALL_DESTINATION ${PACKAGE_CMAKE_INSTALL_DIR})
 export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_BINARY_DIR}/${TARGET_EXPORT_NAME}.cmake)

render_pipeline/rpcore/render_target.h

@@ -47,19 +47,19 @@ class RPCPP_DECL RenderTarget: public RPObject
      * You can also pass a string containing a percentage, e.g. '25%', '50%'
      * or '100%' (the default).
      */
-    void set_size(const std::string& width, const std::string& height);
-    void set_size(const std::string& size);
+    void set_size(const std::string& width, const std::string& height) NOEXCEPT;
+    void set_size(const std::string& size) NOEXCEPT;
 
     /**
      * Set size_constraint.
      * If width or height has negative value,
      * it will be re-calculated to be proportional to resolution.
      */
-    void set_size(const LVecBase2i& size);
+    void set_size(const LVecBase2i& size) NOEXCEPT;
     /** @overload set_size(const LVecBase2i&) */
-    void set_size(int size);
+    void set_size(int size) NOEXCEPT;
     /** @overload set_size(const LVecBase2i&) */
-    void set_size(int width, int height);
+    void set_size(int width, int height) NOEXCEPT;
 
     /** Get current active. */
     bool get_active(void) const;
@@ -108,8 +108,8 @@ class RPCPP_DECL RenderTarget: public RPObject
 
     void consider_resize(void);
 
-    const boost::optional<int>& get_sort(void) const;
-    void set_sort(int sort);
+    const boost::optional<int>& get_sort(void) const NOEXCEPT;
+    void set_sort(int sort) NOEXCEPT;
 
     bool get_support_transparency(void) const;
     bool get_create_default_region(void) const;

src/rpcore/effect.cpp

@@ -7,9 +7,7 @@
 #include <virtualFileSystem.h>
 #include <graphicsWindow.h>
 
-#include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/functional/hash.hpp>
 
 #include "render_pipeline/rpcore/render_pipeline.h"
 #include "render_pipeline/rpcore/globals.h"
@@ -121,7 +119,7 @@ std::string Effect::Impl::generate_hash(const std::string& filename, const Optio
     // will cause a cache miss)
     Filename fname = Filename(filename);
     fname.make_absolute();
-    const std::string& file_hash = std::to_string(boost::filesystem::hash_value(fname.to_os_specific()));
+    const std::string& file_hash = std::to_string(fname.get_hash());
 
     // Hash the options, that is, sort the keys to make sure the values
     // are always in the same order, and then convert the flags to strings using
@@ -164,7 +162,7 @@ void Effect::Impl::parse_content(YAML::Node& parsed_yaml)
 void Effect::Impl::parse_shader_template(const PassType& pass_id_multiview, const std::string& stage, YAML::Node& data)
 {
     const std::string& pass_id = pass_id_multiview.first;
-    bool stereo_mode = RenderPipeline::get_global_ptr()->get_setting<bool>("pipeline.stereo_mode") && pass_id_multiview.second;
+    bool stereo_mode = RenderPipeline::get_global_ptr()->get_setting<bool>("pipeline.stereo_mode", false) && pass_id_multiview.second;
 
     std::string template_src;
     if (stage == "fragment")

src/rpcore/pluginbase/manager.cpp

@@ -5,7 +5,6 @@
 #include <virtualFileSystem.h>
 #include <virtualFileMountSystem.h>
 
-#include <boost/filesystem.hpp>
 #include <boost/detail/winapi/dll.hpp>
 #include <boost/dll/import.hpp>
 

src/rpcore/render_target.cpp

@@ -7,6 +7,8 @@
 #include <auxBitplaneAttrib.h>
 #include <transparencyAttrib.h>
 
+#include <spdlog/fmt/fmt.h>
+
 #include "render_pipeline/rpcore/globals.h"
 #include "render_pipeline/rppanda/showbase/showbase.h"
 
@@ -26,7 +28,7 @@ struct RenderTarget::Impl
 {
     Impl(RenderTarget& self);
 
-    int percent_to_number(const std::string& v);
+    int percent_to_number(const std::string& v) const NOEXCEPT;
 
     void create_buffer(void);
     void compute_size_from_constraint(void);
@@ -81,9 +83,17 @@ RenderTarget::Impl::Impl(RenderTarget& self): self(self)
     });
 }
 
-int RenderTarget::Impl::percent_to_number(const std::string& v)
+int RenderTarget::Impl::percent_to_number(const std::string& v) const NOEXCEPT
 {
-    return percent_to_number_map.at(v);
+    try
+    {
+        return percent_to_number_map.at(v);
+    }
+    catch (...)
+    {
+        self.error(fmt::format("Invalid percent: {}", v));
+        return -1;
+    }
 }
 
 void RenderTarget::Impl::create_buffer(void)
@@ -325,17 +335,17 @@ void RenderTarget::set_layers(int layers)
     impl_->layers_ = layers;
 }
 
-void RenderTarget::set_size(int width, int height)
+void RenderTarget::set_size(int width, int height) NOEXCEPT
 {
     impl_->size_constraint_ = LVecBase2i(width, height);
 }
 
-void RenderTarget::set_size(int size)
+void RenderTarget::set_size(int size) NOEXCEPT
 {
     impl_->size_constraint_ = LVecBase2i(size);
 }
 
-void RenderTarget::set_size(const LVecBase2i& size)
+void RenderTarget::set_size(const LVecBase2i& size) NOEXCEPT
 {
     impl_->size_constraint_ = size;
 }
@@ -360,22 +370,22 @@ Texture* RenderTarget::get_aux_tex(size_t index) const
     return impl_->targets_.at(std::string("aux_") + std::to_string(index));
 }
 
-const boost::optional<int>& RenderTarget::get_sort(void) const
+const boost::optional<int>& RenderTarget::get_sort(void) const NOEXCEPT
 {
     return impl_->sort_;
 }
 
-void RenderTarget::set_sort(int sort)
+void RenderTarget::set_sort(int sort) NOEXCEPT
 {
     impl_->sort_ = sort;
 }
 
-void RenderTarget::set_size(const std::string& width, const std::string& height)
+void RenderTarget::set_size(const std::string& width, const std::string& height) NOEXCEPT
 {
     impl_->size_constraint_ = LVecBase2i(impl_->percent_to_number(width), impl_->percent_to_number(height));
 }
 
-void RenderTarget::set_size(const std::string& size)
+void RenderTarget::set_size(const std::string& size) NOEXCEPT
 {
     set_size(size, size);
 }

src/rppanda/gui/direct_gui_base.cpp

@@ -9,19 +9,25 @@
 #include <nodePathCollection.h>
 #include <throw_event.h>
 
-#include <boost/format.hpp>
+#include <boost/core/typeinfo.hpp>
+
+#include <spdlog/fmt/fmt.h>
+
+#include "rppanda/config_rppanda.h"
 
 namespace rppanda {
 
 const std::type_info& DirectGuiBase::_type_handle(typeid(DirectGuiBase));
 
 boost::any& DirectGuiBase::create_component(const std::string& component_name, boost::any&& component)
 {
-	// Check for invalid component name
-	if (component_name.find("_") != component_name.npos)
-	{
-		throw std::runtime_error(std::string("Component name \"") + component_name + "\" must not contain \"_\"");
-	}
+    // Check for invalid component name
+    if (component_name.find("_") != component_name.npos)
+    {
+        const std::string& msg = fmt::format("Component name \"{}\" must not contain \"_\"", component_name);
+        rppanda_cat.error() << msg << std::endl;
+        throw std::runtime_error(msg);
+    }
 
 	// Get construction keywords
 
@@ -413,7 +419,8 @@ void DirectGuiWidget::set_border_uv_width(const LVecBase2& border_uv_width)
 void DirectGuiWidget::print_config(int indent)
 {
 	std::string space(' ', indent);
-	std::cout << boost::format("%1%%2% - %3%") % space % get_gui_id() % "DirectGuiWidget" << std::endl;
+
+    std::cout << fmt::format("{}{} - DirectGuiWidget", space, get_gui_id()) << std::endl;
 	std::cout << space << "Pos:   " << get_pos() << std::endl;
 	std::cout << space << "Scale: " << get_scale() << std::endl;
 

src/rppanda/interval/meta_interval.cpp

@@ -20,7 +20,7 @@ MetaInterval::MetaInterval(std::initializer_list<CInterval*> ivals, const Parame
 	else if (ivals.size() == 1)
 		add_c_interval(*ivals.begin(), 0.0, CMetaInterval::RS_level_begin);
 	else
-		rppanda_cat.error("Cannot build list from MetaInterval directly.");
+		rppanda_cat.error() << "Cannot build list from MetaInterval directly." << std::endl;
 }
 
 }	// namespace rppanda

src/rppanda/showbase/showbase.cpp

@@ -72,11 +72,11 @@ void ShowBase::Impl::enable_music(bool enable)
         // This is useful when we want to play different music
         // from what the manager has queued
         throw_event_directly(*EventHandler::get_global_event_handler(), "MusicEnabled");
-        rppanda_cat.debug() << "Enabling music\n";
+        rppanda_cat.debug() << "Enabling music" << std::endl;
     }
     else
     {
-        rppanda_cat.debug() << "Disabling music\n";
+        rppanda_cat.debug() << "Disabling music" << std::endl;
     }
 }
 
@@ -86,7 +86,7 @@ ShowBase::ShowBase(PandaFramework* framework, WindowFramework* window_framework)
 {
     if (global_showbase)
     {
-        rppanda_cat.error() << "ShowBase was already created!\n";
+        rppanda_cat.error() << "ShowBase was already created!" << std::endl;
         return;
     }
 
@@ -519,7 +519,7 @@ void ShowBase::disable_all_audio(void)
     // self.SetAllSfxEnables(0)
     if (impl_->music_manager_is_valid_)
         impl_->music_manager_->set_active(false);
-    rppanda_cat.debug() << "Disabling audio\n";
+    rppanda_cat.debug() << "Disabling audio" << std::endl;
 }
 
 void ShowBase::enable_all_audio(void)
@@ -528,7 +528,7 @@ void ShowBase::enable_all_audio(void)
     // self.SetAllSfxEnables(self.sfxActive)
     if (impl_->music_manager_is_valid_)
         impl_->music_manager_->set_active(impl_->music_active_);
-    rppanda_cat.debug() << "Enabling audio\n";
+    rppanda_cat.debug() << "Enabling audio" << std::endl;
 }