From 657b732ca5a410e4186159ca453a9874b1f7b95f Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 7 Oct 2022 09:53:19 +0700 Subject: [PATCH] make widget atlas more robust --- .../dbotthepony/mc/otm/client/render/AtlasSkinElement.kt | 2 +- .../mc/otm/client/render/WidgetAtlasHolder.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt index d1b0b08ef..1424a7b12 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AtlasSkinElement.kt @@ -30,7 +30,7 @@ class AtlasSkinElement private constructor( check(isClient) { "Invalid realm" } val _textureAtlasSprite = _textureAtlasSprite - if (_textureAtlasSprite == null || changeset != WidgetAtlasHolder.INSTANCE.changeset) { + if (_textureAtlasSprite == null || changeset != WidgetAtlasHolder.INSTANCE.changeset || WidgetAtlasHolder.INSTANCE.demandsRebuild) { val get = WidgetAtlasHolder.INSTANCE.getSprite(location) this._textureAtlasSprite = get changeset = WidgetAtlasHolder.INSTANCE.changeset diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt index 108d161d2..10be79de6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetAtlasHolder.kt @@ -23,9 +23,12 @@ class WidgetAtlasHolder private constructor(manager: TextureManager) : TextureAt var changeset = 0 private set - private var queued = false - private var once = false - private var demandsRebuild = false + var queued = false + private set + var once = false + private set + var demandsRebuild = false + private set private var resourceManager by Delegates.notNull() private var profileManager by Delegates.notNull()