Code cleanup.

Author: vanruesc

src/materials/OutlineBlendMaterial.js

@@ -43,7 +43,7 @@ export class OutlineBlendMaterial extends ShaderMaterial {
 
 				tDiffuse: new Uniform(null),
 				tMask: new Uniform(null),
-				tOutline: new Uniform(null),
+				tEdges: new Uniform(null),
 				tPattern: new Uniform(null),
 
 				edgeStrength: new Uniform(settings.edgeStrength),

src/materials/glsl/outline-blend/shader.frag

@@ -1,6 +1,6 @@
 uniform sampler2D tDiffuse;
 uniform sampler2D tMask;
-uniform sampler2D tOutline;
+uniform sampler2D tEdges;
 
 uniform vec3 visibleEdgeColor;
 uniform vec3 hiddenEdgeColor;
@@ -19,7 +19,7 @@ varying vec2 vUv;
 void main() {
 
 	vec4 color = texture2D(tDiffuse, vUv);
-	vec2 outline = texture2D(tOutline, vUv).rg;
+	vec2 edge = texture2D(tEdges, vUv).rg;
 	vec2 mask = texture2D(tMask, vUv).rg;
 
 	#ifndef X_RAY
@@ -28,12 +28,12 @@ void main() {
 
 	#endif
 
-	outline *= (edgeStrength * mask.x * pulse);
-	vec3 outlineColor = outline.x * visibleEdgeColor + outline.y * hiddenEdgeColor;
+	edge *= (edgeStrength * mask.x * pulse);
+	vec3 outlineColor = edge.x * visibleEdgeColor + edge.y * hiddenEdgeColor;
 
 	#ifdef ALPHA_BLENDING
 
-		color.rgb = mix(color.rgb, outlineColor, max(outline.x, outline.y));
+		color.rgb = mix(color.rgb, outlineColor, max(edge.x, edge.y));
 
 	#else
 

src/materials/glsl/outline-edges/shader.frag

@@ -20,8 +20,6 @@ void main() {
 	float a1 = min(c2.y, c3.y);
 	float visibilityFactor = min(a0, a1);
 
-	vec3 edgeColor = (1.0 - visibilityFactor > 0.001) ? vec3(1.0, 0.0, 0.0) : vec3(0.0, 1.0, 0.0);
-
-	gl_FragColor = vec4(edgeColor * d, d);
+	gl_FragColor.rg = (1.0 - visibilityFactor > 0.001) ? vec2(d, 0.0) : vec2(0.0, d);
 
 }

src/passes/OutlinePass.js

@@ -33,6 +33,7 @@ export class OutlinePass extends Pass {
 	 * @param {PerspectiveCamera} camera - The main camera.
 	 * @param {Object} [options] - Additional parameters. See {@link BlurPass}, {@link OutlineBlendMaterial} and {@link OutlineEdgesMaterial} for details.
 	 * @param {Object} [options.pulseSpeed=0.0] - The pulse speed. A value of zero disables the pulse effect.
+	 * @param {Object} [options.blur=true] - Whether the outline should be blurry.
 	 */
 
 	constructor(scene, camera, options = {}) {
@@ -78,10 +79,11 @@ export class OutlinePass extends Pass {
 
 		this.renderTargetDepth = new WebGLRenderTarget(1, 1, {
 			minFilter: LinearFilter,
-			magFilter: LinearFilter
+			magFilter: LinearFilter,
+			format: RGBFormat
 		});
 
-		this.renderTargetDepth.texture.name = "GodRays.Depth";
+		this.renderTargetDepth.texture.name = "Outline.Depth";
 		this.renderTargetDepth.texture.generateMipmaps = false;
 
 		/**
@@ -93,7 +95,7 @@ export class OutlinePass extends Pass {
 
 		this.renderTargetMask = this.renderTargetDepth.clone();
 
-		this.renderTargetMask.texture.name = "GodRays.Mask";
+		this.renderTargetMask.texture.name = "Outline.Mask";
 
 		/**
 		 * A render target for the edge detection.
@@ -106,10 +108,11 @@ export class OutlinePass extends Pass {
 			minFilter: LinearFilter,
 			magFilter: LinearFilter,
 			stencilBuffer: false,
-			depthBuffer: false
+			depthBuffer: false,
+			format: RGBFormat
 		});
 
-		this.renderTargetEdges.texture.name = "GodRays.Edges";
+		this.renderTargetEdges.texture.name = "Outline.Edges";
 		this.renderTargetEdges.texture.generateMipmaps = false;
 
 		/**
@@ -119,9 +122,9 @@ export class OutlinePass extends Pass {
 		 * @private
 		 */
 
-		this.renderTargetOutline = this.renderTargetEdges.clone();
+		this.renderTargetBlurredEdges = this.renderTargetEdges.clone();
 
-		this.renderTargetOutline.texture.name = "GodRays.Outline";
+		this.renderTargetBlurredEdges.texture.name = "Outline.BlurredEdges";
 
 		/**
 		 * A depth pass.
@@ -193,7 +196,8 @@ export class OutlinePass extends Pass {
 
 		this.outlineBlendMaterial = new OutlineBlendMaterial(options);
 		this.outlineBlendMaterial.uniforms.tMask.value = this.renderTargetMask.texture;
-		this.outlineBlendMaterial.uniforms.tOutline.value = this.renderTargetOutline.texture;
+
+		this.blur = (options.blur !== undefined) ? options.blur : true;
 
 		/**
 		 * A list of objects to outline.
@@ -300,8 +304,8 @@ export class OutlinePass extends Pass {
 
 		this.blurPass.enabled = value;
 
-		this.outlineBlendMaterial.uniforms.tOutline.value = value ?
-			this.renderTargetOutline.texture :
+		this.outlineBlendMaterial.uniforms.tEdges.value = value ?
+			this.renderTargetBlurredEdges.texture :
 			this.renderTargetEdges.texture;
 
 	}
@@ -525,7 +529,7 @@ export class OutlinePass extends Pass {
 			if(this.blurPass.enabled) {
 
 				// Blur the edges.
-				this.blurPass.render(renderer, this.renderTargetEdges, this.renderTargetOutline);
+				this.blurPass.render(renderer, this.renderTargetEdges, this.renderTargetBlurredEdges);
 
 			}
 
@@ -556,14 +560,6 @@ export class OutlinePass extends Pass {
 		this.renderPassMask.initialize(renderer, alpha);
 		this.blurPass.initialize(renderer, alpha);
 
-		if(!alpha) {
-
-			this.renderTargetMask.texture.format = RGBFormat;
-			this.renderTargetEdges.texture.format = RGBFormat;
-			this.renderTargetOutline.texture.format = RGBFormat;
-
-		}
-
 	}
 
 	/**
@@ -586,7 +582,7 @@ export class OutlinePass extends Pass {
 		height = this.blurPass.height;
 
 		this.renderTargetEdges.setSize(width, height);
-		this.renderTargetOutline.setSize(width, height);
+		this.renderTargetBlurredEdges.setSize(width, height);
 
 		this.outlineBlendMaterial.uniforms.aspect.value = width / height;
 		this.outlineEdgesMaterial.setTexelSize(1.0 / width, 1.0 / height);