curioustorvald/Terrarum-sans-bitmap
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum-sans-bitmap.git synced 2026-06-11 16:34:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

caching is back to the hashset as we don't iterate over them

Browse Source
This commit is contained in:
minjaesong
2021-10-29 17:20:30 +09:00
parent 58ce18f981
commit c1ec50e166
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/net/torvald/terrarumsansbitmap/gdx/GameFontBase.kt
View File

@@ -119,7 +119,7 @@ class GameFontBase(
//private val textCache = HashMap<CharSequence, ShittyGlyphLayout>() //private val textCache = HashMap<CharSequence, ShittyGlyphLayout>()
private data class TextCacheObj(var age: Int, val hash: Long, val glyphLayout: ShittyGlyphLayout?): Comparable<TextCacheObj> { private data class TextCacheObj(val hash: Long, val glyphLayout: ShittyGlyphLayout?): Comparable<TextCacheObj> {
// var disposed = false; private set // var disposed = false; private set
fun dispose() { fun dispose() {
@@ -132,14 +132,13 @@ class GameFontBase(
} }
} }
private var textCacheCap = 0 private var textCacheCap = 0
private val textCache = HashMap<Long, TextCacheObj>(textCacheSize * 2)
private val textCache = TreeMap<Long, TextCacheObj>()
/** /**
* Insertion sorts the last element fo the textCache * Insertion sorts the last element fo the textCache
*/ */
private fun addToCache(text: CodepointSequence, linotype: Texture, width: Int) { private fun addToCache(text: CodepointSequence, linotype: Texture, width: Int) {
val cacheObj = TextCacheObj(0, text.getHash(), ShittyGlyphLayout(text, linotype, width)) val cacheObj = TextCacheObj(text.getHash(), ShittyGlyphLayout(text, linotype, width))
if (textCacheCap < textCacheSize) { if (textCacheCap < textCacheSize) {
textCache[cacheObj.hash] = cacheObj textCache[cacheObj.hash] = cacheObj
@@ -155,19 +154,7 @@ class GameFontBase(
} }
private fun getCache(hash: Long): TextCacheObj? { private fun getCache(hash: Long): TextCacheObj? {
val cache = textCache[hash] return textCache[hash]
if (cache == null)
return null
// else if (cache.disposed) {
// textCache.remove(hash)
// return null
// }
else {
// decrement age count (see: addToCache(CodepointSequence, Pixmap, Int))
if (cache.age > 0) cache.age -= 1
return cache
}
} }