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

Merged upstream CubeCamera changes

Greg Tatum 10 years ago
parent
078c31024f d4e55945f2
commit
b2b98c8f52
4 changed files with 7 additions and 12 deletions
Split View Show Diff Stats
  1. 5 5
      docs/api/cameras/CubeCamera.html
  2. 0 0
      docs/api/examples/cameras/CombinedCamera.html
  3. 2 6
      docs/list.js
  4. 0 1
      src/extras/animation/Animation.js

+ 5 - 5
docs/api/extras/cameras/CubeCamera.html → docs/api/cameras/CubeCamera.html
View File 

@@ -2,9 +2,9 @@
 
 <html lang="en">
 
 	<head>
 
 		<meta charset="utf-8" />
 
-		<script src="../../../list.js"></script>
 
-		<script src="../../../page.js"></script>
 
-		<link type="text/css" rel="stylesheet" href="../../../page.css" />
 
+		<script src="../../list.js"></script>
 
+		<script src="../../page.js"></script>
 
+		<link type="text/css" rel="stylesheet" href="../../page.css" />
 
 	</head>
 
 	<body>
 
 		[page:Object3D] &rarr;
 
@@ -20,11 +20,11 @@
 
 		<div>[example:webgl_materials_cubemap_dynamic2 shading / physical ]</div>
 
 		
 		<code>//Create cube camera
 
-		var cubeCamera = new THREE.CubeCamera( 1, 100000, 128 );		
+		var cubeCamera = new THREE.CubeCamera( 1, 100000, 128 );
 
 		scene.add( cubeCamera );
 
 		
 		//Create car
 
-		var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, ambient: 0xffffff, envMap: cubeCamera.renderTarget  } );
 
+		var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, ambient: 0xffffff, envMap: cubeCamera.renderTarget } );
 
 		var car = new Mesh( carGeometry, chromeMaterial );
 
 		scene.add( car );

+ 0 - 0
docs/api/extras/cameras/CombinedCamera.html → docs/api/examples/cameras/CombinedCamera.html
View File


+ 2 - 6
docs/list.js
View File 

@@ -19,6 +19,7 @@ var list = {
 
 
 		"Cameras": [
 
 			[ "Camera", "api/cameras/Camera" ],
 
+			[ "CubeCamera", "api/cameras/CubeCamera" ],
 
 			[ "OrthographicCamera", "api/cameras/OrthographicCamera" ],
 
 			[ "PerspectiveCamera", "api/cameras/PerspectiveCamera" ]
 
 		],
 
@@ -169,12 +170,6 @@ var list = {
 
 			[ "AnimationMorphTarget", "api/extras/animation/AnimationMorphTarget" ]
 
 		],
 
 
-		"Extras / Cameras": [
 
-			[ "CombinedCamera", "api/extras/cameras/CombinedCamera" ],
 
-			[ "CubeCamera", "api/extras/cameras/CubeCamera" ]
 
-		],
 
-
 
-
 
 		"Extras / Core": [
 
 			[ "Curve", "api/extras/core/Curve" ],
 
 			[ "CurvePath", "api/extras/core/CurvePath" ],
 
@@ -243,6 +238,7 @@ var list = {
 
 		],
 
 
 		"Examples" : [
 
+			[ "CombinedCamera", "api/examples/cameras/CombinedCamera" ],
 
 			[ "LookupTable", "api/examples/Lut" ]
 
 
 		]

+ 0 - 1
src/extras/animation/Animation.js
View File 

@@ -195,7 +195,6 @@ THREE.Animation.prototype.update = (function(){
 
 			} else {
 
 
 				this.stop();
 
-				return;
 
 
 			}