Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 0c372852a6 into e21198d279

This commit is contained in:
JurgenKuyper 2024-04-28 10:33:19 -10:00 committed by GitHub
parent e21198d279 0c372852a6
commit 08ef720de5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
DynmapCore/src/main/java/org/dynmap/hdmap/TopoHDShader.java
View File

@ -6,10 +6,7 @@ import java.io.IOException;
import java.util.BitSet; import java.util.BitSet;
import java.util.List; import java.util.List;
import org.dynmap.Color; import org.dynmap.*;
import org.dynmap.ConfigurationNode;
import org.dynmap.DynmapCore;
import org.dynmap.MapManager;
import org.dynmap.common.DynmapCommandSender; import org.dynmap.common.DynmapCommandSender;
import org.dynmap.exporter.OBJExport; import org.dynmap.exporter.OBJExport;
import org.dynmap.renderer.DynmapBlockState; import org.dynmap.renderer.DynmapBlockState;
@ -26,15 +23,26 @@ public class TopoHDShader implements HDShader {
private final Color watercolor; private final Color watercolor;
private BitSet hiddenids; private BitSet hiddenids;
private final int linespacing; private final int linespacing;
private int worldheight;
public TopoHDShader(DynmapCore core, ConfigurationNode configuration) { public TopoHDShader(DynmapCore core, ConfigurationNode configuration) {
name = (String) configuration.get("name"); name = (String) configuration.get("name");
if (HDBlockModels.checkVersionRange(core.getDynmapPluginPlatformVersion(), "-1.17.0")){
fillcolor = new Color[256]; /* Color by Y */ worldheight = 256;
/* Load defined colors from parameters */ fillcolor = new Color[worldheight]; /* Color by Y, must be range of total world height, offset by +64*/
for(int i = 0; i < 256; i++) { /* Load defined colors from parameters */
fillcolor[i] = configuration.getColor("color" + i, null); for(int i = 0; i < worldheight; i++) {
fillcolor[i] = configuration.getColor("color" + (i - 64), null); /* need to substract by 64 because Color does not accept <0 indexes*/
}
} }
else{
worldheight = configuration.getInteger("worldheight", 348);
fillcolor = new Color[worldheight]; /* Color by Y, must be range of total world height, offset by +64*/
/* Load defined colors from parameters */
for(int i = 0; i < worldheight; i++) {
fillcolor[i] = configuration.getColor("color" + (i - 64), null); /* need to substract by 64 because Color does not accept <0 indexes*/
}
}
linecolor = configuration.getColor("linecolor", null); linecolor = configuration.getColor("linecolor", null);
watercolor = configuration.getColor("watercolor", null); watercolor = configuration.getColor("watercolor", null);
float wateralpha = configuration.getFloat("wateralpha", 1.0F); float wateralpha = configuration.getFloat("wateralpha", 1.0F);
@ -45,11 +53,11 @@ public class TopoHDShader implements HDShader {
if(fillcolor[0] == null) { if(fillcolor[0] == null) {
fillcolor[0] = new Color(0, 0, 0); fillcolor[0] = new Color(0, 0, 0);
} }
if(fillcolor[255] == null) { if(fillcolor[worldheight-1] == null) {
fillcolor[255] = new Color(255, 255, 255); fillcolor[worldheight-1] = new Color(255, 255, 255);
} }
int starty = 0; int starty = 0;
for(int i = 1; i < 256; i++) { for(int i = 0; i < worldheight; i++) {
if(fillcolor[i] != null) { /* Found color? */ if(fillcolor[i] != null) { /* Found color? */
int delta = i - starty; int delta = i - starty;
Color c0 = fillcolor[starty]; Color c0 = fillcolor[starty];