Merge pull request #18108 from Mugen87/dev29

WebGLRenderer: Remove gammaInput.
mrdoob · Dec 10, 2019 · b686968 · b686968
2 parents 2fb36e6 + ecd7443
commit b686968
Show file tree

Hide file tree

Showing 56 changed files with 84 additions and 356 deletions.
diff --git a/docs/api/en/renderers/WebGLRenderer.html b/docs/api/en/renderers/WebGLRenderer.html
@@ -164,11 +164,6 @@ <h3>[property:Object extensions]</h3>
 		<h3>[property:Float gammaFactor]</h3>
 		<p>Default is *2*. </p>
 
-
-		<h3>[property:Boolean gammaInput]</h3>
-		<p>If set, then it expects that all textures and colors are premultiplied gamma. Default is *false*.</p>
-
-
 		<h3>[property:Boolean gammaOutput]</h3>
 		<p>If set, then it expects that all textures and colors need to be outputted in premultiplied gamma. Default is *false*.</p>
 

diff --git a/docs/api/zh/renderers/WebGLRenderer.html b/docs/api/zh/renderers/WebGLRenderer.html
@@ -143,11 +143,6 @@ <h3>[property:Object extensions]</h3>
 		<h3>[property:Float gammaFactor]</h3>
 		<p>默认是 *2*. </p>
 
-
-		<h3>[property:Boolean gammaInput]</h3>
-		<p>如果设置，那么所有的纹理和颜色都会预乘gamma。 默认值是*false*.</p>
-
-
 		<h3>[property:Boolean gammaOutput]</h3>
 		<p>如果设置, 那么它期望所有纹理和颜色需要乘以gamma输出。 默认值*false*.</p>
 

diff --git a/editor/js/libs/tern-threejs/threejs.js b/editor/js/libs/tern-threejs/threejs.js
@@ -4661,10 +4661,6 @@
           "!type": "bool",
           "!doc": "Defines whether the renderer should auto update objects. Default is true."
         },
-        "gammaInput": {
-          "!type": "bool",
-          "!doc": "Default is false. If set, then it expects that all textures and colors are premultiplied gamma."
-        },
         "gammaOutput": {
           "!type": "bool",
           "!doc": "Default is false.  If set, then it expects that all textures and colors need to be outputted in premultiplied gamma."

diff --git a/examples/js/misc/MD2Character.js b/examples/js/misc/MD2Character.js
@@ -221,6 +221,7 @@ THREE.MD2Character = function () {
 			textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 			textures[ i ].mapping = THREE.UVMapping;
 			textures[ i ].name = textureUrls[ i ];
+			textures[ i ].encoding = THREE.sRGBEncoding;
 
 		}
 

diff --git a/examples/js/misc/MD2CharacterComplex.js b/examples/js/misc/MD2CharacterComplex.js
@@ -516,6 +516,7 @@ THREE.MD2CharacterComplex = function () {
 			textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 			textures[ i ].mapping = THREE.UVMapping;
 			textures[ i ].name = textureUrls[ i ];
+			textures[ i ].encoding = THREE.sRGBEncoding;
 
 		}
 

diff --git a/examples/jsm/misc/MD2Character.js b/examples/jsm/misc/MD2Character.js
@@ -9,7 +9,8 @@ import {
 	MeshLambertMaterial,
 	Object3D,
 	TextureLoader,
-	UVMapping
+	UVMapping,
+	sRGBEncoding
 } from "../../../build/three.module.js";
 import { MD2Loader } from "../loaders/MD2Loader.js";
 
@@ -232,6 +233,7 @@ var MD2Character = function () {
 			textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 			textures[ i ].mapping = UVMapping;
 			textures[ i ].name = textureUrls[ i ];
+			textures[ i ].encoding = sRGBEncoding;
 
 		}
 

diff --git a/examples/jsm/misc/MD2CharacterComplex.js b/examples/jsm/misc/MD2CharacterComplex.js
@@ -8,7 +8,8 @@ import {
 	MeshLambertMaterial,
 	Object3D,
 	TextureLoader,
-	UVMapping
+	UVMapping,
+	sRGBEncoding
 } from "../../../build/three.module.js";
 import { MD2Loader } from "../loaders/MD2Loader.js";
 import { MorphBlendMesh } from "../misc/MorphBlendMesh.js";
@@ -527,6 +528,7 @@ var MD2CharacterComplex = function () {
 			textures[ i ] = textureLoader.load( baseUrl + textureUrls[ i ], checkLoadingComplete );
 			textures[ i ].mapping = UVMapping;
 			textures[ i ].name = textureUrls[ i ];
+			textures[ i ].encoding = sRGBEncoding;
 
 		}
 

diff --git a/examples/jsm/nodes/core/NodeBuilder.js b/examples/jsm/nodes/core/NodeBuilder.js
@@ -951,7 +951,7 @@ NodeBuilder.prototype = {
 
 	getTextureEncodingFromMap: function ( map, gammaOverrideLinear ) {
 
-		gammaOverrideLinear = gammaOverrideLinear !== undefined ? gammaOverrideLinear : this.context.gamma && ( this.renderer ? this.renderer.gammaInput : false );
+		gammaOverrideLinear = gammaOverrideLinear !== undefined ? gammaOverrideLinear : this.context.gamma;
 
 		var encoding;
 
@@ -970,7 +970,7 @@ NodeBuilder.prototype = {
 
 		}
 
-		// add backwards compatibility for WebGLRenderer.gammaInput/gammaOutput parameter, should probably be removed at some point.
+		// add backwards compatibility for WebGLRenderer.gammaOutput parameter, should probably be removed at some point.
 		if ( encoding === LinearEncoding && gammaOverrideLinear ) {
 
 			encoding = GammaEncoding;

diff --git a/examples/misc_exporter_collada.html b/examples/misc_exporter_collada.html
@@ -73,7 +73,6 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( canvasWidth, canvasHeight );
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 				container.appendChild( renderer.domElement );
 
@@ -88,6 +87,7 @@
 				var textureMap = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.anisotropy = 16;
+				textureMap.encoding = THREE.sRGBEncoding;
 
 				// REFLECTION MAP
 				var path = "textures/cube/pisa/";
@@ -98,6 +98,7 @@
 				];
 
 				textureCube = new THREE.CubeTextureLoader().load( urls );
+				textureCube.encoding = THREE.sRGBEncoding;
 
 				// MATERIALS
 				var materialColor = new THREE.Color();

diff --git a/examples/webgl_animation_cloth.html b/examples/webgl_animation_cloth.html
@@ -503,6 +503,7 @@
 				groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping;
 				groundTexture.repeat.set( 25, 25 );
 				groundTexture.anisotropy = 16;
+				groundTexture.encoding = THREE.sRGBEncoding;
 
 				var groundMaterial = new THREE.MeshLambertMaterial( { map: groundTexture } );
 
@@ -561,7 +562,6 @@
 
 				container.appendChild( renderer.domElement );
 
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				renderer.shadowMap.enabled = true;

diff --git a/examples/webgl_buffergeometry.html b/examples/webgl_buffergeometry.html
@@ -156,8 +156,6 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );

diff --git a/examples/webgl_buffergeometry_drawrange.html b/examples/webgl_buffergeometry_drawrange.html
@@ -168,8 +168,6 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );

diff --git a/examples/webgl_buffergeometry_lines.html b/examples/webgl_buffergeometry_lines.html
@@ -82,8 +82,6 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );

diff --git a/examples/webgl_buffergeometry_lines_indexed.html b/examples/webgl_buffergeometry_lines_indexed.html
@@ -190,8 +190,6 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );

diff --git a/examples/webgl_buffergeometry_uint.html b/examples/webgl_buffergeometry_uint.html
@@ -157,8 +157,6 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );

diff --git a/examples/webgl_geometry_teapot.html b/examples/webgl_geometry_teapot.html
@@ -67,7 +67,6 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( canvasWidth, canvasHeight );
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 				container.appendChild( renderer.domElement );
 
@@ -82,6 +81,7 @@
 				var textureMap = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
 				textureMap.wrapS = textureMap.wrapT = THREE.RepeatWrapping;
 				textureMap.anisotropy = 16;
+				textureMap.encoding = THREE.sRGBEncoding;
 
 				// REFLECTION MAP
 				var path = "textures/cube/pisa/";
@@ -92,6 +92,7 @@
 				];
 
 				textureCube = new THREE.CubeTextureLoader().load( urls );
+				textureCube.encoding = THREE.sRGBEncoding;
 
 				// MATERIALS
 				var materialColor = new THREE.Color();

diff --git a/examples/webgl_lensflares.html b/examples/webgl_lensflares.html
@@ -115,12 +115,8 @@
 				renderer = new THREE.WebGLRenderer( { antialias: true, alpha: true } );
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-				container.appendChild( renderer.domElement );
-
-				//
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
+				container.appendChild( renderer.domElement );
 
 				//
 

diff --git a/examples/webgl_lightningstrike.html b/examples/webgl_lightningstrike.html
@@ -54,8 +54,6 @@
 				renderer = new THREE.WebGLRenderer();
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				container.appendChild( renderer.domElement );
@@ -419,6 +417,7 @@
 				var textureCube = new THREE.CubeTextureLoader().load( urls );
 				textureCube.format = THREE.RGBFormat;
 				textureCube.mapping = THREE.CubeReflectionMapping;
+				textureCube.encoding = THREE.sRGBEncoding;
 
 				var sphereMaterial = new THREE.MeshPhysicalMaterial( {
 					transparent: true,

diff --git a/examples/webgl_lights_hemisphere.html b/examples/webgl_lights_hemisphere.html
@@ -190,10 +190,7 @@
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				container.appendChild( renderer.domElement );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
-
 				renderer.shadowMap.enabled = true;
 
 				// STATS

diff --git a/examples/webgl_lights_physical.html b/examples/webgl_lights_physical.html
@@ -110,6 +110,7 @@
 					map.wrapT = THREE.RepeatWrapping;
 					map.anisotropy = 4;
 					map.repeat.set( 10, 24 );
+					map.encoding = THREE.sRGBEncoding;
 					floorMat.map = map;
 					floorMat.needsUpdate = true;
 
@@ -147,6 +148,7 @@
 					map.wrapT = THREE.RepeatWrapping;
 					map.anisotropy = 4;
 					map.repeat.set( 1, 1 );
+					map.encoding = THREE.sRGBEncoding;
 					cubeMat.map = map;
 					cubeMat.needsUpdate = true;
 
@@ -170,13 +172,15 @@
 				textureLoader.load( "textures/planets/earth_atmos_2048.jpg", function ( map ) {
 
 					map.anisotropy = 4;
+					map.encoding = THREE.sRGBEncoding;
 					ballMat.map = map;
 					ballMat.needsUpdate = true;
 
 	} );
 				textureLoader.load( "textures/planets/earth_specular_2048.jpg", function ( map ) {
 
 					map.anisotropy = 4;
+					map.encoding = THREE.sRGBEncoding;
 					ballMat.metalnessMap = map;
 					ballMat.needsUpdate = true;
 
@@ -214,7 +218,6 @@
 
 				renderer = new THREE.WebGLRenderer();
 				renderer.physicallyCorrectLights = true;
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 				renderer.shadowMap.enabled = true;
 				renderer.toneMapping = THREE.ReinhardToneMapping;

diff --git a/examples/webgl_lights_pointlights2.html b/examples/webgl_lights_pointlights2.html
@@ -55,6 +55,7 @@
 				texture.repeat.set( 20, 10 );
 				texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
 				texture.format = THREE.RGBFormat;
+				texture.encoding = THREE.sRGBEncoding;
 
 				// MATERIALS
 
@@ -133,8 +134,6 @@
 				renderer.setPixelRatio( window.devicePixelRatio );
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				container.appendChild( renderer.domElement );
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				// CONTROLS

diff --git a/examples/webgl_lights_rectarealight.html b/examples/webgl_lights_rectarealight.html
@@ -42,7 +42,6 @@
 				renderer.setSize( window.innerWidth, window.innerHeight );
 				renderer.shadowMap.enabled = true;
 				renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 				document.body.appendChild( renderer.domElement );
 

diff --git a/examples/webgl_lights_spotlight.html b/examples/webgl_lights_spotlight.html
@@ -34,8 +34,6 @@
 				document.body.appendChild( renderer.domElement );
 				renderer.shadowMap.enabled = true;
 				renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				scene = new THREE.Scene();

diff --git a/examples/webgl_lights_spotlights.html b/examples/webgl_lights_spotlights.html
@@ -52,8 +52,6 @@
 
 				renderer.shadowMap.enabled = true;
 				renderer.shadowMap.type = THREE.PCFSoftShadowMap;
-
-				renderer.gammaInput = true;
 				renderer.gammaOutput = true;
 
 				camera.position.set( 46, 22, - 21 );