From 0b078921f7d147f34d5ff62e5edca729d9a06e85 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Sun, 26 Nov 2023 00:10:06 +0100 Subject: [PATCH] texture manager: rename dynamic and static --- .../gui/rendering/models/baked/BakedFaceTest.kt | 2 +- .../system/dummy/texture/DummyTextureManager.kt | 4 ++-- .../java/de/bixilon/minosoft/gui/RenderLoop.kt | 2 +- .../bixilon/minosoft/gui/rendering/RenderLoader.kt | 12 ++++++------ .../rendering/chunk/border/WorldBorderRenderer.kt | 4 ++-- .../renderer/storage/chest/DoubleChestRenderer.kt | 4 ++-- .../renderer/storage/chest/SingleChestRenderer.kt | 2 +- .../renderer/storage/shulker/ShulkerBoxRenderer.kt | 2 +- .../world/overlay/overlays/FireOverlay.kt | 2 +- .../overlay/overlays/simple/PowderSnowOverlay.kt | 2 +- .../overlay/overlays/simple/PumpkinOverlay.kt | 2 +- .../world/overlay/overlays/simple/WaterOverlay.kt | 2 +- .../overlay/overlays/simple/WorldBorderOverlay.kt | 2 +- .../overlay/overlays/weather/WeatherOverlay.kt | 6 +++--- .../gui/atlas/textures/AtlasTextureManager.kt | 2 +- .../hud/elements/other/debug/DebugHUDElement.kt | 2 +- .../gui/rendering/models/block/BlockModel.kt | 4 ++-- .../models/fluid/fluids/LavaFluidModel.kt | 4 ++-- .../models/fluid/fluids/WaterFluidModel.kt | 4 ++-- .../gui/rendering/models/item/ItemModel.kt | 2 +- .../gui/rendering/particle/ParticleRenderer.kt | 2 +- .../render/texture/simple/SimpleTextureParticle.kt | 6 +++--- .../gui/rendering/shader/types/TextureShader.kt | 2 +- .../gui/rendering/skeletal/model/SkeletalModel.kt | 2 +- .../gui/rendering/sky/box/SkyboxRenderer.kt | 4 ++-- .../gui/rendering/sky/planet/MoonRenderer.kt | 2 +- .../gui/rendering/sky/planet/SunRenderer.kt | 2 +- .../rendering/system/base/shader/NativeShader.kt | 2 +- .../system/base/texture/TextureManager.kt | 14 +++++++------- .../system/base/texture/skin/SkinManager.kt | 4 ++-- .../system/opengl/texture/OpenGLTextureManager.kt | 4 ++-- .../texture/dynamic/OpenGLDynamicTextureArray.kt | 4 ++-- 32 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedFaceTest.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedFaceTest.kt index bc4582261..9c60ee3c3 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedFaceTest.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/models/baked/BakedFaceTest.kt @@ -34,7 +34,7 @@ class BakedFaceTest { private fun texture(): Texture { val manager = BakedModelTestUtil.createTextureManager(texture) - return manager.staticTextures.create(texture.toResourceLocation()) + return manager.static.create(texture.toResourceLocation()) } private fun singleMesh(): ChunkMesh { diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureManager.kt b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureManager.kt index b6bfe57c6..2635321e8 100644 --- a/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureManager.kt +++ b/src/integration-test/kotlin/de/bixilon/minosoft/gui/rendering/system/dummy/texture/DummyTextureManager.kt @@ -18,7 +18,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.TextureManager import de.bixilon.minosoft.gui.rendering.system.base.texture.array.FontTextureArray class DummyTextureManager(val context: RenderContext) : TextureManager() { - override val dynamicTextures = DummyDynamicTextureArray(context) - override val staticTextures = DummyStaticTextureArray(context) + override val dynamic = DummyDynamicTextureArray(context) + override val static = DummyStaticTextureArray(context) override val font: FontTextureArray = DummyFontTextureArray(context) } diff --git a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt index 81363ee40..8832b1432 100644 --- a/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt +++ b/src/main/java/de/bixilon/minosoft/gui/RenderLoop.kt @@ -89,7 +89,7 @@ class RenderLoop( lastFrame = currentFrame - context.textures.staticTextures.animator.draw() + context.textures.static.animator.draw() context.renderer.draw() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt index 520d0fcd1..983f88705 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderLoader.kt @@ -73,7 +73,7 @@ object RenderLoader { val initLatch = ParentLatch(1, renderLatch) Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Generating font, gathering textures and loading models (after ${stopwatch.labTime()})..." } initLatch.inc(); runAsync { tints.init(connection.assetsManager); initLatch.dec() } - textures.dynamicTextures.upload(initLatch) + textures.dynamic.upload(initLatch) textures.initializeSkins(connection) textures.loadDefaultTextures() font = FontManager.create(this, initLatch) @@ -96,11 +96,11 @@ object RenderLoader { // Post init stage Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Loading textures (after ${stopwatch.labTime()})..." } - textures.staticTextures.load(renderLatch) + textures.static.load(renderLatch) textures.font.load(renderLatch) Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Uploading textures (after ${stopwatch.labTime()})..." } - textures.staticTextures.upload(renderLatch) + textures.static.upload(renderLatch) textures.font.upload(renderLatch) Log.log(LogMessageType.RENDERING, LogLevels.VERBOSE) { "Baking models (after ${stopwatch.labTime()})..." } @@ -120,7 +120,7 @@ object RenderLoader { window::focused.observeRendering(this) { state = it.decide(RenderingStates.RUNNING, RenderingStates.SLOW) } window::iconified.observeRendering(this) { state = it.decide(RenderingStates.PAUSED, RenderingStates.RUNNING) } - profile.animations::sprites.observe(this, true) { textures.staticTextures.animator.enabled = it } + profile.animations::sprites.observe(this, true) { textures.static.animator.enabled = it } input.init() @@ -136,8 +136,8 @@ object RenderLoader { window.postInit() - textures.dynamicTextures.activate() - textures.staticTextures.activate() + textures.dynamic.activate() + textures.static.activate() renderLatch.dec() // initial count from rendering diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt index 2e434c22d..694927024 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/border/WorldBorderRenderer.kt @@ -59,12 +59,12 @@ class WorldBorderRenderer( shader.native.defines["MAX_DISTANCE"] = MAX_DISTANCE shader.load() - texture = context.textures.staticTextures.create(TEXTURE) + texture = context.textures.static.create(TEXTURE) context.camera.offset::offset.observe(this) { reload = true } } override fun postInit(latch: AbstractLatch) { - context.textures.staticTextures.use(shader) + context.textures.static.use(shader) shader.textureIndexLayer = texture.renderData.shaderTextureId } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/DoubleChestRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/DoubleChestRenderer.kt index 990d88faa..a1bec57c0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/DoubleChestRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/DoubleChestRenderer.kt @@ -43,14 +43,14 @@ class DoubleChestRenderer( private val TEXTURE_5 = arrayOf(minecraft("left"), minecraft("right")) private fun register(loader: ModelLoader, name: ResourceLocation, texture: ResourceLocation) { - val static = loader.context.textures.staticTextures + val static = loader.context.textures.static val override = mapOf(TEXTURE to static.create(texture)) loader.skeletal.register(name, MODEL, override) } private fun register5(loader: ModelLoader, name: ResourceLocation, textures: Array) { if (textures.size != 2) throw IllegalStateException("Textures must be left and right!") - val static = loader.context.textures.staticTextures + val static = loader.context.textures.static val override = mapOf( TEXTURE_5[0] to static.create(textures[0]), TEXTURE_5[1] to static.create(textures[1]), diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/SingleChestRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/SingleChestRenderer.kt index 195fa2053..1b11d785c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/SingleChestRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/chest/SingleChestRenderer.kt @@ -41,7 +41,7 @@ class SingleChestRenderer( private val named = minecraft("chest") fun register(loader: ModelLoader, name: ResourceLocation, texture: ResourceLocation) { - val texture = loader.context.textures.staticTextures.create(texture) + val texture = loader.context.textures.static.create(texture) val model = if (loader.packFormat < 5) MODEL else MODEL_5 loader.skeletal.register(name, model, mapOf(named to texture)) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt index b0bb76d00..3a043e634 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/entities/renderer/storage/shulker/ShulkerBoxRenderer.kt @@ -95,7 +95,7 @@ class ShulkerBoxRenderer( } private fun load(name: ResourceLocation, texture: ResourceLocation, loader: ModelLoader) { - val texture = loader.context.textures.staticTextures.create(texture) + val texture = loader.context.textures.static.create(texture) loader.skeletal.register(name, TEMPLATE, override = mapOf(this.named to texture)) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt index 9d5514681..961222eda 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/FireOverlay.kt @@ -31,7 +31,7 @@ class FireOverlay( private val config = context.connection.profiles.rendering.overlay.fire private val player = context.connection.player private val shader = context.shaders.genericTexture2dShader - private var texture: Texture = context.textures.staticTextures.create("block/fire_1".toResourceLocation().texture()) + private var texture: Texture = context.textures.static.create("block/fire_1".toResourceLocation().texture()) private val lava = context.connection.registries.fluid[LavaFluid] override val render: Boolean get() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt index 34c1e6603..291968685 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PowderSnowOverlay.kt @@ -23,7 +23,7 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation class PowderSnowOverlay(context: RenderContext) : SimpleOverlay(context) { private val config = context.connection.profiles.rendering.overlay - override val texture: Texture = context.textures.staticTextures.create(OVERLAY_TEXTURE) + override val texture: Texture = context.textures.static.create(OVERLAY_TEXTURE) private val strength = FloatAverage(1L * 1000000000L, 0.0f) override var render: Boolean = false get() = config.powderSnow && field diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PumpkinOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PumpkinOverlay.kt index 6aad5b132..23d3554f0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PumpkinOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/PumpkinOverlay.kt @@ -23,7 +23,7 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation class PumpkinOverlay(context: RenderContext) : FirstPersonOverlay(context) { private val config = context.connection.profiles.rendering.overlay - override val texture: Texture = context.textures.staticTextures.create(OVERLAY_TEXTURE) + override val texture: Texture = context.textures.static.create(OVERLAY_TEXTURE) override val render: Boolean get() { if (!config.pumpkin) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt index 84cb9eb44..7af37925c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WaterOverlay.kt @@ -24,7 +24,7 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation class WaterOverlay(context: RenderContext) : SimpleOverlay(context) { private val player = context.connection.player - override val texture: Texture = context.textures.staticTextures.create("minecraft:misc/underwater".toResourceLocation().texture()) + override val texture: Texture = context.textures.static.create("minecraft:misc/underwater".toResourceLocation().texture()) override val render: Boolean get() = player.gamemode != Gamemodes.SPECTATOR && player.physics.submersion.eye is WaterFluid diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt index 98158504a..b49573414 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/simple/WorldBorderOverlay.kt @@ -22,7 +22,7 @@ import de.bixilon.minosoft.util.KUtil.toResourceLocation class WorldBorderOverlay(context: RenderContext) : SimpleOverlay(context) { private val config = context.connection.profiles.rendering.overlay - override val texture: Texture = context.textures.staticTextures.create(OVERLAY_TEXTURE) + override val texture: Texture = context.textures.static.create(OVERLAY_TEXTURE) override val render: Boolean get() = config.worldBorder && context.connection.world.border.isOutside(context.connection.player.physics.position) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt index 4df77db34..eccef77ef 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/weather/WeatherOverlay.kt @@ -33,8 +33,8 @@ import java.util.* class WeatherOverlay(private val context: RenderContext) : Overlay { private val world = context.connection.world private val config = context.connection.profiles.rendering.overlay.weather - private val rain = context.textures.staticTextures.create(RAIN) - private val snow = context.textures.staticTextures.create(SNOW) + private val rain = context.textures.static.create(RAIN) + private val snow = context.textures.static.create(SNOW) private val precipitation get() = context.connection.player.physics.positionInfo.biome?.precipitation override val render: Boolean get() = world.dimension.effects.weather && world.weather.raining && when (precipitation) { // ToDo: Check if exposed to the sky @@ -92,7 +92,7 @@ class WeatherOverlay(private val context: RenderContext) : Overlay { override fun postInit() { shader.use() - context.textures.staticTextures.use(shader) + context.textures.static.use(shader) } private fun updateShader() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt index 918dd8acc..916d2c548 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/atlas/textures/AtlasTextureManager.kt @@ -67,7 +67,7 @@ class AtlasTextureManager(private val context: RenderContext) { fun load() { for (texture in textures) { - context.textures.staticTextures += texture + context.textures.static += texture } this.cache.clear() this.textures.clear() diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt index 110b59ad4..4bfdc405b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/debug/DebugHUDElement.kt @@ -251,7 +251,7 @@ class DebugHUDElement(guiRenderer: GUIRenderer) : Element(guiRenderer), Layouted layout += LineSpacerElement(guiRenderer) - layout += AutoTextElement(guiRenderer, 20, properties = RIGHT) { "Dynamic textures ${context.textures.dynamicTextures.size.format()}/${context.textures.dynamicTextures.capacity.format()}" } + layout += AutoTextElement(guiRenderer, 20, properties = RIGHT) { "Dynamic textures ${context.textures.dynamic.size.format()}/${context.textures.dynamic.capacity.format()}" } layout += LineSpacerElement(guiRenderer) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModel.kt index 901801146..5d0ad1ee3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/block/BlockModel.kt @@ -44,14 +44,14 @@ data class BlockModel( fun createTexture(name: String, textures: TextureManager): Texture? { if (!name.startsWith("#")) { - return textures.staticTextures.create(name.toResourceLocation()) + return textures.static.create(name.toResourceLocation()) } val texture = this.textures?.get(name.substring(1)) if (texture == null || texture !is ResourceLocation) { return null } - return textures.staticTextures.create(texture) + return textures.static.create(texture) } fun getOrNullTexture(name: String, textures: TextureManager): Texture? { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt index 0ed40d5e7..985e63213 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/LavaFluidModel.kt @@ -27,8 +27,8 @@ class LavaFluidModel : FluidModel { override val transparency = TextureTransparencies.OPAQUE// TODO: from texture override fun load(context: RenderContext) { - still = context.textures.staticTextures.create(context.models.block.fixTexturePath(STILL).texture()) - flowing = context.textures.staticTextures.create(context.models.block.fixTexturePath(FLOWING).texture()) + still = context.textures.static.create(context.models.block.fixTexturePath(STILL).texture()) + flowing = context.textures.static.create(context.models.block.fixTexturePath(FLOWING).texture()) } companion object { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt index b0bcd3622..ab52e52af 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/fluid/fluids/WaterFluidModel.kt @@ -31,8 +31,8 @@ class WaterFluidModel : FluidModel { override val transparency = TextureTransparencies.TRANSLUCENT// TODO: from texture override fun load(context: RenderContext) { - still = context.textures.staticTextures.create(context.models.block.fixTexturePath(STILL).texture()) - flowing = context.textures.staticTextures.create(context.models.block.fixTexturePath(FLOWING).texture()) + still = context.textures.static.create(context.models.block.fixTexturePath(STILL).texture()) + flowing = context.textures.static.create(context.models.block.fixTexturePath(FLOWING).texture()) } companion object { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModel.kt index 2958c28ea..b6b3ab425 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/models/item/ItemModel.kt @@ -32,7 +32,7 @@ class ItemModel( if (this.textures == null) return null val texture = this.textures["layer0", "particle"]?.toResourceLocation()?.texture() ?: return null - return ItemModelPrototype(textures.staticTextures.create(texture)) + return ItemModelPrototype(textures.static.create(texture)) } companion object { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt index 649275310..ed0cc81c0 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt @@ -119,7 +119,7 @@ class ParticleRenderer( translucentMesh.load() for (particle in connection.registries.particleType) { for (resourceLocation in particle.textures) { - context.textures.staticTextures.create(resourceLocation) + context.textures.static.create(resourceLocation) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt index 22b4cd53b..25a953d15 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/types/render/texture/simple/SimpleTextureParticle.kt @@ -21,7 +21,7 @@ import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.file.FileTe import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection abstract class SimpleTextureParticle(connection: PlayConnection, position: Vec3d, velocity: Vec3d, data: ParticleData? = null) : TextureParticle(connection, position, velocity, data) { - override var texture = this.data.type.textures.getOrNull(0)?.let { connection.rendering?.context?.textures?.staticTextures?.get(it) } + override var texture = this.data.type.textures.getOrNull(0)?.let { connection.rendering?.context?.textures?.static?.get(it) } var spriteDisabled = false @@ -39,13 +39,13 @@ abstract class SimpleTextureParticle(connection: PlayConnection, position: Vec3d if (texture?.nullCast()?.resourceLocation == nextTextureResourceLocation) { return } - texture = connection.rendering?.context?.textures?.staticTextures?.get(nextTextureResourceLocation) + texture = connection.rendering?.context?.textures?.static?.get(nextTextureResourceLocation) } fun setRandomSprite() { val textures = data.type.textures if (textures.isEmpty()) return - texture = connection.rendering?.context?.textures?.staticTextures?.get(textures.random()) + texture = connection.rendering?.context?.textures?.static?.get(textures.random()) } override fun tick() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/TextureShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/TextureShader.kt index 6ccd7ce28..b0156712e 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/TextureShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/shader/types/TextureShader.kt @@ -24,7 +24,7 @@ interface TextureShader : AbstractShader { return uniform(name, textureManager) { native, name, value: TextureManager -> value.use(native, name) if (animated) { - textureManager.staticTextures.animator.use(native) + textureManager.static.animator.use(native) } } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt index 40c74c36f..80efdab42 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/SkeletalModel.kt @@ -42,7 +42,7 @@ data class SkeletalModel( if (name in skip) continue val file = name.texture() if (file in skip) continue - val texture = context.textures.staticTextures.create(file) + val texture = context.textures.static.create(file) this.loadedTextures[name] = SkeletalTextureInstance(properties, texture) } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxRenderer.kt index 7d74834cd..ed351c15c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxRenderer.kt @@ -85,7 +85,7 @@ class SkyboxRenderer( override fun init() { for (properties in DefaultDimensionEffects) { val texture = properties.fixedTexture ?: continue - textureCache[texture] = sky.context.textures.staticTextures.create(texture) + textureCache[texture] = sky.context.textures.static.create(texture) } } @@ -95,7 +95,7 @@ class SkyboxRenderer( colorMesh.load() textureMesh.load() - sky.context.textures.staticTextures.use(textureShader) + sky.context.textures.static.use(textureShader) } private fun updateColorShader() { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt index 3280e677e..931f34925 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/MoonRenderer.kt @@ -29,7 +29,7 @@ import java.util.* class MoonRenderer( sky: SkyRenderer, ) : PlanetRenderer(sky) { - override val texture = sky.context.textures.staticTextures.create(MOON_PHASES) + override val texture = sky.context.textures.static.create(MOON_PHASES) private var phase = MoonPhases.FULL_MOON private fun updateUV(phases: MoonPhases) { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/SunRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/SunRenderer.kt index 58bb6272b..79f00ed6b 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/SunRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/planet/SunRenderer.kt @@ -27,7 +27,7 @@ import kotlin.math.pow class SunRenderer( sky: SkyRenderer, ) : PlanetRenderer(sky) { - override val texture = sky.context.textures.staticTextures.create(SUN) + override val texture = sky.context.textures.static.create(SUN) public override fun calculateAngle(): Float { val time = sky.context.connection.world.time diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt index fb00619a6..5562977b7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/shader/NativeShader.kt @@ -84,7 +84,7 @@ interface NativeShader { companion object { val DEFAULT_DEFINES: Map Any?> = mapOf( "ANIMATED_TEXTURE_COUNT" to { - max(it.textures.staticTextures.animator.size, 1) + max(it.textures.static.animator.size, 1) } ) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt index a2b771ac1..b97b889ba 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/TextureManager.kt @@ -29,8 +29,8 @@ import de.bixilon.minosoft.gui.rendering.textures.TextureUtil.texture import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection abstract class TextureManager { - abstract val staticTextures: StaticTextureArray - abstract val dynamicTextures: DynamicTextureArray + abstract val static: StaticTextureArray + abstract val dynamic: DynamicTextureArray abstract val font: FontTextureArray lateinit var debugTexture: Texture @@ -44,8 +44,8 @@ abstract class TextureManager { if (this::debugTexture.isInitialized) { throw IllegalStateException("Already initialized!") } - debugTexture = staticTextures.create(RenderConstants.DEBUG_TEXTURE_RESOURCE_LOCATION) - whiteTexture = CodeTexturePart(texture = staticTextures.create(minosoft("white").texture(), mipmaps = false), uvStart = Vec2(0.0f, 0.0f), uvEnd = Vec2(0.001f, 0.001f), size = Vec2i(16, 16)) + debugTexture = static.create(RenderConstants.DEBUG_TEXTURE_RESOURCE_LOCATION) + whiteTexture = CodeTexturePart(texture = static.create(minosoft("white").texture(), mipmaps = false), uvStart = Vec2(0.0f, 0.0f), uvEnd = Vec2(0.001f, 0.001f), size = Vec2i(16, 16)) } fun initializeSkins(connection: PlayConnection) { @@ -54,12 +54,12 @@ abstract class TextureManager { } fun use(shader: NativeShader, name: String = ShaderUniforms.TEXTURES) { - staticTextures.use(shader, name) - dynamicTextures.use(shader, name) + static.use(shader, name) + dynamic.use(shader, name) font.use(shader, name) } fun reload() { - dynamicTextures.reload() + dynamic.reload() } } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt index 2818d8e10..3925bcc56 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/base/texture/skin/SkinManager.kt @@ -36,7 +36,7 @@ class SkinManager(private val textureManager: TextureManager) { private var skin: PlayerSkin? = null fun initialize(account: Account, assets: AssetsManager) { - default = DefaultSkinProvider(this.textureManager.dynamicTextures, assets) + default = DefaultSkinProvider(this.textureManager.dynamic, assets) default.initialize() skin = getSkin(account.uuid, account.properties, fetch = true, async = false) } @@ -57,7 +57,7 @@ class SkinManager(private val textureManager: TextureManager) { private fun getSkin(uuid: UUID, properties: PlayerProperties?, async: Boolean = true): PlayerSkin? { val texture = properties?.textures?.skin ?: return default[uuid] - return PlayerSkin(textureManager.dynamicTextures.push(texture.getHash(), async) { texture.read().readSkin() }, default[uuid]?.texture, texture.metadata.model) + return PlayerSkin(textureManager.dynamic.push(texture.getHash(), async) { texture.read().readSkin() }, default[uuid]?.texture, texture.metadata.model) } fun getSkin(player: PlayerEntity, properties: PlayerProperties? = null, fetch: Boolean = true, async: Boolean = true): PlayerSkin? { diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureManager.kt index 1379708a4..84d2fb861 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/OpenGLTextureManager.kt @@ -20,7 +20,7 @@ import de.bixilon.minosoft.gui.rendering.system.opengl.texture.dynamic.OpenGLDyn class OpenGLTextureManager(val context: RenderContext) : TextureManager() { private val mipmaps = context.connection.profiles.rendering.textures.mipmaps - override val staticTextures = OpenGLTextureArray(context, true, mipmaps) - override val dynamicTextures = OpenGLDynamicTextureArray(context, context.system.unsafeCast(), resolution = 64, mipmaps = mipmaps) + override val static = OpenGLTextureArray(context, true, mipmaps) + override val dynamic = OpenGLDynamicTextureArray(context, context.system.unsafeCast(), resolution = 64, mipmaps = mipmaps) override val font = OpenGLFontTextureArray(context) } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/dynamic/OpenGLDynamicTextureArray.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/dynamic/OpenGLDynamicTextureArray.kt index 17d3b2bd8..233f2b4e3 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/dynamic/OpenGLDynamicTextureArray.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/texture/dynamic/OpenGLDynamicTextureArray.kt @@ -49,7 +49,7 @@ class OpenGLDynamicTextureArray( glBindTexture(GL_TEXTURE_2D_ARRAY, handle) unsafeUpload(index, texture) - context.textures.staticTextures.activate() // TODO: why? + context.textures.static.activate() // TODO: why? texture.state = DynamicTextureState.LOADED } @@ -86,7 +86,7 @@ class OpenGLDynamicTextureArray( unsafeUse(shader) } - context.textures.staticTextures.activate() // TODO: why? + context.textures.static.activate() // TODO: why? }