Clean up font setting

RobLoach · RobLoach · commit fd436de60277 · 2022-05-16T04:05:18.000-04:00
diff --git a/examples/text/text_font_filters.cpp b/examples/text/text_font_filters.cpp
@@ -48,7 +48,7 @@ int main(void)
     {
         // Update
         //----------------------------------------------------------------------------------
-        msg.SetFontSize(msg.GetFontSize() + GetMouseWheelMove() * 4.0f);
+        msg.fontSize += GetMouseWheelMove() * 4.0f;
 
         // Choose font texture filter method
         if (IsKeyPressed(KEY_ONE))
@@ -76,8 +76,7 @@ int main(void)
         // Load a dropped TTF file dynamically (at current fontSize)
         for (const auto& file : raylib::GetDroppedFiles()) {
             if (raylib::IsFileExtension(file, ".ttf")) {
-                font = raylib::Font(file, font.GetBaseSize());
-                msg.SetFont(font);
+                msg.font = font = raylib::Font(file, font.GetBaseSize());
             }
         }
         //----------------------------------------------------------------------------------
diff --git a/include/Text.hpp b/include/Text.hpp
@@ -64,7 +64,7 @@ class Text {
      *
      * @see DrawTextPro()
      */
-    inline void Draw(const ::Vector2& position, const Vector2& origin, float rotation = 0) {
+    inline void Draw(const ::Vector2& position, float rotation, const Vector2& origin = {0, 0}) {
         ::DrawTextPro(font, text.c_str(), position, origin, rotation, fontSize, spacing, color);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ int main(void)`
`48`	`48`	`{`
`49`	`49`	`// Update`
`50`	`50`	`//----------------------------------------------------------------------------------`
`51`		`- msg.SetFontSize(msg.GetFontSize() + GetMouseWheelMove() * 4.0f);`
	`51`	`+ msg.fontSize += GetMouseWheelMove() * 4.0f;`
`52`	`52`
`53`	`53`	`// Choose font texture filter method`
`54`	`54`	`if (IsKeyPressed(KEY_ONE))`
`@@ -76,8 +76,7 @@ int main(void)`
`76`	`76`	`// Load a dropped TTF file dynamically (at current fontSize)`
`77`	`77`	`for (const auto& file : raylib::GetDroppedFiles()) {`
`78`	`78`	`if (raylib::IsFileExtension(file, ".ttf")) {`
`79`		`- font = raylib::Font(file, font.GetBaseSize());`
`80`		`- msg.SetFont(font);`
	`79`	`+ msg.font = font = raylib::Font(file, font.GetBaseSize());`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`	`//----------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class Text {`
`64`	`64`	`*`
`65`	`65`	`* @see DrawTextPro()`
`66`	`66`	`*/`
`67`		`- inline void Draw(const ::Vector2& position, const Vector2& origin, float rotation = 0) {`
	`67`	`+ inline void Draw(const ::Vector2& position, float rotation, const Vector2& origin = {0, 0}) {`
`68`	`68`	`::DrawTextPro(font, text.c_str(), position, origin, rotation, fontSize, spacing, color);`
`69`	`69`	`}`
`70`	`70`