Improve Label underline, strikethrough and color (#2364)

Author: halx99

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: axmolengine  # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github:  # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

core/2d/DrawNode.cpp

@@ -909,18 +909,17 @@ void DrawNode::_drawPolygon(const Vec2* verts,
     }
     if (outline)
     {
+        float width = thickness / properties.factor;
         if (thickness != 1.0f || properties.drawOrder)
         {
-            thickness *= properties.factor;
-
             for (unsigned int i = 1; i < (count); i++)
             {
                 Vec2 a  = _vertices[i - 1];
                 Vec2 b  = _vertices[i];
                 Vec2 n  = ((b - a).getPerp()).getNormalized();
                 Vec2 t  = n.getPerp();
-                Vec2 nw = n * thickness;
-                Vec2 tw = t * thickness;
+                Vec2 nw = n * width;
+                Vec2 tw = t * width;
                 Vec2 v0 = b - (nw + tw);
                 Vec2 v1 = b + (nw - tw);
                 Vec2 v2 = b - nw;
@@ -1001,10 +1000,10 @@ void DrawNode::_drawPolygon(const Vec2* verts,
                 Vec2 offset0 = extrude[i].offset;
                 Vec2 offset1 = extrude[j].offset;
 
-                Vec2 inner0 = v0 - offset0 * thickness;
-                Vec2 inner1 = v1 - offset1 * thickness;
-                Vec2 outer0 = v0 + offset0 * thickness;
-                Vec2 outer1 = v1 + offset1 * thickness;
+                Vec2 inner0 = v0 - offset0 * width;
+                Vec2 inner1 = v1 - offset1 * width;
+                Vec2 outer0 = v0 + offset0 * width;
+                Vec2 outer1 = v1 + offset1 * width;
 
                 triangles[ii++] = {{inner0, borderColor, -n0}, {inner1, borderColor, -n0}, {outer1, borderColor, n0}};
 
@@ -1055,25 +1054,26 @@ void DrawNode::_drawSegment(const Vec2& from,
                             DrawNode::EndType etStart,
                             DrawNode::EndType etEnd)
 {
-    Vec2 vertices[2] = {from, to};
-    applyTransform(vertices, vertices, 2);
+    if (thickness < 1.0f)
+        thickness = 1.0f;
 
     if (thickness == 1.0f && !properties.drawOrder)
     {
-        auto line = expandBufferAndGetPointer(_lines, 2);
-        _linesDirty = true;
-
-        line[0] = {vertices[0], color, Vec2::ZERO};
-        line[1] = {vertices[1], color, Vec2::ZERO};
+        _drawLine(from, to, color); // fastest way to draw a line
     }
     else
     {
+        Vec2 vertices[2] = {from, to};
+        applyTransform(vertices, vertices, 2);
+
+        float width = thickness / (2 * properties.factor);
+
         Vec2 a  = vertices[0];
         Vec2 b  = vertices[1];
         Vec2 n  = ((b - a).getPerp()).getNormalized();
         Vec2 t  = n.getPerp();
-        Vec2 nw = n * thickness;
-        Vec2 tw = t * thickness;
+        Vec2 nw = n * width;
+        Vec2 tw = t * width;
         Vec2 v0 = b - (nw + tw);
         Vec2 v1 = b + (nw - tw);
         Vec2 v2 = b - nw;
@@ -1177,6 +1177,19 @@ void DrawNode::_drawSegment(const Vec2& from,
         }
     }
 }
+// Internal function _drawLine => thickness is always 1 (fastes way to draw a line)
+void DrawNode::_drawLine(const Vec2& from, const Vec2& to, const Color4B& color)
+{
+    Vec2 vertices[2] = {from, to};
+    applyTransform(vertices, vertices, 2);
+
+
+    auto line = expandBufferAndGetPointer(_lines, 2);
+    _linesDirty = true;
+
+    line[0] = {vertices[0], color, Vec2::ZERO};
+    line[1] = {vertices[1], color, Vec2::ZERO};
+}
 
 void DrawNode::_drawDot(const Vec2& pos, float radius, const Color4B& color)
 {
@@ -1572,6 +1585,18 @@ void DrawNode::applyTransform(const Vec2* from, Vec2* to, unsigned int count)
     }
 }
 
+void DrawNode::Properties::setDefaultValues()
+{
+    auto fac = Director::getInstance()->getContentScaleFactor();
+    factor   = fac;
+    
+    scale     = Vec2(1.0f, 1.0f);
+    center    = Vec2(0.0f, 0.0f);
+    rotation  = 0.0f;
+    position  = Vec2(0.0f, 0.0f);
+    drawOrder = false;
+};
+
 #if defined(_WIN32)
 #    pragma pop_macro("TRANSPARENT")
 #endif

core/2d/DrawNode.h

@@ -638,6 +638,9 @@ class AX_DLL DrawNode : public Node
                       float thickness    = 1.0f,
                       bool isconvex      = true);
 
+    // Internal function _drawLine
+    void _drawLine(const Vec2& from, const Vec2& to, const Color4B& color);
+
     // Internal function _drawSegment
     void _drawSegment(const Vec2& origin,
                       const Vec2& destination,
@@ -686,10 +689,10 @@ class AX_DLL DrawNode : public Node
     AX_DISALLOW_COPY_AND_ASSIGN(DrawNode);
 
 public:
-    class Properties
+    class AX_DLL Properties
     {
     public:
-        float factor = 0.5f;  /// thickness factor
+        float factor;  /// thickness scale factor 
 
         // transforming stuff
         Vec2 scale;
@@ -778,14 +781,10 @@ class AX_DLL DrawNode : public Node
 
         * @js NA
         */
-        void setDefaultValues()
-        {
-            scale     = Vec2(1.0f, 1.0f);
-            center    = Vec2(0.0f, 0.0f);
-            rotation  = 0.0f;
-            position  = Vec2(0.0f, 0.0f);
-            drawOrder = false;
-        };
+        void setDefaultValues();
+        float getFactor() { return factor; };
+        void setFactor(float fac) { factor = fac; };
+
     } properties;
 };