#5584: TranslateManipulator migrated, including RenderableQuad.

codereader · Jan 23, 2022 · 7506e06 · 7506e06
1 parent 927f86a
commit 7506e06
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 122 deletions.
diff --git a/libs/render.h b/libs/render.h
@@ -474,10 +474,3 @@ inline void draw_circle(const std::size_t segments, const double radius, VertexA
 {
     draw_ellipse<remap_policy>(segments, radius, radius, vertices, firstVertex);
 }
-
-inline void draw_quad(const float radius, VertexCb* quad) {
-	(*quad++).vertex = Vertex3f(-radius, radius, 0);
-	(*quad++).vertex = Vertex3f(radius, radius, 0);
-	(*quad++).vertex = Vertex3f(radius, -radius, 0);
-	(*quad++).vertex = Vertex3f(-radius, -radius, 0);
-}
diff --git a/libs/selection/BestPoint.h b/libs/selection/BestPoint.h
@@ -525,15 +525,15 @@ inline void Circle_BestPoint(const Matrix4& local2view, clipcull_t cull, const V
     }
 }
 
-inline void Quad_BestPoint(const Matrix4& local2view, clipcull_t cull, const VertexCb* vertices, SelectionIntersection& best)
+inline void Quad_BestPoint(const Matrix4& local2view, clipcull_t cull, const Vertex3f* vertices, SelectionIntersection& best)
 {
     Vector4 clipped[9];
     {
-        const std::size_t count = clipTriangle(local2view, vertices[0].vertex, vertices[1].vertex, vertices[3].vertex, clipped);
+        const std::size_t count = clipTriangle(local2view, vertices[0], vertices[1], vertices[3], clipped);
         BestPoint(count, clipped, best, cull);
     }
     {
-        const std::size_t count = clipTriangle(local2view, vertices[1].vertex, vertices[2].vertex, vertices[3].vertex, clipped);
+        const std::size_t count = clipTriangle(local2view, vertices[1], vertices[2], vertices[3], clipped);
         BestPoint(count, clipped, best, cull);
     }
 }

diff --git a/radiantcore/selection/Renderables.h b/radiantcore/selection/Renderables.h
diff --git a/radiantcore/selection/manipulators/ModelScaleManipulator.h b/radiantcore/selection/manipulators/ModelScaleManipulator.h
@@ -4,7 +4,6 @@
 #include "ManipulatorBase.h"
 #include "ManipulatorComponents.h"
 
-#include "selection/Renderables.h"
 #include "selection/ManipulationPivot.h"
 #include "selection/Pivot2World.h"
 #include "selection/BasicSelectable.h"

diff --git a/radiantcore/selection/manipulators/Renderables.h b/radiantcore/selection/manipulators/Renderables.h
@@ -265,6 +265,20 @@ class RenderableArrowLine :
     }
 };
 
+class RenderableQuad :
+    public RenderableLineStrip
+{
+public:
+    RenderableQuad(double edgeLength, const Matrix4& localToWorld) :
+        RenderableLineStrip(4, localToWorld)
+    {
+        _rawPoints[0] = Vector3(edgeLength, edgeLength, 0);
+        _rawPoints[1] = Vector3(edgeLength, -edgeLength, 0);
+        _rawPoints[2] = Vector3(-edgeLength, -edgeLength, 0);
+        _rawPoints[3] = Vector3(-edgeLength, edgeLength, 0);
+    }
+};
+
 // Renders a few flat-shaded triangles as arrow head, offset by a given amount
 class RenderableArrowHead :
     public render::RenderableGeometry

diff --git a/radiantcore/selection/manipulators/RotateManipulator.h b/radiantcore/selection/manipulators/RotateManipulator.h
@@ -4,7 +4,6 @@
 #include "Rotatable.h"
 #include "ManipulatorBase.h"
 #include "ManipulatorComponents.h"
-#include "selection/Renderables.h"
 #include "selection/Pivot2World.h"
 #include "selection/BasicSelectable.h"
 #include "selection/ManipulationPivot.h"

diff --git a/radiantcore/selection/manipulators/TranslateManipulator.cpp b/radiantcore/selection/manipulators/TranslateManipulator.cpp
@@ -20,10 +20,9 @@ TranslateManipulator::TranslateManipulator(ManipulationPivot& pivot, std::size_t
     _arrowZ({ 0,0,length }, _pivot2World._worldSpace),
     _arrowHeadX({ length,0,0 }, _pivot2World._axisScreen, length / 8, length / 3, _pivot2World._worldSpace),
     _arrowHeadY({ 0,length,0 }, _pivot2World._axisScreen, length / 8, length / 3, _pivot2World._worldSpace),
-    _arrowHeadZ({ 0,0,length }, _pivot2World._axisScreen, length / 8, length / 3, _pivot2World._worldSpace)
-{
-    draw_quad(16, &_quadScreen.front());
-}
+    _arrowHeadZ({ 0,0,length }, _pivot2World._axisScreen, length / 8, length / 3, _pivot2World._worldSpace),
+    _quadScreen(16, _pivot2World._viewplaneSpace)
+{}
 
 void TranslateManipulator::updateColours()
 {
@@ -99,6 +98,8 @@ void TranslateManipulator::onPreRender(const RenderSystemPtr& renderSystem, cons
         _arrowZ.clear();
         _arrowHeadZ.clear();
     }
+
+    _quadScreen.update(_lineShader);
 }
 
 void TranslateManipulator::clearRenderables()
@@ -109,58 +110,12 @@ void TranslateManipulator::clearRenderables()
     _arrowHeadX.clear();
     _arrowHeadY.clear();
     _arrowHeadZ.clear();
+    _quadScreen.clear();
 
     _lineShader.reset();
     _arrowHeadShader.reset();
 }
 
-void TranslateManipulator::render(IRenderableCollector& collector, const VolumeTest& volume)
-{
-#if 0
-    _pivot2World.update(_pivot.getMatrix4(), volume.GetModelview(), volume.GetProjection(), volume.GetViewport());
-
-    // temp hack
-    updateColours();
-
-    Vector3 x = _pivot2World._worldSpace.xCol3().getNormalised();
-    bool show_x = manipulator_show_axis(_pivot2World, x);
-
-    Vector3 y = _pivot2World._worldSpace.yCol3().getNormalised();
-    bool show_y = manipulator_show_axis(_pivot2World, y);
-
-    Vector3 z = _pivot2World._worldSpace.zCol3().getNormalised();
-    bool show_z = manipulator_show_axis(_pivot2World, z);
-
-    if(show_x)
-    {
-      collector.addRenderable(*_stateWire, _arrowX, _pivot2World._worldSpace);
-    }
-    if(show_y)
-    {
-      collector.addRenderable(*_stateWire, _arrowY, _pivot2World._worldSpace);
-    }
-    if(show_z)
-    {
-      collector.addRenderable(*_stateWire, _arrowZ, _pivot2World._worldSpace);
-    }
-
-    collector.addRenderable(*_stateWire, _quadScreen, _pivot2World._viewplaneSpace);
-
-    if(show_x)
-    {
-      collector.addRenderable(*_stateFill, _arrowHeadX, _pivot2World._worldSpace);
-    }
-    if(show_y)
-    {
-      collector.addRenderable(*_stateFill, _arrowHeadY, _pivot2World._worldSpace);
-    }
-    if(show_z)
-    {
-      collector.addRenderable(*_stateFill, _arrowHeadZ, _pivot2World._worldSpace);
-    }
-#endif
-}
-
 void TranslateManipulator::testSelect(SelectionTest& test, const Matrix4& pivot2world)
 {
     _pivot2World.update(_pivot.getMatrix4(), test.getVolume().GetModelview(),
@@ -181,7 +136,7 @@ void TranslateManipulator::testSelect(SelectionTest& test, const Matrix4& pivot2
 
       {
         SelectionIntersection best;
-        Quad_BestPoint(local2view, eClipCullCW, &_quadScreen.front(), best);
+        Quad_BestPoint(local2view, eClipCullCW, &_quadScreen.getRawPoints().front(), best);
         if(best.isValid())
         {
           best = SelectionIntersection(0, 0);

diff --git a/radiantcore/selection/manipulators/TranslateManipulator.h b/radiantcore/selection/manipulators/TranslateManipulator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "ManipulatorBase.h"
-#include "selection/Renderables.h"
 #include "selection/Pivot2World.h"
 #include "ManipulatorComponents.h"
 #include "selection/BasicSelectable.h"
@@ -48,7 +47,6 @@ class TranslateManipulator :
 	}
 
     void onPreRender(const RenderSystemPtr& renderSystem, const VolumeTest& volume) override;
-	void render(IRenderableCollector& collector, const VolumeTest& volume) override;
     void clearRenderables() override;
 
 	void testSelect(SelectionTest& test, const Matrix4& pivot2world) override;

diff --git a/radiantcore/selection/textool/TextureToolRotateManipulator.h b/radiantcore/selection/textool/TextureToolRotateManipulator.h
@@ -3,7 +3,6 @@
 #include "imanipulator.h"
 #include "../BasicSelectable.h"
 #include "selection/manipulators/ManipulatorComponents.h"
-#include "../Renderables.h"
 #include "selection/textool/TextureToolManipulationPivot.h"
 
 namespace textool

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1029,7 +1029,6 @@
     <ClInclude Include="..\..\radiantcore\selection\manipulators\RotateManipulator.h" />
     <ClInclude Include="..\..\radiantcore\selection\manipulators\TranslateManipulator.h" />
     <ClInclude Include="..\..\radiantcore\selection\RadiantSelectionSystem.h" />
-    <ClInclude Include="..\..\radiantcore\selection\Renderables.h" />
     <ClInclude Include="..\..\radiantcore\selection\SceneManipulationPivot.h" />
     <ClInclude Include="..\..\radiantcore\selection\SceneWalkers.h" />
     <ClInclude Include="..\..\radiantcore\selection\SelectedNodeList.h" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj.filters b/tools/msvc/DarkRadiantCore.vcxproj.filters
@@ -1899,9 +1899,6 @@
     <ClInclude Include="..\..\radiantcore\selection\RadiantSelectionSystem.h">
       <Filter>src\selection</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiantcore\selection\Renderables.h">
-      <Filter>src\selection</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiantcore\selection\SceneWalkers.h">
       <Filter>src\selection</Filter>
     </ClInclude>