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

add support for ConditionalModels

Browse Source
This commit is contained in:
Lukas 2020-11-10 15:56:48 +01:00
parent 4c52ebab97
commit 4089ff42d8
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -25,15 +25,9 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source> <source>15</source>
14 <target>15</target>
</source> <compilerArgs>--enable-preview</compilerArgs>
<target>
14
</target>
<compilerArgs>
--enable-preview
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

2
src/main/java/de/bixilon/minosoft/render/blockModels/BlockModel.java
View File

@ -53,7 +53,7 @@ public class BlockModel implements BlockModelInterface {
for (Axis axis : Axis.values()) { for (Axis axis : Axis.values()) {
String lowercase = axis.name().toLowerCase(); String lowercase = axis.name().toLowerCase();
if (state.has(lowercase)) { if (state.has(lowercase)) {
BlockModelInterface.rotateModel(model, axis, state.get(lowercase).getAsInt()); BlockModelInterface.rotateModel(model, axis, state.get(lowercase).getAsDouble());
} }
} }
stateMap.put(properties, model); stateMap.put(properties, model);

2
src/main/java/de/bixilon/minosoft/render/blockModels/BlockModelInterface.java
View File

@ -58,7 +58,7 @@ public interface BlockModelInterface {
return load(json, allModels, new HashMap<>()); return load(json, allModels, new HashMap<>());
} }
static void rotateModel(HashSet<SubBlock> subBlocks, Axis axis, int rotation) { static void rotateModel(HashSet<SubBlock> subBlocks, Axis axis, double rotation) {
for (SubBlock subBlock : subBlocks) { for (SubBlock subBlock : subBlocks) {
subBlock.rotate(axis, rotation); subBlock.rotate(axis, rotation);
} }

10
src/main/java/de/bixilon/minosoft/render/blockModels/ConditionalModel.java
View File

@ -18,6 +18,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import de.bixilon.minosoft.data.mappings.blocks.Block; import de.bixilon.minosoft.data.mappings.blocks.Block;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
import de.bixilon.minosoft.render.blockModels.Face.Axis;
import de.bixilon.minosoft.render.blockModels.Face.FaceOrientation; import de.bixilon.minosoft.render.blockModels.Face.FaceOrientation;
import de.bixilon.minosoft.render.blockModels.subBlocks.SubBlock; import de.bixilon.minosoft.render.blockModels.subBlocks.SubBlock;
import org.apache.commons.collections.primitives.ArrayFloatList; import org.apache.commons.collections.primitives.ArrayFloatList;
@ -25,6 +26,7 @@ import org.apache.commons.collections.primitives.ArrayFloatList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
public class ConditionalModel implements BlockModelInterface { public class ConditionalModel implements BlockModelInterface {
HashMap<BlockCondition, HashSet<SubBlock>> conditionMap; HashMap<BlockCondition, HashSet<SubBlock>> conditionMap;
@ -39,7 +41,13 @@ public class ConditionalModel implements BlockModelInterface {
} else { } else {
condition = BlockCondition.trueCondition; condition = BlockCondition.trueCondition;
} }
HashSet<SubBlock> model = blockModels.get(block.get("model").getAsString()); HashSet<SubBlock> model = blockModels.get(block.get("model").getAsString()).stream().map(SubBlock::new).collect(Collectors.toCollection(HashSet::new));
for (Axis axis : Axis.values()) {
String lowercase = axis.name().toLowerCase();
if (block.has(lowercase)) {
BlockModelInterface.rotateModel(model, axis, block.get(lowercase).getAsDouble());
}
}
conditionMap.put(condition, model); conditionMap.put(condition, model);
} }
} }

2
src/main/java/de/bixilon/minosoft/render/blockModels/subBlocks/Cuboid.java
View File

@ -75,7 +75,7 @@ public class Cuboid {
}; };
} }
public void rotate(Axis axis, int rotation) { public void rotate(Axis axis, double rotation) {
for (int i = 0; i < positions.length; i++) { for (int i = 0; i < positions.length; i++) {
positions[i] = positions[i].rotated(axis, rotation); positions[i] = positions[i].rotated(axis, rotation);
} }

2
src/main/java/de/bixilon/minosoft/render/blockModels/subBlocks/SubBlock.java
View File

@ -155,7 +155,7 @@ public class SubBlock {
return result; return result;
} }
public void rotate(Axis axis, int rotation) { public void rotate(Axis axis, double rotation) {
cuboid.rotate(axis, rotation); cuboid.rotate(axis, rotation);
} }

2
src/main/java/de/bixilon/minosoft/render/blockModels/subBlocks/SubBlockPosition.java
View File

@ -45,7 +45,7 @@ public class SubBlockPosition {
vector = new Vec3(position.vector); vector = new Vec3(position.vector);
} }
public SubBlockPosition rotated(Axis axis, int rotation) { public SubBlockPosition rotated(Axis axis, double rotation) {
return new SubBlockRotation(middlePos, axis, rotation).apply(this); return new SubBlockRotation(middlePos, axis, rotation).apply(this);
} }

2
src/main/java/de/bixilon/minosoft/render/blockModels/subBlocks/SubBlockRotation.java
View File

@ -24,7 +24,7 @@ public class SubBlockRotation {
private final double sin; private final double sin;
private final double cos; private final double cos;
public SubBlockRotation(SubBlockPosition origin, Axis axis, float angle) { public SubBlockRotation(SubBlockPosition origin, Axis axis, double angle) {
this.origin = origin.getVector(); this.origin = origin.getVector();
this.axis = axis; this.axis = axis;
double angleRad = Math.toRadians(angle); double angleRad = Math.toRadians(angle);