diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/render/image_sky.cpp | 25 | ||||
-rw-r--r-- | intern/cycles/render/nodes.cpp | 11 | ||||
-rw-r--r-- | intern/cycles/util/CMakeLists.txt | 4 | ||||
-rw-r--r-- | intern/sky/CMakeLists.txt | 35 | ||||
-rw-r--r-- | intern/sky/include/sky_model.h (renamed from intern/cycles/util/util_sky_model.h) | 45 | ||||
-rw-r--r-- | intern/sky/source/sky_float3.h | 157 | ||||
-rw-r--r-- | intern/sky/source/sky_model.cpp (renamed from intern/cycles/util/util_sky_model.cpp) | 20 | ||||
-rw-r--r-- | intern/sky/source/sky_model_data.h (renamed from intern/cycles/util/util_sky_model_data.h) | 4 | ||||
-rw-r--r-- | intern/sky/source/sky_nishita.cpp (renamed from intern/cycles/util/util_sky_nishita.cpp) | 12 |
12 files changed, 251 insertions, 67 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index fa18f4d793a..0758567bb78 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -30,6 +30,7 @@ add_subdirectory(opensubdiv) add_subdirectory(mikktspace) add_subdirectory(glew-mx) add_subdirectory(eigen) +add_subdirectory(sky) if(WITH_AUDASPACE) add_subdirectory(audaspace) diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index ef374f91a65..a2b0ed03925 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -35,7 +35,7 @@ if(WITH_CYCLES_OSL) endif() if(NOT CYCLES_STANDALONE_REPOSITORY) - list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi) + list(APPEND LIBRARIES bf_intern_glew_mx bf_intern_guardedalloc bf_intern_numaapi bf_intern_sky) endif() if(WITH_CYCLES_LOGGING) diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt index e37a0407976..6a1335dc5dd 100644 --- a/intern/cycles/render/CMakeLists.txt +++ b/intern/cycles/render/CMakeLists.txt @@ -2,6 +2,7 @@ set(INC .. ../../glew-mx + ../../sky/include ) set(INC_SYS @@ -92,6 +93,7 @@ set(LIB cycles_device cycles_subd cycles_util + bf_intern_sky ) if(WITH_CYCLES_OSL) diff --git a/intern/cycles/render/image_sky.cpp b/intern/cycles/render/image_sky.cpp index 442e1d7941f..24d4834c2fa 100644 --- a/intern/cycles/render/image_sky.cpp +++ b/intern/cycles/render/image_sky.cpp @@ -16,10 +16,11 @@ #include "render/image_sky.h" +#include "sky_model.h" + #include "util/util_image.h" #include "util/util_logging.h" #include "util/util_path.h" -#include "util/util_sky_model.h" #include "util/util_task.h" CCL_NAMESPACE_BEGIN @@ -62,17 +63,17 @@ bool SkyLoader::load_pixels(const ImageMetaData &metadata, const int rows_per_task = divide_up(1024, width); parallel_for(blocked_range<size_t>(0, height, rows_per_task), [&](const blocked_range<size_t> &r) { - nishita_skymodel_precompute_texture(pixel_data, - metadata.channels, - r.begin(), - r.end(), - width, - height, - sun_elevation, - altitude_f, - air_density, - dust_density, - ozone_density); + SKY_nishita_skymodel_precompute_texture(pixel_data, + metadata.channels, + r.begin(), + r.end(), + width, + height, + sun_elevation, + altitude_f, + air_density, + dust_density, + ozone_density); }); return true; diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index ab392839e52..1e09b71b340 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -27,9 +27,10 @@ #include "render/scene.h" #include "render/svm.h" +#include "sky_model.h" + #include "util/util_foreach.h" #include "util/util_logging.h" -#include "util/util_sky_model.h" #include "util/util_transform.h" #include "kernel/svm/svm_color_util.h" @@ -726,8 +727,8 @@ static void sky_texture_precompute_hosek(SunSky *sunsky, float solarElevation = M_PI_2_F - theta; /* Initialize Sky Model */ - ArHosekSkyModelState *sky_state; - sky_state = arhosek_xyz_skymodelstate_alloc_init( + SKY_ArHosekSkyModelState *sky_state; + sky_state = SKY_arhosek_xyz_skymodelstate_alloc_init( (double)turbidity, (double)ground_albedo, (double)solarElevation); /* Copy values from sky_state to SunSky */ @@ -741,7 +742,7 @@ static void sky_texture_precompute_hosek(SunSky *sunsky, sunsky->radiance_z = (float)sky_state->radiances[2]; /* Free sky_state */ - arhosekskymodelstate_free(sky_state); + SKY_arhosekskymodelstate_free(sky_state); } /* Nishita improved */ @@ -758,7 +759,7 @@ static void sky_texture_precompute_nishita(SunSky *sunsky, float pixel_bottom[3]; float pixel_top[3]; float altitude_f = (float)altitude; - nishita_skymodel_precompute_sun( + SKY_nishita_skymodel_precompute_sun( sun_elevation, sun_size, altitude_f, air_density, dust_density, pixel_bottom, pixel_top); /* send data to svm_sky */ sunsky->nishita_data[0] = pixel_bottom[0]; diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt index ad4ea9c86e0..23a47e064e2 100644 --- a/intern/cycles/util/CMakeLists.txt +++ b/intern/cycles/util/CMakeLists.txt @@ -98,10 +98,6 @@ set(SRC_HEADERS util_rect.h util_set.h util_simd.h - util_sky_model.cpp - util_sky_model.h - util_sky_model_data.h - util_sky_nishita.cpp util_avxf.h util_avxb.h util_semaphore.h diff --git a/intern/sky/CMakeLists.txt b/intern/sky/CMakeLists.txt new file mode 100644 index 00000000000..d46880367dc --- /dev/null +++ b/intern/sky/CMakeLists.txt @@ -0,0 +1,35 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# ***** END GPL LICENSE BLOCK ***** + +set(INC + include +) + +set(INC_SYS + +) + +set(SRC + source/sky_model.cpp + source/sky_nishita.cpp +) + +set(LIB +) + +blender_add_lib(bf_intern_sky "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/cycles/util/util_sky_model.h b/intern/sky/include/sky_model.h index 36f1079a16d..9e7700f3042 100644 --- a/intern/cycles/util/util_sky_model.h +++ b/intern/sky/include/sky_model.h @@ -298,14 +298,14 @@ HINT #1: if you want to model the sky of an earth-like planet that orbits previous paragraph. */ -#include "util/util_types.h" +#ifndef __SKY_MODEL_H__ +#define __SKY_MODEL_H__ -CCL_NAMESPACE_BEGIN +#ifdef __cplusplus +extern "C" { +#endif -#ifndef _SKY_MODEL_H_ -# define _SKY_MODEL_H_ - -typedef double ArHosekSkyModelConfiguration[9]; +typedef double SKY_ArHosekSkyModelConfiguration[9]; // Spectral version of the model @@ -335,8 +335,8 @@ typedef double ArHosekSkyModelConfiguration[9]; ---------------------------------------------------------------------------- */ -typedef struct ArHosekSkyModelState { - ArHosekSkyModelConfiguration configs[11]; +typedef struct SKY_ArHosekSkyModelState { + SKY_ArHosekSkyModelConfiguration configs[11]; double radiances[11]; double turbidity; double solar_radius; @@ -344,7 +344,7 @@ typedef struct ArHosekSkyModelState { double emission_correction_factor_sun[11]; double albedo; double elevation; -} ArHosekSkyModelState; +} SKY_ArHosekSkyModelState; /* ---------------------------------------------------------------------------- @@ -355,7 +355,7 @@ typedef struct ArHosekSkyModelState { ---------------------------------------------------------------------------- */ -ArHosekSkyModelState *arhosekskymodelstate_alloc_init(const double solar_elevation, +SKY_ArHosekSkyModelState *SKY_arhosekskymodelstate_alloc_init(const double solar_elevation, const double atmospheric_turbidity, const double ground_albedo); @@ -388,31 +388,31 @@ ArHosekSkyModelState *arhosekskymodelstate_alloc_init(const double solar_elevati ---------------------------------------------------------------------------- */ -ArHosekSkyModelState *arhosekskymodelstate_alienworld_alloc_init( +SKY_ArHosekSkyModelState *SKY_arhosekskymodelstate_alienworld_alloc_init( const double solar_elevation, const double solar_intensity, const double solar_surface_temperature_kelvin, const double atmospheric_turbidity, const double ground_albedo); -void arhosekskymodelstate_free(ArHosekSkyModelState *state); +void SKY_arhosekskymodelstate_free(SKY_ArHosekSkyModelState *state); -double arhosekskymodel_radiance(ArHosekSkyModelState *state, +double SKY_arhosekskymodel_radiance(SKY_ArHosekSkyModelState *state, double theta, double gamma, double wavelength); // CIE XYZ and RGB versions -ArHosekSkyModelState *arhosek_xyz_skymodelstate_alloc_init(const double turbidity, +SKY_ArHosekSkyModelState *SKY_arhosek_xyz_skymodelstate_alloc_init(const double turbidity, const double albedo, const double elevation); -ArHosekSkyModelState *arhosek_rgb_skymodelstate_alloc_init(const double turbidity, +SKY_ArHosekSkyModelState *SKY_arhosek_rgb_skymodelstate_alloc_init(const double turbidity, const double albedo, const double elevation); -double arhosek_tristim_skymodel_radiance(ArHosekSkyModelState *state, +double SKY_arhosek_tristim_skymodel_radiance(SKY_ArHosekSkyModelState *state, double theta, double gamma, int channel); @@ -421,16 +421,15 @@ double arhosek_tristim_skymodel_radiance(ArHosekSkyModelState *state, // Please read the above description before using this - there are several // caveats! -double arhosekskymodel_solar_radiance(ArHosekSkyModelState *state, +double SKY_arhosekskymodel_solar_radiance(SKY_ArHosekSkyModelState *state, double theta, double gamma, double wavelength); -#endif // _SKY_MODEL_H_ /* Nishita improved sky model */ -void nishita_skymodel_precompute_texture(float *pixels, +void SKY_nishita_skymodel_precompute_texture(float *pixels, int stride, int start_y, int end_y, @@ -442,7 +441,7 @@ void nishita_skymodel_precompute_texture(float *pixels, float dust_density, float ozone_density); -void nishita_skymodel_precompute_sun(float sun_elevation, +void SKY_nishita_skymodel_precompute_sun(float sun_elevation, float angular_diameter, float altitude, float air_density, @@ -450,4 +449,8 @@ void nishita_skymodel_precompute_sun(float sun_elevation, float *pixel_bottom, float *pixel_top); -CCL_NAMESPACE_END +#ifdef __cplusplus +} +#endif + +#endif // __SKY_MODEL_H__ diff --git a/intern/sky/source/sky_float3.h b/intern/sky/source/sky_float3.h new file mode 100644 index 00000000000..2a9b9c89623 --- /dev/null +++ b/intern/sky/source/sky_float3.h @@ -0,0 +1,157 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __SKY_FLOAT3_H__ +#define __SKY_FLOAT3_H__ + +// minimal float3 + util_math.h implementation for nishita sky model + +#include <math.h> + +#ifndef M_PI_F +# define M_PI_F (3.1415926535897932f) /* pi */ +#endif +#ifndef M_PI_2_F +# define M_PI_2_F (1.5707963267948966f) /* pi/2 */ +#endif +#ifndef M_2PI_F +# define M_2PI_F (6.2831853071795864f) /* 2*pi */ +#endif + +struct float3 { + float x, y, z; + + float3() = default; + + float3(const float *ptr) : x{ptr[0]}, y{ptr[1]}, z{ptr[2]} + { + } + + float3(const float (*ptr)[3]) : float3((const float *)ptr) + { + } + + explicit float3(float value) : x(value), y(value), z(value) + { + } + + explicit float3(int value) : x(value), y(value), z(value) + { + } + + float3(float x, float y, float z) : x{x}, y{y}, z{z} + { + } + + operator const float *() const + { + return &x; + } + + operator float *() + { + return &x; + } + + friend float3 operator*(const float3 &a, float b) + { + return {a.x * b, a.y * b, a.z * b}; + } + + friend float3 operator*(float b, const float3 &a) + { + return {a.x * b, a.y * b, a.z * b}; + } + + friend float3 operator-(const float3 &a, const float3 &b) + { + return {a.x - b.x, a.y - b.y, a.z - b.z}; + } + + friend float3 operator-(const float3 &a) + { + return {-a.x, -a.y, -a.z}; + } + + float length_squared() const + { + return x * x + y * y + z * z; + } + + float length() const + { + return sqrt(length_squared()); + } + + static float distance(const float3 &a, const float3 &b) + { + return (a - b).length(); + } + + friend float3 operator+(const float3 &a, const float3 &b) + { + return {a.x + b.x, a.y + b.y, a.z + b.z}; + } + + void operator+=(const float3 &b) + { + this->x += b.x; + this->y += b.y; + this->z += b.z; + } + + friend float3 operator*(const float3 &a, const float3 &b) + { + return {a.x * b.x, a.y * b.y, a.z * b.z}; + } +}; + +inline float sqr(float a) +{ + return a * a; +} + +inline float3 make_float3(float x, float y, float z) +{ + return float3(x, y, z); +} + +inline float dot(const float3 &a, const float3 &b) +{ + return a.x * b.x + a.y * b.y + a.z * b.z; +} + +inline float distance(const float3 &a, const float3 &b) +{ + return float3::distance(a, b); +} + +inline float len_squared(float3 f) +{ + return f.length_squared(); +} + +inline float len(float3 f) +{ + return f.length(); +} + +inline float reduce_add(float3 f) +{ + return f.x + f.y + f.z; +} + +#endif /* __SKY_FLOAT3_H__ */ diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/sky/source/sky_model.cpp index 8cdad8a90a4..3eca68e076c 100644 --- a/intern/cycles/util/util_sky_model.cpp +++ b/intern/sky/source/sky_model.cpp @@ -97,16 +97,14 @@ All instructions on how to use this code are in the accompanying header file. */ -#include "util/util_sky_model.h" -#include "util/util_sky_model_data.h" +#include "sky_model.h" +#include "sky_model_data.h" #include <assert.h> #include <math.h> #include <stdio.h> #include <stdlib.h> -CCL_NAMESPACE_BEGIN - // Some macro definitions that occur elsewhere in ART, and that have to be // replicated to make this a stand-alone module. @@ -138,7 +136,7 @@ typedef const double *ArHosekSkyModel_Radiance_Dataset; // internal functions static void ArHosekSkyModel_CookConfiguration(ArHosekSkyModel_Dataset dataset, - ArHosekSkyModelConfiguration config, + SKY_ArHosekSkyModelConfiguration config, double turbidity, double albedo, double solar_elevation) @@ -272,7 +270,7 @@ static double ArHosekSkyModel_CookRadianceConfiguration(ArHosekSkyModel_Radiance return res; } -static double ArHosekSkyModel_GetRadianceInternal(ArHosekSkyModelConfiguration configuration, +static double ArHosekSkyModel_GetRadianceInternal(SKY_ArHosekSkyModelConfiguration configuration, double theta, double gamma) { @@ -288,12 +286,12 @@ static double ArHosekSkyModel_GetRadianceInternal(ArHosekSkyModelConfiguration c configuration[6] * mieM + configuration[7] * zenith); } -void arhosekskymodelstate_free(ArHosekSkyModelState *state) +void SKY_arhosekskymodelstate_free(SKY_ArHosekSkyModelState *state) { free(state); } -double arhosekskymodel_radiance(ArHosekSkyModelState *state, +double SKY_arhosekskymodel_radiance(SKY_ArHosekSkyModelState *state, double theta, double gamma, double wavelength) @@ -324,11 +322,11 @@ double arhosekskymodel_radiance(ArHosekSkyModelState *state, // xyz and rgb versions -ArHosekSkyModelState *arhosek_xyz_skymodelstate_alloc_init(const double turbidity, +SKY_ArHosekSkyModelState *SKY_arhosek_xyz_skymodelstate_alloc_init(const double turbidity, const double albedo, const double elevation) { - ArHosekSkyModelState *state = ALLOC(ArHosekSkyModelState); + SKY_ArHosekSkyModelState *state = ALLOC(SKY_ArHosekSkyModelState); state->solar_radius = TERRESTRIAL_SOLAR_RADIUS; state->turbidity = turbidity; @@ -345,5 +343,3 @@ ArHosekSkyModelState *arhosek_xyz_skymodelstate_alloc_init(const double turbidit return state; } - -CCL_NAMESPACE_END diff --git a/intern/cycles/util/util_sky_model_data.h b/intern/sky/source/sky_model_data.h index a2a3935eb84..8d98f84cdae 100644 --- a/intern/cycles/util/util_sky_model_data.h +++ b/intern/sky/source/sky_model_data.h @@ -91,8 +91,6 @@ an updated version of this code has been published! ============================================================================ */ -CCL_NAMESPACE_BEGIN - /* This file contains the coefficient data for the XYZ colour space version of @@ -3843,5 +3841,3 @@ static const double datasetXYZRad3[] = { static const double *datasetsXYZ[] = {datasetXYZ1, datasetXYZ2, datasetXYZ3}; static const double *datasetsXYZRad[] = {datasetXYZRad1, datasetXYZRad2, datasetXYZRad3}; - -CCL_NAMESPACE_END diff --git a/intern/cycles/util/util_sky_nishita.cpp b/intern/sky/source/sky_nishita.cpp index 92397804d43..27286ddecac 100644 --- a/intern/cycles/util/util_sky_nishita.cpp +++ b/intern/sky/source/sky_nishita.cpp @@ -14,10 +14,8 @@ * limitations under the License. */ -#include "util/util_math.h" -#include "util/util_sky_model.h" - -CCL_NAMESPACE_BEGIN +#include "sky_model.h" +#include "sky_float3.h" /* Constants */ static const float rayleigh_scale = 8000.0f; // Rayleigh scale height (m) @@ -269,7 +267,7 @@ static void single_scattering(float3 ray_dir, } /* calculate texture array */ -void nishita_skymodel_precompute_texture(float *pixels, +void SKY_nishita_skymodel_precompute_texture(float *pixels, int stride, int start_y, int end_y, @@ -332,7 +330,7 @@ static void sun_radiation(float3 cam_dir, } } -void nishita_skymodel_precompute_sun(float sun_elevation, +void SKY_nishita_skymodel_precompute_sun(float sun_elevation, float angular_diameter, float altitude, float air_density, @@ -367,5 +365,3 @@ void nishita_skymodel_precompute_sun(float sun_elevation, pixel_top[1] = pix_top.y; pixel_top[2] = pix_top.z; } - -CCL_NAMESPACE_END |