Use material for text color

LazyDuchess · Jun 21, 2024 · d71177d · d71177d
1 parent 3effb0e
commit d71177d
Show file tree

Hide file tree

Showing 5 changed files with 321 additions and 210 deletions.
diff --git a/Assets/Resources.meta b/Assets/Resources.meta
diff --git a/Assets/Resources/Skia Font Material.mat b/Assets/Resources/Skia Font Material.mat
diff --git a/Assets/Resources/Skia Font Material.mat.meta b/Assets/Resources/Skia Font Material.mat.meta
diff --git a/Assets/Scenes/Tests/SkiaUITest.unity b/Assets/Scenes/Tests/SkiaUITest.unity
diff --git a/Assets/Scripts/OpenTS2/UI/Skia/SkiaLabel.cs b/Assets/Scripts/OpenTS2/UI/Skia/SkiaLabel.cs
@@ -13,6 +13,16 @@ namespace OpenTS2.UI.Skia
     [RequireComponent(typeof(RawImage))]
     public class SkiaLabel : MonoBehaviour
     {
+        private static Material Material
+        {
+            get
+            {
+                if (_material == null)
+                    _material = Resources.Load<Material>("Skia Font Material");
+                return _material;
+            }
+        }
+        private static Material _material = null;
         public bool SingleLine
         {
             get
@@ -152,7 +162,7 @@ public Color FontColor
                 if (value != m_FontColor)
                 {
                     m_FontColor = value;
-                    Render();
+                    ValidateMaterial();
                 }
             }
         }
@@ -413,8 +423,15 @@ public CharRect GetCharacterRect(int charIndex)
             }
         }
 
+        private void ValidateMaterial()
+        {
+            RawImage.material = Material;
+            RawImage.color = m_FontColor;
+        }
+
         private void Render()
         {
+            ValidateMaterial();
             ValidateFont();
             var skImageInfo = new SKImageInfo(PracticalWidth, PracticalHeight);
             ValidateTexture(skImageInfo);
@@ -427,7 +444,7 @@ private void Render()
 
             _skPaint.TextSize = m_FontSize;
             _skPaint.IsAntialias = true;
-            _skPaint.Color = new SKColor(m_FontColor.r, m_FontColor.g, m_FontColor.b, m_FontColor.a);
+            _skPaint.Color = new SKColor(255, 255, 255, 255);
             _skPaint.IsStroke = false;
 
             if (m_Font != null && m_Font.Typeface != null)