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

Add shader option to disable biome shading, disable biome shading on non-normal worlds

Browse source
This commit is contained in:
Mike Primm 2011-07-24 17:14:45 -05:00
parent 62b42aa302
commit 78f571a68b
7 changed files with 40 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/dynmap/hdmap/TexturePackHDShader.java
View file

@ -2,6 +2,7 @@ package org.dynmap.hdmap;
import static org.dynmap.JSONUtils.s;
import org.bukkit.World.Environment;
import org.dynmap.Color;
import org.dynmap.ConfigurationNode;
import org.dynmap.Log;
@ -13,11 +14,13 @@ public class TexturePackHDShader implements HDShader {
private String tpname;
private String name;
private TexturePack tp;
private boolean biome_shaded;
public TexturePackHDShader(ConfigurationNode configuration) {
tpname = configuration.getString("texturepack", "minecraft");
name = configuration.getString("name", tpname);
tp = TexturePack.getTexturePack(tpname);
biome_shaded = configuration.getBoolean("biomeshaded", true);
if(tp == null) {
Log.severe("Error: shader '" + name + "' cannot load texture pack '" + tpname + "'");
}
@ -30,7 +33,7 @@ public class TexturePackHDShader implements HDShader {
@Override
public boolean isRawBiomeDataNeeded() {
return true;
return biome_shaded;
}
@Override
@ -67,8 +70,9 @@ public class TexturePackHDShader implements HDShader {
private TexturePack scaledtp;
private HDLighting lighting;
private int lastblkid;
private boolean do_biome_shading;
private OurShaderState(MapIterator mapiter, HDMap map) {
private OurShaderState(MapIterator mapiter, HDMap map, MapChunkCache cache) {
this.mapiter = mapiter;
this.map = map;
this.lighting = map.getLighting();
@ -82,6 +86,8 @@ public class TexturePackHDShader implements HDShader {
}
c = new Color();
scaledtp = tp.resampleTexturePack(map.getPerspective().getModelScale());
/* Biome raw data only works on normal worlds at this point */
do_biome_shading = biome_shaded && (cache.getWorld().getEnvironment() != Environment.NORMAL);
}
/**
* Get our shader
@ -126,7 +132,7 @@ public class TexturePackHDShader implements HDShader {
return false;
}
/* Get color from textures */
scaledtp.readColor(ps, mapiter, c, blocktype, lastblocktype);
scaledtp.readColor(ps, mapiter, c, blocktype, lastblocktype, do_biome_shading);
if (c.getAlpha() > 0) {
int subalpha = ps.getSubmodelAlpha();
@ -210,7 +216,7 @@ public class TexturePackHDShader implements HDShader {
* @return state object to use for all rays in tile
*/
public HDShaderState getStateInstance(HDMap map, MapChunkCache cache, MapIterator mapiter) {
return new OurShaderState(mapiter, map);
return new OurShaderState(mapiter, map, cache);
}
/* Add shader's contributions to JSON for map object */