Pārlūkot izejas kodu

rename lights_maps_pars to maps_lights_pars

sunag 7 gadi atpakaļ
vecāks
revīzija
b70c3cad63

+ 3 - 3
examples/js/ShaderSkin.js

@@ -85,7 +85,7 @@ THREE.ShaderSkin = {
 			THREE.ShaderChunk[ "bsdfs" ],
 			THREE.ShaderChunk[ "packing" ],
 			THREE.ShaderChunk[ "begin_lights_pars" ],
-			THREE.ShaderChunk[ 'lights_maps_pars' ],
+			THREE.ShaderChunk[ 'maps_lights_pars' ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 			THREE.ShaderChunk[ "bumpmap_pars_fragment" ],
@@ -266,7 +266,7 @@ THREE.ShaderSkin = {
 
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "begin_lights_pars" ],
-			THREE.ShaderChunk[ 'lights_maps_pars' ],
+			THREE.ShaderChunk[ 'maps_lights_pars' ],
 			THREE.ShaderChunk[ "shadowmap_pars_vertex" ],
 			THREE.ShaderChunk[ "fog_pars_vertex" ],
 
@@ -371,7 +371,7 @@ THREE.ShaderSkin = {
 
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "begin_lights_pars" ],
-			THREE.ShaderChunk[ 'lights_maps_pars' ],
+			THREE.ShaderChunk[ 'maps_lights_pars' ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 
 			"float fresnelReflectance( vec3 H, vec3 V, float F0 ) {",

+ 1 - 1
examples/js/ShaderTerrain.js

@@ -88,7 +88,7 @@ THREE.ShaderTerrain = {
 			THREE.ShaderChunk[ "common" ],
 			THREE.ShaderChunk[ "bsdfs" ],
 			THREE.ShaderChunk[ "begin_lights_pars" ],
-			THREE.ShaderChunk[ 'lights_maps_pars' ],
+			THREE.ShaderChunk[ 'maps_lights_pars' ],
 			THREE.ShaderChunk[ "shadowmap_pars_fragment" ],
 			THREE.ShaderChunk[ "fog_pars_fragment" ],
 

+ 1 - 1
examples/js/objects/Water.js

@@ -145,7 +145,7 @@ THREE.Water = function ( geometry, options ) {
 			THREE.ShaderChunk[ 'bsdfs' ],
 			THREE.ShaderChunk[ 'fog_pars_fragment' ],
 			THREE.ShaderChunk[ 'begin_lights_pars' ],
-			THREE.ShaderChunk[ 'lights_maps_pars' ],
+			THREE.ShaderChunk[ 'maps_lights_pars' ],
 			THREE.ShaderChunk[ 'shadowmap_pars_fragment' ],
 			THREE.ShaderChunk[ 'shadowmask_pars_fragment' ],
 

+ 2 - 2
src/renderers/shaders/ShaderChunk.js

@@ -37,7 +37,7 @@ 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 lights_maps_pars from './ShaderChunk/lights_maps_pars.glsl';
+import maps_lights_pars from './ShaderChunk/maps_lights_pars.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';
@@ -152,7 +152,7 @@ export var ShaderChunk = {
 	lightmap_pars_fragment: lightmap_pars_fragment,
 	lights_lambert_vertex: lights_lambert_vertex,
 	begin_lights_pars: begin_lights_pars,
-	lights_maps_pars: lights_maps_pars,
+	maps_lights_pars: maps_lights_pars,
 	lights_phong_fragment: lights_phong_fragment,
 	lights_phong_pars_fragment: lights_phong_pars_fragment,
 	lights_physical_fragment: lights_physical_fragment,

+ 0 - 0
src/renderers/shaders/ShaderChunk/lights_maps_pars.glsl → src/renderers/shaders/ShaderChunk/maps_lights_pars.glsl


+ 1 - 1
src/renderers/shaders/ShaderLib/meshlambert_frag.glsl

@@ -24,7 +24,7 @@ varying vec3 vLightFront;
 #include <envmap_pars_fragment>
 #include <bsdfs>
 #include <begin_lights_pars>
-#include <lights_maps_pars>
+#include <maps_lights_pars>
 #include <fog_pars_fragment>
 #include <shadowmap_pars_fragment>
 #include <shadowmask_pars_fragment>

+ 1 - 1
src/renderers/shaders/ShaderLib/meshlambert_vert.glsl

@@ -14,7 +14,7 @@ varying vec3 vLightFront;
 #include <envmap_pars_vertex>
 #include <bsdfs>
 #include <begin_lights_pars>
-#include <lights_maps_pars>
+#include <maps_lights_pars>
 #include <color_pars_vertex>
 #include <fog_pars_vertex>
 #include <morphtarget_pars_vertex>

+ 1 - 1
src/renderers/shaders/ShaderLib/meshphong_frag.glsl

@@ -22,7 +22,7 @@ uniform float opacity;
 #include <fog_pars_fragment>
 #include <bsdfs>
 #include <begin_lights_pars>
-#include <lights_maps_pars>
+#include <maps_lights_pars>
 #include <lights_phong_pars_fragment>
 #include <shadowmap_pars_fragment>
 #include <bumpmap_pars_fragment>

+ 1 - 1
src/renderers/shaders/ShaderLib/meshphysical_frag.glsl

@@ -35,7 +35,7 @@ varying vec3 vViewPosition;
 #include <bsdfs>
 #include <cube_uv_reflection_fragment>
 #include <begin_lights_pars>
-#include <lights_maps_pars>
+#include <maps_lights_pars>
 #include <lights_physical_pars_fragment>
 #include <shadowmap_pars_fragment>
 #include <bumpmap_pars_fragment>

+ 1 - 1
src/renderers/shaders/ShaderLib/shadow_frag.glsl

@@ -6,7 +6,7 @@ uniform float opacity;
 #include <fog_pars_fragment>
 #include <bsdfs>
 #include <begin_lights_pars>
-#include <lights_maps_pars>
+#include <maps_lights_pars>
 #include <shadowmap_pars_fragment>
 #include <shadowmask_pars_fragment>