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

rendering: fix texture animations

Browse Source
This commit is contained in:
Bixilon 2021-04-01 21:45:34 +02:00
parent d9bdd66fd1
commit 046c9b3b4b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
View File

@ -223,7 +223,7 @@ class RenderWindow(
// Make the OpenGL context current // Make the OpenGL context current
glfwMakeContextCurrent(windowId) glfwMakeContextCurrent(windowId)
// Enable v-sync // Enable v-sync
glfwSwapInterval(0) glfwSwapInterval(1)
// Make the window visible // Make the window visible

6
src/main/java/de/bixilon/minosoft/gui/rendering/chunk/WorldRenderer.kt
View File

@ -372,8 +372,8 @@ class WorldRenderer(
return divided return divided
} }
} }
}
private operator fun Int.plus(upOrDown: Directions): Int { private operator fun Int.plus(upOrDown: Directions): Int {
return this + upOrDown.directionVector.y.toInt() return this + upOrDown.directionVector.y
}
} }

13
src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.java → src/main/java/de/bixilon/minosoft/gui/rendering/exceptions/ShaderLoadingException.kt
View File

@ -10,14 +10,9 @@
* *
* This software is not affiliated with Mojang AB, the original developer of Minecraft. * This software is not affiliated with Mojang AB, the original developer of Minecraft.
*/ */
package de.bixilon.minosoft.gui.rendering.exceptions
package de.bixilon.minosoft.gui.rendering.exceptions; class ShaderLoadingException : Exception {
constructor()
public class ShaderLoadingException extends Exception { constructor(message: String) : super(message)
public ShaderLoadingException() {
}
public ShaderLoadingException(String message) {
super(message);
}
} }

4
src/main/java/de/bixilon/minosoft/gui/rendering/textures/TextureArray.kt
View File

@ -208,8 +208,8 @@ class TextureArray(val allTextures: MutableList<Texture>) {
val arrayOffset = textureAnimation.animationProperties.animationId * INTS_PER_ANIMATED_TEXTURE val arrayOffset = textureAnimation.animationProperties.animationId * INTS_PER_ANIMATED_TEXTURE
animatedData[arrayOffset] = baseAnimatedData or currentFrame.index animatedData[arrayOffset] = baseAnimatedData + currentFrame.index
animatedData[arrayOffset + 1] = baseAnimatedData or nextFrame.index animatedData[arrayOffset + 1] = baseAnimatedData + nextFrame.index
animatedData[arrayOffset + 2] = interpolation.toInt() animatedData[arrayOffset + 2] = interpolation.toInt()
} }