Water: Removed outputEncoding and toneMapping checks (mrdoob#21418)

mrdoob · web-flow · commit 97a62be3ba51 · 2021-03-05T17:17:08.000Z
diff --git a/examples/js/objects/Water.js b/examples/js/objects/Water.js
@@ -283,24 +283,6 @@ THREE.Water = function ( geometry, options ) {
 
 		// Render
 
-		if ( renderer.outputEncoding !== THREE.LinearEncoding ) {
-
-			console.warn( 'THREE.Water: WebGLRenderer must use LinearEncoding as outputEncoding.' );
-			scope.onBeforeRender = function () {};
-
-			return;
-
-		}
-
-		if ( renderer.toneMapping !== THREE.NoToneMapping ) {
-
-			console.warn( 'THREE.Water: WebGLRenderer must use NoToneMapping as toneMapping.' );
-			scope.onBeforeRender = function () {};
-
-			return;
-
-		}
-
 		var currentRenderTarget = renderer.getRenderTarget();
 
 		var currentXrEnabled = renderer.xr.enabled;
diff --git a/examples/jsm/objects/Water.js b/examples/jsm/objects/Water.js
@@ -1,12 +1,10 @@
 import {
 	Color,
 	FrontSide,
-	LinearEncoding,
 	LinearFilter,
 	MathUtils,
 	Matrix4,
 	Mesh,
-	NoToneMapping,
 	PerspectiveCamera,
 	Plane,
 	RGBFormat,
@@ -303,24 +301,6 @@ var Water = function ( geometry, options ) {
 
 		// Render
 
-		if ( renderer.outputEncoding !== LinearEncoding ) {
-
-			console.warn( 'THREE.Water: WebGLRenderer must use LinearEncoding as outputEncoding.' );
-			scope.onBeforeRender = function () {};
-
-			return;
-
-		}
-
-		if ( renderer.toneMapping !== NoToneMapping ) {
-
-			console.warn( 'THREE.Water: WebGLRenderer must use NoToneMapping as toneMapping.' );
-			scope.onBeforeRender = function () {};
-
-			return;
-
-		}
-
 		var currentRenderTarget = renderer.getRenderTarget();
 
 		var currentXrEnabled = renderer.xr.enabled;
diff --git a/examples/screenshots/webgl_shaders_ocean.jpg b/examples/screenshots/webgl_shaders_ocean.jpg
diff --git a/examples/webgl_shaders_ocean.html b/examples/webgl_shaders_ocean.html
@@ -40,6 +40,7 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
+				renderer.toneMapping = THREE.ACESFilmicToneMapping;
 				container.appendChild( renderer.domElement );
 
 				//
