Home Explore Help
Sign In
javascript
/
three.js
mirror of https://github.com/tazdij/three.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Lensflares: Clean up

Mugen87 7 years ago
parent
8dd1fe836b
commit
ad353e3e4f
6 changed files with 12 additions and 81 deletions
Split View Show Diff Stats
  1. 1 1
      docs/api/deprecated/DeprecatedList.html
  2. 0 41
      docs/api/renderers/webgl/plugins/LensFlarePlugin.html
  3. 7 9
      docs/examples/objects/LensFlare.html
  4. 1 2
      docs/list.js
  5. 1 1
      test/three.example.unit.js
  6. 2 27
      test/unit/example/objects/LensFlare.tests.js

+ 1 - 1
docs/api/deprecated/DeprecatedList.html
View File 

@@ -458,7 +458,7 @@
 
 
 		<h3>[page:LensFlare]</h3>
 
 		<div>
 
-			LensFlare has been moved to [link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/LensFlare.js /examples/js/objects/LensFlare.js].
 
+			LensFlare has been moved to [link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/Lensflare.js /examples/js/objects/Lensflare.js].
 
 		</div>

+ 0 - 41
docs/api/renderers/webgl/plugins/LensFlarePlugin.html
View File 

@@ -1,41 +0,0 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
-	<head>
 
-		<meta charset="utf-8" />
 
-		<base href="../../../../" />
 
-		<script src="list.js"></script>
 
-		<script src="page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="page.css" />
 
-	</head>
 
-	<body>
 
-		<h1>[name]</h1>
 
-
 
-		<div class="desc">The Webglrenderer plugin class that allows lensflares to be rendered in the WebglRenderer. This plugin is automatically loaded in the Webglrenderer.</div>
 
-
 
-
 
-		<h2>Constructor</h2>
 
-
 
-		<h3>[name]()</h3>
 
-		<div>
 
-		Creates a new [name].
 
-		</div>
 
-
 
-
 
-		<h2>Methods</h2>
 
-
 
-		<h3>[method:null render]( [page:Scene scene], [page:Camera camera], [page:Number viewportWidth], [page:Number viewportHeight] )</h3>
 
-		<div>
 
-		scene -- The scene to render. <br />
 
-		camera -- The camera to render. <br />
 
-		viewportWidth -- The width of the viewport. <br />
 
-		viewportHeight -- The height of the viewport.
 
-		</div>
 
-		<div>
 
-		Renders the lensflares defined in the scene. This gets automatically called as post render function to draw the lensflares.
 
-		</div>
 
-
 
-		<h2>Source</h2>
 
-
 
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 
-	</body>
 
-</html>

+ 7 - 9
docs/examples/objects/LensFlare.html
View File 

@@ -14,8 +14,6 @@
 
 
 		<div class="desc">
 
 			Creates a simulated lens flare that tracks a light.<br /><br />
 
-
 
-			Note: [page:WebGLRenderer.alpha] must be set to *true* for LensFlare to work.
 
 		</div>
 
 
 		<h2>Example</h2>
 
@@ -32,13 +30,13 @@ var textureFlare0 = textureLoader.load( "textures/lensflare/lensflare0.png" );
 
 var textureFlare1 = textureLoader.load( "textures/lensflare/lensflare2.png" );
 
 var textureFlare2 = textureLoader.load( "textures/lensflare/lensflare3.png" );
 
 
-var lensFlare = new THREE.LensFlare();
 
+var lensflare = new THREE.Lensflare();
 
 
-lensFlare.add( new THREE.LensFlareElement( textureFlare0, 512, 0 ) );
 
-lensFlare.add( new THREE.LensFlareElement( textureFlare1, 512, 0 ) );
 
-lensFlare.add( new THREE.LensFlareElement( textureFlare2, 60, 0.6 ) );
 
+lensflare.add( new THREE.LensflareElement( textureFlare0, 512, 0 ) );
 
+lensflare.add( new THREE.LensflareElement( textureFlare1, 512, 0 ) );
 
+lensflare.add( new THREE.LensflareElement( textureFlare2, 60, 0.6 ) );
 
 
-light.add( lensFlare );
 
+light.add( lensflare );
 
 			</code>
 
 
 		</div>
 
@@ -46,7 +44,7 @@ light.add( lensFlare );
 
 		<h2>Constructor</h2>
 
 
 
-		<h3>LensFlareElement( [page:Texture texture], [page:Float size], [page:Float distance], [page:Color color], [page:Materials blending] )</h3>
 
+		<h3>LensflareElement( [page:Texture texture], [page:Float size], [page:Float distance], [page:Color color], [page:Materials blending] )</h3>
 
 		<div>
 
 		[page:Texture texture] - THREE.Texture to use for the flare. <br />
 
 		[page:Float size] - (optional) size in pixels <br />
 
@@ -68,6 +66,6 @@ light.add( lensFlare );
 
 
 		<h2>Source</h2>
 
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/LensFlare.js examples/js/objects/LensFlare.js]
 
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/objects/Lensflare.js examples/js/objects/Lensflare.js]
 
 	</body>
 
 </html>

+ 1 - 2
docs/list.js
View File 

@@ -361,7 +361,7 @@ var list = {
 
 		},
 
 
 		"Objects": {
 
-			"LensFlare": "examples/objects/LensFlare",
 
+			"Lensflare": "examples/objects/Lensflare",
 
 		},
 
 
 		"Exporters": {
 
@@ -404,7 +404,6 @@ var list = {
 
 		},
 
 
 		"WebGLRenderer / Plugins": {
 
-			"LensFlarePlugin": "api/renderers/webgl/plugins/LensFlarePlugin",
 
 			"SpritePlugin": "api/renderers/webgl/plugins/SpritePlugin"
 
 		}

+ 1 - 1
test/three.example.unit.js
View File 

@@ -4,4 +4,4 @@
 
 
 import './unit/example/exporters/GLTFExporter.tests';
 
 import './unit/example/loaders/GLTFLoader.tests';
 
-import './unit/example/objects/LensFlare.tests';
 
+import './unit/example/objects/Lensflare.tests';

+ 2 - 27
test/unit/example/objects/LensFlare.tests.js
View File 

@@ -3,11 +3,11 @@
 
  */
 
 /* global QUnit */
 
 
-import * as LensFlare from '../../../../examples/js/objects/LensFlare';
 
+import * as Lensflare from '../../../../examples/js/objects/Lensflare';
 
 
 export default QUnit.module( 'Objects', () => {
 
 
-	QUnit.module( 'LensFlare', () => {
 
+	QUnit.module( 'Lensflare', () => {
 
 
 		// INHERITANCE
 
 		QUnit.todo( "Extending", ( assert ) => {
 
@@ -23,31 +23,6 @@ export default QUnit.module( 'Objects', () => {
 
 
 		} );
 
 
-		// PUBLIC STUFF
 
-		QUnit.todo( "isLensFlare", ( assert ) => {
 
-
 
-			assert.ok( false, "everything's gonna be alright" );
 
-
 
-		} );
 
-
 
-		QUnit.todo( "copy", ( assert ) => {
 
-
 
-			assert.ok( false, "everything's gonna be alright" );
 
-
 
-		} );
 
-
 
-		QUnit.todo( "add", ( assert ) => {
 
-
 
-			assert.ok( false, "everything's gonna be alright" );
 
-
 
-		} );
 
-
 
-		QUnit.todo( "updateLensFlares", ( assert ) => {
 
-
 
-			assert.ok( false, "everything's gonna be alright" );
 
-
 
-		} );
 
-
 
 	} );
 
 
 } );