浏览代码

Convert selected color to linear

WestLangley 4 年之前
父节点
当前提交
93f47339e1
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      examples/webgl_materials_matcap.html

+ 6 - 4
examples/webgl_materials_matcap.html

@@ -25,7 +25,7 @@
 			var mesh, renderer, scene, camera;
 			var mesh, renderer, scene, camera;
 
 
 			var API = {
 			var API = {
-				color: 0xffffff,
+				color: 0xffffff, // sRGB
 				exposure: 1.0
 				exposure: 1.0
 			};
 			};
 
 
@@ -80,7 +80,7 @@
 
 
 					mesh.material = new THREE.MeshMatcapMaterial( {
 					mesh.material = new THREE.MeshMatcapMaterial( {
 
 
-						color: API.color,
+						color: new THREE.Color().setHex( API.color ).convertSRGBToLinear(),
 						matcap: matcap,
 						matcap: matcap,
 						normalMap: normalmap
 						normalMap: normalmap
 
 
@@ -97,14 +97,16 @@
 					.listen()
 					.listen()
 					.onChange( function () {
 					.onChange( function () {
 
 
-						mesh.material.color.set( API.color ); render();
+						mesh.material.color.set( API.color ).convertSRGBToLinear();
+						render();
 
 
 					} );
 					} );
 
 
 				gui.add( API, 'exposure', 0, 2 )
 				gui.add( API, 'exposure', 0, 2 )
 					.onChange( function () {
 					.onChange( function () {
 
 
-						renderer.toneMappingExposure = API.exposure; render();
+						renderer.toneMappingExposure = API.exposure;
+						render();
 
 
 					} );
 					} );