update to kotlin 1.4; fixed a bug where trying to colour a text using…

… gdxbatch's colour would cause undesirable results
curioustorvald · Sep 12, 2021 · 92aeb3c · 92aeb3c
1 parent 3841611
commit 92aeb3c
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 64 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/libraries/GdxLib.xml b/.idea/libraries/GdxLib.xml
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
diff --git a/.idea/libraries/TesterLib.xml b/.idea/libraries/TesterLib.xml
diff --git a/.idea/libraries/com_badlogicgames_gdx_gdx_1_10_0.xml b/.idea/libraries/com_badlogicgames_gdx_gdx_1_10_0.xml
diff --git a/BuildJAR_TerrarumSansBitmap.iml b/BuildJAR_TerrarumSansBitmap.iml
@@ -7,7 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="com.badlogicgames.gdx:gdx:1.10.0" level="project" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="GdxLib" level="project" />
   </component>
 </module>
diff --git a/FontTestGDX/FontTestGDX.iml b/FontTestGDX/FontTestGDX.iml
@@ -7,9 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="library" name="GdxLib" level="project" />
-    <orderEntry type="library" name="TesterLib" level="project" />
     <orderEntry type="module" module-name="BuildJAR_TerrarumSansBitmap" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
   </component>
 </module>
diff --git a/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt b/src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
@@ -391,8 +391,6 @@ class GameFontBase(
 
     private lateinit var tempLinotype: Texture
 
-    private lateinit var originalColour: Color
-
     private var nullProp = GlyphProps(15, 0)
 
     private val pixmapOffsetY = 10
@@ -414,12 +412,10 @@ class GameFontBase(
         val x = Math.round(x)
         val y = Math.round(y)
 
-        originalColour = batch.color.cpy()
-        val mainColObj = originalColour
-        var mainCol: Int = originalColour.toRGBA8888().forceOpaque()
-
         val charSeqHash = charSeq.toCodePoints().getHash()
 
+        var renderCol = -1 // subject to change with the colour code
+
         if (charSeqNotBlank) {
 
             val cacheObj = getCache(charSeqHash)
@@ -458,10 +454,10 @@ class GameFontBase(
 
                     if (isColourCode(c)) {
                         if (c == 0x100000) {
-                            mainCol = originalColour.toRGBA8888().forceOpaque()
+                            renderCol = -1
                         }
                         else {
-                            mainCol = getColour(c)
+                            renderCol = getColour(c)
                         }
                     }
                     else if (isCharsetOverride(c)) {
@@ -492,15 +488,9 @@ class GameFontBase(
                         val jungTex = hangulSheet.get(indexJung, jungRow)
                         val jongTex = hangulSheet.get(indexJong, jongRow)
 
-                        linotypePixmap.setColor(mainCol)
-                        linotypePixmap.drawPixmap(choTex,  posXbuffer[index], pixmapOffsetY, mainCol)
-                        linotypePixmap.drawPixmap(jungTex, posXbuffer[index], pixmapOffsetY, mainCol)
-                        linotypePixmap.drawPixmap(jongTex, posXbuffer[index], pixmapOffsetY, mainCol)
-
-                        //batch.color = mainCol
-                        //batch.draw(choTex, x + posXbuffer[index].toFloat(), y)
-                        //batch.draw(jungTex, x + posXbuffer[index].toFloat(), y)
-                        //batch.draw(hangulSheet.get(indexJong, jongRow), x + posXbuffer[index].toFloat(), y)
+                        linotypePixmap.drawPixmap(choTex,  posXbuffer[index], pixmapOffsetY, renderCol)
+                        linotypePixmap.drawPixmap(jungTex, posXbuffer[index], pixmapOffsetY, renderCol)
+                        linotypePixmap.drawPixmap(jongTex, posXbuffer[index], pixmapOffsetY, renderCol)
 
 
                         index += hangulLength - 1
@@ -518,14 +508,11 @@ class GameFontBase(
                             val posX = posXbuffer[index]
                             val texture = sheets[sheetID].get(sheetX, sheetY)
 
-                            linotypePixmap.drawPixmap(texture, posX, posY + pixmapOffsetY, mainCol)
+                            linotypePixmap.drawPixmap(texture, posX, posY + pixmapOffsetY, renderCol)
 
-                            //batch.color = mainCol
-                            //batch.draw(texture, posX, posY)
 
                         }
                         catch (noSuchGlyph: ArrayIndexOutOfBoundsException) {
-                            //batch.color = mainCol
                         }
                     }
 
@@ -550,9 +537,6 @@ class GameFontBase(
             }
 
 
-
-            batch.color = mainColObj
-
             if (!flipY) {
                 batch.draw(tempLinotype, x.toFloat(), (y - pixmapOffsetY).toFloat())
             }
@@ -567,7 +551,6 @@ class GameFontBase(
 
         }
 
-        batch.color = originalColour
         return null
     }