diff --git a/examples/js/ShaderSkin.js b/examples/js/ShaderSkin.js index b5f55d3f790b073671ca4fa5e12e53d21a58905e..f7dbd70d1be7ae093df90900b1e6b8be68ffa01c 100644 --- a/examples/js/ShaderSkin.js +++ b/examples/js/ShaderSkin.js @@ -84,7 +84,7 @@ THREE.ShaderSkin = { THREE.ShaderChunk[ "common" ], THREE.ShaderChunk[ "bsdfs" ], THREE.ShaderChunk[ "packing" ], - THREE.ShaderChunk[ "begin_lights_pars" ], + THREE.ShaderChunk[ "lights_pars_begin" ], THREE.ShaderChunk[ "shadowmap_pars_fragment" ], THREE.ShaderChunk[ "fog_pars_fragment" ], THREE.ShaderChunk[ "bumpmap_pars_fragment" ], @@ -264,7 +264,7 @@ THREE.ShaderSkin = { "varying vec3 vViewPosition;", THREE.ShaderChunk[ "common" ], - THREE.ShaderChunk[ "begin_lights_pars" ], + THREE.ShaderChunk[ "lights_pars_begin" ], THREE.ShaderChunk[ "shadowmap_pars_vertex" ], THREE.ShaderChunk[ "fog_pars_vertex" ], @@ -368,7 +368,7 @@ THREE.ShaderSkin = { "varying vec3 vViewPosition;", THREE.ShaderChunk[ "common" ], - THREE.ShaderChunk[ "begin_lights_pars" ], + THREE.ShaderChunk[ "lights_pars_begin" ], THREE.ShaderChunk[ "fog_pars_fragment" ], "float fresnelReflectance( vec3 H, vec3 V, float F0 ) {", diff --git a/examples/js/nodes/materials/PhongNode.js b/examples/js/nodes/materials/PhongNode.js index afb2f26a1341b466146cf6ea2803d4d3ada3903d..cd2111ccd1352715083b05c23d0f5577c8697f5c 100644 --- a/examples/js/nodes/materials/PhongNode.js +++ b/examples/js/nodes/materials/PhongNode.js @@ -144,7 +144,7 @@ THREE.PhongNode.prototype.build = function ( builder ) { "#include ", "#include ", "#include ", - "#include ", + "#include ", "#include ", "#include ", "#include " @@ -208,8 +208,8 @@ THREE.PhongNode.prototype.build = function ( builder ) { 'material.specularShininess = shininess;', 'material.specularStrength = specularStrength;', - "#include ", - "#include " + "#include ", + "#include " ); if ( light ) { diff --git a/examples/js/nodes/materials/StandardNode.js b/examples/js/nodes/materials/StandardNode.js index 30f6c647c68078da4f1a10d5e99e4920c4d1b1e6..8381f875f21ff2b9e3af343f1147dae9420cff5c 100644 --- a/examples/js/nodes/materials/StandardNode.js +++ b/examples/js/nodes/materials/StandardNode.js @@ -182,7 +182,7 @@ THREE.StandardNode.prototype.build = function ( builder ) { "#include ", "#include ", "#include ", - "#include ", + "#include ", "#include ", "#include ", "#include ", @@ -287,8 +287,8 @@ THREE.StandardNode.prototype.build = function ( builder ) { } output.push( - "#include ", - "#include " + "#include ", + "#include " ); if ( light ) { diff --git a/examples/js/objects/Water.js b/examples/js/objects/Water.js index 45a2006f32430d6869e730f6e3f2a901583965fa..2b5ee95c8bc6e74ecb9918d287c9be54fea2bc59 100644 --- a/examples/js/objects/Water.js +++ b/examples/js/objects/Water.js @@ -144,7 +144,7 @@ THREE.Water = function ( geometry, options ) { THREE.ShaderChunk[ 'packing' ], THREE.ShaderChunk[ 'bsdfs' ], THREE.ShaderChunk[ 'fog_pars_fragment' ], - THREE.ShaderChunk[ 'begin_lights_pars' ], + THREE.ShaderChunk[ 'lights_pars_begin' ], THREE.ShaderChunk[ 'shadowmap_pars_fragment' ], THREE.ShaderChunk[ 'shadowmask_pars_fragment' ], diff --git a/src/renderers/shaders/ShaderChunk.js b/src/renderers/shaders/ShaderChunk.js index 24aba594ad13c6fb40b29d0453643b1914aca252..7e436e1f5011b8f3698fe5769692dfe15a4ee568 100644 --- a/src/renderers/shaders/ShaderChunk.js +++ b/src/renderers/shaders/ShaderChunk.js @@ -36,15 +36,15 @@ import gradientmap_pars_fragment from './ShaderChunk/gradientmap_pars_fragment.g import lightmap_fragment from './ShaderChunk/lightmap_fragment.glsl'; import lightmap_pars_fragment from './ShaderChunk/lightmap_pars_fragment.glsl'; import lights_lambert_vertex from './ShaderChunk/lights_lambert_vertex.glsl'; -import begin_lights_pars from './ShaderChunk/begin_lights_pars.glsl'; -import maps_lights_pars from './ShaderChunk/maps_lights_pars.glsl'; +import lights_pars_begin from './ShaderChunk/lights_pars_begin.glsl'; +import lights_pars_maps from './ShaderChunk/lights_pars_maps.glsl'; import lights_phong_fragment from './ShaderChunk/lights_phong_fragment.glsl'; import lights_phong_pars_fragment from './ShaderChunk/lights_phong_pars_fragment.glsl'; import lights_physical_fragment from './ShaderChunk/lights_physical_fragment.glsl'; import lights_physical_pars_fragment from './ShaderChunk/lights_physical_pars_fragment.glsl'; -import begin_lights_fragment from './ShaderChunk/begin_lights_fragment.glsl'; -import maps_lights_fragment from './ShaderChunk/maps_lights_fragment.glsl'; -import end_lights_fragment from './ShaderChunk/end_lights_fragment.glsl'; +import lights_fragment_begin from './ShaderChunk/lights_fragment_begin.glsl'; +import lights_fragment_maps from './ShaderChunk/lights_fragment_maps.glsl'; +import lights_fragment_end from './ShaderChunk/lights_fragment_end.glsl'; import logdepthbuf_fragment from './ShaderChunk/logdepthbuf_fragment.glsl'; import logdepthbuf_pars_fragment from './ShaderChunk/logdepthbuf_pars_fragment.glsl'; import logdepthbuf_pars_vertex from './ShaderChunk/logdepthbuf_pars_vertex.glsl'; @@ -151,15 +151,15 @@ export var ShaderChunk = { lightmap_fragment: lightmap_fragment, lightmap_pars_fragment: lightmap_pars_fragment, lights_lambert_vertex: lights_lambert_vertex, - begin_lights_pars: begin_lights_pars, - maps_lights_pars: maps_lights_pars, + lights_pars_begin: lights_pars_begin, + lights_pars_maps: lights_pars_maps, lights_phong_fragment: lights_phong_fragment, lights_phong_pars_fragment: lights_phong_pars_fragment, lights_physical_fragment: lights_physical_fragment, lights_physical_pars_fragment: lights_physical_pars_fragment, - begin_lights_fragment: begin_lights_fragment, - maps_lights_fragment: maps_lights_fragment, - end_lights_fragment: end_lights_fragment, + lights_fragment_begin: lights_fragment_begin, + lights_fragment_maps: lights_fragment_maps, + lights_fragment_end: lights_fragment_end, logdepthbuf_fragment: logdepthbuf_fragment, logdepthbuf_pars_fragment: logdepthbuf_pars_fragment, logdepthbuf_pars_vertex: logdepthbuf_pars_vertex, diff --git a/src/renderers/shaders/ShaderChunk/begin_lights_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/begin_lights_fragment.glsl rename to src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl diff --git a/src/renderers/shaders/ShaderChunk/end_lights_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_fragment_end.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/end_lights_fragment.glsl rename to src/renderers/shaders/ShaderChunk/lights_fragment_end.glsl diff --git a/src/renderers/shaders/ShaderChunk/maps_lights_fragment.glsl b/src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/maps_lights_fragment.glsl rename to src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl diff --git a/src/renderers/shaders/ShaderChunk/begin_lights_pars.glsl b/src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/begin_lights_pars.glsl rename to src/renderers/shaders/ShaderChunk/lights_pars_begin.glsl diff --git a/src/renderers/shaders/ShaderChunk/maps_lights_pars.glsl b/src/renderers/shaders/ShaderChunk/lights_pars_maps.glsl similarity index 100% rename from src/renderers/shaders/ShaderChunk/maps_lights_pars.glsl rename to src/renderers/shaders/ShaderChunk/lights_pars_maps.glsl diff --git a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl index e9c1288a9de6692a6a301830c6c517382f5b71d5..12bc9e2c85f04a48a637387a158962815947abeb 100644 --- a/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshlambert_frag.glsl @@ -23,8 +23,8 @@ varying vec3 vLightFront; #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshlambert_vert.glsl b/src/renderers/shaders/ShaderLib/meshlambert_vert.glsl index 72b6489b398849e6a4628a966b2a177e73ae4c03..eecf55d63c4e11b48ba82a16e7e295fdc22ce059 100644 --- a/src/renderers/shaders/ShaderLib/meshlambert_vert.glsl +++ b/src/renderers/shaders/ShaderLib/meshlambert_vert.glsl @@ -13,8 +13,8 @@ varying vec3 vLightFront; #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl index 62b3eb2ba972d58c9e04a728de4ec32f2365e51d..3eb307ac7318ec6b2e8ec606b8449e14e09b2d6c 100644 --- a/src/renderers/shaders/ShaderLib/meshphong_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshphong_frag.glsl @@ -21,8 +21,8 @@ uniform float opacity; #include #include #include -#include -#include +#include +#include #include #include #include @@ -50,9 +50,9 @@ void main() { // accumulation #include - #include - #include - #include + #include + #include + #include // modulation #include diff --git a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl index 02db13bebdc0afa0db580be59c92904ef789540a..1e80be0f0cc6c4cd275b5f9f4d24c425b528c9c5 100644 --- a/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl +++ b/src/renderers/shaders/ShaderLib/meshphysical_frag.glsl @@ -34,8 +34,8 @@ varying vec3 vViewPosition; #include #include #include -#include -#include +#include +#include #include #include #include @@ -65,9 +65,9 @@ void main() { // accumulation #include - #include - #include - #include + #include + #include + #include // modulation #include diff --git a/src/renderers/shaders/ShaderLib/shadow_frag.glsl b/src/renderers/shaders/ShaderLib/shadow_frag.glsl index d668a198591c1db14f3ffb5fb621f47461bcabfe..67ead617e7e07a3f430b9ba8178971229b070939 100644 --- a/src/renderers/shaders/ShaderLib/shadow_frag.glsl +++ b/src/renderers/shaders/ShaderLib/shadow_frag.glsl @@ -5,7 +5,7 @@ uniform float opacity; #include #include #include -#include +#include #include #include