mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-24 22:16:38 +01:00
started work on voxel shape refactoring
-reworked the belt shapes, still need to revisit for casings Signed-off-by: Zelophed <zefren1@googlemail.com>
This commit is contained in:
zelophed
Zelophed
parent
1d96f50b9a
commit
74721cda95
2 changed files with 154 additions and 59 deletions
|
|
@ -15,6 +15,8 @@ import net.minecraft.util.math.shapes.VoxelShapes;
|
||||||
|
|
||||||
public class VoxelShaper {
|
public class VoxelShaper {
|
||||||
|
|
||||||
|
//big todo lul
|
||||||
|
|
||||||
private Map<Direction, VoxelShape> shapes = new HashMap<>();
|
private Map<Direction, VoxelShape> shapes = new HashMap<>();
|
||||||
|
|
||||||
public VoxelShape get(Direction direction) {
|
public VoxelShape get(Direction direction) {
|
||||||
|
|
@ -46,6 +48,16 @@ public class VoxelShaper {
|
||||||
return voxelShaper;
|
return voxelShaper;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static VoxelShaper forVerticalBelt(VoxelShape southBeltShape){
|
||||||
|
VoxelShaper voxelShaper = new VoxelShaper();
|
||||||
|
for (Direction facing : Direction.values()) {
|
||||||
|
if (facing.getAxis().isVertical())
|
||||||
|
continue;
|
||||||
|
voxelShaper.shapes.put(facing, rotatedCopy(rotatedCopy(southBeltShape, facing.getAxisDirection() == AxisDirection.NEGATIVE ? 90 : 270, 0),0,(int) -facing.getHorizontalAngle()));
|
||||||
|
}
|
||||||
|
return voxelShaper;
|
||||||
|
}
|
||||||
|
|
||||||
public static VoxelShaper forRotatedPillar(VoxelShape zShape) {
|
public static VoxelShaper forRotatedPillar(VoxelShape zShape) {
|
||||||
VoxelShaper voxelShaper = new VoxelShaper();
|
VoxelShaper voxelShaper = new VoxelShaper();
|
||||||
for (Axis axis : Axis.values()) {
|
for (Axis axis : Axis.values()) {
|
||||||
|
|
|
||||||
|
|
@ -16,49 +16,161 @@ import net.minecraft.util.math.shapes.VoxelShapes;
|
||||||
|
|
||||||
public class BeltShapes {
|
public class BeltShapes {
|
||||||
|
|
||||||
private static final VoxelShape SLOPE_BUILDING_BLOCK_X = makeCuboidShape(5, 5, 1, 11, 11, 15),
|
/*
|
||||||
SLOPE_BUILDING_BLOCK_Z = makeCuboidShape(1, 5, 5, 15, 11, 11),
|
* | hi. i made these comments mostly to help me with creating the shapes. but they should also be able to help you understand what i'm doing here if that's why you came here. cheers
|
||||||
CASING_HORIZONTAL = makeCuboidShape(0, 0, 0, 16, 11, 16);
|
* |
|
||||||
|
* | belt shape slope south descending
|
||||||
|
* | generated by makeSlopePart
|
||||||
|
* | z
|
||||||
|
* | y 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 | | | |
|
||||||
|
* | | | | | | |
|
||||||
|
* | +5 | # | | belt shape flat south ending | belt shape flat south full |
|
||||||
|
* | +4 | # # | | generated by makeFlatEnding | generated by makeFlatFull |
|
||||||
|
* | +3 | # # # | z |z |z |
|
||||||
|
* | +2 | # # # # | 15 14 ... | 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 | 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 |
|
||||||
|
* | +1 | # # # # # | | | | | | | | |
|
||||||
|
* | 15 ------+ - - - - - - - - - # # # # # #-- | --+---------- | --+ - - - - - - - - - - - - - - +-- | --+ - - - - - - - - - - - - - - +--- |
|
||||||
|
* | 14 | # # # # # # # | | | | | | | | |
|
||||||
|
* | 13 | # # # # # # # # | | | | | | | | |
|
||||||
|
* | 12 | # # # # # # # # # | | | | # # # # # # # # # # # # # # | | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 11 | # # # # # # # # # # | | | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 10 | # # # # # # # # # # # | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 9 | # # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 8 | # # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 7 | # # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 6 | # # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 5 # # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 4 # # # # # # # # # # | | # | # # # # # # # # # # # # # # # # | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 3 # # # # # # # # # | | # | | # # # # # # # # # # # # # # | | # # # # # # # # # # # # # # # # |
|
||||||
|
* | 2 # # # # # # # # | | # | | | | | | |
|
||||||
|
* | 1 # # # # # # # | | # | | | | | | |
|
||||||
|
* | 0 -------# # # # # # - - - - - - - - - +-- | --#---------- | --+ - - - - - - - - - - - - - - +-- | --+ - - - - - - - - - - - - - - +--- |
|
||||||
|
* |-1 # # # # # | | | | | | | | | |
|
||||||
|
* |-2 # # # # | | | | | | | | | |
|
||||||
|
* |-3 # # # | slice used | | |
|
||||||
|
* |-4 # # | to create | | |
|
||||||
|
* |-5 # | the stairs | | |
|
||||||
|
* | x 1 to 14 | | | |
|
||||||
|
*/
|
||||||
|
|
||||||
private static final VoxelShaper SLOPE_END = VoxelShaper.forHorizontal(makeCuboidShape(1, 3, 0, 15, 13, 10)),
|
/*
|
||||||
SLOPE_TOP_END = VoxelShaper.forHorizontal(
|
* |Belt shapes always consist of 2 halves depending on state. This class generated all shapes for belts facing SOUTH and then uses VoxelShapers to fill the remaining 3 Directions
|
||||||
VoxelShapes.or(SLOPE_END.get(Direction.SOUTH), createHalfSlope(Direction.SOUTH, false))),
|
* |Middle shapes use the same building part in both halved and don't need to be composed
|
||||||
SLOPE_BOTTOM_END = VoxelShaper.forHorizontal(
|
* |some of these shapes could be skipped and easily achieved by rotating other shapes but i left them in for clarity's sake
|
||||||
VoxelShapes.or(SLOPE_END.get(Direction.SOUTH), createHalfSlope(Direction.SOUTH, true))),
|
* | Flat Belts: Sloped Belts: (DESC) (ASC)
|
||||||
FLAT_STRAIGHT = VoxelShaper.forHorizontalAxis(makeCuboidShape(0, 3, 1, 16, 13, 15)),
|
* | south half north half south half north half south half north half
|
||||||
VERTICAL_STRAIGHT = VoxelShaper.forHorizontalAxis(makeCuboidShape(1, 0, 3, 15, 16, 13)),
|
* |
|
||||||
SLOPE_STRAIGHT = VoxelShaper.forHorizontal(createSlope(Direction.SOUTH)),
|
* | Middle flat full flat full Middle slope desc slope desc slope asc slope asc
|
||||||
CASING_TOP_END = VoxelShaper.forHorizontal(makeCuboidShape(0, 0, 0, 16, 11, 11));
|
* | End flat end flat full End flat end slope desc flat end slope asc
|
||||||
|
* | Start flat full flat end Start slope desc flat end slope asc flat end
|
||||||
|
*/
|
||||||
|
|
||||||
|
//Building parts for the shapes
|
||||||
|
private static final VoxelShape
|
||||||
|
SLOPE_DESC_PART = makeSlopePart(false),
|
||||||
|
SLOPE_ASC_PART = makeSlopePart(true),
|
||||||
|
FLAT_FULL_PART = makeFlatFull(),
|
||||||
|
FLAT_END_PART = makeFlatEnding();
|
||||||
|
|
||||||
|
private static final VoxelShape SOUTH_MASK = makeCuboidShape(0,-5,8,16,16+5,16);
|
||||||
|
private static final VoxelShape NORTH_MASK = makeCuboidShape(0,-5,0,16,16+5,8);
|
||||||
|
|
||||||
|
//Vertical Shapes
|
||||||
|
private static final VoxelShaper
|
||||||
|
VERTICAL_FULL = VoxelShaper.forVerticalBelt(FLAT_FULL_PART),
|
||||||
|
VERTICAL_END = VoxelShaper.forVerticalBelt(compose(FLAT_END_PART, FLAT_FULL_PART)),
|
||||||
|
VERTICAL_START = VoxelShaper.forVerticalBelt(compose(FLAT_FULL_PART, FLAT_END_PART));
|
||||||
|
//Flat Shapes
|
||||||
|
private static final VoxelShaper
|
||||||
|
FLAT_FULL = VoxelShaper.forHorizontalAxis(FLAT_FULL_PART),
|
||||||
|
FLAT_END = VoxelShaper.forHorizontal(compose(FLAT_END_PART, FLAT_FULL_PART)),
|
||||||
|
FLAT_START = VoxelShaper.forHorizontal(compose(FLAT_FULL_PART, FLAT_END_PART));
|
||||||
|
//Sloped Shapes
|
||||||
|
private static final VoxelShaper
|
||||||
|
SLOPE_DESC = VoxelShaper.forHorizontal(SLOPE_DESC_PART),
|
||||||
|
SLOPE_ASC = VoxelShaper.forHorizontal(SLOPE_ASC_PART),
|
||||||
|
SLOPE_DESC_END = VoxelShaper.forHorizontal(compose(FLAT_END_PART, SLOPE_DESC_PART)),
|
||||||
|
SLOPE_DESC_START = VoxelShaper.forHorizontal(compose(SLOPE_DESC_PART, FLAT_END_PART)),
|
||||||
|
SLOPE_ASC_END = VoxelShaper.forHorizontal(compose(FLAT_END_PART, SLOPE_ASC_PART)),
|
||||||
|
SLOPE_ASC_START = VoxelShaper.forHorizontal(compose(SLOPE_ASC_PART, FLAT_END_PART));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
private static VoxelShape compose(VoxelShape southPart, VoxelShape northPart){
|
||||||
|
return VoxelShapes.or(
|
||||||
|
VoxelShapes.combine(SOUTH_MASK, southPart, IBooleanFunction.AND),
|
||||||
|
VoxelShapes.combine(NORTH_MASK, northPart, IBooleanFunction.AND)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VoxelShape makeSlopePart(boolean ascendingInstead) {
|
||||||
|
VoxelShape slice = makeCuboidShape(1, 0, 16, 15, 11, 15);
|
||||||
|
VoxelShape result = VoxelShapes.empty();
|
||||||
|
|
||||||
|
for (int i = 0; i < 16; i++) {
|
||||||
|
|
||||||
|
int yOffset = ascendingInstead ? 10 - i : i - 5;
|
||||||
|
|
||||||
|
result = VoxelShapes.or(
|
||||||
|
result,//move slice i voxels "right" and i-5 voxels "down"
|
||||||
|
slice.withOffset(0, yOffset / 16f, -i / 16f));
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VoxelShape makeFlatEnding(){
|
||||||
|
return VoxelShapes.or(
|
||||||
|
makeCuboidShape(1,4,0,15,12,16),
|
||||||
|
makeCuboidShape(1,3,1,15,13,15)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static VoxelShape makeFlatFull(){
|
||||||
|
return makeCuboidShape(1,3,0,15,13,16);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final VoxelShape CASING_HORIZONTAL = makeCuboidShape(0, 0, 0, 16, 11, 16);
|
||||||
|
//todo still need to remove these two
|
||||||
|
private static final VoxelShaper CASING_TOP_END = VoxelShaper.forHorizontal(makeCuboidShape(0, 0, 0, 16, 11, 11));
|
||||||
|
|
||||||
public static VoxelShape getShape(BlockState state) {
|
public static VoxelShape getShape(BlockState state) {
|
||||||
Direction facing = state.get(BeltBlock.HORIZONTAL_FACING);
|
Direction facing = state.get(BeltBlock.HORIZONTAL_FACING);
|
||||||
Axis axis = facing.getAxis();
|
Axis axis = facing.getAxis();
|
||||||
Axis perpendicularAxis = facing.rotateY().getAxis();
|
|
||||||
Part part = state.get(BeltBlock.PART);
|
Part part = state.get(BeltBlock.PART);
|
||||||
Slope slope = state.get(BeltBlock.SLOPE);
|
Slope slope = state.get(BeltBlock.SLOPE);
|
||||||
|
|
||||||
if (slope == Slope.HORIZONTAL)
|
//vertical
|
||||||
return FLAT_STRAIGHT.get(perpendicularAxis);
|
if (slope == Slope.VERTICAL) {
|
||||||
if (slope == Slope.VERTICAL)
|
if (part == Part.MIDDLE || part == Part.PULLEY)
|
||||||
return VERTICAL_STRAIGHT.get(axis);
|
return VERTICAL_FULL.get(axis);
|
||||||
|
//vertical ending
|
||||||
|
return (part == Part.START ? VERTICAL_START : VERTICAL_END).get(facing);
|
||||||
|
}
|
||||||
|
|
||||||
if (part != Part.MIDDLE && part != Part.PULLEY) {
|
//flat part
|
||||||
boolean upward = slope == Slope.UPWARD;
|
if (slope == Slope.HORIZONTAL) {
|
||||||
|
if (part == Part.MIDDLE || part == Part.PULLEY)
|
||||||
|
return FLAT_FULL.get(axis);
|
||||||
|
//flat ending
|
||||||
|
return (part == Part.START ? FLAT_START : FLAT_END).get(facing);
|
||||||
|
}
|
||||||
|
|
||||||
|
//slope
|
||||||
|
if (part == Part.MIDDLE || part == Part.PULLEY)
|
||||||
|
return (slope == Slope.DOWNWARD ? SLOPE_DESC : SLOPE_ASC).get(facing);
|
||||||
|
//sloped ending
|
||||||
if (part == Part.START)
|
if (part == Part.START)
|
||||||
upward = !upward;
|
return (slope == Slope.DOWNWARD ? SLOPE_DESC_START : SLOPE_ASC_START).get(facing);
|
||||||
else
|
if (part == Part.END)
|
||||||
facing = facing.getOpposite();
|
return (slope == Slope.DOWNWARD ? SLOPE_DESC_END : SLOPE_ASC_END).get(facing);
|
||||||
|
|
||||||
|
//bad state
|
||||||
|
return VoxelShapes.empty();
|
||||||
|
|
||||||
return upward ? SLOPE_TOP_END.get(facing) : SLOPE_BOTTOM_END.get(facing);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (slope == Slope.DOWNWARD)
|
public static VoxelShape getCasingShape(BlockState state) {//todo
|
||||||
facing = facing.getOpposite();
|
|
||||||
|
|
||||||
return SLOPE_STRAIGHT.get(facing);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static VoxelShape getCasingShape(BlockState state) {
|
|
||||||
if (!state.get(BeltBlock.CASING))
|
if (!state.get(BeltBlock.CASING))
|
||||||
return VoxelShapes.empty();
|
return VoxelShapes.empty();
|
||||||
|
|
||||||
|
|
@ -87,33 +199,4 @@ public class BeltShapes {
|
||||||
return CASING_TOP_END.get(facing.getOpposite());
|
return CASING_TOP_END.get(facing.getOpposite());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static VoxelShape createSlope(Direction facing) {
|
|
||||||
return VoxelShapes.or(createHalfSlope(facing.getOpposite(), false), createHalfSlope(facing, true));
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static VoxelShape createHalfSlope(Direction facing, boolean upward) {
|
|
||||||
VoxelShape shape = VoxelShapes.empty();
|
|
||||||
VoxelShape buildingBlock = facing.getAxis() == Axis.X ? SLOPE_BUILDING_BLOCK_X : SLOPE_BUILDING_BLOCK_Z;
|
|
||||||
Vec3i directionVec = facing.getDirectionVec();
|
|
||||||
|
|
||||||
int x = directionVec.getX();
|
|
||||||
int y = upward ? 1 : -1;
|
|
||||||
int z = directionVec.getZ();
|
|
||||||
|
|
||||||
for (int segment = 0; segment < 6; segment++)
|
|
||||||
shape = VoxelShapes.or(shape,
|
|
||||||
buildingBlock.withOffset(x * segment / 16f, y * segment / 16f, z * segment / 16f));
|
|
||||||
|
|
||||||
if (!upward)
|
|
||||||
return shape;
|
|
||||||
|
|
||||||
VoxelShape mask = makeCuboidShape(0, -8, 0, 16, 24, 16);
|
|
||||||
for (int segment = 6; segment < 11; segment++)
|
|
||||||
shape = VoxelShapes.or(shape,
|
|
||||||
VoxelShapes.combine(mask,
|
|
||||||
buildingBlock.withOffset(x * segment / 16f, y * segment / 16f, z * segment / 16f),
|
|
||||||
IBooleanFunction.AND));
|
|
||||||
return shape;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue