Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add more state data (isSolid())

Browse source
This commit is contained in:
BuildTools 2018-09-01 23:26:36 -05:00
parent 9cff98807a
commit eb5fe20502
13 changed files with 223 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

63
DynmapCore/src/main/java/org/dynmap/hdmap/renderer/FluidStateRenderer.java
View file

@ -30,7 +30,7 @@ public class FluidStateRenderer extends CustomRenderer {
// Create meshes for flat topped blocks
for (int i = 0; i < 8; i++) {
list.clear();
CustomRenderer.addBox(rpf, list, 0.0, 1.0, 0.0, 0.875 - (0.12 * i), 0.0, 1.0, still_patches);
CustomRenderer.addBox(rpf, list, 0.0, 1.0, 0.0, 1.0 - ((i + 1) / 9.0), 0.0, 1.0, still_patches);
flat_meshes[i] = list.toArray(new RenderPatch[list.size()]);
}
list.clear();
@ -44,20 +44,57 @@ public class FluidStateRenderer extends CustomRenderer {
public int getMaximumTextureCount() {
return 2;
}
private DynmapBlockState getFluidState(MapDataContext ctx, int dx, int dy, int dz) {
DynmapBlockState bs;
if ((dx == 0) && (dy == 0) && (dz == 0)) {
bs = ctx.getBlockType();
}
else {
bs = ctx.getBlockTypeAt(dx, dy, dz);
}
DynmapBlockState fbs = bs.getLiquidState();
return (fbs != null) ? fbs : bs;
}
private double getCornerHeight(DynmapBlockState b0, DynmapBlockState b1, DynmapBlockState b2, DynmapBlockState b3,
DynmapBlockState u0, DynmapBlockState u1, DynmapBlockState u2, DynmapBlockState u3) {
// If any above blocks are match, return full height
if (b0.matchingBaseState(u0) || b0.matchingBaseState(u1) || b0.matchingBaseState(u2) || b0.matchingBaseState(u3)) {
return 1.0;
}
return 0;
}
@Override
public RenderPatch[] getRenderPatchList(MapDataContext ctx) {
DynmapBlockState bs = ctx.getBlockType();
DynmapBlockState fbs = bs.getLiquidState();
if (fbs == null)
fbs = bs;
int idx = fbs.stateIndex;
if ((idx == 0) || (idx >= 8)) {
DynmapBlockState up = ctx.getBlockTypeAt(0, 1, 0);
if (up.isWaterFilled()) {
return full_mesh;
}
}
DynmapBlockState bs_0_0_0 = getFluidState(ctx, 0, 0, 0); // Get own state
// Check above block - if matching fluid, block will be full
DynmapBlockState bs_0_1_0 = getFluidState(ctx, 0, 1, 0);
if (bs_0_1_0.matchingBaseState(bs_0_0_0)) {
return full_mesh;
}
// Get other above blocks
DynmapBlockState bs_0_1_1 = getFluidState(ctx, 0, 1, 1);
DynmapBlockState bs_1_1_0 = getFluidState(ctx, 1, 1, 0);
DynmapBlockState bs_1_1_1 = getFluidState(ctx, 1, 1, 1);
DynmapBlockState bs_0_1_n1 = getFluidState(ctx, 0, 1, -1);
DynmapBlockState bs_n1_1_0 = getFluidState(ctx, -1, 1, 0);
DynmapBlockState bs_n1_1_n1 = getFluidState(ctx, -1, 1, -1);
DynmapBlockState bs_1_1_n1 = getFluidState(ctx, 1, 1, -1);
DynmapBlockState bs_n1_1_1 = getFluidState(ctx, -1, 1, 1);
// Get other neighbors
DynmapBlockState bs_0_0_1 = getFluidState(ctx, 0, 0, 1);
DynmapBlockState bs_1_0_0 = getFluidState(ctx, 1, 0, 0);
DynmapBlockState bs_1_0_1 = getFluidState(ctx, 1, 0, 1);
DynmapBlockState bs_0_0_n1 = getFluidState(ctx, 0, 0, -1);
DynmapBlockState bs_n1_0_0 = getFluidState(ctx, -1, 0, 0);
DynmapBlockState bs_n1_0_n1 = getFluidState(ctx, -1, 0, -1);
DynmapBlockState bs_1_0_n1 = getFluidState(ctx, 1, 0, -1);
DynmapBlockState bs_n1_0_1 = getFluidState(ctx, -1, 0, 1);
// Get each corner height
int idx = bs_0_0_0.stateIndex;
return (idx < 8) ? flat_meshes[idx] : flat_meshes[0];
}
}