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

block state free rotation

Browse Source 
and reenabled sign models
This commit is contained in:
Moritz Zwerger 2023-08-01 04:29:19 +02:00
parent 8b03e0b206
commit 7223ca11e3
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 19 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/assets/AssetsLoader.kt
View File

@ -28,7 +28,7 @@ object AssetsLoader {
fun create(profile: ResourcesProfile, version: Version, latch: AbstractLatch, property: AssetsVersionProperty = AssetsVersionProperties[version] ?: throw IllegalAccessException("$version has no assets!")): AssetsManager { fun create(profile: ResourcesProfile, version: Version, latch: AbstractLatch, property: AssetsVersionProperty = AssetsVersionProperties[version] ?: throw IllegalAccessException("$version has no assets!")): AssetsManager {
val assetsManager = PriorityAssetsManager() val assetsManager = PriorityAssetsManager()
// assetsManager += Minosoft.OVERRIDE_ASSETS_MANAGER assetsManager += Minosoft.OVERRIDE_ASSETS_MANAGER
for (resourcePack in profile.assets.resourcePacks.reversed()) { for (resourcePack in profile.assets.resourcePacks.reversed()) {
resourcePack.type.creator(resourcePack).let { resourcePack.type.creator(resourcePack).let {
it.load(latch) it.load(latch)

25
src/main/java/de/bixilon/minosoft/gui/rendering/models/block/state/apply/SingleBlockStateApply.kt
View File

@ -17,12 +17,13 @@ import de.bixilon.kotlinglm.vec2.Vec2
import de.bixilon.kutil.exception.Broken import de.bixilon.kutil.exception.Broken
import de.bixilon.kutil.json.JsonObject import de.bixilon.kutil.json.JsonObject
import de.bixilon.kutil.primitive.BooleanUtil.toBoolean import de.bixilon.kutil.primitive.BooleanUtil.toBoolean
import de.bixilon.kutil.primitive.IntUtil.toInt import de.bixilon.kutil.primitive.FloatUtil.toFloat
import de.bixilon.minosoft.data.Axes import de.bixilon.minosoft.data.Axes
import de.bixilon.minosoft.data.direction.DirectionUtil.rotateX import de.bixilon.minosoft.data.direction.DirectionUtil.rotateX
import de.bixilon.minosoft.data.direction.DirectionUtil.rotateY import de.bixilon.minosoft.data.direction.DirectionUtil.rotateY
import de.bixilon.minosoft.data.direction.Directions import de.bixilon.minosoft.data.direction.Directions
import de.bixilon.minosoft.gui.rendering.models.block.BlockModel import de.bixilon.minosoft.gui.rendering.models.block.BlockModel
import de.bixilon.minosoft.gui.rendering.models.block.element.ElementRotation
import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakedFace import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakedFace
import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakedModel import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakedModel
import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.compact import de.bixilon.minosoft.gui.rendering.models.block.state.baked.BakingUtil.compact
@ -39,6 +40,7 @@ data class SingleBlockStateApply(
val uvLock: Boolean = false, val uvLock: Boolean = false,
val x: Int = 0, val x: Int = 0,
val y: Int = 0, val y: Int = 0,
val rotation: Vec2? = null,
) : BlockStateApply { ) : BlockStateApply {
private fun FloatArray.rotateX(count: Int) { private fun FloatArray.rotateX(count: Int) {
@ -166,9 +168,16 @@ data class SingleBlockStateApply(
.rotateY(this.y) .rotateY(this.y)
val positions = element.positions(direction) var positions = element.positions(direction)
.rotateX(direction) .rotateX(direction)
.rotateY(direction.rotateX(this.x)) if (this.rotation != null && this.rotation.x != 0.0f) {
ElementRotation(axis = Axes.X, angle = this.rotation.x).apply(positions)
}
positions = positions.rotateY(direction.rotateX(this.x))
if (this.rotation != null && this.rotation.y != 0.0f) {
ElementRotation(axis = Axes.Y, angle = this.rotation.y).apply(positions)
}
var uv = face.getUV(uvLock, element.from, element.to, direction, rotatedDirection, positions, x, y).toArray(rotatedDirection, face.rotation) var uv = face.getUV(uvLock, element.from, element.to, direction, rotatedDirection, positions, x, y).toArray(rotatedDirection, face.rotation)
@ -219,17 +228,19 @@ data class SingleBlockStateApply(
fun Int.rotation(): Int { fun Int.rotation(): Int {
var rotation = this var rotation = this
if (rotation % ROTATION_STEP != 0) throw IllegalArgumentException("Invalid rotation: $rotation")
rotation /= ROTATION_STEP rotation /= ROTATION_STEP
return rotation and 0x03 return rotation and 0x03
} }
fun deserialize(model: BlockModel, data: JsonObject): SingleBlockStateApply { fun deserialize(model: BlockModel, data: JsonObject): SingleBlockStateApply {
val uvLock = data["uvlock"]?.toBoolean() ?: false val uvLock = data["uvlock"]?.toBoolean() ?: false
val x = data["x"]?.toInt()?.rotation() ?: 0
val y = data["y"]?.toInt()?.rotation() ?: 0
return SingleBlockStateApply(model, uvLock, x, y) val x = data["x"]?.toFloat() ?: 0.0f
val y = data["y"]?.toFloat() ?: 0.0f
val rotation = Vec2(x % ROTATION_STEP, y % ROTATION_STEP)
return SingleBlockStateApply(model, uvLock, x.toInt().rotation(), y.toInt().rotation(), rotation = if (rotation.x == 0.0f && rotation.y == 0.0f) null else rotation)
} }
fun deserialize(loader: BlockLoader, data: JsonObject): SingleBlockStateApply? { fun deserialize(loader: BlockLoader, data: JsonObject): SingleBlockStateApply? {