AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix skeletal position and animations (chest)

Browse Source
This commit is contained in:
Bixilon 2022-12-25 17:31:29 +01:00
parent 0e68f35ffa
commit 1ca468ac44
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/baked/BakedSkeletalModel.kt
View File

@ -91,7 +91,7 @@ class BakedSkeletalModel(
companion object { companion object {
fun Vec3.fromBlockCoordinates(): Vec3 { fun Vec3.fromBlockCoordinates(): Vec3 {
return Vec3(this.x.toBlockCoordinate(), this.y.toBlockCoordinate(), this.z.toBlockCoordinate()) return Vec3(this.x.toBlockCoordinate(), this.y / BLOCK_RESOLUTION, this.z.toBlockCoordinate())
} }
inline fun Float.toBlockCoordinate(): Float { inline fun Float.toBlockCoordinate(): Float {

4
src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/instance/SkeletalInstance.kt
View File

@ -74,8 +74,8 @@ class SkeletalInstance(
fun updatePosition(position: Vec3, rotation: EntityRotation) { fun updatePosition(position: Vec3, rotation: EntityRotation) {
val matrix = Mat4() val matrix = Mat4()
.translateAssign(position) .translateAssign(position)
.rotateAssign((180.0f - rotation.yaw).toFloat().rad, Vec3(0, 1, 0)) .rotateAssign((180.0f - rotation.yaw).rad, Vec3(0, 1, 0))
.translateAssign(Vec3(-0.5, -0.5, -0.5)) // move to bottom center .translateAssign(Vec3(-0.5, 0.0f, -0.5)) // move to bottom center
if (baseTransform != matrix) { if (baseTransform != matrix) {
baseTransform = matrix baseTransform = matrix

6
src/main/java/de/bixilon/minosoft/gui/rendering/skeletal/model/animations/SkeletalAnimation.kt
View File

@ -55,9 +55,9 @@ interface SkeletalAnimation {
val rotation = get(KeyframeChannels.ROTATION, outliner, tweakedTime) val rotation = get(KeyframeChannels.ROTATION, outliner, tweakedTime)
if (rotation != null && rotation != Vec3.EMPTY_INSTANCE) { if (rotation != null && rotation != Vec3.EMPTY_INSTANCE) {
transform.translateAssign(outliner.origin.fromBlockCoordinates()) transform.translateAssign(outliner.origin.fromBlockCoordinates())
transform.rotateAssign(rotation.x.rad, Vec3(1, 0, 0)) transform.rotateAssign(-rotation.x.rad, Vec3(1, 0, 0))
transform.rotateAssign(rotation.y.rad, Vec3(0, 1, 0)) transform.rotateAssign(-rotation.y.rad, Vec3(0, 1, 0))
transform.rotateAssign(rotation.z.rad, Vec3(0, 0, 1)) transform.rotateAssign(-rotation.z.rad, Vec3(0, 0, 1))
transform.translateAssign(-outliner.origin.fromBlockCoordinates()) transform.translateAssign(-outliner.origin.fromBlockCoordinates())
} }
val scale = get(KeyframeChannels.SCALE, outliner, tweakedTime) val scale = get(KeyframeChannels.SCALE, outliner, tweakedTime)