Merge pull request #3 from mrdoob/dev

Sync
mrdoob · Mar 16, 2015 · 5e6fd61 · 5e6fd61
2 parents 3e09c15 + 1aabcb3
commit 5e6fd61
Show file tree

Hide file tree

Showing 347 changed files with 17,584 additions and 10,331 deletions.
diff --git a/build/three.js b/build/three.js
diff --git a/build/three.min.js b/build/three.min.js
diff --git a/docs/api/cameras/CubeCamera.html b/docs/api/cameras/CubeCamera.html
@@ -24,7 +24,7 @@ <h2>Examples</h2>
 		scene.add( cubeCamera );
 
 		//Create car
-		var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, ambient: 0xffffff, envMap: cubeCamera.renderTarget } );
+		var chromeMaterial = new THREE.MeshLambertMaterial( { color: 0xffffff, envMap: cubeCamera.renderTarget } );
 		var car = new Mesh( carGeometry, chromeMaterial );
 		scene.add( car );
 

diff --git a/docs/api/constants/CustomBlendingEquations.html b/docs/api/constants/CustomBlendingEquations.html
@@ -13,7 +13,9 @@ <h2>Equations</h2>
 		<div>
 		THREE.AddEquation<br />
 		THREE.SubtractEquation<br />
-		THREE.ReverseSubtractEquation
+		THREE.ReverseSubtractEquation<br />
+		THREE.MinEquation<br />
+		THREE.MaxEquation
 		</div>
 
 		<h2>Destination Factors</h2>

diff --git a/docs/api/constants/GLState.html b/docs/api/constants/GLState.html
@@ -7,7 +7,7 @@
 		<link type="text/css" rel="stylesheet" href="../../page.css" />
 	</head>
 	<body>
-		<h1>GL State Conflicts</h1>
+		<h1>GL State Constants</h1>
 
 		<h2>Cull Face</h2>
 		<div>

diff --git a/docs/api/constants/Textures.html b/docs/api/constants/Textures.html
@@ -21,6 +21,8 @@ <h2>Mapping Modes</h2>
 		THREE.UVMapping<br />
 		THREE.CubeReflectionMapping<br />
 		THREE.CubeRefractionMapping<br />
+		THREE.EquirectangularReflectionMapping<br />
+		THREE.EquirectangularRefractionMapping<br />
 		THREE.SphericalReflectionMapping
 		</div>
 
@@ -49,7 +51,8 @@ <h2>Data Types</h2>
 		THREE.UnsignedShortType<br />
 		THREE.IntType<br />
 		THREE.UnsignedIntType<br />
-		THREE.FloatType
+		THREE.FloatType<br />
+		THREE.HalfFloatType
 		</div>
 
 		<h2>Pixel Types</h2>
@@ -65,17 +68,25 @@ <h2>Pixel Formats</h2>
 		THREE.RGBFormat<br />
 		THREE.RGBAFormat<br />
 		THREE.LuminanceFormat<br />
-		THREE.LuminanceAlphaFormat
+		THREE.LuminanceAlphaFormat<br />
+		THREE.RGBEFormat
 		</div>
 
-		<h2>Compressed Texture Formats</h2>
+		<h2>DDS / ST3C Compressed Texture Formats</h2>
 		<div>
 		THREE.RGB_S3TC_DXT1_Format<br />
 		THREE.RGBA_S3TC_DXT1_Format<br />
 		THREE.RGBA_S3TC_DXT3_Format<br />
 		THREE.RGBA_S3TC_DXT5_Format
 		</div>
 
+		<h2>PVRTC Compressed Texture Formats</h2>
+		<div>
+		THREE.RGB_PVRTC_4BPPV1_Format<br />
+		THREE.RGB_PVRTC_2BPPV1_Format<br />
+		THREE.RGBA_PVRTC_4BPPV1_Format<br />
+		THREE.RGBA_PVRTC_2BPPV1_Format
+		</div>
 
 		<h2>Source</h2>
 

diff --git a/docs/api/core/Raycaster.html b/docs/api/core/Raycaster.html
@@ -23,8 +23,8 @@ <h2>Example</h2>
 			// calculate mouse position in normalized device coordinates
 			// (-1 to +1) for both components
 
-			mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1
-			mouse.y = - ( event.clientY / window.innerHeight ) * 2 + 1		
+			mouse.x = ( event.clientX / window.innerWidth ) * 2 - 1;
+			mouse.y = - ( event.clientY / window.innerHeight ) * 2 + 1;		
 
 		}
 
@@ -36,9 +36,9 @@ <h2>Example</h2>
 			// calculate objects intersecting the picking ray
 			var intersects = raycaster.intersectObjects( scene.children );
 
-			for ( var intersect in intersects ) {
+			for ( var i = 0; i < intersects.length; i++ ) {
 
-				intersect.object.material.color = new THREE.Color( 0xff0000 );
+				intersects[ i ].object.material.color.set( 0xff0000 );
 
 			}
 

diff --git a/docs/api/extras/geometries/CylinderGeometry.html b/docs/api/extras/geometries/CylinderGeometry.html
@@ -8,7 +8,7 @@
 	</head>
 	<body>
 		[page:Geometry] &rarr;
-		
+
 		<h1>[name]</h1>
 
 		<div class="desc">A class for generating cylinder geometries</div>
@@ -26,21 +26,23 @@ <h2>Example</h2>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:Float radiusTop], [page:Float radiusBottom], [page:Float height], [page:Integer radiusSegments], [page:Integer heightSegments], [page:Boolean openEnded])</h3>
+		<h3>[name]([page:Float radiusTop], [page:Float radiusBottom], [page:Float height], [page:Integer radiusSegments], [page:Integer heightSegments], [page:Boolean openEnded], [page:Float thetaStart], [page:Float thetaLength])</h3>
 		<div>
 		radiusTop — Radius of the cylinder at the top. Default is 20.<br />
 		radiusBottom — Radius of the cylinder at the bottom. Default is 20.<br />
 		height — Height of the cylinder. Default is 100.<br />
 		radiusSegments — Number of segmented faces around the circumference of the cylinder. Default is 8<br />
 		heightSegments — Number of rows of faces along the height of the cylinder. Default is 1.<br />
-		openEnded — A Boolean indicating whether the ends of the cylinder are open or capped. Default is false, meaning capped.
+		openEnded — A Boolean indicating whether the ends of the cylinder are open or capped. Default is false, meaning capped.<br />
+		thetaStart — Start angle for first segment, default = 0 (three o'clock position).<br />
+		thetaLength — The central angle, often called theta, of the circular sector. The default is 2*Pi, which makes for a complete cylinder.
 		</div>
 
 
 		<h2>Properties</h2>
 
 		<div>
-		Each of the contructor parameters is accessible as a property of the same name. Any modification of these properties after instantiation does not change the geometry.
+		Each of the constructor parameters is accessible as a property of the same name. Any modification of these properties after instantiation does not change the geometry.
 		</div>
 
 

diff --git a/docs/api/extras/helpers/CameraHelper.html b/docs/api/extras/helpers/CameraHelper.html
@@ -45,7 +45,7 @@ <h3>[property:Camera camera]</h3>
 		<h2>Methods</h2>
 
 
-		<h3>[method:todo update]()</h3>
+		<h3>[method:null update]()</h3>
 		<div>
 		Updates the helper based on the projectionMatrix of the camera.
 		</div>

diff --git a/docs/api/extras/helpers/DirectionalLightHelper.html b/docs/api/extras/helpers/DirectionalLightHelper.html
@@ -17,7 +17,7 @@ <h1>[name]</h1>
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([DirectionalLight:todo light], [page:Number size])</h3>
+		<h3>[name]([page:DirectionalLight light], [page:Number size])</h3>
 		<div>
 		light -- [page:DirectionalLight] -- Light to visualize <br />
 		size -- dimensions of the plane
@@ -32,18 +32,18 @@ <h2>Properties</h2>
 
 		<h3>[property:Line lightPlane]</h3>
 		<div>
-		todo
+		Contains the line mesh showing the location of the directional light.
 		</div> 
 
 		<h3>[property:DirectionalLight light]</h3>
 		<div>
-		todo
+		Contains the directionalLight.
 		</div> 
 
 		<h3>[property:Line targetLine]</h3>
 		<div>
-		todo
-		</div> 
+		Contains the line mesh that shows the direction of the light. 
+		</div>
 
 		<h2>Methods</h2>
 

diff --git a/docs/api/extras/helpers/EdgesHelper.html b/docs/api/extras/helpers/EdgesHelper.html
@@ -27,10 +27,12 @@ <h2>Example</h2>
 		</code>
 
 		<h2>Constructor</h2>
-		<h3>[name]( [page:Object3D object], [page:Color color] )</h3>
+		<h3>[name]( [page:Object3D object], [page:Color color], [page:Float thresholdAngle] )</h3>
 		<div>
 		object -- Object of which to draw edges <br />
-		color -- Color of the edges.
+		color -- Color of the edges.<br />
+		thresholdAngle -- the minimim angle (in degrees), between the face normals of adjacent faces, that is required to render an edge. Default is 0.1.
+
 		</div>
 		<div>
 		Creates a [page:Line], showing only the "hard" edges of the passed object; specifically, no edge will be drawn between faces which are adjacent and coplanar (or nearly coplanar).

diff --git a/docs/api/extras/helpers/HemisphereLightHelper.html b/docs/api/extras/helpers/HemisphereLightHelper.html
@@ -11,41 +11,39 @@
 
 		<h1>[name]</h1>
 
-		<div class="desc">todo</div>
+		<div class="desc">Creates a visual aid for a [page:HemisphereLight HemisphereLight].</div>
 
 
 		<h2>Constructor</h2>
 
-		<h3>[name]([page:todo light], [page:todo sphereSize], [page:todo arrowLength], [page:todo domeSize])</h3>
+		<h3>[name]([page:HemisphereLight light], [page:Number sphereSize])</h3>
 		<div>
-		light -- todo <br />
-		sphereSize -- todo <br />
-		arrowLength -- todo <br />
-		domeSize -- todo
+		light -- The HemisphereLight. <br />
+		sphereSize -- The size of the sphere that shows the location.
 		</div>
 		<div>
-		todo
+		Creates an helper for the hemispherelight.
 		</div>
 
 
 		<h2>Properties</h2>
 
 		<h3>[property:Mesh lightSphere]</h3>
 		<div>
-		todo
+		The sphere mesh that shows the location of the hemispherelight. 
 		</div> 
 
 		<h3>[property:HemisphereLight light]</h3>
 		<div>
-		todo
+		Contains the HemisphereLight.
 		</div> 
 
 
 		<h2>Methods</h2>
 
-		<h3>[method:todo update]()</h3>
+		<h3>[method:null update]()</h3>
 		<div>
-		todo
+		Updates the helper to match the position and direction of the [page:.light].
 		</div>
 
 

diff --git a/docs/api/loaders/OBJMTLLoader.html b/docs/api/loaders/OBJMTLLoader.html
@@ -47,7 +47,7 @@ <h3>[method:Object3D parse]( [page:String text], [page:Function mtllibCallback]
 		</div>
 		<div>
 		Parse an <em>obj</em> text structure and return an [page:Object3D].<br />
-		Found objects are converted to [page:Mesh] with a [page:BufferGeometry] and materials are converted to [page:MeshLambertMaterial].
+		Found objects are converted to a [page:Mesh] and materials are converted to [page:MeshLambertMaterial].
 		</div>
 
 		<h2>Example</h2>

diff --git a/docs/api/loaders/SceneLoader.html b/docs/api/loaders/SceneLoader.html
diff --git a/docs/api/materials/MeshLambertMaterial.html b/docs/api/materials/MeshLambertMaterial.html
@@ -29,7 +29,7 @@ <h3>[name]([page:Object parameters])</h3>
 		specularMap — Set specular map. Default is null.<br />
 		alphaMap — Set alpha map. Default is null.<br />
 		envMap — Set env map. Default is null.<br />
-		fog — Define whether the material color is affected by global fog settings. Default is false.
+		fog — Define whether the material color is affected by global fog settings. Default is false.<br />
 		shading — How the triangles of a curved surface are rendered. Default is [page:Materials THREE.SmoothShading].<br/>
 		wireframe — Render geometry as wireframe. Default is false (i.e. render as smooth shaded).<br/>
 		wireframeLinewidth — Controls wireframe thickness. Default is 1.<br/>
@@ -49,11 +49,6 @@ <h3>[property:Color color]</h3>
 		Diffuse color of the material. Default is white.<br />
 		</div>
 
-		<h3>[property:Color ambient]</h3>
-		<div>
-		Ambient color of the material, multiplied by the color of the [page:AmbientLight]. Default is white.<br />
-		</div>
-
 		<h3>[property:Color emissive]</h3>
 		<div>
 		Emissive (light) color of the material, essentially a solid color unaffected by other lighting. Default is black.<br />