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

Physically-based Sky Model based on Nishita93 #2907

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

Physically-based Sky Model based on Nishita93 #2907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8585e61
Merge pull request #1 from appleseedhq/master
joelbarmettlerUZH Sep 2, 2020
46f3851
Added empty nishita93 environment edf shader class
joelbarmettlerUZH Sep 2, 2020
f91b1d4
Nishita93 single scattering sky (without optical depth lookup table)
joelbarmettlerUZH Sep 15, 2020
53b8b8d
Optical Depths lookup table
joelbarmettlerUZH Sep 18, 2020
0ecf485
Demo scenes
joelbarmettlerUZH Sep 18, 2020
71177dc
Code cleanup & opticaldepth class
joelbarmettlerUZH Sep 23, 2020
aacd73d
Added nishita namespace
joelbarmettlerUZH Sep 23, 2020
6dbc5a1
Calculate optical depth using spectrums & fixed optical-depth influen…
joelbarmettlerUZH Sep 29, 2020
e20883f
Added support for ozone
joelbarmettlerUZH Sep 30, 2020
d166e57
Interpolation of optical depths in lookup table
joelbarmettlerUZH Oct 1, 2020
651bfd5
Changed sun radiance values to the ones used by appleseeds sunlight.cpp
joelbarmettlerUZH Oct 2, 2020
dd41b62
Scientific function of ozone density by height
joelbarmettlerUZH Oct 4, 2020
0175ff4
Upsample shell density in upper regions
joelbarmettlerUZH Oct 4, 2020
9149321
Fixed typo in appleseed.studio user interface
joelbarmettlerUZH Nov 13, 2020
3cc6b10
Removed comment
joelbarmettlerUZH Nov 15, 2020
67130cb
Delete Source.cpp
joelbarmettlerUZH Jan 5, 2022
085f88b
added test scenes for nishita sky
joelbarmettlerUZH Jan 12, 2022
8337cdf
extended cmake
joelbarmettlerUZH Jan 12, 2022
4446883
Sugguest alternate way for find_index
LZaw Jan 12, 2022
761d77e
better reverse function
joelbarmettlerUZH Jan 12, 2022
49c47b6
remove static
joelbarmettlerUZH Jan 12, 2022
eee548f
merge
joelbarmettlerUZH Jan 12, 2022
a48854b
better if-statement
joelbarmettlerUZH Jan 12, 2022
9bd4051
fixed comments
joelbarmettlerUZH Jan 12, 2022
5257fd7
bmp to png
joelbarmettlerUZH Jan 12, 2022
434f45f
reverted appleseed studio settings
joelbarmettlerUZH Jan 12, 2022
2192c9d
declare mie_g in cpp
joelbarmettlerUZH Jan 12, 2022
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
172 changes: 172 additions & 0 deletions sandbox/tests/test scenes/sun and sky/20 - nishita93 - theta 0 - ptne.appleseed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
<project format_revision="34">
<scene>
<camera name="camera" model="pinhole_camera">
<parameter name="autofocus_enabled" value="false" />
<parameter name="controller_target" value="0.0450397 0.413182 0.698789" />
<parameter name="film_dimensions" value="0.024892 0.014" />
<parameter name="focal_length" value="0.035" />
<parameter name="shutter_close_begin_time" value="1.0" />
<parameter name="shutter_close_end_time" value="1.0" />
<parameter name="shutter_open_begin_time" value="0.0" />
<parameter name="shutter_open_end_time" value="0.0" />
<transform time="0">
<matrix>
0.95313944699513697 -0.00430888342411300 -0.30250062496702701 -1.21740753536959101
0.00000000000000000 0.99989856662897403 -0.01424276845712700 0.35374149338383298
0.30253131173781700 0.01357534445090600 0.95304276684796996 4.67618990067894735
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
</matrix>
</transform>
</camera>
<environment_edf name="environment_edf" model="nishita93_environment_edf">
<parameter name="air_molecule_density" value="1.0" />
<parameter name="cast_shadows" value="true" />
<parameter name="dust_molecule_density" value="1.0" />
<parameter name="elevation" value="0" />
<parameter name="haze" value="0.8" />
<parameter name="horizon_shift" value="-0.05" />
<parameter name="sun_angular_diameter" value="0.545" />
<parameter name="sun_intensity_multiplier" value="1.0" />
<parameter name="sun_phi" value="0.0" />
<parameter name="sun_theta" value="0.0" />
</environment_edf>
<environment_shader name="environment_shader" model="edf_environment_shader">
<parameter name="environment_edf" value="environment_edf" />
</environment_shader>
<environment name="environment" model="generic_environment">
<parameter name="environment_edf" value="environment_edf" />
<parameter name="environment_shader" value="environment_shader" />
</environment>
<assembly name="assembly">
<color name="diffuse_brdf_reflectance">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
0.729412019 0.729412019 0.729412019
</values>
<alpha>
1.000000000
</alpha>
</color>
<color name="metal_brdf_diffuse">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
1.000000000 1.000000000 1.000000000
</values>
<alpha>
1.000000000
</alpha>
</color>
<color name="metal_brdf_glossy">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
1.000000000 1.000000000 1.000000000
</values>
<alpha>
1.000000000
</alpha>
</color>
<bsdf name="diffuse_brdf" model="lambertian_brdf">
<parameter name="reflectance" value="diffuse_brdf_reflectance" />
<parameter name="reflectance_multiplier" value="1.0" />
</bsdf>
<bsdf name="metal_brdf" model="ashikhmin_brdf">
<parameter name="diffuse_reflectance" value="metal_brdf_diffuse" />
<parameter name="diffuse_reflectance_multiplier" value="0.0" />
<parameter name="fresnel_multiplier" value="1.0" />
<parameter name="glossy_reflectance" value="metal_brdf_glossy" />
<parameter name="glossy_reflectance_multiplier" value="1.0" />
<parameter name="shininess_u" value="1000.0" />
<parameter name="shininess_v" value="1000.0" />
</bsdf>
<surface_shader name="physical_surface_shader" model="physical_surface_shader" />
<material name="diffuse_material" model="generic_material">
<parameter name="bsdf" value="diffuse_brdf" />
<parameter name="bump_amplitude" value="1.0" />
<parameter name="displacement_method" value="bump" />
<parameter name="normal_map_up" value="z" />
<parameter name="surface_shader" value="physical_surface_shader" />
</material>
<material name="metal_material" model="generic_material">
<parameter name="bsdf" value="metal_brdf" />
<parameter name="bump_amplitude" value="1.0" />
<parameter name="displacement_method" value="bump" />
<parameter name="normal_map_up" value="z" />
<parameter name="surface_shader" value="physical_surface_shader" />
</material>
<object name="geometry" model="mesh_object">
<parameter name="filename" value="geometry.obj" />
</object>
<object_instance name="geometry.cube_Default_inst" object="geometry.cube_Default">
<assign_material slot="Default" side="front" material="metal_material" />
<assign_material slot="Default" side="back" material="metal_material" />
</object_instance>
<object_instance name="geometry.plane_Default_inst" object="geometry.plane_Default">
<assign_material slot="Default" side="front" material="diffuse_material" />
<assign_material slot="Default" side="back" material="diffuse_material" />
</object_instance>
<object_instance name="geometry.sphere_Default_inst" object="geometry.sphere_Default">
<assign_material slot="Default" side="front" material="metal_material" />
<assign_material slot="Default" side="back" material="metal_material" />
</object_instance>
</assembly>
<assembly_instance name="assembly_inst" assembly="assembly">
</assembly_instance>
</scene>
<output>
<frame name="beauty">
<parameter name="camera" value="camera" />
<parameter name="filter" value="blackman-harris" />
<parameter name="filter_size" value="2" />
<parameter name="resolution" value="640 360" />
</frame>
</output>
<configurations>
<configuration name="final" base="base_final">
<parameter name="lighting_engine" value="pt" />
<parameter name="pixel_renderer" value="uniform" />
<parameter name="spectrum_mode" value="spectral" />
<parameters name="generic_tile_renderer">
</parameters>
<parameters name="pt">
<parameter name="dl_light_samples" value="1" />
<parameter name="enable_caustics" value="true" />
<parameter name="enable_dl" value="true" />
<parameter name="enable_ibl" value="true" />
<parameter name="ibl_bsdf_samples" value="1" />
<parameter name="ibl_env_samples" value="1" />
<parameter name="max_bounces" value="-1" />
<parameter name="max_diffuse_bounces" value="-1" />
<parameter name="max_glossy_bounces" value="-1" />
<parameter name="max_specular_bounces" value="-1" />
<parameter name="next_event_estimation" value="true" />
<parameter name="rr_min_path_length" value="3" />
</parameters>
<parameters name="sppm">
<parameter name="enable_importons" value="false" />
</parameters>
<parameters name="uniform_pixel_renderer">
<parameter name="samples" value="16" />
</parameters>
</configuration>
<configuration name="interactive" base="base_interactive">
<parameter name="spectrum_mode" value="spectral" />
<parameters name="pt">
<parameter name="max_bounces" value="-1" />
<parameter name="max_diffuse_bounces" value="-1" />
<parameter name="max_glossy_bounces" value="-1" />
<parameter name="max_specular_bounces" value="-1" />
</parameters>
<parameters name="sppm">
<parameter name="enable_importons" value="false" />
</parameters>
</configuration>
</configurations>
</project>
172 changes: 172 additions & 0 deletions sandbox/tests/test scenes/sun and sky/21 - nishita93 - theta 60 - ptne.appleseed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- File generated by appleseed.dll version 2.1.0-beta (SSE SSE2 SSE3 SSSE3 SSE4.1 SSE4.2). -->
<project format_revision="34">
<scene>
<camera name="camera" model="pinhole_camera">
<parameter name="autofocus_enabled" value="false" />
<parameter name="controller_target" value="0.0450397 0.413182 0.698789" />
<parameter name="film_dimensions" value="0.024892 0.014" />
<parameter name="focal_length" value="0.035" />
<parameter name="shutter_close_begin_time" value="1.0" />
<parameter name="shutter_close_end_time" value="1.0" />
<parameter name="shutter_open_begin_time" value="0.0" />
<parameter name="shutter_open_end_time" value="0.0" />
<transform time="0">
<matrix>
0.95313944699513697 -0.00430888342411300 -0.30250062496702701 -1.21740753536959101
0.00000000000000000 0.99989856662897403 -0.01424276845712700 0.35374149338383298
0.30253131173781700 0.01357534445090600 0.95304276684796996 4.67618990067894735
0.00000000000000000 0.00000000000000000 0.00000000000000000 1.00000000000000000
</matrix>
</transform>
</camera>
<environment_edf name="environment_edf" model="nishita93_environment_edf">
<parameter name="air_molecule_density" value="1.0" />
<parameter name="cast_shadows" value="true" />
<parameter name="dust_molecule_density" value="1.0" />
<parameter name="elevation" value="0" />
<parameter name="haze" value="0.8" />
<parameter name="horizon_shift" value="-0.05" />
<parameter name="sun_angular_diameter" value="0.545" />
<parameter name="sun_intensity_multiplier" value="1.0" />
<parameter name="sun_phi" value="-90" />
<parameter name="sun_theta" value="60.0" />
</environment_edf>
<environment_shader name="environment_shader" model="edf_environment_shader">
<parameter name="environment_edf" value="environment_edf" />
</environment_shader>
<environment name="environment" model="generic_environment">
<parameter name="environment_edf" value="environment_edf" />
<parameter name="environment_shader" value="environment_shader" />
</environment>
<assembly name="assembly">
<color name="diffuse_brdf_reflectance">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
0.729412019 0.729412019 0.729412019
</values>
<alpha>
1.000000000
</alpha>
</color>
<color name="metal_brdf_diffuse">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
1.000000000 1.000000000 1.000000000
</values>
<alpha>
1.000000000
</alpha>
</color>
<color name="metal_brdf_glossy">
<parameter name="color_space" value="srgb" />
<parameter name="multiplier" value="1.0" />
<parameter name="wavelength_range" value="400.0 700.0" />
<values>
1.000000000 1.000000000 1.000000000
</values>
<alpha>
1.000000000
</alpha>
</color>
<bsdf name="diffuse_brdf" model="lambertian_brdf">
<parameter name="reflectance" value="diffuse_brdf_reflectance" />
<parameter name="reflectance_multiplier" value="1.0" />
</bsdf>
<bsdf name="metal_brdf" model="ashikhmin_brdf">
<parameter name="diffuse_reflectance" value="metal_brdf_diffuse" />
<parameter name="diffuse_reflectance_multiplier" value="0.0" />
<parameter name="fresnel_multiplier" value="1.0" />
<parameter name="glossy_reflectance" value="metal_brdf_glossy" />
<parameter name="glossy_reflectance_multiplier" value="1.0" />
<parameter name="shininess_u" value="1000.0" />
<parameter name="shininess_v" value="1000.0" />
</bsdf>
<surface_shader name="physical_surface_shader" model="physical_surface_shader" />
<material name="diffuse_material" model="generic_material">
<parameter name="bsdf" value="diffuse_brdf" />
<parameter name="bump_amplitude" value="1.0" />
<parameter name="displacement_method" value="bump" />
<parameter name="normal_map_up" value="z" />
<parameter name="surface_shader" value="physical_surface_shader" />
</material>
<material name="metal_material" model="generic_material">
<parameter name="bsdf" value="metal_brdf" />
<parameter name="bump_amplitude" value="1.0" />
<parameter name="displacement_method" value="bump" />
<parameter name="normal_map_up" value="z" />
<parameter name="surface_shader" value="physical_surface_shader" />
</material>
<object name="geometry" model="mesh_object">
<parameter name="filename" value="geometry.obj" />
</object>
<object_instance name="geometry.cube_Default_inst" object="geometry.cube_Default">
<assign_material slot="Default" side="front" material="metal_material" />
<assign_material slot="Default" side="back" material="metal_material" />
</object_instance>
<object_instance name="geometry.plane_Default_inst" object="geometry.plane_Default">
<assign_material slot="Default" side="front" material="diffuse_material" />
<assign_material slot="Default" side="back" material="diffuse_material" />
</object_instance>
<object_instance name="geometry.sphere_Default_inst" object="geometry.sphere_Default">
<assign_material slot="Default" side="front" material="metal_material" />
<assign_material slot="Default" side="back" material="metal_material" />
</object_instance>
</assembly>
<assembly_instance name="assembly_inst" assembly="assembly">
</assembly_instance>
</scene>
<output>
<frame name="beauty">
<parameter name="camera" value="camera" />
<parameter name="filter" value="blackman-harris" />
<parameter name="filter_size" value="2" />
<parameter name="resolution" value="640 360" />
</frame>
</output>
<configurations>
<configuration name="final" base="base_final">
<parameter name="lighting_engine" value="pt" />
<parameter name="pixel_renderer" value="uniform" />
<parameter name="spectrum_mode" value="spectral" />
<parameters name="generic_tile_renderer">
</parameters>
<parameters name="pt">
<parameter name="dl_light_samples" value="1" />
<parameter name="enable_caustics" value="true" />
<parameter name="enable_dl" value="true" />
<parameter name="enable_ibl" value="true" />
<parameter name="ibl_bsdf_samples" value="1" />
<parameter name="ibl_env_samples" value="1" />
<parameter name="max_bounces" value="-1" />
<parameter name="max_diffuse_bounces" value="-1" />
<parameter name="max_glossy_bounces" value="-1" />
<parameter name="max_specular_bounces" value="-1" />
<parameter name="next_event_estimation" value="true" />
<parameter name="rr_min_path_length" value="3" />
</parameters>
<parameters name="sppm">
<parameter name="enable_importons" value="false" />
</parameters>
<parameters name="uniform_pixel_renderer">
<parameter name="samples" value="16" />
</parameters>
</configuration>
<configuration name="interactive" base="base_interactive">
<parameter name="spectrum_mode" value="spectral" />
<parameters name="pt">
<parameter name="max_bounces" value="-1" />
<parameter name="max_diffuse_bounces" value="-1" />
<parameter name="max_glossy_bounces" value="-1" />
<parameter name="max_specular_bounces" value="-1" />
</parameters>
<parameters name="sppm">
<parameter name="enable_importons" value="false" />
</parameters>
</configuration>
</configurations>
</project>
Loading