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.

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

Add apparent emitter brightness controls #1555

Closed
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix specular reflections and simplify code
Co-Authored-By: Justin Barker <[email protected]>
Peregrine05 and JustinTimeCuber committed Mar 16, 2023
commit 9d92080da15091d6fff0f0c18b67d3ac23107b24
39 changes: 15 additions & 24 deletions chunky/src/java/se/llbit/chunky/renderer/scene/PathTracer.java
Original file line number Diff line number Diff line change
@@ -160,31 +160,22 @@ public static boolean pathTrace(Scene scene, Ray ray, WorkerState state, int add
if (random.nextFloat() < pDiffuse) {
// Diffuse reflection.

boolean wasFirstReflection = firstReflection;
firstReflection = false;

if (!scene.kill(ray.depth + 1, random)) {
Ray reflected = new Ray();

Vector4 indirectEmitterColor = new Vector4(0, 0, 0, 0);

if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {

if (wasFirstReflection) {
ray.apparentBrightness.x = ray.color.x * ray.color.x * currentMat.apparentBrightness * scene.apparentEmitterBrightness * scene.emitterIntensity;
ray.apparentBrightness.y = ray.color.y * ray.color.y * currentMat.apparentBrightness * scene.apparentEmitterBrightness * scene.emitterIntensity;
ray.apparentBrightness.z = ray.color.z * ray.color.z * currentMat.apparentBrightness * scene.apparentEmitterBrightness * scene.emitterIntensity;
double apparentBrightnessFactor = currentMat.apparentBrightness * scene.apparentEmitterBrightness;

} else {
ray.emittance.x = ray.color.x * ray.color.x *
currentMat.emittance * scene.emitterLightIntensity * scene.emitterIntensity;
ray.emittance.y = ray.color.y * ray.color.y *
currentMat.emittance * scene.emitterLightIntensity * scene.emitterIntensity;
ray.emittance.z = ray.color.z * ray.color.z *
currentMat.emittance * scene.emitterLightIntensity * scene.emitterIntensity;
}
if (scene.emittersEnabled && (!scene.isPreventNormalEmitterWithSampling() || scene.getEmitterSamplingStrategy() == EmitterSamplingStrategy.NONE || ray.depth == 0) && currentMat.emittance > Ray.EPSILON) {
ray.emittance.x = ray.color.x * scene.emitterIntensity;
ray.emittance.y = ray.color.y * scene.emitterIntensity;
ray.emittance.z = ray.color.z * scene.emitterIntensity;

hit = true;

} else if(scene.emittersEnabled && scene.emitterSamplingStrategy != EmitterSamplingStrategy.NONE && scene.getEmitterGrid() != null) {
// Sample emitter
switch (scene.emitterSamplingStrategy) {
@@ -241,12 +232,12 @@ public static boolean pathTrace(Scene scene, Ray ray, WorkerState state, int add
reflected.diffuseReflection(ray, random);
hit = pathTrace(scene, reflected, state, 0, false) || hit;
if (hit) {
ray.color.x = (addEmitted * ray.apparentBrightness.x) + (addEmitted * ray.emittance.x) + ray.color.x * (directLightR * scene.sun.emittance.x + (
reflected.color.x + reflected.emittance.x) + (indirectEmitterColor.x));
ray.color.y = (addEmitted * ray.apparentBrightness.y) + (addEmitted * ray.emittance.y) + ray.color.y * (directLightG * scene.sun.emittance.y + (
reflected.color.y + reflected.emittance.y) + (indirectEmitterColor.y));
ray.color.z = (addEmitted * ray.apparentBrightness.z) + (addEmitted * ray.emittance.z) + ray.color.z * (directLightB * scene.sun.emittance.z + (
reflected.color.z + reflected.emittance.z) + (indirectEmitterColor.z));
ray.color.x = (addEmitted * ray.emittance.x * apparentBrightnessFactor) + ray.color.x * (directLightR * scene.sun.emittance.x + (
reflected.color.x + reflected.emittance.x + scene.emitterLightIntensity * reflected.emittance.x) + (indirectEmitterColor.x));
ray.color.y = (addEmitted * ray.emittance.y * apparentBrightnessFactor) + ray.color.y * (directLightG * scene.sun.emittance.y + (
reflected.color.y + reflected.emittance.y + scene.emitterLightIntensity * reflected.emittance.y) + (indirectEmitterColor.y));
ray.color.z = (addEmitted * ray.emittance.z * apparentBrightnessFactor) + ray.color.z * (directLightB * scene.sun.emittance.z + (
reflected.color.z + reflected.emittance.z + scene.emitterLightIntensity * reflected.emittance.z) + (indirectEmitterColor.z));
} else if(indirectEmitterColor.x > Ray.EPSILON || indirectEmitterColor.y > Ray.EPSILON || indirectEmitterColor.z > Ray.EPSILON) {
hit = true;
ray.color.x *= indirectEmitterColor.x;
@@ -260,11 +251,11 @@ public static boolean pathTrace(Scene scene, Ray ray, WorkerState state, int add
hit = pathTrace(scene, reflected, state, 0, false) || hit;
if (hit) {
ray.color.x =
(addEmitted * ray.apparentBrightness.x) + (addEmitted * ray.emittance.x) + ray.color.x * ((reflected.color.x + reflected.emittance.x) + (indirectEmitterColor.x));
(addEmitted * ray.emittance.x * apparentBrightnessFactor) + ray.color.x * ((reflected.color.x + reflected.emittance.x * scene.emitterLightIntensity * reflected.emittance.x) + (indirectEmitterColor.x));
ray.color.y =
(addEmitted * ray.apparentBrightness.y) + (addEmitted * ray.emittance.y) + ray.color.y * ((reflected.color.y + reflected.emittance.y) + (indirectEmitterColor.y));
(addEmitted * ray.emittance.y * apparentBrightnessFactor) + ray.color.y * ((reflected.color.y + reflected.emittance.y * scene.emitterLightIntensity * reflected.emittance.y) + (indirectEmitterColor.y));
ray.color.z =
(addEmitted * ray.apparentBrightness.z) + (addEmitted * ray.emittance.z) + ray.color.z * ((reflected.color.z + reflected.emittance.z) + (indirectEmitterColor.z));
(addEmitted * ray.emittance.z * apparentBrightnessFactor) + ray.color.z * ((reflected.color.z + reflected.emittance.z * scene.emitterLightIntensity * reflected.emittance.z) + (indirectEmitterColor.z));
} else if(indirectEmitterColor.x > Ray.EPSILON || indirectEmitterColor.y > Ray.EPSILON || indirectEmitterColor.z > Ray.EPSILON) {
hit = true;
ray.color.x *= indirectEmitterColor.x;
4 changes: 2 additions & 2 deletions chunky/src/java/se/llbit/chunky/renderer/scene/Scene.java
Original file line number Diff line number Diff line change
@@ -123,7 +123,7 @@ public class Scene implements JsonSerializable, Refreshable {
/**
* Minimum emitter intensity.
*/
public static final double MIN_EMITTER_INTENSITY = 0.01;
public static final double MIN_EMITTER_INTENSITY = 0;

/**
* Maximum emitter intensity.
@@ -138,7 +138,7 @@ public class Scene implements JsonSerializable, Refreshable {
/**
* Minimum emitter light intensity.
*/
public static final double MIN_EMITTER_LIGHT_INTENSITY = 0.01;
public static final double MIN_EMITTER_LIGHT_INTENSITY = 0;

/**
* Maximum emitter light intensity.
7 changes: 0 additions & 7 deletions chunky/src/java/se/llbit/math/Ray.java
Original file line number Diff line number Diff line change
@@ -74,11 +74,6 @@ public class Ray {
*/
public Vector3 emittance = new Vector3();

/**
* Apparent brightness of previously intersected surface.
*/
public Vector3 apparentBrightness = new Vector3();

/**
* Previous material.
*/
@@ -156,7 +151,6 @@ public void setDefault() {
depth = 0;
color.set(0, 0, 0, 0);
emittance.set(0, 0, 0);
apparentBrightness.set(0, 0, 0);
specular = true;
}

@@ -174,7 +168,6 @@ public void set(Ray other) {
geomN.set(other.geomN);
color.set(0, 0, 0, 0);
emittance.set(0, 0, 0);
apparentBrightness.set(0, 0, 0);
specular = other.specular;
}