ソースを参照

Merge pull request #6511 from TatumCreative/docs-updates-misc

Docs updates misc
Ricardo Cabello 10 年 前
コミット
e176dfd81b

+ 1 - 1
docs/api/cameras/CubeCamera.html

@@ -67,7 +67,7 @@
 
 
 
-		<h3>[method:todo updateCubeMap]([page:todo renderer], [page:todo scene])</h3>
+		<h3>[method:null updateCubeMap]([page:WebGLRenderer renderer], [page:Scene scene])</h3>
 		<div>
 		renderer -- The current WebGL renderer <br />
 		scene -- The current scene

+ 17 - 34
docs/api/extras/ImageUtils.html

@@ -44,18 +44,7 @@
 		Parses a DDS Image from the string into a CompressedTexture. 
 		</div>
 
-		<h3>[method:todo loadCompressedTexture]([page:todo url], [page:todo mapping], [page:todo onLoad], [page:todo onError])</h3>
-		<div>
-		url -- todo <br />
-		mapping -- todo <br />
-		onLoad -- todo <br />
-		onError -- todo
-		</div>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo loadTexture]([page:String url], [page:UVMapping mapping], [page:Function onLoad], [page:Function onError])</h3>
+		<h3>[method:Texture loadTexture]([page:String url], [page:UVMapping mapping], [page:Function onLoad], [page:Function onError])</h3>
 		<div>
 		url -- the url of the texture<br />
 		mapping -- Can be an instance of [page:UVMapping THREE.UVMapping], [page:CubeReflectionMapping THREE.CubeReflectionMapping] or [page:SphericalReflectionMapping THREE.SphericalReflectionMapping]. Describes how the image is applied to the object.<br />Use undefined instead of null as a default value. See mapping property of [page:Texture texture] for more details. <br/>
@@ -63,38 +52,32 @@
 		onError -- callback function
 		</div>
 		<div>
-		todo
+		A helper function to generates a [page:Texture THREE.Texture] from an image URL. Provides a load and error
+		callback.
 		</div>
 
-		<h3>[method:todo getNormalMap]([page:todo image], [page:todo depth])</h3>
+		<h3>[method:canvas getNormalMap]([page:Image image], [page:Float depth])</h3>
 		<div>
-		image -- todo <br />
-		depth -- todo
+		image -- A loaded image element <br />
+		depth -- The depth of the normal map. Defaults to between -1 and 1.
 		</div>
 		<div>
-		todo
+		Translates an image element into a normal map with the range (-1, -1, -1) to (1, 1, 1) multiplied by the depth.
+		Returns a canvas element.
 		</div>
 
-		<h3>[method:todo loadCompressedTextureCube]([page:todo array], [page:todo mapping], [page:todo onLoad], [page:todo onError])</h3>
+		<h3>[method:CubeTexture loadTextureCube]([page:Array array], [page:Textures mapping], [page:function onLoad], [page:function onError])</h3>
 		<div>
-		array -- todo <br />
-		mapping -- todo <br />
-		onLoad -- todo <br />
-		onError -- todo
+		array -- An array of 6 images <br />
+		mapping -- Either [page:Textures THREE.CubeReflectionMapping] or [page:Textures THREE.CubeRefractionMapping]<br />
+		onLoad -- callback <br />
+		onError -- callback
 		</div>
 		<div>
-		todo
-		</div>
-
-		<h3>[method:todo loadTextureCube]([page:todo array], [page:todo mapping], [page:todo onLoad], [page:todo onError])</h3>
-		<div>
-		array -- todo <br />
-		mapping -- todo <br />
-		onLoad -- todo <br />
-		onError -- todo
-		</div>
-		<div>
-		todo
+		Creates a [page:CubeTexture] from 6 images.<br /><br />
+		
+		The images are loaded in the following order where p is positiive and n is negative: [ px, nx, py, ny, pz, nz ].
+		See [page:CubeTexture] for an example in code.
 		</div>
 
 		<h2>Source</h2>

+ 2 - 2
docs/api/extras/animation/Animation.html

@@ -48,7 +48,7 @@
 		
 		<h3>[property:number timeScale]</h3>
 		<div>
-		The timez 
+		How much to scale the speed of the animation. Defaults to 1.
 		</div>
 
 		<h3>[property:boolean isPlaying]</h3>
@@ -75,7 +75,7 @@
 		
 		<h3>[method:null play]([page:Number startTime])</h3>
 		<div>
-		Starts the animation from a moment startTime in the animation.
+		Starts the animation at the startTime (in seconds) of the animation.
 		</div>
 
 		<h3>[method:null stop]()</h3>

+ 0 - 105
docs/api/extras/animation/AnimationMorphTarget.html

@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<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" />
-	</head>
-	<body>
-		<h1>[name]</h1>
-
-		<div class="desc">todo</div>
-
-
-		<h2>Constructor</h2>
-
-
-		<h3>[name]([page:todo root], [page:todo data])</h3>
-		<div>
-		root -- todo <br />
-		data -- todo
-		</div>
-		<div>
-		todo
-		</div>
-
-		<h2>Properties</h2>
-		
-		<h3>[property:todo root]</h3>
-		<div>
-		todo
-		</div> 
-
-		<h3>[property:todo data]</h3>
-		<div>
-		todo
-		</div> 
-		
-		<h3>[property:todo hierarchy]</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[property:number currentTime]</h3>
-		<div>
-		todo
-		</div>
-		
-		<h3>[property:number timeScale]</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[property:boolean isPlaying]</h3>
-		<div>
-		todo
-		</div>
-		
-		<h3>[property:boolean isPaused]</h3>
-		<div>
-		todo
-		</div>
-		
-		<h3>[property:boolean loop]</h3>
-		<div>
-		todo
-		</div> 
-		
-		<h3>[property:number influence]</h3>
-		<div>
-		todo
-		</div> 
-
-
-		<h2>Methods</h2>
-
-		<h3>[method:todo play]()</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo pause]()</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo stop]()</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo update]([page:todo deltaTimeMS])</h3>
-		<div>
-		deltaTimeMS -- todo
-		</div>
-		<div>
-		todo
-		</div>
-
-
-		<h2>Source</h2>
-
-		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
-	</body>
-</html>

+ 36 - 54
docs/api/extras/animation/KeyFrameAnimation.html

@@ -9,124 +9,106 @@
 	<body>
 		<h1>[name]</h1>
 
-		<div class="desc">todo</div>
+		<div class="desc">Runs a keyframe animation as imported from the [page:ColladaLoader].</div>
+
+		<h2>Examples</h2>
+		
+		<div>[example:webgl_loader_collada_keyframe loader / collada / keyframe ]</div>
 
 
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo root], [page:todo data], [page:todo JITCompile])</h3>
+		<h3>[name]([page:Object data])</h3>
 		<div>
-		root -- todo <br />
-		data -- todo <br />
-		JITCompile -- todo
+		data -- An individual animation object from a the [page:ColladaLoader], e.g. loadedColladaObj.animations[0] <br />
 		</div>
 		<div>
-		todo
+		Creates a new keyframe animation and initializes it to the first keyframes.
 		</div>
 		
 
 		<h2>Properties</h2>
 
-		<h3>[property:todo root]</h3>
+		<h3>[property:Object3D root]</h3>
 		<div>
-		todo
+		The root object of the animation
 		</div> 
 
-		<h3>[property:todo data]</h3>
+		<h3>[property:Object data]</h3>
 		<div>
-		todo
+		The data containing the animation
 		</div> 
 		
-		<h3>[property:todo hierarchy]</h3>
+		<h3>[property:Array hierarchy]</h3>
 		<div>
-		todo
+		The objects that are influenced by the animation.
 		</div>
 
 		<h3>[property:number currentTime]</h3>
 		<div>
-		todo
+		The time elapsed since the last start/restart of the animation.
 		</div>
 		
 		<h3>[property:number timeScale]</h3>
 		<div>
-		todo
+		How much to scale the speed of the animation. Defaults to 1.
 		</div>
 
 		<h3>[property:boolean isPlaying]</h3>
 		<div>
-		todo
+		Indicates whether the animation is playing. This shouldn't be adapted by user code.
 		</div>
 		
 		<h3>[property:boolean isPaused]</h3>
 		<div>
-		todo
+		Indicates whether the animation is paused. This shouldn't be adapted by user code.
 		</div>
 		
 		<h3>[property:boolean loop]</h3>
 		<div>
-		todo
+		Set to make the animation restart when the animation ends.
 		</div> 
 		
-		<h3>[property:boolean JITCompile]</h3>
-		<div>
-		todo
-		</div>
-
 		<h2>Methods</h2>
 		
-		<h3>[method:todo play]()</h3>
+		<h3>[method:null play]([page:Number startTime])</h3>
 		<div>
-		todo
+		Starts the animation at the startTime (in seconds) of the animation.
 		</div>
 
-		<h3>[method:todo pause]()</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo stop]()</h3>
-		<div>
-		todo
-		</div>
-
-		<h3>[method:todo update]([page:todo deltaTimeMS])</h3>
-		<div>
-		deltaTimeMS -- todo
-		</div>
+		<h3>[method:null stop]()</h3>
 		<div>
-		todo
+		Stops the animation.
 		</div>
 
-		<h3>[method:todo interpolateCatmullRom]([page:todo points], [page:todo scale])</h3>
+		<h3>[method:null update]([page:Float deltaTime])</h3>
 		<div>
-		points -- todo <br />
-		scale -- todo
+		deltaTime -- The change in time in seconds
 		</div>
 		<div>
-		todo
+		Updates the keyframe animation
 		</div>
 
-		<h3>[method:todo getNextKeyWith]([page:todo sid], [page:todo h], [page:todo key])</h3>
+		<h3>[method:Object getNextKeyWith]([page:String sid], [page:Integer h], [page:Integer key])</h3>
 		<div>
-		sid -- todo <br />
-		h -- todo <br />
-		key -- todo
+		sid -- The string id <br />
+		h -- The index in the heirarchy to use<br />
+		key -- The index of which key to start from
 		</div>
 		<div>
-		todo
+		Used internally to traverse the animation
 		</div>
 
-		<h3>[method:todo getPrevKeyWith]([page:todo sid], [page:todo h], [page:todo key])</h3>
+		<h3>[method:Object getPrevKeyWith]([page:String sid], [page:Integer h], [page:Integer key])</h3>
 		<div>
-		sid -- todo <br />
-		h -- todo <br />
-		key -- todo
+		sid -- The string id <br />
+		h -- The index in the heirarchy to use<br />
+		key -- The index of which key to start from
 		</div>
 		<div>
-		todo
+		Used internally to traverse the animation
 		</div>
-		<h2>Source</h2>
 
 		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
 	</body>

+ 5 - 2
docs/api/extras/core/Curve.html

@@ -9,7 +9,10 @@
 	<body>
 		<h1>[name]</h1>
 
-		<div class="desc">An extensible curve object which contains methods for interpolation.</div>
+		<div class="desc">
+		An abstract base class for creating a curve object that contains methods for interpolation.
+		For an array of Curves see [page:CurvePath].
+		</div>
 		
 		<h2>Examples</h2>
 		
@@ -27,7 +30,7 @@
 		<h2>Methods</h2>
 
 		<h3>[method:Vector getPoint]( t )</h3>
-		<div>Returns a vector for point t of the curve where t is between 0 and 1</div>
+		<div>Returns a vector for point t of the curve where t is between 0 and 1. Must be implemented in the extending class.</div>
 
 		<h3>[method:Vector getPointAt]( u )</h3>
 		<div>Returns a vector for point at relative position in curve according to arc length</div>

+ 48 - 45
docs/api/extras/core/CurvePath.html

@@ -11,7 +11,10 @@
 
 		<h1>[name]</h1>
 
-		<div class="desc">todo</div>
+		<div class="desc">
+		An abstract base class further extending [page:Curve]. A CurvePath is simply an array of connected curves,
+		but retains the api of a curve.
+		</div>
 
 
 		<h2>Constructor</h2>
@@ -19,7 +22,7 @@
 
 		<h3>[name]()</h3>
 		<div>
-		todo
+		The constructor take no parameters.
 		</div>
 
 
@@ -28,107 +31,107 @@
 
 		<h3>[property:array curves]</h3>
 		<div>
-		todo
+		The array of [page:Curve]s
 		</div> 
 
 		<h3>[property:array bends]</h3>
 		<div>
-		todo
+		An array of [page:Curve]s used to transform and bend the curve using [page:CurvePath.getWrapPoints].
 		</div> 
 
 		<h3>[property:boolean autoClose]</h3>
 		<div>
-		todo
+		Whether or not to automatically close the path.
 		</div> 
 
 		<h2>Methods</h2>
 
 
-		<h3>[method:todo getWrapPoints]([page:todo oldPts], [page:todo path])</h3>
+		<h3>[method:Array getWrapPoints]([page:Array vertices], [page:Curve curve])</h3>
 		<div>
-		oldPts -- todo <br />
-		path -- todo
+		vertices -- An array of [page:Vector2]s to modify<br />
+		curve -- An array of 2d [page:Curve]s
 		</div>
 		<div>
-		todo
+		Modifies the array of vertices by warping it by the curve. The curve parameter also accepts objects with similar
+		interfaces such as [page:CurvePath], [page:Path], [page:SplineCurve], etc. Returns the original vertices after
+		modification.
 		</div>
 
-		<h3>[method:todo createPointsGeometry]([page:todo divisions])</h3>
+		<h3>[method:null addWrapPath]([page:Curve curve])</h3>
 		<div>
-		divisions -- todo
+		curve -- A [page:Curve] or object with a similar interface.
 		</div>
 		<div>
-		todo
+		Pushes a curve onto the bends array.
 		</div>
 
-		<h3>[method:todo addWrapPath]([page:todo bendpath])</h3>
+		<h3>[method:Geometry createGeometry]([page:Vector3 points])</h3>
 		<div>
-		bendpath -- todo
+		points -- An array of [page:Vector3]s
 		</div>
 		<div>
-		todo
+		Creates a geometry from points
 		</div>
 
-		<h3>[method:todo createGeometry]([page:todo points])</h3>
+		<h3>[method:Geometry createPointsGeometry]([page:Integer divisions])</h3>
 		<div>
-		points -- todo
+		divisions -- How many segments to create with [page:Vector3]s. Defaults to 12.
 		</div>
 		<div>
-		todo
+		Creates a [page:Geometry] object comprised of [page:Vector3]s
 		</div>
-
-		<h3>[method:todo add]([page:todo curve])</h3>
+		
+		<h3>[method:Geometry createSpacedPointsGeometry]([page:Integer divisions])</h3>
 		<div>
-		curve -- todo
+		divisions -- How many segments to create with [page:Vector3]s. Defaults to 12.
 		</div>
 		<div>
-		todo
+		Creates a [page:Geometry] object comprised of [page:Vector3]s that are equidistant.
 		</div>
+		
 
-		<h3>[method:todo getTransformedSpacedPoints]([page:todo segments], [page:todo bends])</h3>
+		<h3>[method:null add]([page:Curve curve])</h3>
 		<div>
-		segments -- todo <br />
-		bends -- todo
+		curve -- The [page:Curve curve] to add
 		</div>
 		<div>
-		todo
+		Pushes a curve onto the curves array.
 		</div>
 
-		<h3>[method:todo createSpacedPointsGeometry]([page:todo divisions])</h3>
+		<h3>[method:null closePath]()</h3>
 		<div>
-		divisions -- todo
-		</div>
-		<div>
-		todo
+		Adds a curve to close the path.
 		</div>
 
-		<h3>[method:todo closePath]()</h3>
+		<h3>[method:Object getBoundingBox]()</h3>
 		<div>
-		todo
+		Returns an object with the keys minX, minY, maxX, maxY, (if 3d: maxZ, minZ)
 		</div>
 
-		<h3>[method:todo getBoundingBox]()</h3>
+		<h3>[method:Float getCurveLengths]()</h3>
 		<div>
-		todo
+		Adds together the length of the curves
 		</div>
 
-		<h3>[method:todo getCurveLengths]()</h3>
+		<h3>[method:Array getTransformedPoints]([page:Integer segments], [page:Array bends])</h3>
 		<div>
-		todo
+		segments -- The number of segments to create using the getPoints()<br />
+		bends -- (optional) An array of [page:Curve]s used to transform the points. Defaults to this.bends if blank.
 		</div>
-
-		<h3>[method:todo getTransformedPoints]([page:todo segments], [page:todo bends])</h3>
 		<div>
-		segments -- todo <br />
-		bends -- todo
+		Uses this CurvePath to generate a series of points transformed by the curves in the bends array. Returns an
+		array of [page:Vector2]s.
 		</div>
+		
+		<h3>[method:Array getTransformedSpacedPoints]([page:Integer segments], [page:Array bends])</h3>
 		<div>
-		todo
+		segments -- The number of segments to create using the getPoints()<br />
+		bends -- (optional) Defaults to this.bends if blank. An array of [page:Curve]s used to transform the points.
 		</div>
-
-		<h3>[method:todo checkConnection]()</h3>
 		<div>
-		todo
+		Uses this CurvePath to generate a series equidistant points that are then transformed by the curves in the bends.
+	    Returns an array of [page:Vector2]s.
 		</div>
 
 		<h2>Source</h2>

+ 64 - 21
docs/api/extras/core/Path.html

@@ -11,13 +11,16 @@
 
 		<h1>[name]</h1>
 
-		<div class="desc">A 2d path representation, comprising of points, lines, and cubes,  similar to the html5 2d canvas api. It extends CurvePath.</div>
+		<div class="desc">
+		A 2d path representation, comprising of points, lines, and cubes, similar to the html5 2d canvas api.
+		It extends [page:CurvePath].
+		</div>
 
 
 		<h2>Constructor</h2>
 
 
-		<h3>[name]([page:todo points])</h3>
+		<h3>[name]([page:Array points])</h3>
 		<div>
 		points -- array of Vector2
 		</div>
@@ -36,40 +39,80 @@
 
 		<h2>Methods</h2>
 
-		<h3>[method:todo fromPoints]( vectors )</h3>
+		<h3>[method:null fromPoints]( [page:Array vector2s] )</h3>
 		<div>
 		Adds to the Path from the points. The first vector defines the offset. After that the lines get defined.
 		</div>
 
-		<h3>[method:todo moveTo]( x, y )</h3>
+		<h3>[method:null moveTo]( [page:Float x], [page:Float y] )</h3>
 		<div>This moves the offset to x and y</div>
 
-		<h3>[method:todo lineTo]( x, y )</h3>
+		<h3>[method:null lineTo]( [page:Float x], [page:Float y] )</h3>
 		<div>This creates a line from the offset to X and Y and updates the offset to X and Y.</div>
 
-		<h3>[method:todo quadraticCurveTo]( aCPx, aCPy, aX, aY )</h3>
-		<div>This creates a quadratic curve from the offset to aX and aY with aCPx and aCPy as control point and updates the offset to aX and aY.</div>
+		<h3>[method:null quadraticCurveTo]( [page:Float cpX], [page:Float cpY], [page:Float x], [page:Float y] )</h3>
+		<div>This creates a quadratic curve from the offset to x and y with cpX and cpY as control point and updates the offset to x and y.</div>
 
-		<h3>[method:todo bezierCurveTo]( aCP1x, aCP1y, aCP2x, aCP2y, aX, aY )</h3>
-		<div>This creates a bezier curve from the offset to aX and aY with aCP1x, aCP1y and aCP1x, aCP1y  as control points and updates the offset to aX and aY.</div>
+		<h3>[method:null bezierCurveTo]( [page:Float cp1X], [page:Float cp1Y], [page:Float cp2X], [page:Float cp2Y], [page:Float x], [page:Float y] )</h3>
+		<div>This creates a bezier curve from the last offset to x and y with cp1X, cp1Y and cp1X, cp1Y as control points and updates the offset to x and y.</div>
 
-		<h3>.splineThru ( pts /*Array of Vector*/ ) </h3>
-		<div>todo</div>
+		<h3>[method:null splineThru] ( [page:Array points] ) </h3>
+		<div>points - An array of [page:Vector2]s</div>
+		<div>Connects a new [page:SplineCurve] onto the path.</div>
 
-		<h3>[method:todo arc]( aX, aY, aRadius, aStartAngle, aEndAngle, aClockwise )</h3>
-		<div>todo</div>
+		<h3>[method:null arc]( [page:Float x], [page:Float y], [page:Float radius], [page:Float startAngle], [page:Float endAngle], [page:Float clockwise] )</h3>
+		<div>
+		x, y -- The center of the arc offset from the last call
+		radius -- The radius of the arc
+		startAngle -- The start angle in radians
+		endAngle -- The end angle in radians
+		clockwise -- Sweep the arc clockwise. Defaults to false
+		</div>
+		<div>Draw an arc offset from the last call</div>
 
-		<h3>[method:todo absarc]( aX, aY, aRadius, aStartAngle, aEndAngle, aClockwise )</h3>
-		<div>todo</div>
+		<h3>[method:null absarc]( [page:Float x], [page:Float y], [page:Float radius], [page:Float startAngle], [page:Float endAngle], [page:Float clockwise] )</h3>
+		<div>
+		x, y -- The absolute center of the arc
+		radius -- The radius of the arc
+		startAngle -- The start angle in radians
+		endAngle -- The end angle in radians
+		clockwise -- Sweep the arc clockwise. Defaults to false
+		</div>
+		<div>Draw an arc absolutely positioned</div>
 
-		<h3>[method:todo ellipse]( aX, aY, xRadius, yRadius, aStartAngle, aEndAngle, aClockwise )</h3>
-		<div>todo</div>
+		<h3>[method:null ellipse]( [page:Float x], [page:Float y], [page:Float xRadius], [page:Float yRadius], [page:Float startAngle], [page:Float endAngle], [page:Float clockwise] )</h3>
+		<div>
+		x, y -- The center of the ellipse offset from the last call
+		xRadius -- The radius of the ellipse in the x axis
+		yRadius -- The radius of the ellipse in the y axis
+		startAngle -- The start angle in radians
+		endAngle -- The end angle in radians
+		clockwise -- Sweep the ellipse clockwise. Defaults to false
+		</div>
+		<div>Draw an ellipse offset from the last call</div>
 
-		<h3>[method:todo absellipse]( aX, aY, xRadius, yRadius, aStartAngle, aEndAngle, aClockwise )</h3>
-		<div>todo</div>
+		<h3>[method:null absellipse]( [page:Float x], [page:Float y], [page:Float xRadius], [page:Float yRadius], [page:Float startAngle], [page:Float endAngle], [page:Float clockwise] )</h3>
+		<div>
+		x, y -- The absolute center of the ellipse
+		xRadius -- The radius of the ellipse in the x axis
+		yRadius -- The radius of the ellipse in the y axis
+		startAngle -- The start angle in radians
+		endAngle -- The end angle in radians
+		clockwise -- Sweep the ellipse clockwise. Defaults to false
+		</div>
+		<div>Draw an ellipse absolutely positioned</div>
 
-		<h3>[method:todo toShapes]()</h3>
-		<div>todo</div>
+		<h3>[method:Array toShapes]( [page:Boolean isCCW], [page:Boolean noHoles] )</h3>
+		<div>
+		isCCW -- Changes how solids and holes are generated<br/>
+		noHoles -- Whether or not to generate holes
+		</div>
+		<div>
+		Converts the Path into an array of Shapes. By default solid shapes are defined clockwise (CW) and holes are defined counterclockwise (CCW). If isCCW is set to true,
+		then those are flipped. If the paramater noHoles is set to true then all paths are set as solid shapes and isCCW is ignored.
+		<br/>
+		
+		</div>
 
 
 		<h2>Source</h2>

+ 58 - 0
docs/api/textures/CubeTexture.html

@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<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" />
+	</head>
+	<body>
+		[page:Texture] &rarr;
+		
+		<h1>[name]</h1>
+
+		<div class="desc">Creates a cube texture made up of six images.</div>
+
+		<h2>Example</h2>
+
+		<code>
+		var path = "textures/cube/pisa/";
+		var format = '.png';
+		var urls = [
+			path + 'px' + format, path + 'nx' + format,
+			path + 'py' + format, path + 'ny' + format,
+			path + 'pz' + format, path + 'nz' + format
+		];
+
+		var textureCube = THREE.ImageUtils.loadTextureCube( urls );
+		var material = new THREE.MeshBasicMaterial( { color: 0xffffff, envMap: textureCube } );
+		</code>
+
+		<h2>Constructor</h2>
+
+
+		<h3>[name]( images, mapping, wrapS, wrapT, magFilter, minFilter, format, type, anisotropy )</h3>
+		
+		<div>
+		CubeTexture is almost equivalent in functionality and usage to [page:Texture]. The only differences are that the
+		images are an array of 6 images as opposed to a single image, and the mapping options are
+		[page:Textures THREE.CubeReflectionMapping] (default) or [page:Textures THREE.CubeRefractionMapping]<br />
+		<br />
+		Generally [page:ImageUtils.loadTextureCube] is used instead of using CubeTexture directly.
+		</div>
+
+
+		<h2>Properties</h2>
+
+		<h3>See [page:Texture]</h3>
+
+		<h2>Methods</h2>
+		
+
+		<h3>See [page:Texture]</h3>
+		
+		<h2>Source</h2>
+
+		[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
+	</body>
+</html>

+ 2 - 2
docs/list.js

@@ -151,6 +151,7 @@ var list = {
 		],
 
 		"Textures": [
+			[ "CubeTexture", "api/textures/CubeTexture" ],
 			[ "CompressedTexture", "api/textures/CompressedTexture" ],
 			[ "DataTexture", "api/textures/DataTexture" ],
 			[ "Texture", "api/textures/Texture" ]
@@ -166,8 +167,7 @@ var list = {
 		"Extras / Animation": [
 			[ "Animation", "api/extras/animation/Animation" ],
 			[ "AnimationHandler", "api/extras/animation/AnimationHandler" ],
-			[ "KeyFrameAnimation", "api/extras/animation/KeyFrameAnimation" ],
-			[ "AnimationMorphTarget", "api/extras/animation/AnimationMorphTarget" ]
+			[ "KeyFrameAnimation", "api/extras/animation/KeyFrameAnimation" ]
 		],
 
 		"Extras / Core": [

+ 3 - 1
docs/scenes/geometry-browser.html

@@ -53,6 +53,7 @@
 			document.body.appendChild( renderer.domElement );
 			
 			var orbit = new THREE.OrbitControls( camera, renderer.domElement );
+			orbit.noZoom = true;
 
 			var ambientLight = new THREE.AmbientLight( 0x000000 );
 			scene.add( ambientLight );
@@ -87,7 +88,8 @@
 					new THREE.MeshPhongMaterial({
 						color: 0x156289,
 						emissive: 0x072534,
-						side: THREE.DoubleSide
+						side: THREE.DoubleSide,
+						shading: THREE.FlatShading
 					})
 					
 				]

+ 2 - 2
docs/scenes/js/geometry.js

@@ -149,8 +149,8 @@ var guis = {
 		folder.add( data, 'tube', 0.1, 10 ).onChange( generateGeometry )
 		folder.add( data, 'radialSegments', 3, 300 ).step(1).onChange( generateGeometry )
 		folder.add( data, 'tubularSegments', 3, 20 ).step(1).onChange( generateGeometry )
-		folder.add( data, 'p', 1, 20 ).onChange( generateGeometry )
-		folder.add( data, 'q', 1, 20 ).onChange( generateGeometry )
+		folder.add( data, 'p', 1, 20 ).step(1).onChange( generateGeometry )
+		folder.add( data, 'q', 1, 20 ).step(1).onChange( generateGeometry )
 		folder.add( data, 'heightScale', 1, 20 ).onChange( generateGeometry )
 		
 		generateGeometry()