- use a blue-y white for tundra

- fix temp/moisture using inverse colouring
- tweak how temp/moist scales with larger biome sizes
This commit is contained in:
dags- 2020-03-12 12:45:50 +00:00
parent d193d2ebda
commit b21dec9a9a
3 changed files with 10 additions and 5 deletions

View File

@ -53,9 +53,14 @@ public class ClimateModule {
public ClimateModule(Seed seed, GeneratorSettings settings) { public ClimateModule(Seed seed, GeneratorSettings settings) {
int biomeSize = settings.biome.biomeSize; int biomeSize = settings.biome.biomeSize;
// todo - better solution (reduces the amount that temp/moist grows with biome size)
int tempScaler = biomeSize > 500 ? 8 : 10;
int moistScaler = biomeSize > 500 ? 20 : 40;
float biomeFreq = 1F / biomeSize; float biomeFreq = 1F / biomeSize;
int moistureSize = 40 * biomeSize; int moistureSize = moistScaler * biomeSize;
int temperatureSize = 10 * biomeSize; int temperatureSize = tempScaler * tempScaler;
int moistScale = NoiseUtil.round(moistureSize * biomeFreq); int moistScale = NoiseUtil.round(moistureSize * biomeFreq);
int tempScale = NoiseUtil.round(temperatureSize * biomeFreq); int tempScale = NoiseUtil.round(temperatureSize * biomeFreq);
int warpScale = settings.biome.biomeWarpScale; int warpScale = settings.biome.biomeWarpScale;

View File

@ -65,9 +65,9 @@ public enum RenderMode {
float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), new float[3]); float[] hsb = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), new float[3]);
return Color.getHSBColor(hsb[0], hsb[1], (hsb[2] * scale) + bias); return Color.getHSBColor(hsb[0], hsb[1], (hsb[2] * scale) + bias);
case MOISTURE: case MOISTURE:
return Color.getHSBColor(step(1 - cell.moisture, 8) * 0.65F, saturation, brightness); return Color.getHSBColor(step(cell.moisture, 8) * 0.65F, saturation, brightness);
case TEMPERATURE: case TEMPERATURE:
return Color.getHSBColor(step(cell.temperature, 8) * 0.65F, saturation, brightness); return Color.getHSBColor(step(1 - cell.temperature, 8) * 0.65F, saturation, brightness);
default: default:
return Color.black; return Color.black;
} }

View File

@ -3,7 +3,7 @@
ALPINE=4b7835 ALPINE=4b7835
TAIGA=4b7835 TAIGA=4b7835
TEMPERATE_RAINFOREST=3c602b TEMPERATE_RAINFOREST=3c602b
TUNDRA=ba9d47 TUNDRA=f7fafc
TROPICAL_RAINFOREST=4aa73a TROPICAL_RAINFOREST=4aa73a
SAVANNA=389a38 SAVANNA=389a38
GRASSLAND=429545 GRASSLAND=429545