Merge branch 'fix-dcast'

bluekyu · bluekyu · commit 85f74149d7b3 · 2018-04-16T21:50:54.000+09:00
diff --git a/render_pipeline/rpcore/pluginbase/base_plugin.hpp b/render_pipeline/rpcore/pluginbase/base_plugin.hpp
@@ -38,6 +38,20 @@
     } \
     BOOST_DLL_ALIAS(::rpcpp_plugin_creator__, create_plugin)
 
+#define RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL() \
+    void* downcast() override; \
+    const void* downcast() const override;
+
+#define RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(PLUGIN_TYPE) \
+    void* PLUGIN_TYPE::downcast() \
+    { \
+        return dynamic_cast<PLUGIN_TYPE*>(this); \
+    } \
+    const void* PLUGIN_TYPE::downcast() const \
+    { \
+        return dynamic_cast<const PLUGIN_TYPE*>(this); \
+    }
+
 // ************************************************************************************************
 
 namespace boost {
@@ -107,6 +121,14 @@ class RENDER_PIPELINE_DECL BasePlugin : public RPObject
 
     virtual RequrieType& get_required_plugins() const = 0;
 
+    /**
+     * Downcast instance of plugin.
+     *
+     * Use static_cast<Plugin*>(BasePlugin::downcast()) to access downcasted instance.
+     */
+    virtual void* downcast() = 0;
+    virtual const void* downcast() const = 0;
+
     /** Trigger hook. */
     ///@{
     virtual void on_load() {}
diff --git a/src/rpcore/gui/debugger.cpp b/src/rpcore/gui/debugger.cpp
@@ -357,7 +357,7 @@ AsyncTask::DoneStatus Debugger::update_stats(rppanda::FunctionalTask* task)
     LVecBase3f sun_vector(0);
     if (pipeline->get_plugin_mgr()->is_plugin_enabled("scattering"))
     {
-        sun_vector = dynamic_cast<rpplugins::ScatteringPlugin*>(pipeline->get_plugin_mgr()->get_instance("scattering"))->get_sun_vector();
+        sun_vector = static_cast<rpplugins::ScatteringPlugin*>(pipeline->get_plugin_mgr()->get_instance("scattering")->downcast())->get_sun_vector();
     }
 
     const NodePath& camera = Globals::base->get_cam();
@@ -385,7 +385,7 @@ AsyncTask::DoneStatus Debugger::update_stats(rppanda::FunctionalTask* task)
 
         LVecBase3f focus_point;
         float focus_size;
-        bool exist = dynamic_cast<rpplugins::PSSMPlugin*>(pssm_plugin)->get_last_focus(focus_point, focus_size);
+        bool exist = static_cast<rpplugins::PSSMPlugin*>(pssm_plugin->downcast())->get_last_focus(focus_point, focus_size);
 
         if (exist)
         {
diff --git a/src/rpplugins/ao/src/plugin.cpp b/src/rpplugins/ao/src/plugin.cpp
@@ -31,6 +31,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
@@ -39,6 +41,11 @@ Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_
 
 Plugin::~Plugin() = default;
 
+Plugin::RequrieType& Plugin::get_required_plugins() const
+{
+    return require_plugins;
+}
+
 void Plugin::on_stage_setup()
 {
     auto stage = std::make_unique<AOStage>(pipeline_);
diff --git a/src/rpplugins/ao/src/plugin.hpp b/src/rpplugins/ao/src/plugin.hpp
@@ -32,9 +32,11 @@ class Plugin : public rpcore::BasePlugin
 {
 public:
     Plugin(rpcore::RenderPipeline& pipeline);
-    ~Plugin() final;
+    virtual ~Plugin();
 
-    RequrieType& get_required_plugins() const final { return require_plugins; }
+    RequrieType& get_required_plugins() const final;
+
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/bloom/src/plugin.cpp b/src/rpplugins/bloom/src/plugin.cpp
@@ -32,6 +32,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/bloom/src/plugin.hpp b/src/rpplugins/bloom/src/plugin.hpp
@@ -34,6 +34,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_pipeline_created() final;
diff --git a/src/rpplugins/clouds/src/plugin.cpp b/src/rpplugins/clouds/src/plugin.cpp
@@ -30,6 +30,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins = { "scattering" };
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/clouds/src/plugin.hpp b/src/rpplugins/clouds/src/plugin.hpp
@@ -34,6 +34,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_pipeline_created() final;
diff --git a/src/rpplugins/color_correction/src/plugin.cpp b/src/rpplugins/color_correction/src/plugin.cpp
@@ -32,6 +32,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/color_correction/src/plugin.hpp b/src/rpplugins/color_correction/src/plugin.hpp
@@ -38,6 +38,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_pipeline_created() final;
     void on_stage_setup() final;
diff --git a/src/rpplugins/dof/src/plugin.cpp b/src/rpplugins/dof/src/plugin.cpp
@@ -33,6 +33,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/dof/src/plugin.hpp b/src/rpplugins/dof/src/plugin.hpp
@@ -32,6 +32,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/env_probes/include/env_probes_plugin.hpp b/src/rpplugins/env_probes/include/env_probes_plugin.hpp
@@ -32,6 +32,7 @@ class EnvProbesPlugin : public rpcore::BasePlugin
     EnvProbesPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_prepare_scene(NodePath scene) final;
diff --git a/src/rpplugins/env_probes/src/env_probes_plugin.cpp b/src/rpplugins/env_probes/src/env_probes_plugin.cpp
@@ -47,6 +47,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::EnvProbesPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(EnvProbesPlugin);
+
 class EnvProbesPlugin::Impl
 {
 public:
@@ -186,7 +188,7 @@ void EnvProbesPlugin::on_pre_render_update()
 
             if (is_plugin_enabled("pssm"))
             {
-                dynamic_cast<PSSMPlugin*>(get_plugin_instance("pssm"))->request_focus(probe->get_bounds()->get_center(), probe->get_bounds()->get_radius());
+                static_cast<PSSMPlugin*>(get_plugin_instance("pssm")->downcast())->request_focus(probe->get_bounds()->get_center(), probe->get_bounds()->get_radius());
             }
         }
         else
diff --git a/src/rpplugins/forward_shading/src/plugin.cpp b/src/rpplugins/forward_shading/src/plugin.cpp
@@ -30,6 +30,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/forward_shading/src/plugin.hpp b/src/rpplugins/forward_shading/src/plugin.hpp
@@ -32,6 +32,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/motion_blur/src/plugin.cpp b/src/rpplugins/motion_blur/src/plugin.cpp
@@ -31,6 +31,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::Plugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(Plugin);
+
 Plugin::RequrieType Plugin::require_plugins;
 
 Plugin::Plugin(rpcore::RenderPipeline& pipeline): rpcore::BasePlugin(pipeline, RPPLUGIN_ID_STRING)
diff --git a/src/rpplugins/motion_blur/src/plugin.hpp b/src/rpplugins/motion_blur/src/plugin.hpp
@@ -32,6 +32,7 @@ class Plugin : public rpcore::BasePlugin
     Plugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final { return require_plugins; }
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/pssm/include/pssm_plugin.hpp b/src/rpplugins/pssm/include/pssm_plugin.hpp
@@ -35,6 +35,8 @@ class PSSMPlugin : public rpcore::BasePlugin
 
     RequrieType& get_required_plugins() const final;
 
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
+
     void on_stage_setup() final;
     void on_pipeline_created() final;
     void on_pre_render_update() final;
diff --git a/src/rpplugins/pssm/src/pssm_plugin.cpp b/src/rpplugins/pssm/src/pssm_plugin.cpp
@@ -47,6 +47,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::PSSMPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(PSSMPlugin);
+
 class PSSMPlugin::Impl
 {
 public:
@@ -88,7 +90,7 @@ void PSSMPlugin::Impl::toggle_update_enabled()
 
 void PSSMPlugin::Impl::on_pre_render_update()
 {
-    const LVecBase3f& sun_vector = dynamic_cast<rpplugins::ScatteringPlugin*>(self_.get_plugin_instance("scattering"))->get_sun_vector();
+    const LVecBase3f& sun_vector = static_cast<rpplugins::ScatteringPlugin*>(self_.get_plugin_instance("scattering")->downcast())->get_sun_vector();
 
     if (sun_vector.get_z() < 0.0f)
     {
@@ -230,7 +232,7 @@ void PSSMPlugin::on_pipeline_created()
 
     if (is_plugin_enabled("volumetrics"))
     {
-        auto stage = dynamic_cast<VolumentricsPlugin*>(get_plugin_instance("volumetrics"))->get_stage();
+        auto stage = static_cast<VolumentricsPlugin*>(get_plugin_instance("volumetrics")->downcast())->get_stage();
         stage->set_shader_input(ShaderInput("pssm_mvps", impl_->camera_rig_->get_mvp_array()));
         stage->set_shader_input(ShaderInput("pssm_nearfar", impl_->camera_rig_->get_nearfar_array()));
     }
diff --git a/src/rpplugins/scattering/include/scattering_plugin.hpp b/src/rpplugins/scattering/include/scattering_plugin.hpp
@@ -39,13 +39,14 @@ class ScatteringPlugin : public rpcore::BasePlugin
     virtual ~ScatteringPlugin();
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_pipeline_created() final;
     void on_stage_setup() final;
     void on_pre_render_update() final;
     void on_shader_reload() final;
 
-    virtual LVecBase3f get_sun_vector();
+    virtual LVecBase3f get_sun_vector() const;
 
     virtual ScatteringStage* get_display_stage() const;
     virtual ScatteringEnvmapStage* get_envmap_stage() const;
diff --git a/src/rpplugins/scattering/src/scattering_plugin.cpp b/src/rpplugins/scattering/src/scattering_plugin.cpp
@@ -41,6 +41,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::ScatteringPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(ScatteringPlugin);
+
 class ScatteringPlugin::Impl
 {
 public:
@@ -116,7 +118,7 @@ void ScatteringPlugin::on_shader_reload()
     impl_->scattering_model_->compute();
 }
 
-LVecBase3f ScatteringPlugin::get_sun_vector()
+LVecBase3f ScatteringPlugin::get_sun_vector() const
 {
     float sun_altitude = get_daytime_setting("sun_altitude").first[0];
     float sun_azimuth = get_daytime_setting("sun_azimuth").first[0];
diff --git a/src/rpplugins/skin_shading/src/skin_shading_plugin.cpp b/src/rpplugins/skin_shading/src/skin_shading_plugin.cpp
@@ -30,6 +30,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::SkinShadingPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(SkinShadingPlugin);
+
 SkinShadingPlugin::RequrieType SkinShadingPlugin::require_plugins_;
 
 // ************************************************************************************************
diff --git a/src/rpplugins/skin_shading/src/skin_shading_plugin.hpp b/src/rpplugins/skin_shading/src/skin_shading_plugin.hpp
@@ -32,6 +32,7 @@ class SkinShadingPlugin : public rpcore::BasePlugin
     SkinShadingPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/sky_ao/src/sky_ao_plugin.cpp b/src/rpplugins/sky_ao/src/sky_ao_plugin.cpp
@@ -35,6 +35,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::SkyAOPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(SkyAOPlugin);
+
 SkyAOPlugin::RequrieType SkyAOPlugin::require_plugins_;
 
 // ************************************************************************************************
@@ -66,7 +68,7 @@ void SkyAOPlugin::on_post_stage_setup()
 {
     if (is_plugin_enabled("env_probes"))
     {
-        auto capture_stage = dynamic_cast<EnvProbesPlugin*>(get_plugin_instance("env_probes"))->get_capture_stage();
+        auto capture_stage = static_cast<EnvProbesPlugin*>(get_plugin_instance("env_probes")->downcast())->get_capture_stage();
 
         capture_stage->get_required_inputs().push_back("SkyAOCapturePosition");
         capture_stage->get_required_pipes().push_back("SkyAOHeight");
diff --git a/src/rpplugins/sky_ao/src/sky_ao_plugin.hpp b/src/rpplugins/sky_ao/src/sky_ao_plugin.hpp
@@ -32,6 +32,7 @@ class SkyAOPlugin : public rpcore::BasePlugin
     SkyAOPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_post_stage_setup() final;
diff --git a/src/rpplugins/smaa/src/smaa_plugin.cpp b/src/rpplugins/smaa/src/smaa_plugin.cpp
@@ -39,6 +39,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::SMAAPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(SMAAPlugin);
+
 class SMAAPlugin::Impl
 {
 public:
diff --git a/src/rpplugins/smaa/src/smaa_plugin.hpp b/src/rpplugins/smaa/src/smaa_plugin.hpp
@@ -32,6 +32,7 @@ class SMAAPlugin : public rpcore::BasePlugin
     SMAAPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_pre_render_update() final;
diff --git a/src/rpplugins/ssr/src/ssr_plugin.cpp b/src/rpplugins/ssr/src/ssr_plugin.cpp
@@ -30,6 +30,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::SSRPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(SSRPlugin);
+
 SSRPlugin::RequrieType SSRPlugin::require_plugins_;
 
 // ************************************************************************************************
diff --git a/src/rpplugins/ssr/src/ssr_plugin.hpp b/src/rpplugins/ssr/src/ssr_plugin.hpp
@@ -32,6 +32,7 @@ class SSRPlugin : public rpcore::BasePlugin
     SSRPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/volumetrics/include/volumetrics_plugin.hpp b/src/rpplugins/volumetrics/include/volumetrics_plugin.hpp
@@ -34,6 +34,7 @@ class VolumentricsPlugin : public rpcore::BasePlugin
     VolumentricsPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
 
diff --git a/src/rpplugins/volumetrics/src/volumetrics_plugin.cpp b/src/rpplugins/volumetrics/src/volumetrics_plugin.cpp
@@ -31,6 +31,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::VolumentricsPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(VolumentricsPlugin);
+
 class VolumentricsPlugin::Impl
 {
 public:
diff --git a/src/rpplugins/vxgi/src/vxgi_plugin.cpp b/src/rpplugins/vxgi/src/vxgi_plugin.cpp
@@ -39,6 +39,8 @@ RENDER_PIPELINE_PLUGIN_CREATOR(rpplugins::VXGIPlugin)
 
 namespace rpplugins {
 
+RENDER_PIPELINE_PLUGIN_DOWNCAST_IMPL(VXGIPlugin);
+
 class VXGIPlugin::Impl
 {
 public:
diff --git a/src/rpplugins/vxgi/src/vxgi_plugin.hpp b/src/rpplugins/vxgi/src/vxgi_plugin.hpp
@@ -32,6 +32,7 @@ class VXGIPlugin : public rpcore::BasePlugin
     VXGIPlugin(rpcore::RenderPipeline& pipeline);
 
     RequrieType& get_required_plugins() const final;
+    RENDER_PIPELINE_PLUGIN_DOWNCAST_DECL();
 
     void on_stage_setup() final;
     void on_pipeline_created() final;

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ AsyncTask::DoneStatus Debugger::update_stats(rppanda::FunctionalTask* task)`
`357`	`357`	`LVecBase3f sun_vector(0);`
`358`	`358`	`if (pipeline->get_plugin_mgr()->is_plugin_enabled("scattering"))`
`359`	`359`	`{`
`360`		`- sun_vector = dynamic_cast<rpplugins::ScatteringPlugin*>(pipeline->get_plugin_mgr()->get_instance("scattering"))->get_sun_vector();`
	`360`	`+ sun_vector = static_cast<rpplugins::ScatteringPlugin*>(pipeline->get_plugin_mgr()->get_instance("scattering")->downcast())->get_sun_vector();`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`const NodePath& camera = Globals::base->get_cam();`
`@@ -385,7 +385,7 @@ AsyncTask::DoneStatus Debugger::update_stats(rppanda::FunctionalTask* task)`
`385`	`385`
`386`	`386`	`LVecBase3f focus_point;`
`387`	`387`	`float focus_size;`
`388`		`- bool exist = dynamic_cast<rpplugins::PSSMPlugin*>(pssm_plugin)->get_last_focus(focus_point, focus_size);`
	`388`	`+ bool exist = static_cast<rpplugins::PSSMPlugin*>(pssm_plugin->downcast())->get_last_focus(focus_point, focus_size);`
`389`	`389`
`390`	`390`	`if (exist)`
`391`	`391`	`{`