diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/OverlayC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/OverlayC.kt index 46207e82d..5d3b1c308 100644 --- a/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/OverlayC.kt +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/OverlayC.kt @@ -15,6 +15,7 @@ package de.bixilon.minosoft.config.profile.profiles.rendering.overlay import de.bixilon.minosoft.config.profile.delegate.primitive.BooleanDelegate import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile +import de.bixilon.minosoft.config.profile.profiles.rendering.overlay.arm.ArmC import de.bixilon.minosoft.config.profile.profiles.rendering.overlay.fire.FireC import de.bixilon.minosoft.config.profile.profiles.rendering.overlay.weather.WeatherC @@ -36,4 +37,5 @@ class OverlayC(profile: RenderingProfile) { val fire = FireC(profile) val weather = WeatherC(profile) + val arm = ArmC(profile) } diff --git a/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/arm/ArmC.kt b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/arm/ArmC.kt new file mode 100644 index 000000000..e7452a4be --- /dev/null +++ b/src/main/java/de/bixilon/minosoft/config/profile/profiles/rendering/overlay/arm/ArmC.kt @@ -0,0 +1,21 @@ +/* + * Minosoft + * Copyright (C) 2020-2022 Moritz Zwerger + * + * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with this program. If not, see . + * + * This software is not affiliated with Mojang AB, the original developer of Minecraft. + */ + +package de.bixilon.minosoft.config.profile.profiles.rendering.overlay.arm + +import de.bixilon.minosoft.config.profile.delegate.primitive.BooleanDelegate +import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile + +class ArmC(profile: RenderingProfile) { + val render by BooleanDelegate(profile, true) +} diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/arm/ArmOverlay.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/arm/ArmOverlay.kt index dba5d658d..5e074a973 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/arm/ArmOverlay.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/arm/ArmOverlay.kt @@ -30,7 +30,7 @@ class ArmOverlay(private val renderWindow: RenderWindow) : Overlay { private val config = renderWindow.connection.profiles.rendering.overlay private val shader = renderWindow.renderSystem.createShader(minosoft("arm")) { ArmOverlayShader(it) } override val render: Boolean - get() = renderWindow.camera.view.view.renderArm + get() = renderWindow.camera.view.view.renderArm && config.arm.render private var arm = renderWindow.connection.player.mainArm // TODO: camera player entity private var skin: DynamicTexture? = null private var model: PlayerModel? = null