Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 11:15:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix texture order handling for mod support API handling for stairs

Browse Source
This commit is contained in:
Mike Primm 2019-12-08 01:01:21 -06:00
parent 24bb87d635
commit f910b1135d
2 changed files with 224 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

223
DynmapCore/src/main/java/org/dynmap/hdmap/renderer/CopyStairBlockRenderer.java Normal file
View File

@ -0,0 +1,223 @@
package org.dynmap.hdmap.renderer;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
import java.util.Map;
import org.dynmap.renderer.CustomRenderer;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.renderer.MapDataContext;
import org.dynmap.renderer.RenderPatch;
import org.dynmap.renderer.RenderPatchFactory;
public class CopyStairBlockRenderer extends CustomRenderer {
private static final int TEXTURE_X_PLUS = 0;
private static final int TEXTURE_Y_PLUS = 1;
private static final int TEXTURE_Z_PLUS = 2;
private static final int TEXTURE_X_MINUS = 3;
private static final int TEXTURE_Y_MINUS = 4;
private static final int TEXTURE_Z_MINUS = 5;
private static BitSet stair_ids = new BitSet();
// Array of meshes for normal steps - index = (data value & 7)
private RenderPatch[][] stepmeshes = new RenderPatch[8][];
// Array of meshes for 3/4 steps - index = (data value & 7), with extra one clockwise from normal step
private RenderPatch[][] step_3_4_meshes = new RenderPatch[8][];
// Array of meshes for 1/4 steps - index = (data value & 7), with clockwise quarter clopped from normal step
private RenderPatch[][] step_1_4_meshes = new RenderPatch[8][];
private void setID(String bname) {
DynmapBlockState bbs = DynmapBlockState.getBaseStateByName(bname);
if (bbs.isNotAir()) {
for (int i = 0; i < bbs.getStateCount(); i++) {
stair_ids.set(bbs.getState(i).globalStateIndex);
}
}
}
@Override
public boolean initializeRenderer(RenderPatchFactory rpf, String blkname, BitSet blockdatamask, Map<String,String> custparm) {
if(!super.initializeRenderer(rpf, blkname, blockdatamask, custparm))
return false;
setID(blkname); /* Mark block as a stair */
/* Build step meshes */
for(int i = 0; i < 8; i++) {
stepmeshes[i] = buildStepMeshes(rpf, i);
step_1_4_meshes[i] = buildCornerStepMeshes(rpf, i);
step_3_4_meshes[i] = buildIntCornerStepMeshes(rpf, i);
}
return true;
}
@Override
public int getMaximumTextureCount() {
return 6;
}
@Override
public String[] getTileEntityFieldsNeeded() {
return null;
}
private static final int[] patchlist = { TEXTURE_Y_PLUS, TEXTURE_Y_MINUS, TEXTURE_Z_PLUS, TEXTURE_Z_MINUS, TEXTURE_X_PLUS, TEXTURE_X_MINUS };
private void addBox(RenderPatchFactory rpf, List<RenderPatch> list, double xmin, double xmax, double ymin, double ymax, double zmin, double zmax) {
addBox(rpf, list, xmin, xmax, ymin, ymax, zmin, zmax, patchlist);
}
private RenderPatch[] buildStepMeshes(RenderPatchFactory rpf, int dat) {
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
/* If inverted, add half top */
if((dat & 0x4) != 0) {
addBox(rpf, list, 0, 1, 0.5, 1, 0, 1);
}
else { // Else, add half bottom
addBox(rpf, list, 0, 1, 0.0, 0.5, 0, 1);
}
switch(dat & 0x3) {
case 0:
addBox(rpf, list, 0.5, 1, 0, 1, 0, 1);
break;
case 1:
addBox(rpf, list, 0, 0.5, 0, 1, 0, 1);
break;
case 2:
addBox(rpf, list, 0, 1, 0, 1, 0.5, 1);
break;
case 3:
addBox(rpf, list, 0, 1, 0, 1, 0, 0.5);
break;
}
return list.toArray(new RenderPatch[list.size()]);
}
private RenderPatch[] buildCornerStepMeshes(RenderPatchFactory rpf, int dat) {
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
/* If inverted, add half top */
if((dat & 0x4) != 0) {
addBox(rpf, list, 0, 1, 0.5, 1, 0, 1);
}
else { // Else, add half bottom
addBox(rpf, list, 0, 1, 0.0, 0.5, 0, 1);
}
switch(dat & 0x3) {
case 0:
addBox(rpf, list, 0.5, 1, 0, 1, 0, 0.5);
break;
case 1:
addBox(rpf, list, 0, 0.5, 0, 1, 0, 0.5);
break;
case 2:
addBox(rpf, list, 0, 0.5, 0, 1, 0.5, 1);
break;
case 3:
addBox(rpf, list, 0.5, 1, 0, 1, 0.5, 1);
break;
}
return list.toArray(new RenderPatch[list.size()]);
}
private RenderPatch[] buildIntCornerStepMeshes(RenderPatchFactory rpf, int dat) {
ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
/* If inverted, add half top */
if((dat & 0x4) != 0) {
addBox(rpf, list, 0, 1, 0.5, 1, 0, 1);
}
else { // Else, add half bottom
addBox(rpf, list, 0, 1, 0.0, 0.5, 0, 1);
}
switch(dat & 0x3) {
case 0:
addBox(rpf, list, 0.5, 1, 0, 1, 0, 1);
addBox(rpf, list, 0, 0.5, 0, 1, 0, 0.5);
break;
case 1:
addBox(rpf, list, 0.5, 1, 0, 1, 0, 1);
addBox(rpf, list, 0, 0.5, 0, 1, 0.5, 1);
break;
case 2:
addBox(rpf, list, 0, 0.5, 0, 1, 0, 1);
addBox(rpf, list, 0.5, 1, 0, 1, 0, 0.5);
break;
case 3:
addBox(rpf, list, 0, 0.5, 0, 1, 0, 1);
addBox(rpf, list, 0.5, 1, 0, 1, 0.5, 1);
break;
}
return list.toArray(new RenderPatch[list.size()]);
}
// Steps
// 0 = up to east
// 1 = up to west
// 2 = up to south
// 3 = up to north
// Corners
// 0 = NE
// 1 = NW
// 2 = SW
// 3 = SE
// Interior Corners
// 0 = open to SW
// 1 = open to NW
// 2 = open to SE
// 3 = open to NE
private static final int off_x[] = { 1, -1, 0, 0, 1, -1, 0, 0 };
private static final int off_z[] = { 0, 0, 1, -1, 0, 0, 1, -1 };
private static final int match1[] = { 2, 3, 0, 1, 6, 7, 4, 5 };
private static final int corner1[] = { 3, 1, 3, 1, 7, 5, 7, 5 };
private static final int icorner1[] = { 1, 2, 1, 2, 5, 6, 5, 6 };
private static final int match2[] = { 3, 2, 1, 0, 7, 6, 5, 4 };
private static final int corner2[] = { 0, 2, 2, 0, 4, 6, 6, 4 };
private static final int icorner2[] = { 0, 3, 3, 0, 4, 7, 7, 4 };
@Override
public RenderPatch[] getRenderPatchList(MapDataContext ctx) {
return getBaseRenderPatchList(ctx);
}
private RenderPatch[] getBaseRenderPatchList(MapDataContext ctx) {
int data = ctx.getBlockType().stateIndex & 0x07; /* Get block data */
/* Check block behind stair */
DynmapBlockState corner = ctx.getBlockTypeAt(off_x[data], 0, off_z[data]);
if (stair_ids.get(corner.globalStateIndex)) { /* If it is a stair */
int cornerdat = corner.stateIndex & 0x07;
if(cornerdat == match1[data]) { /* If right orientation */
/* Make sure we don't have matching stair to side */
DynmapBlockState side = ctx.getBlockTypeAt(-off_x[cornerdat], 0, -off_z[cornerdat]);
if((!stair_ids.get(side.globalStateIndex)) || ((side.stateIndex & 0x07) != data)) {
return step_1_4_meshes[corner1[data]];
}
}
else if(cornerdat == match2[data]) { /* If other orientation */
/* Make sure we don't have matching stair to side */
DynmapBlockState side = ctx.getBlockTypeAt(-off_x[cornerdat], 0, -off_z[cornerdat]);
if((!stair_ids.get(side.globalStateIndex)) || ((side.stateIndex & 0x07) != data)) {
return step_1_4_meshes[corner2[data]];
}
}
}
/* Check block in front of stair */
corner = ctx.getBlockTypeAt(-off_x[data], 0, -off_z[data]);
if(stair_ids.get(corner.globalStateIndex)) { /* If it is a stair */
int cornerdat = corner.stateIndex & 0x07;
if(cornerdat == match1[data]) { /* If right orientation */
/* Make sure we don't have matching stair to side */
DynmapBlockState side = ctx.getBlockTypeAt(off_x[cornerdat], 0, off_z[cornerdat]);
if((!stair_ids.get(side.globalStateIndex)) || ((side.stateIndex & 0x07) != data)) {
return step_3_4_meshes[icorner1[data]];
}
}
else if(cornerdat == match2[data]) { /* If other orientation */
/* Make sure we don't have matching stair to side */
DynmapBlockState side = ctx.getBlockTypeAt(off_x[cornerdat], 0, off_z[cornerdat]);
if((!stair_ids.get(side.globalStateIndex)) || ((side.stateIndex & 0x07) != data)) {
return step_3_4_meshes[icorner2[data]];
}
}
}
return stepmeshes[data];
}
}

2
DynmapCore/src/main/java/org/dynmap/modsupport/impl/StairBlockModelImpl.java
View File

@ -15,7 +15,7 @@ public class StairBlockModelImpl extends BlockModelImpl implements StairBlockMod
public String getLine() {
String ids = this.getIDsAndMeta();
if (ids == null) return null;
return String.format("customblock:%s,class=org.dynmap.hdmap.renderer.StairBlockRenderer", ids);
return String.format("customblock:%s,class=org.dynmap.hdmap.renderer.CopyStairBlockRenderer", ids);
}
}