#5436: Migrate RotateManipulator to use IGLFont

codereader · Dec 3, 2020 · 55b292f · 55b292f
1 parent a141544
commit 55b292f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/install/user.xml b/install/user.xml
@@ -63,6 +63,8 @@
     <dragResizeEntitiesSymmetrically value="1" />
     <transientComponentSelection value="1" />
     <offsetClonedObjects value="1" />
+    <manipulatorFontSize value="14" />
+    <manipulatorFontStyle value="Sans" />
     <transformDialog>
       <window xPosition="150" yPosition="200" width="260" height="314" />
       <rotXStep value="45" />

diff --git a/radiantcore/selection/RadiantSelectionSystem.cpp b/radiantcore/selection/RadiantSelectionSystem.cpp
@@ -30,6 +30,12 @@
 namespace selection
 {
 
+namespace
+{
+    const std::string RKEY_MANIPULATOR_FONTSTYLE = "user/ui/manipulatorFontStyle";
+    const std::string RKEY_MANIPULATOR_FONTSIZE = "user/ui/manipulatorFontSize";
+}
+
 // --------- RadiantSelectionSystem Implementation ------------------------------------------
 
 RadiantSelectionSystem::RadiantSelectionSystem() :
@@ -862,10 +868,15 @@ const Matrix4& RadiantSelectionSystem::getPivot2World()
 
 void RadiantSelectionSystem::captureShaders()
 {
+    auto manipulatorFontStyle = registry::getValue<std::string>(RKEY_MANIPULATOR_FONTSTYLE) == "Sans" ?
+        IGLFont::Style::Sans : IGLFont::Style::Mono;
+    auto manipulatorFontSize = registry::getValue<int>(RKEY_MANIPULATOR_FONTSIZE);
+
     TranslateManipulator::_stateWire = GlobalRenderSystem().capture("$WIRE_OVERLAY");
     TranslateManipulator::_stateFill = GlobalRenderSystem().capture("$FLATSHADE_OVERLAY");
     RotateManipulator::_stateOuter = GlobalRenderSystem().capture("$WIRE_OVERLAY");
 	RotateManipulator::_pivotPointShader = GlobalRenderSystem().capture("$POINT");
+	RotateManipulator::_glFont = GlobalOpenGL().getFont(manipulatorFontStyle, manipulatorFontSize);
 	ModelScaleManipulator::_lineShader = GlobalRenderSystem().capture("$WIRE_OVERLAY");
 	ModelScaleManipulator::_pointShader = GlobalRenderSystem().capture("$POINT");
 }
@@ -874,6 +885,7 @@ void RadiantSelectionSystem::releaseShaders()
 {
     TranslateManipulator::_stateWire.reset();
     TranslateManipulator::_stateFill.reset();
+    RotateManipulator::_glFont.reset();
 	RotateManipulator::_stateOuter.reset();
 	RotateManipulator::_pivotPointShader.reset();
     ModelScaleManipulator::_lineShader.reset();

diff --git a/radiantcore/selection/manipulators/RotateManipulator.cpp b/radiantcore/selection/manipulators/RotateManipulator.cpp
@@ -166,7 +166,7 @@ void RotateManipulator::render(const RenderInfo& info) const
 		glRasterPos3dv(_pivot2World._worldSpace.t().getVector3() - Vector3(10, 10, 10));
 
 		double angle = static_cast<double>(c_RAD2DEGMULT * _rotateAxis.getCurAngle());
-		GlobalOpenGL().drawString(fmt::format("Rotate: {0:3.2f} degrees", angle));
+        _glFont->drawString(fmt::format("Rotate: {0:3.2f} degrees", angle));
 	}
 }
 
@@ -306,5 +306,6 @@ void RotateManipulator::rotate(const Quaternion& rotation)
 // Static members
 ShaderPtr RotateManipulator::_stateOuter;
 ShaderPtr RotateManipulator::_pivotPointShader;
+IGLFont::Ptr RotateManipulator::_glFont;
 
 }
diff --git a/radiantcore/selection/manipulators/RotateManipulator.h b/radiantcore/selection/manipulators/RotateManipulator.h
@@ -55,6 +55,7 @@ class RotateManipulator :
 public:
 	static ShaderPtr _stateOuter;
 	static ShaderPtr _pivotPointShader;
+    static IGLFont::Ptr _glFont;
 
 	// Constructor
 	RotateManipulator(ManipulationPivot& pivot, std::size_t segments, float radius);