Quellcode durchsuchen

Use the same coding style as the other lines

Benjamin MICHEL vor 5 Jahren
Ursprung
Commit
df1c4369eb
2 geänderte Dateien mit 24 neuen und 7 gelöschten Zeilen
  1. 9 4
      examples/js/postprocessing/RenderPass.js
  2. 15 3
      examples/jsm/postprocessing/RenderPass.js

+ 9 - 4
examples/js/postprocessing/RenderPass.js

@@ -29,16 +29,16 @@ THREE.RenderPass.prototype = Object.assign( Object.create( THREE.Pass.prototype
 		var oldAutoClear = renderer.autoClear;
 		var oldAutoClear = renderer.autoClear;
 		renderer.autoClear = false;
 		renderer.autoClear = false;
 
 
-		var oldOverrideMaterial = this.scene.overrideMaterial;
+		var oldClearColor, oldClearAlpha, oldOverrideMaterial;
 
 
 		if ( this.overrideMaterial !== undefined ) {
 		if ( this.overrideMaterial !== undefined ) {
 
 
+			oldOverrideMaterial = this.scene.overrideMaterial;
+
 			this.scene.overrideMaterial = this.overrideMaterial;
 			this.scene.overrideMaterial = this.overrideMaterial;
 
 
 		}
 		}
 
 
-		var oldClearColor, oldClearAlpha;
-
 		if ( this.clearColor ) {
 		if ( this.clearColor ) {
 
 
 			oldClearColor = renderer.getClearColor().getHex();
 			oldClearColor = renderer.getClearColor().getHex();
@@ -66,7 +66,12 @@ THREE.RenderPass.prototype = Object.assign( Object.create( THREE.Pass.prototype
 
 
 		}
 		}
 
 
-		this.scene.overrideMaterial = oldOverrideMaterial;
+		if ( this.overrideMaterial !== undefined ) {
+
+			this.scene.overrideMaterial = oldOverrideMaterial;
+
+		}
+
 		renderer.autoClear = oldAutoClear;
 		renderer.autoClear = oldAutoClear;
 
 
 	}
 	}

+ 15 - 3
examples/jsm/postprocessing/RenderPass.js

@@ -32,9 +32,16 @@ RenderPass.prototype = Object.assign( Object.create( Pass.prototype ), {
 		var oldAutoClear = renderer.autoClear;
 		var oldAutoClear = renderer.autoClear;
 		renderer.autoClear = false;
 		renderer.autoClear = false;
 
 
-		this.scene.overrideMaterial = this.overrideMaterial;
 
 
-		var oldClearColor, oldClearAlpha;
+		var oldClearColor, oldClearAlpha, oldOverrideMaterial;
+
+		if ( this.overrideMaterial !== undefined ) {
+
+			oldOverrideMaterial = this.scene.overrideMaterial;
+
+			this.scene.overrideMaterial = this.overrideMaterial;
+
+		}
 
 
 		if ( this.clearColor ) {
 		if ( this.clearColor ) {
 
 
@@ -63,7 +70,12 @@ RenderPass.prototype = Object.assign( Object.create( Pass.prototype ), {
 
 
 		}
 		}
 
 
-		this.scene.overrideMaterial = null;
+		if ( this.overrideMaterial !== undefined ) {
+
+			this.scene.overrideMaterial = oldOverrideMaterial;
+
+		}
+
 		renderer.autoClear = oldAutoClear;
 		renderer.autoClear = oldAutoClear;
 
 
 	}
 	}