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

arm: don't scale with pixel size

Browse Source
This commit is contained in:
Bixilon 2022-12-13 12:23:30 +01:00
parent e845a10b23
commit 85d75fcfaa
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/gui/rendering/framebuffer/world/overlay/overlays/arm/ArmOverlay.kt
View File

@ -24,7 +24,6 @@ import de.bixilon.minosoft.gui.rendering.entity.models.minecraft.player.ArmAnima
import de.bixilon.minosoft.gui.rendering.entity.models.minecraft.player.PlayerModel import de.bixilon.minosoft.gui.rendering.entity.models.minecraft.player.PlayerModel
import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.Overlay import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.Overlay
import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory import de.bixilon.minosoft.gui.rendering.framebuffer.world.overlay.OverlayFactory
import de.bixilon.minosoft.gui.rendering.models.unbaked.element.UnbakedElement.Companion.BLOCK_RESOLUTION
import de.bixilon.minosoft.gui.rendering.system.base.IntegratedBufferTypes import de.bixilon.minosoft.gui.rendering.system.base.IntegratedBufferTypes
import de.bixilon.minosoft.gui.rendering.system.base.RenderingCapabilities import de.bixilon.minosoft.gui.rendering.system.base.RenderingCapabilities
import de.bixilon.minosoft.gui.rendering.system.base.texture.skin.PlayerSkin import de.bixilon.minosoft.gui.rendering.system.base.texture.skin.PlayerSkin
@ -85,21 +84,21 @@ class ArmOverlay(private val renderWindow: RenderWindow) : Overlay {
val projection = renderWindow.camera.matrixHandler.projectionMatrix val projection = renderWindow.camera.matrixHandler.projectionMatrix
val matrix = Mat4() val matrix = Mat4()
matrix.rotateAssign(-25.0f.rad, Vec3(0, 1, 0)) matrix.rotateAssign(-5.0f.rad, Vec3(0, 1, 0))
matrix.rotateAssign(130.0f.rad, Vec3(1, 0, 0)) matrix.rotateAssign(130.0f.rad, Vec3(1, 0, 0))
a += 1 a += 1
matrix.translateAssign(Vec3(if (arm == Arms.LEFT) 0.2f else -0.2f, 0, 0)) // move inner side of arm to 0|0|0 matrix.translateAssign(Vec3(if (arm == Arms.LEFT) 0.2f else -0.2f, 0, 0)) // move inner side of arm to 0|0|0
matrix.scaleAssign(BLOCK_RESOLUTION) // make a pixel one pixel // matrix.scaleAssign(BLOCK_RESOLUTION) // make a pixel one pixel
matrix.translateAssign(-0.5f) matrix.translateAssign(-0.5f)
return matrix val a = projection * matrix
// "${matrix * Vec4(Vec3(4, 12, -2).fromBlockCoordinates(), 1)} -> ${matrix * Vec4(Vec3(7, 24, 2).fromBlockCoordinates(), 1)}" // "${a * Vec4(Vec3(4, 12, -2).fromBlockCoordinates(), 1)} -> ${a * Vec4(Vec3(7, 24, 2).fromBlockCoordinates(), 1)}"
return projection * matrix return projection * matrix
} }