From cc52143e58d70e873bbeb708f90adeb6b4229d55 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Thu, 17 Mar 2016 21:56:46 +0000 Subject: [PATCH] Clean up. --- src/renderers/shaders/ShaderLib.js | 116 ++++++++++++++--------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/src/renderers/shaders/ShaderLib.js b/src/renderers/shaders/ShaderLib.js index bc95a5155c..7fdf6d1b72 100644 --- a/src/renderers/shaders/ShaderLib.js +++ b/src/renderers/shaders/ShaderLib.js @@ -13,14 +13,14 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "common" ], - THREE.UniformsLib[ "aomap" ], - THREE.UniformsLib[ "fog" ] + THREE.UniformsLib[ 'common' ], + THREE.UniformsLib[ 'aomap' ], + THREE.UniformsLib[ 'fog' ] ] ), - vertexShader: THREE.ShaderChunk['meshbasic_vert'], - fragmentShader: THREE.ShaderChunk['meshbasic_frag'] + vertexShader: THREE.ShaderChunk[ 'meshbasic_vert' ], + fragmentShader: THREE.ShaderChunk[ 'meshbasic_frag' ] }, @@ -28,12 +28,12 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "common" ], - THREE.UniformsLib[ "aomap" ], - THREE.UniformsLib[ "lightmap" ], - THREE.UniformsLib[ "emissivemap" ], - THREE.UniformsLib[ "fog" ], - THREE.UniformsLib[ "lights" ], + THREE.UniformsLib[ 'common' ], + THREE.UniformsLib[ 'aomap' ], + THREE.UniformsLib[ 'lightmap' ], + THREE.UniformsLib[ 'emissivemap' ], + THREE.UniformsLib[ 'fog' ], + THREE.UniformsLib[ 'lights' ], { "emissive" : { type: "c", value: new THREE.Color( 0x000000 ) } @@ -41,8 +41,8 @@ THREE.ShaderLib = { ] ), - vertexShader: THREE.ShaderChunk['meshlambert_vert'], - fragmentShader: THREE.ShaderChunk['meshlambert_frag'] + vertexShader: THREE.ShaderChunk[ 'meshlambert_vert' ], + fragmentShader: THREE.ShaderChunk[ 'meshlambert_frag' ] }, @@ -50,15 +50,15 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "common" ], - THREE.UniformsLib[ "aomap" ], - THREE.UniformsLib[ "lightmap" ], - THREE.UniformsLib[ "emissivemap" ], - THREE.UniformsLib[ "bumpmap" ], - THREE.UniformsLib[ "normalmap" ], - THREE.UniformsLib[ "displacementmap" ], - THREE.UniformsLib[ "fog" ], - THREE.UniformsLib[ "lights" ], + THREE.UniformsLib[ 'common' ], + THREE.UniformsLib[ 'aomap' ], + THREE.UniformsLib[ 'lightmap' ], + THREE.UniformsLib[ 'emissivemap' ], + THREE.UniformsLib[ 'bumpmap' ], + THREE.UniformsLib[ 'normalmap' ], + THREE.UniformsLib[ 'displacementmap' ], + THREE.UniformsLib[ 'fog' ], + THREE.UniformsLib[ 'lights' ], { "emissive" : { type: "c", value: new THREE.Color( 0x000000 ) }, @@ -68,8 +68,8 @@ THREE.ShaderLib = { ] ), - vertexShader: THREE.ShaderChunk['meshphong_vert'], - fragmentShader: THREE.ShaderChunk['meshphong_frag'] + vertexShader: THREE.ShaderChunk[ 'meshphong_vert' ], + fragmentShader: THREE.ShaderChunk[ 'meshphong_frag' ] }, @@ -77,17 +77,17 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "common" ], - THREE.UniformsLib[ "aomap" ], - THREE.UniformsLib[ "lightmap" ], - THREE.UniformsLib[ "emissivemap" ], - THREE.UniformsLib[ "bumpmap" ], - THREE.UniformsLib[ "normalmap" ], - THREE.UniformsLib[ "displacementmap" ], - THREE.UniformsLib[ "roughnessmap" ], - THREE.UniformsLib[ "metalnessmap" ], - THREE.UniformsLib[ "fog" ], - THREE.UniformsLib[ "lights" ], + THREE.UniformsLib[ 'common' ], + THREE.UniformsLib[ 'aomap' ], + THREE.UniformsLib[ 'lightmap' ], + THREE.UniformsLib[ 'emissivemap' ], + THREE.UniformsLib[ 'bumpmap' ], + THREE.UniformsLib[ 'normalmap' ], + THREE.UniformsLib[ 'displacementmap' ], + THREE.UniformsLib[ 'roughnessmap' ], + THREE.UniformsLib[ 'metalnessmap' ], + THREE.UniformsLib[ 'fog' ], + THREE.UniformsLib[ 'lights' ], { "emissive" : { type: "c", value: new THREE.Color( 0x000000 ) }, @@ -98,8 +98,8 @@ THREE.ShaderLib = { ] ), - vertexShader: THREE.ShaderChunk['meshstandard_vert'], - fragmentShader: THREE.ShaderChunk['meshstandard_frag'] + vertexShader: THREE.ShaderChunk[ 'meshstandard_vert' ], + fragmentShader: THREE.ShaderChunk[ 'meshstandard_frag' ] }, @@ -107,13 +107,13 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "points" ], - THREE.UniformsLib[ "fog" ] + THREE.UniformsLib[ 'points' ], + THREE.UniformsLib[ 'fog' ] ] ), - vertexShader: THREE.ShaderChunk['points_vert'], - fragmentShader: THREE.ShaderChunk['points_frag'] + vertexShader: THREE.ShaderChunk[ 'points_vert' ], + fragmentShader: THREE.ShaderChunk[ 'points_frag' ] }, @@ -121,8 +121,8 @@ THREE.ShaderLib = { uniforms: THREE.UniformsUtils.merge( [ - THREE.UniformsLib[ "common" ], - THREE.UniformsLib[ "fog" ], + THREE.UniformsLib[ 'common' ], + THREE.UniformsLib[ 'fog' ], { "scale" : { type: "1f", value: 1 }, @@ -132,8 +132,8 @@ THREE.ShaderLib = { ] ), - vertexShader: THREE.ShaderChunk['linedashed_vert'], - fragmentShader: THREE.ShaderChunk['linedashed_frag'] + vertexShader: THREE.ShaderChunk[ 'linedashed_vert' ], + fragmentShader: THREE.ShaderChunk[ 'linedashed_frag' ] }, @@ -147,8 +147,8 @@ THREE.ShaderLib = { }, - vertexShader: THREE.ShaderChunk['depth_vert'], - fragmentShader: THREE.ShaderChunk['depth_frag'] + vertexShader: THREE.ShaderChunk[ 'depth_vert' ], + fragmentShader: THREE.ShaderChunk[ 'depth_frag' ] }, @@ -160,8 +160,8 @@ THREE.ShaderLib = { }, - vertexShader: THREE.ShaderChunk['normal_vert'], - fragmentShader: THREE.ShaderChunk['normal_frag'] + vertexShader: THREE.ShaderChunk[ 'normal_vert' ], + fragmentShader: THREE.ShaderChunk[ 'normal_frag' ] }, @@ -176,8 +176,8 @@ THREE.ShaderLib = { "tFlip": { type: "1f", value: - 1 } }, - vertexShader: THREE.ShaderChunk['cube_vert'], - fragmentShader: THREE.ShaderChunk['cube_frag'] + vertexShader: THREE.ShaderChunk[ 'cube_vert' ], + fragmentShader: THREE.ShaderChunk[ 'cube_frag' ] }, @@ -192,8 +192,8 @@ THREE.ShaderLib = { "tFlip": { type: "1f", value: - 1 } }, - vertexShader: THREE.ShaderChunk['equirect_vert'], - fragmentShader: THREE.ShaderChunk['equirect_frag'] + vertexShader: THREE.ShaderChunk[ 'equirect_vert' ], + fragmentShader: THREE.ShaderChunk[ 'equirect_frag' ] }, @@ -213,8 +213,8 @@ THREE.ShaderLib = { uniforms: {}, - vertexShader: THREE.ShaderChunk['depthRGBA_vert'], - fragmentShader: THREE.ShaderChunk['depthRGBA_frag'] + vertexShader: THREE.ShaderChunk[ 'depthRGBA_vert' ], + fragmentShader: THREE.ShaderChunk[ 'depthRGBA_frag' ] }, @@ -223,12 +223,12 @@ THREE.ShaderLib = { uniforms: { - "lightPos": { type: "v3", value: new THREE.Vector3( 0, 0, 0 ) } + "lightPos": { type: "v3", value: new THREE.Vector3() } }, - vertexShader: THREE.ShaderChunk['distanceRGBA_vert'], - fragmentShader: THREE.ShaderChunk['distanceRGBA_frag'] + vertexShader: THREE.ShaderChunk[ 'distanceRGBA_vert' ], + fragmentShader: THREE.ShaderChunk[ 'distanceRGBA_frag' ] } -- GitLab