Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use procedural water as default #1630

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Use procedural water as default #1630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public class Scene implements JsonSerializable, Refreshable {
protected double waterPlaneHeight = World.SEA_LEVEL;
protected boolean waterPlaneOffsetEnabled = true;
protected boolean waterPlaneChunkClip = true;
protected WaterShader waterShading = new LegacyWaterShader();
protected WaterShader waterShading = new SimplexWaterShader();

public final Fog fog = new Fog(this);

Expand Down Expand Up @@ -2940,14 +2940,14 @@ public synchronized void importFromJson(JsonObject json) {
waterColor.y = colorObj.get("green").doubleValue(waterColor.y);
waterColor.z = colorObj.get("blue").doubleValue(waterColor.z);
}
String waterShader = json.get("waterShader").stringValue("LEGACY");
String waterShader = json.get("waterShader").stringValue("SIMPLEX");
if(waterShader.equals("LEGACY"))
waterShading = new LegacyWaterShader();
else if(waterShader.equals("SIMPLEX"))
waterShading = new SimplexWaterShader();
else {
Log.infof("Unknown water shader %s, using LEGACY", waterShader);
waterShading = new LegacyWaterShader();
Log.infof("Unknown water shader %s, using SIMPLEX", waterShader);
waterShading = new SimplexWaterShader();
}
waterShading.load(json);
biomeColors = json.get("biomeColorsEnabled").boolValue(biomeColors);
Expand Down
Loading