Skip to content

Commit c845144

Browse files
committed
Add support for simplex noise water to the normal renderer.
1 parent 17be24c commit c845144

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/main/java/de/lemaik/chunky/denoiser/ChunkyCompatHelper.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static class Water {
6565

6666
private static Method doWaterDisplacementImpl = getMethod(water, "doWaterDisplacement", Ray.class);
6767

68-
public static void doWaterDisplacement(Ray ray) {
68+
public static void doWaterDisplacement(se.llbit.chunky.renderer.scene.Scene scene, Ray ray) {
6969
try {
7070
doWaterDisplacementImpl.invoke(null, ray);
7171
} catch (IllegalAccessException | InvocationTargetException e) {
@@ -150,5 +150,13 @@ public static int getCanvasHeight(se.llbit.chunky.renderer.scene.Scene scene) {
150150
}
151151
return scene.canvasConfig.getHeight();
152152
}
153+
154+
public static void doWaterShading(se.llbit.chunky.renderer.scene.Scene scene, Ray ray) {
155+
try {
156+
scene.getCurrentWaterShader().doWaterShading(ray, scene.getAnimationTime());
157+
} catch (NoSuchMethodError e) {
158+
Water.doWaterDisplacement(scene, ray);
159+
}
160+
}
153161
}
154162
}

src/main/java/de/lemaik/chunky/denoiser/NormalRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void trace(Scene scene, WorkerState state) {
3131
if (PreviewRayTracer.nextIntersection(scene, ray)) {
3232
if (BetterRenderManager.NORMAL_WATER_DISPLACEMENT && !ChunkyCompatHelper.Scene.isStillWaterEnabled(scene)
3333
&& ray.getCurrentMaterial().isWater()) {
34-
ChunkyCompatHelper.Water.doWaterDisplacement(ray);
34+
ChunkyCompatHelper.Scene.doWaterShading(scene, ray);
3535
}
3636

3737
if (MAP_POSITIVE) {

src/main/resources/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "DenoiserPlugin",
33
"author": "leMaik",
44
"main": "de.lemaik.chunky.denoiser.DenoiserPlugin",
5-
"version": "0.4.4",
5+
"version": "0.4.5",
66
"targetVersion": "2.4.0",
77
"description": "Renders normal and albedo maps to pfm files for use with denoisers."
88
}

0 commit comments

Comments
 (0)