#5584: Some preparations to get manipulator rendering on the rails

codereader · Jan 22, 2022 · f006295 · f006295
1 parent 3a329a0
commit f006295
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/include/imanipulator.h b/include/imanipulator.h
@@ -13,6 +13,9 @@ class VolumeTest;
 class SelectionTest;
 class IRenderableCollector;
 
+class RenderSystem;
+typedef std::shared_ptr<RenderSystem> RenderSystemPtr;
+
 namespace selection
 {
 
@@ -117,9 +120,15 @@ class ISceneManipulator :
 
     virtual ~ISceneManipulator() {}
 
+    // Prepares this manipulator for rendering
+    virtual void onPreRender(const RenderSystemPtr& renderSystem, const VolumeTest& volume) = 0;
+
     // Renders the manipulator's visual representation to the scene
     virtual void render(IRenderableCollector& collector, const VolumeTest& volume) = 0;
 
+    // Removes / hides the renderables of this manipulator
+    virtual void clearRenderables() = 0;
+
     // Manipulators should indicate whether component editing is supported or not
     virtual bool supportsComponentManipulation() const = 0;
 };

diff --git a/radiantcore/selection/RadiantSelectionSystem.cpp b/radiantcore/selection/RadiantSelectionSystem.cpp
@@ -924,6 +924,27 @@ Vector3 RadiantSelectionSystem::getCurrentSelectionCenter()
     return algorithm::getCurrentSelectionCenter();
 }
 
+void RadiantSelectionSystem::onPreRender(const VolumeTest& volume)
+{
+    if (!nothingSelected())
+    {
+        auto renderSystem = GlobalMapModule().getRoot()->getRenderSystem();
+
+        if (renderSystem)
+        {
+            _activeManipulator->onPreRender(renderSystem, volume);
+        }
+        else
+        {
+            _activeManipulator->clearRenderables();
+        }
+    }
+    else
+    {
+        _activeManipulator->clearRenderables();
+    }
+}
+
 /* greebo: Renders the currently active manipulator by setting the render state and
  * calling the manipulator's render method
  */

diff --git a/radiantcore/selection/RadiantSelectionSystem.h b/radiantcore/selection/RadiantSelectionSystem.h
@@ -152,6 +152,7 @@ class RadiantSelectionSystem :
 	const WorkZone& getWorkZone() override;
 	Vector3 getCurrentSelectionCenter() override;
 
+    void onPreRender(const VolumeTest& volume) override;
 	void renderSolid(IRenderableCollector& collector, const VolumeTest& volume) const override;
 	void renderWireframe(IRenderableCollector& collector, const VolumeTest& volume) const override;
     void renderHighlights(IRenderableCollector& collector, const VolumeTest& volume) override

diff --git a/radiantcore/selection/manipulators/ManipulatorBase.h b/radiantcore/selection/manipulators/ManipulatorBase.h
@@ -24,10 +24,16 @@ class ManipulatorBase :
 		return true;
 	}
 
+    virtual void onPreRender(const RenderSystemPtr& renderSystem, const VolumeTest& volume) override
+    {}
+
 	// No visual representation by default
 	virtual void render(IRenderableCollector& collector, const VolumeTest& volume) override
 	{}
 
+    virtual void clearRenderables() override
+    {}
+
 public:
 	std::size_t getId() const override
 	{