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

uvLock, fixes

Browse Source
This commit is contained in:
Bixilon 2021-11-09 22:56:09 +01:00
parent 4ddb8dcaf7
commit 958df37f96
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/data/direction/Directions.kt
View File

@ -75,7 +75,7 @@ enum class Directions(
return when (this) { return when (this) {
DOWN -> arrayOf(Vec3(from.x, from.y, to.z), Vec3(to.x, from.y, to.z), Vec3(to.x, from.y, from.z), from) DOWN -> arrayOf(Vec3(from.x, from.y, to.z), Vec3(to.x, from.y, to.z), Vec3(to.x, from.y, from.z), from)
UP -> arrayOf(Vec3(from.x, to.y, from.z), Vec3(to.x, to.y, from.z), to, Vec3(from.x, to.y, to.z)) UP -> arrayOf(Vec3(from.x, to.y, from.z), Vec3(to.x, to.y, from.z), to, Vec3(from.x, to.y, to.z))
NORTH -> arrayOf(Vec3(to.x, to.y, from.y), Vec3(from.x, to.y, from.z), from, Vec3(to.x, from.y, from.z)) NORTH -> arrayOf(Vec3(to.x, to.y, from.z), Vec3(from.x, to.y, from.z), from, Vec3(to.x, from.y, from.z))
SOUTH -> arrayOf(Vec3(from.x, to.y, to.z), to, Vec3(to.x, from.y, to.z), Vec3(from.x, from.y, to.z)) SOUTH -> arrayOf(Vec3(from.x, to.y, to.z), to, Vec3(to.x, from.y, to.z), Vec3(from.x, from.y, to.z))
WEST -> arrayOf(Vec3(from.x, to.y, from.z), Vec3(from.x, to.y, to.z), Vec3(from.x, from.y, to.z), from) WEST -> arrayOf(Vec3(from.x, to.y, from.z), Vec3(from.x, to.y, to.z), Vec3(from.x, from.y, to.z), from)
EAST -> arrayOf(to, Vec3(to.x, to.y, from.z), Vec3(to.x, from.y, from.z), Vec3(to.x, from.y, to.z)) EAST -> arrayOf(to, Vec3(to.x, to.y, from.z), Vec3(to.x, from.y, from.z), Vec3(to.x, from.y, to.z))

26
src/main/java/de/bixilon/minosoft/gui/rendering/models/unbaked/block/UnbakedBlockStateModel.kt
View File

@ -24,8 +24,9 @@ import de.bixilon.minosoft.gui.rendering.models.unbaked.UnbakedBlockModel
import de.bixilon.minosoft.gui.rendering.models.unbaked.UnbakedModel import de.bixilon.minosoft.gui.rendering.models.unbaked.UnbakedModel
import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture import de.bixilon.minosoft.gui.rendering.system.base.texture.texture.AbstractTexture
import de.bixilon.minosoft.gui.rendering.textures.TextureUtil.texture import de.bixilon.minosoft.gui.rendering.textures.TextureUtil.texture
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2Util.toVec2N import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2iUtil.toVec2iN
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.EMPTY
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.get
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.set import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3Util.set
import de.bixilon.minosoft.util.KUtil.toBoolean import de.bixilon.minosoft.util.KUtil.toBoolean
import de.bixilon.minosoft.util.KUtil.toInt import de.bixilon.minosoft.util.KUtil.toInt
@ -34,13 +35,15 @@ import de.bixilon.minosoft.util.KUtil.unsafeCast
import glm_.func.rad import glm_.func.rad
import glm_.mat4x4.Mat4 import glm_.mat4x4.Mat4
import glm_.vec2.Vec2 import glm_.vec2.Vec2
import glm_.vec2.Vec2i
import glm_.vec3.Vec3 import glm_.vec3.Vec3
import glm_.vec4.Vec4 import glm_.vec4.Vec4
import glm_.vec4.swizzle.xyz import glm_.vec4.swizzle.xyz
import glm_.vec4.swizzle.xz
data class UnbakedBlockStateModel( data class UnbakedBlockStateModel(
val model: UnbakedBlockModel, val model: UnbakedBlockModel,
val rotation: Vec2?, val rotation: Vec2i?,
val uvLock: Boolean, val uvLock: Boolean,
val weight: Int, val weight: Int,
) : UnbakedModel { ) : UnbakedModel {
@ -81,9 +84,6 @@ data class UnbakedBlockStateModel(
val rescale = element.rotation?.rescale ?: false val rescale = element.rotation?.rescale ?: false
for (face in element.faces) { for (face in element.faces) {
val texture = resolvedTextures[face.texture.removePrefix("#")]!! // ToDo: Allow direct texture names? val texture = resolvedTextures[face.texture.removePrefix("#")]!! // ToDo: Allow direct texture names?
if (texture.resourceLocation.path.contains("carved_pumpkin")) {
var a = 1
}
val positions = face.direction.getPositions(element.from, element.to) val positions = face.direction.getPositions(element.from, element.to)
val rotationMatrix = Mat4() val rotationMatrix = Mat4()
element.rotation?.let { element.rotation?.let {
@ -97,7 +97,7 @@ data class UnbakedBlockStateModel(
val direction = Directions.byDirection((rotationMatrix * Vec4(face.direction.vectorf, 1.0f)).xyz) val direction = Directions.byDirection((rotationMatrix * Vec4(face.direction.vectorf, 1.0f)).xyz)
for ((index, position) in positions.withIndex()) { for ((index, position) in positions.withIndex()) {
positions[index] = (rotationMatrix * Vec4(position, 1.0f)).xyz positions[index] = (rotationMatrix * Vec4(position - 0.5f, 1.0f)).xyz + 0.5f
} }
val texturePositions = arrayOf( val texturePositions = arrayOf(
@ -107,6 +107,18 @@ data class UnbakedBlockStateModel(
face.uvEnd, face.uvEnd,
).rotateLeft((face.rotation % 360) / 90).toTypedArray() ).rotateLeft((face.rotation % 360) / 90).toTypedArray()
if (this.uvLock && this.rotation != null) {
val matrix = Mat4()
//matrix.rotateAssign(this.rotation.x.rad, Vec3(1,0,0))
val rotationVec3 = Vec3(this.rotation, 0.0f)
val angle = rotationVec3[face.direction.axis]
matrix.rotateAssign(-angle.rad, direction.vectorf)
//matrix.rotateAssign(this.rotation.x.rad, Vec3(0,1,0))
for ((index, position) in texturePositions.withIndex()) {
texturePositions[index] = (matrix * Vec4(position.x - 0.5f, 0.0f, position.y - 0.5f, 0.0f)).xz + 0.5f
}
}
faces[direction.ordinal] += BakedFace( faces[direction.ordinal] += BakedFace(
faceSize = face.direction.getSize(element.from, element.to), faceSize = face.direction.getSize(element.from, element.to),
@ -133,7 +145,7 @@ data class UnbakedBlockStateModel(
operator fun invoke(models: Map<ResourceLocation, GenericUnbakedModel>, data: Map<String, Any>): UnbakedBlockStateModel { operator fun invoke(models: Map<ResourceLocation, GenericUnbakedModel>, data: Map<String, Any>): UnbakedBlockStateModel {
return UnbakedBlockStateModel( return UnbakedBlockStateModel(
model = models[data["model"].toResourceLocation()].unsafeCast(), model = models[data["model"].toResourceLocation()].unsafeCast(),
rotation = data.toVec2N(), rotation = data.toVec2iN(),
uvLock = data["uvlock"]?.toBoolean() ?: false, uvLock = data["uvlock"]?.toBoolean() ?: false,
weight = data["weight"]?.toInt() ?: 1, weight = data["weight"]?.toInt() ?: 1,
) )