diff --git a/libraries/lights/genglsl/lights_genglsl_impl.mtlx b/libraries/lights/genglsl/lights_genglsl_impl.mtlx index cde8de51e3..4106f93626 100644 --- a/libraries/lights/genglsl/lights_genglsl_impl.mtlx +++ b/libraries/lights/genglsl/lights_genglsl_impl.mtlx @@ -2,12 +2,12 @@ - + - + - + diff --git a/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl b/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl index f16d90c3cb..66e8ab08a6 100644 --- a/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_environment_fis.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" // https://developer.nvidia.com/gpugems/GPUGems3/gpugems3_ch20.html // Section 20.4 Equation 13 diff --git a/libraries/pbrlib/genglsl/lib/mx_environment_none.glsl b/libraries/pbrlib/genglsl/lib/mx_environment_none.glsl index 9e6ff48fe2..aeef10d703 100644 --- a/libraries/pbrlib/genglsl/lib/mx_environment_none.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_environment_none.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" vec3 mx_environment_radiance(vec3 N, vec3 V, vec3 X, vec2 roughness, int distribution, FresnelData fd) { diff --git a/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl b/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl index d694575661..4a51872a77 100644 --- a/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_environment_prefilter.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" float mx_latlong_compute_lod(float alpha) { diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl index f7157fdc21..e758a179bc 100644 --- a/libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl" // Based on the OSL implementation of Oren-Nayar diffuse, which is in turn // based on https://mimosa-pudica.net/improved-oren-nayar.html. diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl index 9e2dc91209..c6adce0fbb 100644 --- a/libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl" // http://www.aconty.com/pdf/s2017_pbs_imageworks_sheen.pdf // Equation 2 diff --git a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl index 38722fca38..ea5ad4caa3 100644 --- a/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet.glsl" // Fresnel model options. const int FRESNEL_MODEL_DIELECTRIC = 0; diff --git a/libraries/pbrlib/genglsl/lib/mx_table.glsl b/libraries/pbrlib/genglsl/lib/mx_table.glsl index ea9ce3de4e..c0cb6fd793 100644 --- a/libraries/pbrlib/genglsl/lib/mx_table.glsl +++ b/libraries/pbrlib/genglsl/lib/mx_table.glsl @@ -1,5 +1,5 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_sheen.glsl" -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" vec3 mx_generate_dir_albedo_table() { diff --git a/libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl b/libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl index ca1e7c199c..d2ab8af37f 100644 --- a/libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_burley_diffuse_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" void mx_burley_diffuse_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 normal, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl b/libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl index 228516a22a..06f97a9b8b 100644 --- a/libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_conductor_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" void mx_conductor_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 ior_n, vec3 ior_k, vec2 roughness, vec3 N, vec3 X, int distribution, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl b/libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl index 8286037fe3..c5b62ecb1b 100644 --- a/libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_dielectric_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" void mx_dielectric_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 tint, float ior, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl b/libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl index 444cdbf8a2..89b7693059 100644 --- a/libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_generalized_schlick_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_specular.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_specular.glsl" void mx_generalized_schlick_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color0, vec3 color90, float exponent, vec2 roughness, vec3 N, vec3 X, int distribution, int scatter_mode, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl b/libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl index 99814c0ed5..feb583430b 100644 --- a/libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_oren_nayar_diffuse_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" void mx_oren_nayar_diffuse_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 normal, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl b/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl index 1bc9b9069a..18c46b76ac 100644 --- a/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_sheen.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_sheen.glsl" void mx_sheen_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, float roughness, vec3 N, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl b/libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl index 65f5c574a6..49ac0b6601 100644 --- a/libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl +++ b/libraries/pbrlib/genglsl/mx_subsurface_bsdf.glsl @@ -1,4 +1,4 @@ -#include "pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" +#include "libraries/pbrlib/genglsl/lib/mx_microfacet_diffuse.glsl" void mx_subsurface_bsdf_reflection(vec3 L, vec3 V, vec3 P, float occlusion, float weight, vec3 color, vec3 radius, float anisotropy, vec3 normal, inout BSDF bsdf) { diff --git a/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx b/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx index a8b617e2a5..c74061455e 100644 --- a/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx +++ b/libraries/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx @@ -2,31 +2,31 @@ - + - + - + - + - + - + - + - + - + @@ -50,7 +50,7 @@ - + @@ -59,12 +59,12 @@ - + - + - + diff --git a/libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl b/libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl index e81cd1c4b2..f58866c87d 100644 --- a/libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl +++ b/libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet.osl" // Rational curve fit approximation for the directional albedo of Imageworks sheen. float mx_imageworks_sheen_dir_albedo_analytic(float NdotV, float roughness) diff --git a/libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl b/libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl index 6302d3c296..7db4748a5a 100644 --- a/libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl +++ b/libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet.osl" // Compute the average of an anisotropic alpha pair. float mx_average_alpha(vector2 alpha) diff --git a/libraries/pbrlib/genosl/mx_conductor_bsdf.osl b/libraries/pbrlib/genosl/mx_conductor_bsdf.osl index 6529c4ac02..9b74b6386a 100644 --- a/libraries/pbrlib/genosl/mx_conductor_bsdf.osl +++ b/libraries/pbrlib/genosl/mx_conductor_bsdf.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet_specular.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl" void mx_conductor_bsdf(float weight, color ior_n, color ior_k, vector2 roughness, normal N, vector U, string distribution, output BSDF bsdf) { diff --git a/libraries/pbrlib/genosl/mx_dielectric_bsdf.osl b/libraries/pbrlib/genosl/mx_dielectric_bsdf.osl index 10b7b2f67f..a2463bf935 100644 --- a/libraries/pbrlib/genosl/mx_dielectric_bsdf.osl +++ b/libraries/pbrlib/genosl/mx_dielectric_bsdf.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet_specular.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl" void mx_dielectric_bsdf(float weight, color tint, float ior, vector2 roughness, normal N, vector U, string distribution, string scatter_mode, output BSDF bsdf) { diff --git a/libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl b/libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl index 4108658655..08aedfe1ce 100644 --- a/libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl +++ b/libraries/pbrlib/genosl/mx_generalized_schlick_bsdf.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet_specular.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet_specular.osl" void mx_generalized_schlick_bsdf(float weight, color color0, color color90, float exponent, vector2 roughness, normal N, vector U, string distribution, string scatter_mode, output BSDF bsdf) { diff --git a/libraries/pbrlib/genosl/mx_sheen_bsdf.osl b/libraries/pbrlib/genosl/mx_sheen_bsdf.osl index d30054ff59..83bfb13185 100644 --- a/libraries/pbrlib/genosl/mx_sheen_bsdf.osl +++ b/libraries/pbrlib/genosl/mx_sheen_bsdf.osl @@ -1,4 +1,4 @@ -#include "pbrlib/genosl/lib/mx_microfacet_sheen.osl" +#include "libraries/pbrlib/genosl/lib/mx_microfacet_sheen.osl" // TODO: Vanilla OSL doesn't have a proper sheen closure, // so use 'diffuse' scaled by sheen directional albedo for now. diff --git a/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx b/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx index 7ad4fe4e77..2f553df668 100644 --- a/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx +++ b/libraries/pbrlib/genosl/pbrlib_genosl_impl.mtlx @@ -2,37 +2,37 @@ - + - + - + - + - + - + - + - + - + - + @@ -53,19 +53,19 @@ - + - - + + - + - + - + diff --git a/libraries/stdlib/genglsl/mx_ap1_to_rec709_color3.glsl b/libraries/stdlib/genglsl/mx_ap1_to_rec709_color3.glsl index 874a2e0571..c4f282e59d 100644 --- a/libraries/stdlib/genglsl/mx_ap1_to_rec709_color3.glsl +++ b/libraries/stdlib/genglsl/mx_ap1_to_rec709_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_ap1_to_rec709_color3(vec3 _in, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_ap1_to_rec709_color4.glsl b/libraries/stdlib/genglsl/mx_ap1_to_rec709_color4.glsl index 765e6482ff..0a4a6824b3 100644 --- a/libraries/stdlib/genglsl/mx_ap1_to_rec709_color4.glsl +++ b/libraries/stdlib/genglsl/mx_ap1_to_rec709_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_ap1_to_rec709_color4(vec4 _in, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_burn_color3.glsl b/libraries/stdlib/genglsl/mx_burn_color3.glsl index 0c046d4676..fc4e11f9eb 100644 --- a/libraries/stdlib/genglsl/mx_burn_color3.glsl +++ b/libraries/stdlib/genglsl/mx_burn_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_burn_float.glsl" +#include "libraries/stdlib/genglsl/mx_burn_float.glsl" void mx_burn_color3(vec3 fg, vec3 bg, float mixval, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_burn_color4.glsl b/libraries/stdlib/genglsl/mx_burn_color4.glsl index 36d8134dc4..bc1946475e 100644 --- a/libraries/stdlib/genglsl/mx_burn_color4.glsl +++ b/libraries/stdlib/genglsl/mx_burn_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_burn_float.glsl" +#include "libraries/stdlib/genglsl/mx_burn_float.glsl" void mx_burn_color4(vec4 fg, vec4 bg, float mixval, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_cellnoise2d_float.glsl b/libraries/stdlib/genglsl/mx_cellnoise2d_float.glsl index 37902f68c9..de0711d599 100644 --- a/libraries/stdlib/genglsl/mx_cellnoise2d_float.glsl +++ b/libraries/stdlib/genglsl/mx_cellnoise2d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_cellnoise2d_float(vec2 texcoord, out float result) { diff --git a/libraries/stdlib/genglsl/mx_cellnoise3d_float.glsl b/libraries/stdlib/genglsl/mx_cellnoise3d_float.glsl index c384d5ef68..9c7de6e44f 100644 --- a/libraries/stdlib/genglsl/mx_cellnoise3d_float.glsl +++ b/libraries/stdlib/genglsl/mx_cellnoise3d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_cellnoise3d_float(vec3 position, out float result) { diff --git a/libraries/stdlib/genglsl/mx_dodge_color3.glsl b/libraries/stdlib/genglsl/mx_dodge_color3.glsl index 048e21afef..b21f4db432 100644 --- a/libraries/stdlib/genglsl/mx_dodge_color3.glsl +++ b/libraries/stdlib/genglsl/mx_dodge_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_dodge_float.glsl" +#include "libraries/stdlib/genglsl/mx_dodge_float.glsl" void mx_dodge_color3(vec3 fg, vec3 bg, float mixval, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_dodge_color4.glsl b/libraries/stdlib/genglsl/mx_dodge_color4.glsl index 1f60ac4611..ec9b786de5 100644 --- a/libraries/stdlib/genglsl/mx_dodge_color4.glsl +++ b/libraries/stdlib/genglsl/mx_dodge_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_dodge_float.glsl" +#include "libraries/stdlib/genglsl/mx_dodge_float.glsl" void mx_dodge_color4(vec4 fg , vec4 bg , float mixval, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl index 2a8b090928..3d52d75548 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_fa_vector2(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl index 916b885e7b..cd445c5e71 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_fa_vector3(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl index b757c1c4fc..5c991285f5 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_fa_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_fa_vector4(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_float.glsl b/libraries/stdlib/genglsl/mx_fractal3d_float.glsl index 265c6cbee0..1c3d7e2f82 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_float.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_float(float amplitude, int octaves, float lacunarity, float diminish, vec3 position, out float result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_vector2.glsl b/libraries/stdlib/genglsl/mx_fractal3d_vector2.glsl index f05e9dead1..1e4ad0e911 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_vector2(vec2 amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_vector3.glsl b/libraries/stdlib/genglsl/mx_fractal3d_vector3.glsl index cf044c069e..6eaf79aaad 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_vector3(vec3 amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_fractal3d_vector4.glsl b/libraries/stdlib/genglsl/mx_fractal3d_vector4.glsl index b904742bb7..7dac32f7b5 100644 --- a/libraries/stdlib/genglsl/mx_fractal3d_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_fractal3d_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_fractal3d_vector4(vec4 amplitude, int octaves, float lacunarity, float diminish, vec3 position, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color3.glsl b/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color3.glsl index 92e4a12fc9..b0efd28a66 100644 --- a/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color3.glsl +++ b/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_g22_ap1_to_lin_rec709_color3(vec3 _in, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color4.glsl b/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color4.glsl index 5105f82a37..32991c0916 100644 --- a/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color4.glsl +++ b/libraries/stdlib/genglsl/mx_g22_ap1_to_lin_rec709_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_g22_ap1_to_lin_rec709_color4(vec4 _in, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_hsvtorgb_color3.glsl b/libraries/stdlib/genglsl/mx_hsvtorgb_color3.glsl index 4a5a54c204..1bc6631b43 100644 --- a/libraries/stdlib/genglsl/mx_hsvtorgb_color3.glsl +++ b/libraries/stdlib/genglsl/mx_hsvtorgb_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_hsv.glsl" +#include "libraries/stdlib/genglsl/lib/mx_hsv.glsl" void mx_hsvtorgb_color3(vec3 _in, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_hsvtorgb_color4.glsl b/libraries/stdlib/genglsl/mx_hsvtorgb_color4.glsl index afae475745..05fc28daf7 100644 --- a/libraries/stdlib/genglsl/mx_hsvtorgb_color4.glsl +++ b/libraries/stdlib/genglsl/mx_hsvtorgb_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_hsv.glsl" +#include "libraries/stdlib/genglsl/lib/mx_hsv.glsl" void mx_hsvtorgb_color4(vec4 _in, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl index 6441cf9d00..cf20a6ecd5 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_fa_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_fa_vector2(float amplitude, float pivot, vec2 texcoord, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl index 2d1dd3279b..6b55424bea 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_fa_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_fa_vector3(float amplitude, float pivot, vec2 texcoord, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl index fd8e245d8a..acf1f93bdd 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_fa_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_fa_vector4(float amplitude, float pivot, vec2 texcoord, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_float.glsl b/libraries/stdlib/genglsl/mx_noise2d_float.glsl index be780c40e7..517d493a01 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_float.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_float(float amplitude, float pivot, vec2 texcoord, out float result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_vector2.glsl b/libraries/stdlib/genglsl/mx_noise2d_vector2.glsl index 8a3831aa52..adcc3d58af 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_vector2(vec2 amplitude, float pivot, vec2 texcoord, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_vector3.glsl b/libraries/stdlib/genglsl/mx_noise2d_vector3.glsl index 264c271cbb..33373ac15b 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_vector3(vec3 amplitude, float pivot, vec2 texcoord, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_noise2d_vector4.glsl b/libraries/stdlib/genglsl/mx_noise2d_vector4.glsl index a7133e3e0c..789ebae3d1 100644 --- a/libraries/stdlib/genglsl/mx_noise2d_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_noise2d_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise2d_vector4(vec4 amplitude, float pivot, vec2 texcoord, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl index 0a6421723f..fe049dde26 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_fa_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_fa_vector2(float amplitude, float pivot, vec3 position, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl index 4c03ed74a2..ce665e94b4 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_fa_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_fa_vector3(float amplitude, float pivot, vec3 position, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl b/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl index d33f7f9a17..7f9b2bac21 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_fa_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_fa_vector4(float amplitude, float pivot, vec3 position, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_float.glsl b/libraries/stdlib/genglsl/mx_noise3d_float.glsl index 9803273402..4f05c70020 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_float.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_float(float amplitude, float pivot, vec3 position, out float result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_vector2.glsl b/libraries/stdlib/genglsl/mx_noise3d_vector2.glsl index 564eb4b4d0..1f8b101350 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_vector2(vec2 amplitude, float pivot, vec3 position, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_vector3.glsl b/libraries/stdlib/genglsl/mx_noise3d_vector3.glsl index 6c304e6dc6..c5ea6105ff 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_vector3(vec3 amplitude, float pivot, vec3 position, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_noise3d_vector4.glsl b/libraries/stdlib/genglsl/mx_noise3d_vector4.glsl index 21bbb405f4..7c1552a09e 100644 --- a/libraries/stdlib/genglsl/mx_noise3d_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_noise3d_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_noise3d_vector4(vec4 amplitude, float pivot, vec3 position, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_overlay_color3.glsl b/libraries/stdlib/genglsl/mx_overlay_color3.glsl index 97c9f3b737..b62d653740 100644 --- a/libraries/stdlib/genglsl/mx_overlay_color3.glsl +++ b/libraries/stdlib/genglsl/mx_overlay_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_overlay.glsl" +#include "libraries/stdlib/genglsl/mx_overlay.glsl" void mx_overlay_color3(vec3 fg, vec3 bg, float mix, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_overlay_color4.glsl b/libraries/stdlib/genglsl/mx_overlay_color4.glsl index e331028a7f..5f129b4188 100644 --- a/libraries/stdlib/genglsl/mx_overlay_color4.glsl +++ b/libraries/stdlib/genglsl/mx_overlay_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_overlay.glsl" +#include "libraries/stdlib/genglsl/mx_overlay.glsl" void mx_overlay_color4(vec4 fg, vec4 bg, float mix, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_rgbtohsv_color3.glsl b/libraries/stdlib/genglsl/mx_rgbtohsv_color3.glsl index c49b0f889e..4456e1b8e8 100644 --- a/libraries/stdlib/genglsl/mx_rgbtohsv_color3.glsl +++ b/libraries/stdlib/genglsl/mx_rgbtohsv_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_hsv.glsl" +#include "libraries/stdlib/genglsl/lib/mx_hsv.glsl" void mx_rgbtohsv_color3(vec3 _in, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_rgbtohsv_color4.glsl b/libraries/stdlib/genglsl/mx_rgbtohsv_color4.glsl index 7cb931f8f3..7f4ab246b9 100644 --- a/libraries/stdlib/genglsl/mx_rgbtohsv_color4.glsl +++ b/libraries/stdlib/genglsl/mx_rgbtohsv_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_hsv.glsl" +#include "libraries/stdlib/genglsl/lib/mx_hsv.glsl" void mx_rgbtohsv_color4(vec4 _in, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec2.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec2.glsl index 8af5c513b8..b621a9600f 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec2.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec2(vec2 val, vec2 low, vec2 high, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec2FA.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec2FA.glsl index 0663c7f0b4..e419ea09c2 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec2FA.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec2FA.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec2FA(vec2 val, float low, float high, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec3.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec3.glsl index 29122d359f..535fcfa3b0 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec3.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec3(vec3 val, vec3 low, vec3 high, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec3FA.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec3FA.glsl index 8b39dd6dd5..1b0ee5248a 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec3FA.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec3FA.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec3FA(vec3 val, float low, float high, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec4.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec4.glsl index 7f9a849d05..155d49ebef 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec4.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec4(vec4 val, vec4 low, vec4 high, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_smoothstep_vec4FA.glsl b/libraries/stdlib/genglsl/mx_smoothstep_vec4FA.glsl index cdce10593c..f9e7dbeea5 100644 --- a/libraries/stdlib/genglsl/mx_smoothstep_vec4FA.glsl +++ b/libraries/stdlib/genglsl/mx_smoothstep_vec4FA.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_smoothstep_float.glsl" +#include "libraries/stdlib/genglsl/mx_smoothstep_float.glsl" void mx_smoothstep_vec4FA(vec4 val, float low, float high, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_splitlr_float.glsl b/libraries/stdlib/genglsl/mx_splitlr_float.glsl index cdfbbb2b10..11df7449e6 100644 --- a/libraries/stdlib/genglsl/mx_splitlr_float.glsl +++ b/libraries/stdlib/genglsl/mx_splitlr_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splitlr_float(float valuel, float valuer, float center, vec2 texcoord, out float result) { diff --git a/libraries/stdlib/genglsl/mx_splitlr_vector2.glsl b/libraries/stdlib/genglsl/mx_splitlr_vector2.glsl index eb08d40f92..6ba2af0112 100644 --- a/libraries/stdlib/genglsl/mx_splitlr_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_splitlr_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splitlr_vector2(vec2 valuel, vec2 valuer, float center, vec2 texcoord, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_splitlr_vector3.glsl b/libraries/stdlib/genglsl/mx_splitlr_vector3.glsl index c7b4c51703..c37cc074db 100644 --- a/libraries/stdlib/genglsl/mx_splitlr_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_splitlr_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splitlr_vector3(vec3 valuel, vec3 valuer, float center, vec2 texcoord, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_splitlr_vector4.glsl b/libraries/stdlib/genglsl/mx_splitlr_vector4.glsl index c4b934d3e5..00201ed841 100644 --- a/libraries/stdlib/genglsl/mx_splitlr_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_splitlr_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splitlr_vector4(vec4 valuel, vec4 valuer, float center, vec2 texcoord, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_splittb_float.glsl b/libraries/stdlib/genglsl/mx_splittb_float.glsl index 6f87687aa9..dbe20239a5 100644 --- a/libraries/stdlib/genglsl/mx_splittb_float.glsl +++ b/libraries/stdlib/genglsl/mx_splittb_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splittb_float(float valuet, float valueb, float center, vec2 texcoord, out float result) { diff --git a/libraries/stdlib/genglsl/mx_splittb_vector2.glsl b/libraries/stdlib/genglsl/mx_splittb_vector2.glsl index 91b4a69d62..a6acb9a24a 100644 --- a/libraries/stdlib/genglsl/mx_splittb_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_splittb_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splittb_vector2(vec2 valuet, vec2 valueb, float center, vec2 texcoord, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_splittb_vector3.glsl b/libraries/stdlib/genglsl/mx_splittb_vector3.glsl index 33bd96e807..4676694ef7 100644 --- a/libraries/stdlib/genglsl/mx_splittb_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_splittb_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splittb_vector3(vec3 valuet, vec3 valueb, float center, vec2 texcoord, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_splittb_vector4.glsl b/libraries/stdlib/genglsl/mx_splittb_vector4.glsl index b44d4fe6e1..198744c7b0 100644 --- a/libraries/stdlib/genglsl/mx_splittb_vector4.glsl +++ b/libraries/stdlib/genglsl/mx_splittb_vector4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/mx_aastep.glsl" +#include "libraries/stdlib/genglsl/mx_aastep.glsl" void mx_splittb_vector4(vec4 valuet, vec4 valueb, float center, vec2 texcoord, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl b/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl index e49a3fc3f6..94446d840e 100644 --- a/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl +++ b/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_srgb_texture_to_lin_rec709_color3(vec3 _in, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl b/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl index 4ae3d5494a..5109c21eaa 100644 --- a/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl +++ b/libraries/stdlib/genglsl/mx_srgb_texture_to_lin_rec709_color4.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_transform_color.glsl" +#include "libraries/stdlib/genglsl/lib/mx_transform_color.glsl" void mx_srgb_texture_to_lin_rec709_color4(vec4 _in, out vec4 result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise2d_float.glsl b/libraries/stdlib/genglsl/mx_worleynoise2d_float.glsl index 25246b134b..5753975c8b 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise2d_float.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise2d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise2d_float(vec2 texcoord, float jitter, out float result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise2d_vector2.glsl b/libraries/stdlib/genglsl/mx_worleynoise2d_vector2.glsl index 4048abc549..6bc8c48412 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise2d_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise2d_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise2d_vector2(vec2 texcoord, float jitter, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise2d_vector3.glsl b/libraries/stdlib/genglsl/mx_worleynoise2d_vector3.glsl index abae183dc6..d857dcdd9b 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise2d_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise2d_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise2d_vector3(vec2 texcoord, float jitter, out vec3 result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise3d_float.glsl b/libraries/stdlib/genglsl/mx_worleynoise3d_float.glsl index 7b40e40729..86b3df1d54 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise3d_float.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise3d_float.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise3d_float(vec3 position, float jitter, out float result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise3d_vector2.glsl b/libraries/stdlib/genglsl/mx_worleynoise3d_vector2.glsl index ef2935ad80..064b1b0aae 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise3d_vector2.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise3d_vector2.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise3d_vector2(vec3 position, float jitter, out vec2 result) { diff --git a/libraries/stdlib/genglsl/mx_worleynoise3d_vector3.glsl b/libraries/stdlib/genglsl/mx_worleynoise3d_vector3.glsl index 7523c00ce9..16426fd2c1 100644 --- a/libraries/stdlib/genglsl/mx_worleynoise3d_vector3.glsl +++ b/libraries/stdlib/genglsl/mx_worleynoise3d_vector3.glsl @@ -1,4 +1,4 @@ -#include "stdlib/genglsl/lib/mx_noise.glsl" +#include "libraries/stdlib/genglsl/lib/mx_noise.glsl" void mx_worleynoise3d_vector3(vec3 position, float jitter, out vec3 result) { diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx index 9c81e54253..a6ac39201a 100644 --- a/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx +++ b/libraries/stdlib/genglsl/stdlib_genglsl_cm_impl.mtlx @@ -5,20 +5,20 @@ - - - - - - + + + + + + - - + + - - + + - - + + diff --git a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx index 4323bddeb3..5e6d5a7656 100644 --- a/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx +++ b/libraries/stdlib/genglsl/stdlib_genglsl_impl.mtlx @@ -19,132 +19,132 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - + + + - - - + + + @@ -204,242 +204,242 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - + @@ -451,28 +451,28 @@ - - - - + + + + - - + + - - + + - - + + - + - + @@ -481,124 +481,124 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - - - + + + - - - + + + - - - - - - - + + + + + + + @@ -766,21 +766,21 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/libraries/stdlib/genosl/mx_burn_color3.osl b/libraries/stdlib/genosl/mx_burn_color3.osl index bbb4e18dfe..8396ad6f22 100644 --- a/libraries/stdlib/genosl/mx_burn_color3.osl +++ b/libraries/stdlib/genosl/mx_burn_color3.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/mx_burn_float.osl" +#include "libraries/stdlib/genosl/mx_burn_float.osl" void mx_burn_color3(color fg, color bg, float mix, output color result) { diff --git a/libraries/stdlib/genosl/mx_burn_color4.osl b/libraries/stdlib/genosl/mx_burn_color4.osl index c04630e63b..13884af543 100644 --- a/libraries/stdlib/genosl/mx_burn_color4.osl +++ b/libraries/stdlib/genosl/mx_burn_color4.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/mx_burn_float.osl" +#include "libraries/stdlib/genosl/mx_burn_float.osl" void mx_burn_color4(color4 fg, color4 bg, float mix, output color4 result) { diff --git a/libraries/stdlib/genosl/mx_dodge_color3.osl b/libraries/stdlib/genosl/mx_dodge_color3.osl index 92c3b71689..dd88fa425f 100644 --- a/libraries/stdlib/genosl/mx_dodge_color3.osl +++ b/libraries/stdlib/genosl/mx_dodge_color3.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/mx_dodge_float.osl" +#include "libraries/stdlib/genosl/mx_dodge_float.osl" void mx_dodge_color3(color fg, color bg, float mix, output color result) { diff --git a/libraries/stdlib/genosl/mx_dodge_color4.osl b/libraries/stdlib/genosl/mx_dodge_color4.osl index 6e02e41d8e..9a34499929 100644 --- a/libraries/stdlib/genosl/mx_dodge_color4.osl +++ b/libraries/stdlib/genosl/mx_dodge_color4.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/mx_dodge_float.osl" +#include "libraries/stdlib/genosl/mx_dodge_float.osl" void mx_dodge_color4(color4 fg , color4 bg , float mix , output color4 result) { diff --git a/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color3.osl b/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color3.osl index eeb925bc17..dbe4384910 100644 --- a/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color3.osl +++ b/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color3.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/lib/mx_transform_color.osl" +#include "libraries/stdlib/genosl/lib/mx_transform_color.osl" void mx_srgb_texture_to_lin_rec709_color3(color _in, output color result) { diff --git a/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color4.osl b/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color4.osl index 29c80a7bf9..f48c5ee294 100644 --- a/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color4.osl +++ b/libraries/stdlib/genosl/mx_srgb_texture_to_lin_rec709_color4.osl @@ -1,4 +1,4 @@ -#include "stdlib/genosl/lib/mx_transform_color.osl" +#include "libraries/stdlib/genosl/lib/mx_transform_color.osl" void mx_srgb_texture_to_lin_rec709_color4(color4 _in, output color4 result) { diff --git a/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx index 977112b485..668339d2fb 100644 --- a/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx +++ b/libraries/stdlib/genosl/stdlib_genosl_cm_impl.mtlx @@ -5,20 +5,20 @@ - - - - - - + + + + + + - - + + - - + + - - + + diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx index a121bdacd1..3ab5566e31 100644 --- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx +++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx @@ -12,141 +12,141 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - + + + - - - + + + @@ -154,456 +154,456 @@ - + - + - + - + - + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - - - - + + + + - - + + - - + + - - + + - + - + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - + + - - + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - - - + + + - - - + + + - - - - - - - + + + + + + + @@ -766,28 +766,28 @@ - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/python/MaterialXTest/genshader.py b/python/MaterialXTest/genshader.py index 11def46649..471f073b4a 100644 --- a/python/MaterialXTest/genshader.py +++ b/python/MaterialXTest/genshader.py @@ -13,10 +13,9 @@ class TestGenShader(unittest.TestCase): def test_ShaderInterface(self): doc = mx.createDocument() - libraryFolders = ["targets", "stdlib"] filePath = os.path.dirname(os.path.abspath(__file__)) - searchPath = os.path.join(filePath, "..", "..", "libraries") - mx.loadLibraries(libraryFolders, searchPath, doc) + searchPath = os.path.join(filePath, "..", "..") + mx.loadLibraries(["libraries"], searchPath, doc) exampleName = u"shader_interface" diff --git a/python/Scripts/baketextures.py b/python/Scripts/baketextures.py index a8b69e5fcd..d96a01261b 100644 --- a/python/Scripts/baketextures.py +++ b/python/Scripts/baketextures.py @@ -33,7 +33,7 @@ def main(): filePath = os.path.dirname(os.path.abspath(__file__)) searchPath = mx.FileSearchPath(os.path.join(filePath, '..', '..')) searchPath.append(os.path.dirname(opts.inputFilename)) - libraryFolders = [ "libraries" ] + libraryFolders = [] if opts.paths: for pathList in opts.paths: for path in pathList: @@ -42,6 +42,7 @@ def main(): for libraryList in opts.libraries: for library in libraryList: libraryFolders.append(library) + libraryFolders.append("libraries") mx.loadLibraries(libraryFolders, searchPath, stdlib) doc.importLibrary(stdlib) diff --git a/python/Scripts/generateshader.py b/python/Scripts/generateshader.py index 564455abcc..d4812f1e12 100644 --- a/python/Scripts/generateshader.py +++ b/python/Scripts/generateshader.py @@ -50,7 +50,7 @@ def main(): filePath = os.path.dirname(os.path.abspath(__file__)) searchPath = mx.FileSearchPath(os.path.join(filePath, '..', '..', 'libraries')) searchPath.append(os.path.dirname(opts.inputFilename)) - libraryFolders = [ 'libraries' ] + libraryFolders = [] if opts.paths: for pathList in opts.paths: for path in pathList: @@ -59,6 +59,7 @@ def main(): for libraryList in opts.libraries: for library in libraryList: libraryFolders.append(library) + libraryFolders.append("libraries") mx.loadLibraries(libraryFolders, searchPath, stdlib) doc.importLibrary(stdlib) diff --git a/python/Scripts/translateshader.py b/python/Scripts/translateshader.py index 919ce54610..dc2a2a9499 100644 --- a/python/Scripts/translateshader.py +++ b/python/Scripts/translateshader.py @@ -35,7 +35,7 @@ def main(): filePath = os.path.dirname(os.path.abspath(__file__)) searchPath = mx.FileSearchPath(os.path.join(filePath, '..', '..')) searchPath.append(os.path.dirname(opts.inputFilename)) - libraryFolders = [ "libraries" ] + libraryFolders = [] if opts.paths: for pathList in opts.paths: for path in pathList: @@ -44,6 +44,7 @@ def main(): for libraryList in opts.libraries: for library in libraryList: libraryFolders.append(library) + libraryFolders.append("libraries") mx.loadLibraries(libraryFolders, searchPath, stdlib) doc.importLibrary(stdlib) diff --git a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp index 4fb9c97572..1dd59f791a 100644 --- a/source/MaterialXGenGlsl/GlslShaderGenerator.cpp +++ b/source/MaterialXGenGlsl/GlslShaderGenerator.cpp @@ -344,15 +344,15 @@ void GlslShaderGenerator::emitSpecularEnvironment(GenContext& context, ShaderSta int specularMethod = context.getOptions().hwSpecularEnvironmentMethod; if (specularMethod == SPECULAR_ENVIRONMENT_FIS) { - emitInclude("pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_fis.glsl", context, stage); + emitInclude("libraries/pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_fis.glsl", context, stage); } else if (specularMethod == SPECULAR_ENVIRONMENT_PREFILTER) { - emitInclude("pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_prefilter.glsl", context, stage); + emitInclude("libraries/pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_prefilter.glsl", context, stage); } else if (specularMethod == SPECULAR_ENVIRONMENT_NONE) { - emitInclude("pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_none.glsl", context, stage); + emitInclude("libraries/pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_environment_none.glsl", context, stage); } else { @@ -522,7 +522,7 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c emitOutputs(context, stage); // Add common math functions - emitInclude("stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_math.glsl", context, stage); + emitInclude("libraries/stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_math.glsl", context, stage); emitLineBreak(stage); // Determine whether lighting is required @@ -556,13 +556,13 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c context.getOptions().hwWriteDepthMoments; if (shadowing) { - emitInclude("pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_shadow.glsl", context, stage); + emitInclude("libraries/pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_shadow.glsl", context, stage); } // Emit directional albedo table code. if (context.getOptions().hwWriteAlbedoTable) { - emitInclude("pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_table.glsl", context, stage); + emitInclude("libraries/pbrlib/" + GlslShaderGenerator::TARGET + "/lib/mx_table.glsl", context, stage); emitLineBreak(stage); } @@ -570,11 +570,11 @@ void GlslShaderGenerator::emitPixelStage(const ShaderGraph& graph, GenContext& c // depending on the vertical flip flag. if (context.getOptions().fileTextureVerticalFlip) { - _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_transform_uv_vflip.glsl"; + _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "libraries/stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_transform_uv_vflip.glsl"; } else { - _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_transform_uv.glsl"; + _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "libraries/stdlib/" + GlslShaderGenerator::TARGET + "/lib/mx_transform_uv.glsl"; } // Emit uv transform code globally if needed. diff --git a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp index 2a61c42c05..0b129f39f5 100644 --- a/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp +++ b/source/MaterialXGenGlsl/Nodes/BlurNodeGlsl.cpp @@ -20,7 +20,7 @@ ShaderNodeImplPtr BlurNodeGlsl::create() void BlurNodeGlsl::emitSamplingFunctionDefinition(const ShaderNode& /*node*/, GenContext& context, ShaderStage& stage) const { const ShaderGenerator& shadergen = context.getShaderGenerator(); - shadergen.emitInclude("stdlib/genglsl/lib/mx_sampling" + shadergen.getSyntax().getSourceFileExtension(), context, stage); + shadergen.emitInclude("libraries/stdlib/genglsl/lib/mx_sampling" + shadergen.getSyntax().getSourceFileExtension(), context, stage); shadergen.emitLineBreak(stage); } diff --git a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp index e474649b95..79d41d79e1 100644 --- a/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp +++ b/source/MaterialXGenGlsl/Nodes/HeightToNormalNodeGlsl.cpp @@ -55,7 +55,7 @@ void HeightToNormalNodeGlsl::emitFunctionDefinition(const ShaderNode&, GenContex BEGIN_SHADER_STAGE(stage, Stage::PIXEL) // Emit sampling functions const ShaderGenerator& shadergen = context.getShaderGenerator(); - shadergen.emitInclude("stdlib/genglsl/lib/mx_sampling.glsl", context, stage); + shadergen.emitInclude("libraries/stdlib/genglsl/lib/mx_sampling.glsl", context, stage); shadergen.emitLineBreak(stage); END_SHADER_STAGE(shader, Stage::PIXEL) } diff --git a/source/MaterialXGenOsl/Nodes/BlurNodeOsl.cpp b/source/MaterialXGenOsl/Nodes/BlurNodeOsl.cpp index 57dd900673..55bab703e9 100644 --- a/source/MaterialXGenOsl/Nodes/BlurNodeOsl.cpp +++ b/source/MaterialXGenOsl/Nodes/BlurNodeOsl.cpp @@ -20,7 +20,7 @@ ShaderNodeImplPtr BlurNodeOsl::create() void BlurNodeOsl::emitSamplingFunctionDefinition(const ShaderNode& /*node*/, GenContext& context, ShaderStage& stage) const { const ShaderGenerator& shadergen = context.getShaderGenerator(); - shadergen.emitInclude("stdlib/genosl/lib/mx_sampling" + shadergen.getSyntax().getSourceFileExtension(), context, stage); + shadergen.emitInclude("libraries/stdlib/genosl/lib/mx_sampling" + shadergen.getSyntax().getSourceFileExtension(), context, stage); shadergen.emitLineBreak(stage); } diff --git a/source/MaterialXGenOsl/OslShaderGenerator.cpp b/source/MaterialXGenOsl/OslShaderGenerator.cpp index 50b89aa7f1..1ff1f9c07e 100644 --- a/source/MaterialXGenOsl/OslShaderGenerator.cpp +++ b/source/MaterialXGenOsl/OslShaderGenerator.cpp @@ -204,11 +204,11 @@ ShaderPtr OslShaderGenerator::generate(const string& name, ElementPtr element, G // depending on the vertical flip flag. if (context.getOptions().fileTextureVerticalFlip) { - _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "stdlib/" + OslShaderGenerator::TARGET + "/lib/mx_transform_uv_vflip.osl"; + _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "libraries/stdlib/" + OslShaderGenerator::TARGET + "/lib/mx_transform_uv_vflip.osl"; } else { - _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "stdlib/" + OslShaderGenerator::TARGET + "/lib/mx_transform_uv.osl"; + _tokenSubstitutions[ShaderGenerator::T_FILE_TRANSFORM_UV] = "libraries/stdlib/" + OslShaderGenerator::TARGET + "/lib/mx_transform_uv.osl"; } // Emit function definitions for all nodes diff --git a/source/MaterialXRenderGlsl/TextureBaker.cpp b/source/MaterialXRenderGlsl/TextureBaker.cpp index 701ea88756..6f4c3e0a8f 100644 --- a/source/MaterialXRenderGlsl/TextureBaker.cpp +++ b/source/MaterialXRenderGlsl/TextureBaker.cpp @@ -475,10 +475,7 @@ DocumentPtr TextureBaker::bakeMaterialToDoc(DocumentPtr doc, const FileSearchPat DefaultColorManagementSystemPtr cms = DefaultColorManagementSystem::create(genContext.getShaderGenerator().getTarget()); cms->loadLibrary(doc); - for (const FilePath& path : searchPath) - { - genContext.registerSourceCodeSearchPath(path / "libraries"); - } + genContext.registerSourceCodeSearchPath(searchPath); genContext.getShaderGenerator().setColorManagementSystem(cms); // Compute the material tag set. diff --git a/source/MaterialXTest/MaterialXCore/Node.cpp b/source/MaterialXTest/MaterialXCore/Node.cpp index 14c15b7972..594a137f78 100644 --- a/source/MaterialXTest/MaterialXCore/Node.cpp +++ b/source/MaterialXTest/MaterialXCore/Node.cpp @@ -139,9 +139,8 @@ TEST_CASE("Node", "[node]") TEST_CASE("Inheritance", "[nodedef]") { mx::DocumentPtr doc = mx::createDocument(); - const mx::FilePathVec libraryFolders; - mx::FileSearchPath libraryRoot(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); - mx::loadLibraries(libraryFolders, libraryRoot, doc); + mx::FileSearchPath searchPath(mx::FilePath::getCurrentPath()); + mx::loadLibraries({ "libraries" }, searchPath, doc); REQUIRE(doc->validate()); auto nodedef = doc->getNodeDef("ND_standard_surface_surfaceshader"); REQUIRE(nodedef); diff --git a/source/MaterialXTest/MaterialXCore/Traversal.cpp b/source/MaterialXTest/MaterialXCore/Traversal.cpp index 2b7f473a4d..b3a94cc9e3 100644 --- a/source/MaterialXTest/MaterialXCore/Traversal.cpp +++ b/source/MaterialXTest/MaterialXCore/Traversal.cpp @@ -174,16 +174,14 @@ TEST_CASE("IntraGraph Traversal", "[traversal]") REQUIRE(doc->validate()); } -TEST_CASE("InterGraph Tranversal", "[traversal]") +TEST_CASE("InterGraph Traversal", "[traversal]") { - mx::FileSearchPath searchPath; - const mx::FilePath currentPath = mx::FilePath::getCurrentPath(); - searchPath.append(currentPath / mx::FilePath("libraries")); - mx::DocumentPtr doc = mx::createDocument(); - mx::loadLibraries({ "stdlib", "pbrlib", "bxdf" }, searchPath, doc); + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); + mx::FileSearchPath searchPath(currentPath); + mx::loadLibraries({ "libraries" }, searchPath, doc); - mx::FilePath testFile = mx::FilePath::getCurrentPath() / mx::FilePath("resources/Materials/TestSuite/stdlib/nodegraph_inputs/nodegraph_nodegraph.mtlx"); + mx::FilePath testFile = currentPath / mx::FilePath("resources/Materials/TestSuite/stdlib/nodegraph_inputs/nodegraph_nodegraph.mtlx"); mx::readFromXmlFile(doc, testFile, searchPath); REQUIRE(doc->validate()); diff --git a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp index 72ecd72bef..ee7647f732 100644 --- a/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp +++ b/source/MaterialXTest/MaterialXGenGlsl/GenGlsl.cpp @@ -91,8 +91,8 @@ TEST_CASE("GenShader: GLSL Unique Names", "[genglsl]") { mx::GenContext context(mx::GlslShaderGenerator::create()); - mx::FilePath searchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - context.registerSourceCodeSearchPath(searchPath); + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); + context.registerSourceCodeSearchPath(currentPath); GenShaderUtil::testUniqueNames(context, mx::Stage::PIXEL); } @@ -102,8 +102,8 @@ TEST_CASE("GenShader: Bind Light Shaders", "[genglsl]") mx::DocumentPtr doc = mx::createDocument(); mx::FileSearchPath searchPath; - searchPath.append(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); - loadLibraries({ "targets", "stdlib", "pbrlib", "lights" }, searchPath, doc); + searchPath.append(mx::FilePath::getCurrentPath()); + loadLibraries({ "libraries" }, searchPath, doc); mx::NodeDefPtr pointLightShader = doc->getNodeDef("ND_point_light"); mx::NodeDefPtr spotLightShader = doc->getNodeDef("ND_spot_light"); @@ -111,7 +111,7 @@ TEST_CASE("GenShader: Bind Light Shaders", "[genglsl]") REQUIRE(spotLightShader != nullptr); mx::GenContext context(mx::GlslShaderGenerator::create()); - context.registerSourceCodeSearchPath(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); + context.registerSourceCodeSearchPath(searchPath); mx::HwShaderGenerator::bindLightShader(*pointLightShader, 42, context); REQUIRE_THROWS(mx::HwShaderGenerator::bindLightShader(*spotLightShader, 42, context)); @@ -127,7 +127,7 @@ static void generateGlslCode(bool generateLayout = false) mx::FilePathVec testRootPaths; testRootPaths.push_back("resources/Materials/TestSuite"); testRootPaths.push_back("resources/Materials/Examples"); - const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); + const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath(); const mx::FileSearchPath srcSearchPath(libSearchPath.asString()); bool writeShadersToDisk = false; diff --git a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp index 68a22aa5b8..6b9f814bb5 100644 --- a/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp +++ b/source/MaterialXTest/MaterialXGenMdl/GenMdl.cpp @@ -95,20 +95,6 @@ TEST_CASE("GenShader: MDL Implementation Check", "[genmdl]") GenShaderUtil::checkImplementations(context, generatorSkipNodeTypes, generatorSkipNodeDefs, 55); } -/* -TEST_CASE("GenShader: MDL Unique Names", "[genmdl]") -{ - mx::GenContext context(mx::MdlShaderGenerator::create()); - - mx::FilePath searchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - context.registerSourceCodeSearchPath(searchPath); - // TODO: Add path to find MDL module files - // context.registerSourceCodeSearchPath(searchPath / mx::FilePath("stdlib/mdl")); - - GenShaderUtil::testUniqueNames(context, mx::Stage::PIXEL); -} -*/ - void MdlShaderGeneratorTester::compileSource(const std::vector& sourceCodePaths) { if (sourceCodePaths.empty() || sourceCodePaths[0].isEmpty()) @@ -240,9 +226,9 @@ TEST_CASE("GenShader: MDL Shader Generation", "[genmdl]") testRootPaths.push_back("resources/Materials/TestSuite"); testRootPaths.push_back("resources/Materials/Examples"); - const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); + const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath(); mx::FileSearchPath srcSearchPath(libSearchPath.asString()); - srcSearchPath.append(libSearchPath / mx::FilePath("stdlib/genmdl")); + srcSearchPath.append(libSearchPath / mx::FilePath("libraries/stdlib/genmdl")); const mx::FilePath logPath("genmdl_mdl_generate_test.txt"); diff --git a/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp b/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp index 4639b3692f..37e8d57adf 100644 --- a/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp +++ b/source/MaterialXTest/MaterialXGenOsl/GenOsl.cpp @@ -95,11 +95,9 @@ TEST_CASE("GenShader: OSL Implementation Check", "[genosl]") TEST_CASE("GenShader: OSL Unique Names", "[genosl]") { mx::GenContext context(mx::OslShaderGenerator::create()); - - mx::FilePath searchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - context.registerSourceCodeSearchPath(searchPath); - // Add path to find OSL include files - context.registerSourceCodeSearchPath(searchPath / mx::FilePath("stdlib/genosl/include")); + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); + context.registerSourceCodeSearchPath(currentPath); + context.registerSourceCodeSearchPath(currentPath / mx::FilePath("libraries/stdlib/genosl/include")); GenShaderUtil::testUniqueNames(context, mx::Stage::PIXEL); } @@ -107,10 +105,10 @@ TEST_CASE("GenShader: OSL Unique Names", "[genosl]") TEST_CASE("GenShader: OSL Metadata", "[genosl]") { mx::FileSearchPath searchPath; - searchPath.append(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); + searchPath.append(mx::FilePath::getCurrentPath()); mx::DocumentPtr doc = mx::createDocument(); - mx::loadLibraries({ "targets", "stdlib", "pbrlib", "bxdf" }, searchPath, doc); + mx::loadLibraries({ "libraries" }, searchPath, doc); // // Define custom attributes to be exported as shader metadata @@ -193,9 +191,9 @@ static void generateOslCode() testRootPaths.push_back("resources/Materials/TestSuite"); testRootPaths.push_back("resources/Materials/Examples"); - const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); + const mx::FilePath libSearchPath = mx::FilePath::getCurrentPath(); mx::FileSearchPath srcSearchPath(libSearchPath.asString()); - srcSearchPath.append(libSearchPath / mx::FilePath("stdlib/genosl/include")); + srcSearchPath.append(libSearchPath / mx::FilePath("libraries/stdlib/genosl/include")); srcSearchPath.append(mx::FilePath::getCurrentPath()); const mx::FilePath logPath("genosl_vanilla_generate_test.txt"); diff --git a/source/MaterialXTest/MaterialXGenShader/GenShader.cpp b/source/MaterialXTest/MaterialXGenShader/GenShader.cpp index 7b15f0d9b0..7059f1f42b 100644 --- a/source/MaterialXTest/MaterialXGenShader/GenShader.cpp +++ b/source/MaterialXTest/MaterialXGenShader/GenShader.cpp @@ -58,8 +58,8 @@ TEST_CASE("GenShader: Valid Libraries", "[genshader]") mx::DocumentPtr doc = mx::createDocument(); mx::FileSearchPath searchPath; - searchPath.append(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); - loadLibraries({ "targets", "stdlib", "pbrlib" }, searchPath, doc); + searchPath.append(mx::FilePath::getCurrentPath()); + loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib" }, searchPath, doc); std::string validationErrors; bool valid = doc->validate(&validationErrors); @@ -108,11 +108,11 @@ TEST_CASE("GenShader: Graph + Nodedf Translation Check", "[genshader]") { mx::FileSearchPath searchPath; const mx::FilePath currentPath = mx::FilePath::getCurrentPath(); - searchPath.append(currentPath / mx::FilePath("libraries")); + searchPath.append(currentPath); searchPath.append(currentPath / mx::FilePath("resources/Materials/TestSuite")); mx::DocumentPtr doc = mx::createDocument(); - loadLibraries({ "targets", "stdlib", "pbrlib", "bxdf", }, searchPath, doc); + loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib", "libraries/bxdf" }, searchPath, doc); mx::FilePath testPath = mx::FilePath::getCurrentPath() / mx::FilePath("resources/Materials/TestSuite/pbrlib/surfaceshader/transparency_test.mtlx"); mx::readFromXmlFile(doc, testPath, searchPath); @@ -167,8 +167,8 @@ TEST_CASE("GenShader: Graph + Nodedf Translation Check", "[genshader]") TEST_CASE("GenShader: Transparency Regression Check", "[genshader]") { - const mx::FilePath currentPath = mx::FilePath::getCurrentPath(); mx::DocumentPtr libraries = mx::createDocument(); + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); mx::FileSearchPath searchPath(currentPath); mx::loadLibraries({ "libraries" }, searchPath, libraries); @@ -263,9 +263,9 @@ void testDeterministicGeneration(mx::DocumentPtr libraries, mx::GenContext& cont TEST_CASE("GenShader: Deterministic Generation", "[genshader]") { - const mx::FileSearchPath searchPath(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); mx::DocumentPtr libraries = mx::createDocument(); - mx::loadLibraries({ "targets", "stdlib", "pbrlib", "bxdf" }, searchPath, libraries); + mx::FileSearchPath searchPath(mx::FilePath::getCurrentPath()); + mx::loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib", "libraries/bxdf" }, searchPath, libraries); #ifdef MATERIALX_BUILD_GEN_GLSL { diff --git a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp index bfb1a8d22f..6368e1377c 100644 --- a/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp +++ b/source/MaterialXTest/MaterialXGenShader/GenShaderUtil.cpp @@ -73,10 +73,8 @@ void checkImplementations(mx::GenContext& context, const mx::ShaderGenerator& shadergen = context.getShaderGenerator(); - mx::FileSearchPath searchPath; - mx::FilePath librariesRoot = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - searchPath.append(librariesRoot); - loadLibraries({ "targets", "adsk", "stdlib", "pbrlib" }, searchPath, doc); + mx::FileSearchPath searchPath(mx::FilePath::getCurrentPath()); + loadLibraries({ "libraries/targets", "libraries/stdlib", "libraries/pbrlib" }, searchPath, doc); const std::string& target = shadergen.getTarget(); @@ -86,9 +84,7 @@ void checkImplementations(mx::GenContext& context, implDumpBuffer.open(fileName, std::ios::out); std::ostream implDumpStream(&implDumpBuffer); - mx::FileSearchPath sourceSearchPath = searchPath; - sourceSearchPath.append(librariesRoot / mx::FilePath("adsk")); - context.registerSourceCodeSearchPath(sourceSearchPath); + context.registerSourceCodeSearchPath(searchPath); // Node types to explicitly skip temporarily. mx::StringSet skipNodeTypes = @@ -289,9 +285,8 @@ void testUniqueNames(mx::GenContext& context, const std::string& stage) { mx::DocumentPtr doc = mx::createDocument(); - mx::FileSearchPath searchPath; - searchPath.append(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); - loadLibraries({ "targets", "stdlib" }, searchPath, doc); + mx::FileSearchPath searchPath(mx::FilePath::getCurrentPath()); + loadLibraries({ "libraries/targets", "libraries/stdlib" }, searchPath, doc); const std::string exampleName = "unique_names"; @@ -488,8 +483,7 @@ void ShaderGeneratorTester::setupDependentLibraries() _dependLib = mx::createDocument(); // Load the standard libraries. - const mx::FilePathVec libraries = { "targets", "adsk", "stdlib", "pbrlib", "bxdf", "lights" }; - loadLibraries(libraries, _libSearchPath, _dependLib, _skipLibraryFiles); + loadLibraries({ "libraries" }, _libSearchPath, _dependLib, _skipLibraryFiles); } void ShaderGeneratorTester::addSkipFiles() diff --git a/source/MaterialXTest/MaterialXRender/RenderUtil.cpp b/source/MaterialXTest/MaterialXRender/RenderUtil.cpp index a4e99c406b..c864f913d0 100644 --- a/source/MaterialXTest/MaterialXRender/RenderUtil.cpp +++ b/source/MaterialXTest/MaterialXRender/RenderUtil.cpp @@ -60,8 +60,7 @@ void ShaderRenderTester::loadDependentLibraries(GenShaderUtil::TestSuiteOptions { dependLib = mx::createDocument(); - const mx::FilePathVec libraries = { "targets", "adsk", "stdlib", "pbrlib", "bxdf", "lights" }; - mx::loadLibraries(libraries, searchPath, dependLib); + mx::loadLibraries({ "libraries" }, searchPath, dependLib); for (size_t i = 0; i < options.extraLibraryPaths.size(); i++) { const mx::FilePath& libraryPath = options.extraLibraryPaths[i]; @@ -145,8 +144,9 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath) addSkipFiles(); // Library search path + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); mx::FileSearchPath searchPath; - searchPath.append(mx::FilePath::getCurrentPath() / mx::FilePath("libraries")); + searchPath.append(currentPath); // Load in the library dependencies once // This will be imported in each test document below @@ -176,8 +176,8 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath) _shaderGenerator->getUnitSystem()->setUnitConverterRegistry(registry); mx::GenContext context(_shaderGenerator); - context.registerSourceCodeSearchPath(searchPath); - registerSourceCodeSearchPaths(context); + context.registerSourceCodeSearchPath(currentPath); + context.registerSourceCodeSearchPath(currentPath / mx::FilePath("libraries/stdlib/genosl/include")); // Set target unit space context.getOptions().targetDistanceUnit = "meter"; diff --git a/source/MaterialXTest/MaterialXRender/RenderUtil.h b/source/MaterialXTest/MaterialXRender/RenderUtil.h index f07193204a..154d5c4dce 100644 --- a/source/MaterialXTest/MaterialXRender/RenderUtil.h +++ b/source/MaterialXTest/MaterialXRender/RenderUtil.h @@ -128,9 +128,6 @@ class ShaderRenderTester // Code generation methods // - // Register any additional source code paths used by the generator - virtual void registerSourceCodeSearchPaths(mx::GenContext& /*context*/) {}; - // Register any lights used by the generation context virtual void registerLights(mx::DocumentPtr /*dependLib*/, const GenShaderUtil::TestSuiteOptions &/*options*/, diff --git a/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp b/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp index 9b9a47ae52..113a7b8585 100644 --- a/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp +++ b/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp @@ -23,9 +23,9 @@ namespace mx = MaterialX; TEST_CASE("GenReference: OSL Reference", "[genreference]") { mx::DocumentPtr stdlib = mx::createDocument(); - mx::FilePath librariesPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - mx::FileSearchPath searchPath(librariesPath); - loadLibraries({ "targets", "stdlib" }, searchPath, stdlib); + mx::FilePath currentPath = mx::FilePath::getCurrentPath(); + mx::FileSearchPath searchPath(currentPath); + loadLibraries({ "libraries/targets", "libraries/stdlib" }, searchPath, stdlib); // Create renderer if requested. bool runCompileTest = !std::string(MATERIALX_OSL_BINARY_OSLC).empty(); @@ -38,7 +38,7 @@ TEST_CASE("GenReference: OSL Reference", "[genreference]") oslIncludePaths.append(mx::FilePath(MATERIALX_OSL_INCLUDE_PATH)); // Add in library include path for compile testing as the generated // shader's includes are not added with absolute paths. - oslIncludePaths.append(librariesPath / mx::FilePath("stdlib/genosl/include")); + oslIncludePaths.append(currentPath / mx::FilePath("libraries/stdlib/genosl/include")); oslRenderer->setOslIncludePath(oslIncludePaths); } @@ -46,7 +46,7 @@ TEST_CASE("GenReference: OSL Reference", "[genreference]") mx::ShaderGeneratorPtr generator = mx::OslShaderGenerator::create(); mx::GenContext context(generator); context.getOptions().addUpstreamDependencies = false; - context.registerSourceCodeSearchPath(librariesPath); + context.registerSourceCodeSearchPath(currentPath); context.getOptions().fileTextureVerticalFlip = true; // Create output directory. diff --git a/source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp b/source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp index a483c75c40..fb22168125 100644 --- a/source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp +++ b/source/MaterialXTest/MaterialXRenderOsl/RenderOsl.cpp @@ -78,16 +78,6 @@ class OslShaderRenderTester : public RenderUtil::ShaderRenderTester } protected: - void registerSourceCodeSearchPaths(mx::GenContext& context) override - { - // Include extra OSL implementation files - mx::FilePath searchPath = mx::FilePath::getCurrentPath() / mx::FilePath("libraries"); - context.registerSourceCodeSearchPath(searchPath / mx::FilePath("stdlib/genosl/include")); - - // Include current path to find resources. - context.registerSourceCodeSearchPath(mx::FilePath::getCurrentPath()); - } - void createRenderer(std::ostream& log) override; bool runRenderer(const std::string& shaderName, diff --git a/source/MaterialXView/Main.cpp b/source/MaterialXView/Main.cpp index 43f6738aba..0b57ccf3d9 100644 --- a/source/MaterialXView/Main.cpp +++ b/source/MaterialXView/Main.cpp @@ -84,7 +84,7 @@ int main(int argc, char* const argv[]) std::string meshFilename = "resources/Geometry/shaderball.obj"; std::string envRadianceFilename = "resources/Lights/san_giuseppe_bridge_split.hdr"; mx::FileSearchPath searchPath = getDefaultSearchPath(); - mx::FilePathVec libraryFolders = { "libraries" }; + mx::FilePathVec libraryFolders; mx::Vector3 meshRotation; float meshScale = 1.0f; @@ -248,6 +248,9 @@ int main(int argc, char* const argv[]) } } + // Append the standard library folder, giving it a lower precedence than user-supplied libraries. + libraryFolders.push_back("libraries"); + ng::init(); { ng::ref viewer = new Viewer(materialFilename, diff --git a/source/MaterialXView/Viewer.cpp b/source/MaterialXView/Viewer.cpp index b736e54fba..0fc29d4196 100644 --- a/source/MaterialXView/Viewer.cpp +++ b/source/MaterialXView/Viewer.cpp @@ -258,7 +258,6 @@ Viewer::Viewer(const std::string& materialFilename, _wedgePropertyMin(0.0f), _wedgePropertyMax(1.0f), _wedgeImageCount(8), - _bakeTextures(false), _bakeHdr(false), _bakeAverage(false), _bakeOptimize(true), @@ -500,7 +499,8 @@ void Viewer::loadEnvironmentLight() _lightRigFilename = _envRadianceFilename; _lightRigFilename.removeExtension(); _lightRigFilename.addExtension(mx::MTLX_EXTENSION); - if (_searchPath.find(_lightRigFilename).exists()) + _lightRigFilename = _searchPath.find(_lightRigFilename); + if (_lightRigFilename.exists()) { _lightRigDoc = mx::createDocument(); mx::readFromXmlFile(_lightRigDoc, _lightRigFilename, _searchPath); @@ -953,7 +953,7 @@ void Viewer::createAdvancedSettings(Widget* parent) textureLabel->set_font("sans-bold"); ng::CheckBox* bakeHdrBox = new ng::CheckBox(advancedPopup, "Bake HDR Textures"); - bakeHdrBox->set_checked(_bakeTextures); + bakeHdrBox->set_checked(_bakeHdr); bakeHdrBox->set_callback([this](bool enable) { _bakeHdr = enable; @@ -1563,11 +1563,8 @@ mx::DocumentPtr Viewer::translateMaterial() void Viewer::initContext(mx::GenContext& context) { - // Initialize search paths. - for (const mx::FilePath& path : _searchPath) - { - context.registerSourceCodeSearchPath(path / "libraries"); - } + // Initialize search path. + context.registerSourceCodeSearchPath(_searchPath); // Initialize color management. mx::DefaultColorManagementSystemPtr cms = mx::DefaultColorManagementSystem::create(context.getShaderGenerator().getTarget()); diff --git a/source/MaterialXView/Viewer.h b/source/MaterialXView/Viewer.h index 0390cb635d..0462c5fcbe 100644 --- a/source/MaterialXView/Viewer.h +++ b/source/MaterialXView/Viewer.h @@ -377,7 +377,6 @@ class Viewer : public ng::Screen unsigned int _wedgeImageCount; // Texture baking - bool _bakeTextures; bool _bakeHdr; bool _bakeAverage; bool _bakeOptimize;