From d62f3527f684651f510f23c208a89332a9e328ef Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 1 Jul 2016 14:30:32 -0700 Subject: [PATCH] Simplified cube and equirect shaders. See #9235. --- src/renderers/shaders/ShaderLib/cube_frag.glsl | 6 ------ src/renderers/shaders/ShaderLib/cube_vert.glsl | 4 ---- src/renderers/shaders/ShaderLib/equirect_frag.glsl | 6 ------ src/renderers/shaders/ShaderLib/equirect_vert.glsl | 4 ---- 4 files changed, 20 deletions(-) diff --git a/src/renderers/shaders/ShaderLib/cube_frag.glsl b/src/renderers/shaders/ShaderLib/cube_frag.glsl index 45b3301935..822084c937 100644 --- a/src/renderers/shaders/ShaderLib/cube_frag.glsl +++ b/src/renderers/shaders/ShaderLib/cube_frag.glsl @@ -5,16 +5,10 @@ uniform float opacity; varying vec3 vWorldPosition; #include -#include -#include void main() { - #include - gl_FragColor = textureCube( tCube, vec3( tFlip * vWorldPosition.x, vWorldPosition.yz ) ); gl_FragColor.a *= opacity; - #include - } diff --git a/src/renderers/shaders/ShaderLib/cube_vert.glsl b/src/renderers/shaders/ShaderLib/cube_vert.glsl index eeb7e062db..d2ca8a2b07 100644 --- a/src/renderers/shaders/ShaderLib/cube_vert.glsl +++ b/src/renderers/shaders/ShaderLib/cube_vert.glsl @@ -1,8 +1,6 @@ varying vec3 vWorldPosition; #include -#include -#include void main() { @@ -10,7 +8,5 @@ void main() { #include #include - #include - #include } diff --git a/src/renderers/shaders/ShaderLib/equirect_frag.glsl b/src/renderers/shaders/ShaderLib/equirect_frag.glsl index e307f048e0..81648499b1 100644 --- a/src/renderers/shaders/ShaderLib/equirect_frag.glsl +++ b/src/renderers/shaders/ShaderLib/equirect_frag.glsl @@ -4,13 +4,9 @@ uniform float tFlip; varying vec3 vWorldPosition; #include -#include -#include void main() { - #include - // gl_FragColor = textureCube( tCube, vec3( tFlip * vWorldPosition.x, vWorldPosition.yz ) ); vec3 direction = normalize( vWorldPosition ); vec2 sampleUV; @@ -18,6 +14,4 @@ void main() { sampleUV.x = atan( direction.z, direction.x ) * RECIPROCAL_PI2 + 0.5; gl_FragColor = texture2D( tEquirect, sampleUV ); - #include - } diff --git a/src/renderers/shaders/ShaderLib/equirect_vert.glsl b/src/renderers/shaders/ShaderLib/equirect_vert.glsl index eeb7e062db..d2ca8a2b07 100644 --- a/src/renderers/shaders/ShaderLib/equirect_vert.glsl +++ b/src/renderers/shaders/ShaderLib/equirect_vert.glsl @@ -1,8 +1,6 @@ varying vec3 vWorldPosition; #include -#include -#include void main() { @@ -10,7 +8,5 @@ void main() { #include #include - #include - #include } -- GitLab