Explorar o código

Move premultiplied_alpha chunk

WestLangley %!s(int64=5) %!d(string=hai) anos
pai
achega
218d8e5b25

+ 1 - 1
examples/js/effects/OutlineEffect.js

@@ -158,10 +158,10 @@ THREE.OutlineEffect = function ( renderer, parameters ) {
 
 
 		"	gl_FragColor = vec4( outlineColor, outlineAlpha );",
 		"	gl_FragColor = vec4( outlineColor, outlineAlpha );",
 
 
-		"	#include <premultiplied_alpha_fragment>",
 		"	#include <tonemapping_fragment>",
 		"	#include <tonemapping_fragment>",
 		"	#include <encodings_fragment>",
 		"	#include <encodings_fragment>",
 		"	#include <fog_fragment>",
 		"	#include <fog_fragment>",
+		"	#include <premultiplied_alpha_fragment>",
 
 
 		"}"
 		"}"
 
 

+ 1 - 1
examples/js/lines/LineMaterial.js

@@ -228,10 +228,10 @@ THREE.ShaderLib[ 'line' ] = {
 
 
 			gl_FragColor = vec4( diffuseColor.rgb, diffuseColor.a );
 			gl_FragColor = vec4( diffuseColor.rgb, diffuseColor.a );
 
 
-			#include <premultiplied_alpha_fragment>
 			#include <tonemapping_fragment>
 			#include <tonemapping_fragment>
 			#include <encodings_fragment>
 			#include <encodings_fragment>
 			#include <fog_fragment>
 			#include <fog_fragment>
+			#include <premultiplied_alpha_fragment>
 
 
 		}
 		}
 		`
 		`

+ 1 - 1
examples/js/loaders/LDrawLoader.js

@@ -77,10 +77,10 @@ THREE.LDrawLoader = ( function () {
 		#include <color_fragment>
 		#include <color_fragment>
 		outgoingLight = diffuseColor.rgb; // simple shader
 		outgoingLight = diffuseColor.rgb; // simple shader
 		gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 		gl_FragColor = vec4( outgoingLight, diffuseColor.a );
-		#include <premultiplied_alpha_fragment>
 		#include <tonemapping_fragment>
 		#include <tonemapping_fragment>
 		#include <encodings_fragment>
 		#include <encodings_fragment>
 		#include <fog_fragment>
 		#include <fog_fragment>
+		#include <premultiplied_alpha_fragment>
 	}
 	}
 	`;
 	`;
 
 

+ 1 - 1
examples/jsm/effects/OutlineEffect.js

@@ -166,10 +166,10 @@ var OutlineEffect = function ( renderer, parameters ) {
 
 
 		"	gl_FragColor = vec4( outlineColor, outlineAlpha );",
 		"	gl_FragColor = vec4( outlineColor, outlineAlpha );",
 
 
-		"	#include <premultiplied_alpha_fragment>",
 		"	#include <tonemapping_fragment>",
 		"	#include <tonemapping_fragment>",
 		"	#include <encodings_fragment>",
 		"	#include <encodings_fragment>",
 		"	#include <fog_fragment>",
 		"	#include <fog_fragment>",
+		"	#include <premultiplied_alpha_fragment>",
 
 
 		"}"
 		"}"
 
 

+ 1 - 1
examples/jsm/lines/LineMaterial.js

@@ -236,10 +236,10 @@ ShaderLib[ 'line' ] = {
 
 
 			gl_FragColor = vec4( diffuseColor.rgb, diffuseColor.a );
 			gl_FragColor = vec4( diffuseColor.rgb, diffuseColor.a );
 
 
-			#include <premultiplied_alpha_fragment>
 			#include <tonemapping_fragment>
 			#include <tonemapping_fragment>
 			#include <encodings_fragment>
 			#include <encodings_fragment>
 			#include <fog_fragment>
 			#include <fog_fragment>
+			#include <premultiplied_alpha_fragment>
 
 
 		}
 		}
 		`
 		`

+ 1 - 1
examples/jsm/loaders/LDrawLoader.js

@@ -95,10 +95,10 @@ var LDrawLoader = ( function () {
 		#include <color_fragment>
 		#include <color_fragment>
 		outgoingLight = diffuseColor.rgb; // simple shader
 		outgoingLight = diffuseColor.rgb; // simple shader
 		gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 		gl_FragColor = vec4( outgoingLight, diffuseColor.a );
-		#include <premultiplied_alpha_fragment>
 		#include <tonemapping_fragment>
 		#include <tonemapping_fragment>
 		#include <encodings_fragment>
 		#include <encodings_fragment>
 		#include <fog_fragment>
 		#include <fog_fragment>
+		#include <premultiplied_alpha_fragment>
 	}
 	}
 	`;
 	`;
 
 

+ 2 - 2
examples/jsm/nodes/materials/nodes/PhongNode.js

@@ -327,10 +327,10 @@ PhongNode.prototype.build = function ( builder ) {
 		}
 		}
 
 
 		output.push(
 		output.push(
-			"#include <premultiplied_alpha_fragment>",
 			"#include <tonemapping_fragment>",
 			"#include <tonemapping_fragment>",
 			"#include <encodings_fragment>",
 			"#include <encodings_fragment>",
-			"#include <fog_fragment>"
+			"#include <fog_fragment>",
+			"#include <premultiplied_alpha_fragment>"
 		);
 		);
 
 
 		code = output.join( "\n" );
 		code = output.join( "\n" );

+ 1 - 1
src/renderers/shaders/ShaderLib/linedashed_frag.glsl.js

@@ -33,10 +33,10 @@ void main() {
 
 
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 
 
-	#include <premultiplied_alpha_fragment>
 	#include <tonemapping_fragment>
 	#include <tonemapping_fragment>
 	#include <encodings_fragment>
 	#include <encodings_fragment>
 	#include <fog_fragment>
 	#include <fog_fragment>
+	#include <premultiplied_alpha_fragment>
 
 
 }
 }
 `;
 `;

+ 1 - 1
src/renderers/shaders/ShaderLib/meshbasic_frag.glsl.js

@@ -62,10 +62,10 @@ void main() {
 
 
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 
 
-	#include <premultiplied_alpha_fragment>
 	#include <tonemapping_fragment>
 	#include <tonemapping_fragment>
 	#include <encodings_fragment>
 	#include <encodings_fragment>
 	#include <fog_fragment>
 	#include <fog_fragment>
+	#include <premultiplied_alpha_fragment>
 
 
 }
 }
 `;
 `;

+ 1 - 1
src/renderers/shaders/ShaderLib/meshmatcap_frag.glsl.js

@@ -57,10 +57,10 @@ void main() {
 
 
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 
 
-	#include <premultiplied_alpha_fragment>
 	#include <tonemapping_fragment>
 	#include <tonemapping_fragment>
 	#include <encodings_fragment>
 	#include <encodings_fragment>
 	#include <fog_fragment>
 	#include <fog_fragment>
+	#include <premultiplied_alpha_fragment>
 
 
 }
 }
 `;
 `;

+ 1 - 1
src/renderers/shaders/ShaderLib/points_frag.glsl.js

@@ -25,10 +25,10 @@ void main() {
 
 
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 	gl_FragColor = vec4( outgoingLight, diffuseColor.a );
 
 
-	#include <premultiplied_alpha_fragment>
 	#include <tonemapping_fragment>
 	#include <tonemapping_fragment>
 	#include <encodings_fragment>
 	#include <encodings_fragment>
 	#include <fog_fragment>
 	#include <fog_fragment>
+	#include <premultiplied_alpha_fragment>
 
 
 }
 }
 `;
 `;