From 799acf8b172fa7b506d8533df72ba16b4d7a14b9 Mon Sep 17 00:00:00 2001 From: Moritz Zwerger Date: Thu, 26 Oct 2023 23:34:18 +0200 Subject: [PATCH] biped models, rotate player head --- .../gui/rendering/entities/feature/SkeletalFeature.kt | 2 +- .../gui/rendering/entities/model/biped/BipedModel.kt | 1 - .../rendering/entities/renderer/player/PlayerRenderer.kt | 9 ++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt index 924b5849b..f6511e4b1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/feature/SkeletalFeature.kt @@ -37,7 +37,7 @@ open class SkeletalFeature( protected open fun updatePosition() { - val renderInfo = renderer.entity.renderInfo + val renderInfo = renderer.info val yaw = renderInfo.rotation.yaw val position = renderInfo.position diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/biped/BipedModel.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/biped/BipedModel.kt index 7341b129c..7758ec6de 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/biped/BipedModel.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/model/biped/BipedModel.kt @@ -34,5 +34,4 @@ abstract class BipedModel(renderer: EntityRenderer<*>, model: BakedSkeletalModel .rotateRadAssign(Vec3(-pitch.rad, 0.0f, 0.0f)) .translateAssign(head.nPivot) } - } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/player/PlayerRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/player/PlayerRenderer.kt index 5a5d35ee6..1db4f9492 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/player/PlayerRenderer.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entities/renderer/player/PlayerRenderer.kt @@ -20,7 +20,7 @@ import de.bixilon.minosoft.data.registries.identified.Identified import de.bixilon.minosoft.data.registries.identified.Namespaces.minecraft import de.bixilon.minosoft.gui.rendering.entities.EntitiesRenderer import de.bixilon.minosoft.gui.rendering.entities.factory.RegisteredEntityModelFactory -import de.bixilon.minosoft.gui.rendering.entities.feature.SkeletalFeature +import de.bixilon.minosoft.gui.rendering.entities.model.biped.PlayerModel import de.bixilon.minosoft.gui.rendering.entities.renderer.EntityRenderer import de.bixilon.minosoft.gui.rendering.models.loader.ModelLoader import de.bixilon.minosoft.gui.rendering.models.loader.SkeletalLoader.Companion.sModel @@ -42,12 +42,11 @@ open class PlayerRenderer(renderer: EntitiesRenderer, entity: if (registered) return val update = updateProperties() - val model = getModel() - - val instance = model?.createInstance(renderer.context) ?: return + val model = getModel() ?: return this.registered = true - this.features += SkeletalFeature(this, instance) + + this.features += PlayerModel(this, model) } private fun updateProperties(): Boolean {