Browse Source

LensFlare: Clean up

Mugen87 7 years ago
parent
commit
39790a87c8
2 changed files with 9 additions and 9 deletions
  1. 3 3
      examples/js/objects/LensFlare.js
  2. 6 6
      examples/webgl_lensflares.html

+ 3 - 3
examples/js/objects/LensFlare.js

@@ -53,7 +53,7 @@ THREE.LensFlare = function () {
 	var validArea = new THREE.Box2();
 	var viewport = new THREE.Vector4();
 
-	this.onBeforeRender = function ( renderer, scene, camera, geometry, material, group ) {
+	this.onBeforeRender = function ( renderer, scene, camera ) {
 
 		viewport.copy( renderer.getCurrentViewport() );
 
@@ -252,7 +252,7 @@ THREE.LensFlareElement = function ( texture, size, distance, color, blending, op
 		uniforms: {
 			'map': { value: texture },
 			'occlusionMap': { value: null },
-			'opacity': { value: 1 },
+			'opacity': { value: opacity || 1 },
 			'color': { value: color || new THREE.Color( 0xffffff ) },
 			'scale': { value: new THREE.Vector2() },
 			'screenPosition': { value: new THREE.Vector3() }
@@ -314,7 +314,7 @@ THREE.LensFlareElement.Shader = {
 		'	visibility += texture2D( occlusionMap, vec2( 0.5, 0.1 ) );',
 		'	visibility += texture2D( occlusionMap, vec2( 0.9, 0.1 ) );',
 		'	visibility += texture2D( occlusionMap, vec2( 0.9, 0.5 ) );',
-		' visibility += texture2D( occlusionMap, vec2( 0.9, 0.9 ) );',
+		'	visibility += texture2D( occlusionMap, vec2( 0.9, 0.9 ) );',
 		'	visibility += texture2D( occlusionMap, vec2( 0.5, 0.9 ) );',
 		'	visibility += texture2D( occlusionMap, vec2( 0.1, 0.9 ) );',
 		'	visibility += texture2D( occlusionMap, vec2( 0.1, 0.5 ) );',

+ 6 - 6
examples/webgl_lensflares.html

@@ -122,13 +122,13 @@
 				// lensflares
 				var textureLoader = new THREE.TextureLoader();
 
-				var textureFlare0 = textureLoader.load( "textures/lensflare/lensflare0.png" );
-				var textureFlare2 = textureLoader.load( "textures/lensflare/lensflare2.png" );
-				var textureFlare3 = textureLoader.load( "textures/lensflare/lensflare3.png" );
+				var textureFlare0 = textureLoader.load( 'textures/lensflare/lensflare0.png' );
+				var textureFlare2 = textureLoader.load( 'textures/lensflare/lensflare2.png' );
+				var textureFlare3 = textureLoader.load( 'textures/lensflare/lensflare3.png' );
 
-				addLight( 0.55, 0.9, 0.5, 5000, 0, -1000 );
-				addLight( 0.08, 0.8, 0.5,    0, 0, -1000 );
-				addLight( 0.995, 0.5, 0.9, 5000, 5000, -1000 );
+				addLight( 0.55, 0.9, 0.5, 5000, 0, - 1000 );
+				addLight( 0.08, 0.8, 0.5,    0, 0, - 1000 );
+				addLight( 0.995, 0.5, 0.9, 5000, 5000, - 1000 );
 
 				function addLight( h, s, l, x, y, z ) {