Browse Source

Merge pull request #13030 from dhritzkiv/patch-25

PMREM: Restore previous renderTarget after update()
Mr.doob 7 years ago
parent
commit
38162cc27f
2 changed files with 5 additions and 0 deletions
  1. 3 0
      examples/js/pmrem/PMREMCubeUVPacker.js
  2. 2 0
      examples/js/pmrem/PMREMGenerator.js

+ 3 - 0
examples/js/pmrem/PMREMCubeUVPacker.js

@@ -114,12 +114,15 @@ THREE.PMREMCubeUVPacker.prototype = {
 		var gammaOutput = renderer.gammaOutput;
 		var gammaOutput = renderer.gammaOutput;
 		var toneMapping = renderer.toneMapping;
 		var toneMapping = renderer.toneMapping;
 		var toneMappingExposure = renderer.toneMappingExposure;
 		var toneMappingExposure = renderer.toneMappingExposure;
+		var currentRenderTarget = renderer.getRenderTarget();
+		
 		renderer.gammaInput = false;
 		renderer.gammaInput = false;
 		renderer.gammaOutput = false;
 		renderer.gammaOutput = false;
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMappingExposure = 1.0;
 		renderer.toneMappingExposure = 1.0;
 		renderer.render( this.scene, this.camera, this.CubeUVRenderTarget, false );
 		renderer.render( this.scene, this.camera, this.CubeUVRenderTarget, false );
 
 
+		renderer.setRenderTarget( currentRenderTarget );
 		renderer.toneMapping = toneMapping;
 		renderer.toneMapping = toneMapping;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.gammaInput = gammaInput;
 		renderer.gammaInput = gammaInput;

+ 2 - 0
examples/js/pmrem/PMREMGenerator.js

@@ -90,6 +90,7 @@ THREE.PMREMGenerator.prototype = {
 		var gammaOutput = renderer.gammaOutput;
 		var gammaOutput = renderer.gammaOutput;
 		var toneMapping = renderer.toneMapping;
 		var toneMapping = renderer.toneMapping;
 		var toneMappingExposure = renderer.toneMappingExposure;
 		var toneMappingExposure = renderer.toneMappingExposure;
+		var currentRenderTarget = renderer.getRenderTarget();
 
 
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMapping = THREE.LinearToneMapping;
 		renderer.toneMappingExposure = 1.0;
 		renderer.toneMappingExposure = 1.0;
@@ -109,6 +110,7 @@ THREE.PMREMGenerator.prototype = {
 
 
 		}
 		}
 
 
+		renderer.setRenderTarget( currentRenderTarget );
 		renderer.toneMapping = toneMapping;
 		renderer.toneMapping = toneMapping;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.toneMappingExposure = toneMappingExposure;
 		renderer.gammaInput = gammaInput;
 		renderer.gammaInput = gammaInput;