Ver código fonte

WebGLDeferredRenderer: renamed multiply => brightness.

alteredq 12 anos atrás
pai
commit
189f042445

+ 3 - 3
examples/js/ShaderDeferred.js

@@ -226,7 +226,7 @@ THREE.ShaderDeferred = {
 		uniforms: {
 
 			samplerLight: 	{ type: "t", value: null },
-			multiply:		{ type: "f", value: 1 }
+			brightness:		{ type: "f", value: 1 }
 
 		},
 
@@ -234,12 +234,12 @@ THREE.ShaderDeferred = {
 
 			"varying vec2 texCoord;",
 			"uniform sampler2D samplerLight;",
-			"uniform float multiply;",
+			"uniform float brightness;",
 
 			"void main() {",
 
 				"vec3 color = texture2D( samplerLight, texCoord ).xyz;",
-				"gl_FragColor = vec4( multiply * sqrt( color ), 1.0 );",
+				"gl_FragColor = vec4( brightness * sqrt( color ), 1.0 );",
 
 			"}"
 

+ 2 - 2
examples/js/renderers/WebGLDeferredRenderer.js

@@ -15,7 +15,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 	var scaledHeight = Math.floor( scale * height );
 
 	var additiveSpecular = parameters.additiveSpecular;
-	var multiply = parameters.multiply;
+	var brightness = parameters.brightness;
 
 	this.renderer = parameters.renderer;
 
@@ -548,7 +548,7 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
 
 		compositePass = new THREE.ShaderPass( compositeShader );
 		compositePass.uniforms[ 'samplerLight' ].value = compLight.renderTarget2;
-		compositePass.uniforms[ 'multiply' ].value = multiply;
+		compositePass.uniforms[ 'brightness' ].value = brightness;
 		compositePass.material.blending = THREE.NoBlending;
 		compositePass.clear = true;
 

+ 1 - 1
examples/webgl_lights_deferred_morphs.html

@@ -111,7 +111,7 @@
 
 				// renderer
 
-				renderer = new THREE.WebGLDeferredRenderer( { width: WIDTH, height: HEIGHT, scale: SCALE, multiply: 2, additiveSpecular: true } );
+				renderer = new THREE.WebGLDeferredRenderer( { width: WIDTH, height: HEIGHT, scale: SCALE, brightness: 2, additiveSpecular: true } );
 
 				renderer.domElement.style.position = "absolute";
 				renderer.domElement.style.top = MARGIN + "px";

+ 1 - 1
examples/webgl_lights_deferred_pointlights.html

@@ -111,7 +111,7 @@
 
 				// renderer
 
-				renderer = new THREE.WebGLDeferredRenderer( { width: WIDTH, height: HEIGHT, scale: SCALE, additiveSpecular: false, multiply: 2 } );
+				renderer = new THREE.WebGLDeferredRenderer( { width: WIDTH, height: HEIGHT, scale: SCALE, additiveSpecular: false, brightness: 2 } );
 
 				renderer.domElement.style.position = "absolute";
 				renderer.domElement.style.top = MARGIN + "px";