Skip to content

Commit 4add979

Browse files
committed
Fix fireflies.
1 parent 7b3a163 commit 4add979

File tree

8 files changed

+189
-196
lines changed

8 files changed

+189
-196
lines changed

sandbox/settings/appleseed.studio.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@
1010
<parameter name="tile_ordering" value="spiral" />
1111
</parameters>
1212
<parameters name="ui">
13-
<parameters name="file_dialog">
14-
<parameters name="frames">
15-
<parameter name="last_directory" value="C:\Users\joao_\OneDrive\Imagens" />
16-
<parameter name="selected_filter" value="JPEG Files (*.jpg *.jpe *.jpeg *.jif *.jfif *.jfi)" />
17-
</parameters>
18-
<parameters name="projects">
19-
<parameter name="last_directory" value="D:\appleseed-scenes" />
20-
<parameter name="selected_filter" value="Plain Project Files (*.appleseed)" />
21-
</parameters>
22-
</parameters>
2313
<parameters name="render_region">
2414
<parameter name="triggers_rendering" value="true" />
2515
</parameters>

src/appleseed/foundation/image/colorspace.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ LightingConditions::LightingConditions(
14851485
m_cmf_reflectance[31].set(0.0f);
14861486

14871487
const float reflectance_normalizer = get_cmf_normalizer(m_cmf_reflectance);
1488-
// Adjust brightness for coherence with linear to rgb function.
1488+
// Adjust the brightness for coherence with linear_rgb_to_spectrum function.
14891489
const float illuminance_normalizer = 1 / 100.0f;
14901490

14911491
// Normalize color matching functions.

src/appleseed/renderer/modeling/environmentedf/hosekenvironmentedf.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,14 @@ namespace
233233
compute_ground_color(shading_context, shifted_outgoing, radiance);
234234

235235
value.set(radiance, g_std_lighting_conditions, Spectrum::Illuminance);
236-
value += sun_value;
236+
237237
probability = shifted_outgoing.y > 0.0f ? shifted_outgoing.y * RcpPi<float>() : 0.0f;
238+
if (sun_value != Spectrum(0.0f))
239+
{
240+
probability *= sun_value.illuminance_to_ciexyz(g_std_lighting_conditions)[1]
241+
/ value.illuminance_to_ciexyz(g_std_lighting_conditions)[1];
242+
value += sun_value;
243+
}
238244
assert(probability >= 0.0f);
239245
}
240246

src/appleseed/renderer/modeling/environmentedf/preethamenvironmentedf.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,13 @@ namespace
227227
else radiance.set(0.0f);
228228

229229
value.set(radiance, g_std_lighting_conditions, Spectrum::Illuminance);
230-
value += sun_value;
231230
probability = shifted_outgoing.y > 0.0f ? shifted_outgoing.y * RcpPi<float>() : 0.0f;
231+
if (sun_value != Spectrum(0.0f))
232+
{
233+
probability *= sun_value.illuminance_to_ciexyz(g_std_lighting_conditions)[1]
234+
/ value.illuminance_to_ciexyz(g_std_lighting_conditions)[1];
235+
value += sun_value;
236+
}
232237
assert(probability >= 0.0f);
233238
}
234239

0 commit comments

Comments
 (0)