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

Add sun disc. #2866

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add sun disc. #2866

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39b94c6
Add sun disk to sky model.
mororo250 Jul 4, 2020
fc408e3
Add sun disc to preethan
mororo250 Jul 9, 2020
fd43427
add Hosek sun
mororo250 Jul 30, 2020
3dcca7b
Fix sun and sky luminance
mororo250 Aug 19, 2020
7b3a163
Improve hosek sky ground albedo
mororo250 Aug 20, 2020
4add979
Fix fireflies.
mororo250 Aug 22, 2020
3fae2f1
Fix Travis
mororo250 Aug 31, 2020
c921d6f
travis 2
mororo250 Nov 18, 2020
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
17 changes: 17 additions & 0 deletions src/appleseed/renderer/modeling/environmentedf/hosekenvironmentedf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "renderer/modeling/input/inputarray.h"
#include "renderer/modeling/input/source.h"
#include "renderer/modeling/input/sourceinputs.h"
#include "renderer/modeling/light/sunlight.h"
#include "renderer/utility/transformsequence.h"

// appleseed.foundation headers.
Expand Down Expand Up @@ -109,6 +110,7 @@ namespace
m_inputs.declare("luminance_gamma", InputFormat::Float, "1.0");
m_inputs.declare("saturation_multiplier", InputFormat::Float, "1.0");
m_inputs.declare("horizon_shift", InputFormat::Float, "0.0");
m_inputs.declare("sun_light", InputFormat::Entity, "");
}

void release() override
Expand All @@ -133,6 +135,9 @@ namespace
// Evaluate uniform values.
m_inputs.evaluate_uniforms(&m_uniform_values);

// If there is a binded sun get it
mororo250 marked this conversation as resolved.
Show resolved Hide resolved
m_sun = dynamic_cast<SunLight*>(m_inputs.get_entity("sun_light"));

// Compute the sun direction.
m_sun_theta = deg_to_rad(m_uniform_values.m_sun_theta);
m_sun_phi = deg_to_rad(m_uniform_values.m_sun_phi);
Expand Down Expand Up @@ -189,6 +194,10 @@ namespace
{
assert(is_normalized(outgoing));

Spectrum sun_value(0.0f);
if (m_sun)
m_sun->evaluate(Vector3d(outgoing.x, outgoing.y, outgoing.z), sun_value);

Transformd scratch;
const Transformd& transform = m_transform_sequence.evaluate(0.0f, scratch);
const Vector3f local_outgoing = transform.vector_to_local(outgoing);
Expand All @@ -200,6 +209,7 @@ namespace
else radiance.set(0.0f);

value.set(radiance, g_std_lighting_conditions, Spectrum::Illuminance);
value += sun_value;
}

void evaluate(
Expand All @@ -210,6 +220,10 @@ namespace
{
assert(is_normalized(outgoing));

Spectrum sun_value(0.0f);
if (m_sun)
m_sun->evaluate(Vector3d(outgoing.x, outgoing.y, outgoing.z), sun_value);

Transformd scratch;
const Transformd& transform = m_transform_sequence.evaluate(0.0f, scratch);
const Vector3f local_outgoing = transform.vector_to_local(outgoing);
Expand All @@ -221,6 +235,7 @@ namespace
else radiance.set(0.0f);

value.set(radiance, g_std_lighting_conditions, Spectrum::Illuminance);
value += sun_value;
probability = shifted_outgoing.y > 0.0f ? shifted_outgoing.y * RcpPi<float>() : 0.0f;
assert(probability >= 0.0f);
}
Expand Down Expand Up @@ -265,6 +280,8 @@ namespace
float m_uniform_coeffs[3 * 9];
float m_uniform_master_Y[3];

SunLight* m_sun;

// Compute the coefficients of the radiance distribution function and the master luminance value.
static void compute_coefficients(
const float turbidity,
Expand Down
Loading