Skip to content

Commit

Permalink
Fix node #3 of issue mrdoob#5805 (comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
bhouston committed Mar 9, 2015
1 parent b0eb1bf commit 98f65da
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/renderers/shaders/ShaderLib.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ THREE.ShaderLib = {
THREE.ShaderChunk[ "alphatest_fragment" ],
THREE.ShaderChunk[ "specularmap_fragment" ],

" outgoingLight.rgb = diffuseColor.rgb;", // simple shader
" outgoingLight = diffuseColor.rgb;", // simple shader

THREE.ShaderChunk[ "lightmap_fragment" ], // TODO: Light map on an otherwise unlit surface doesn't make sense.
THREE.ShaderChunk[ "envmap_fragment" ],
Expand Down Expand Up @@ -196,7 +196,7 @@ THREE.ShaderLib = {

" vec3 outgoingLight = vec3( 0.0, 0.0, 0.0 );", // outgoing light does not have an alpha, the surface does
" vec4 diffuseColor = vec4( 1.0, 1.0, 1.0, opacity );",

THREE.ShaderChunk[ "logdepthbuf_fragment" ],
THREE.ShaderChunk[ "map_fragment" ],
THREE.ShaderChunk[ "color_fragment" ],
Expand Down Expand Up @@ -421,7 +421,7 @@ THREE.ShaderLib = {
THREE.ShaderChunk[ "color_fragment" ],
THREE.ShaderChunk[ "alphatest_fragment" ],

" outgoingLight.rgb = diffuseColor.rgb;", // simple shader
" outgoingLight = diffuseColor.rgb;", // simple shader

THREE.ShaderChunk[ "shadowmap_fragment" ],
THREE.ShaderChunk[ "fog_fragment" ],
Expand Down Expand Up @@ -713,7 +713,7 @@ THREE.ShaderLib = {
"vec3 direction = normalize( vWorldPosition );",
"vec2 sampleUV;",
"sampleUV.y = saturate( tFlip * direction.y * -0.5 + 0.5 );",
"sampleUV.x = atan( direction.z, direction.x ) * RECIPROCAL_PI2 + 0.5;",
"sampleUV.x = atan( direction.z, direction.x ) * RECIPROCAL_PI2 + 0.5;",
"gl_FragColor = texture2D( tEquirect, sampleUV );",

THREE.ShaderChunk[ "logdepthbuf_fragment" ],
Expand Down

0 comments on commit 98f65da

Please sign in to comment.