Skip to content

Commit fed23b5

Browse files
mrdoobmrdoob
committed
r78
1 parent 05964c5 commit fed23b5

File tree

206 files changed

+45966
-4390
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+45966
-4390
lines changed

‎build/three.js

Lines changed: 1266 additions & 1138 deletions
Large diffs are not rendered by default.

‎build/three.min.js

Lines changed: 315 additions & 312 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/cameras/OrthographicCamera.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,25 @@ <h3>[property:Float far]</h3>
7474

7575
<h2>Methods</h2>
7676

77+
<h3>[method:null setViewOffset]( [page:Float fullWidth], [page:Float fullHeight], [page:Float x], [page:Float y], [page:Float width], [page:Float height] )</h3>
78+
<div>
79+
fullWidth — full width of multiview setup<br />
80+
fullHeight — full height of multiview setup<br />
81+
x — horizontal offset of subcamera<br />
82+
y — vertical offset of subcamera<br />
83+
width — width of subcamera<br />
84+
height — height of subcamera
85+
</div>
86+
87+
<div>
88+
Sets an offset in a larger frustum. This is useful for multi-window or multi-monitor/multi-machine setups. For an example on how to use it see [page:PerspectiveCamera].
89+
</div>
90+
91+
<h3>[method:null clearViewOffset]()</h3>
92+
<div>
93+
Removes any offset set by the .setViewOffset method.
94+
</div>
95+
7796
<h3>[method:null updateProjectionMatrix]()</h3>
7897
<div>
7998
Updates the camera projection matrix. Must be called after change of parameters.

‎docs/api/cameras/PerspectiveCamera.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ <h1>[name]</h1>
1717

1818
<h2>Example</h2>
1919

20-
<div>[example:canvas_effects_stereo effects / stereo ]</div>
2120
<div>[example:canvas_geometry_birds geometry / birds ]</div>
2221
<div>[example:canvas_geometry_cube geometry / cube ]</div>
2322
<div>[example:webgl_animation_skinning_blending animation / skinning / blending ]</div>
2423
<div>[example:webgl_animation_skinning_morph animation / skinning / blending ]</div>
24+
<div>[example:webgl_effects_stereo effects / stereo ]</div>
2525
<div>[example:webgl_interactive_cubes interactive / cubes ]</div>
2626
<div>[example:webgl_loader_collada_skinning loader / collada / skinning ]</div>
2727

@@ -88,7 +88,7 @@ <h3>[method:Float getFilmWidth]()</h3>
8888

8989
<h3>[method:Float getFilmHeight]()</h3>
9090
<div>
91-
Returns the height of the image on the film. If .aspect is less than or equal to one (portrait format), the result equals .fimlGauge.
91+
Returns the height of the image on the film. If .aspect is less than or equal to one (portrait format), the result equals .filmGauge.
9292
</div>
9393

9494
<h3>[method:null setFocalLength]( [page:Float focalLength] )</h3>
@@ -157,6 +157,11 @@ <h3>[method:null setViewOffset]( [page:Float fullWidth], [page:Float fullHeight]
157157
Note there is no reason monitors have to be the same size or in a grid.
158158
</div>
159159

160+
<h3>[method:null clearViewOffset]()</h3>
161+
<div>
162+
Removes any offset set by the .setViewOffset method.
163+
</div>
164+
160165
<h3>[method:null updateProjectionMatrix]()</h3>
161166
<div>
162167
Updates the camera projection matrix. Must be called after change of parameters.

‎docs/api/core/Object3D.html

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,30 @@ <h3>[method:null translateZ]( [page:Float distance] )</h3>
175175
Translates object along z axis by distance.
176176
</div>
177177

178+
<h3>[method:null rotateX]( [page:Float rad] )</h3>
179+
<div>
180+
rad - the angle to rotate in radians.<br />
181+
</div>
182+
<div>
183+
Rotates the object around x axis in local space.
184+
</div>
185+
186+
<h3>[method:null rotateY]( [page:Float rad] )</h3>
187+
<div>
188+
rad - the angle to rotate in radians.<br />
189+
</div>
190+
<div>
191+
Rotates the object around y axis in local space.
192+
</div>
193+
194+
<h3>[method:null rotateZ]( [page:Float rad] )</h3>
195+
<div>
196+
rad - the angle to rotate in radians.<br />
197+
</div>
198+
<div>
199+
Rotates the object around z axis in local space.
200+
</div>
201+
178202
<h3>[method:Vector3 localToWorld]( [page:Vector3 vector] )</h3>
179203
<div>
180204
vector - A local vector.<br />
@@ -250,9 +274,12 @@ <h3>[method:null updateMatrixWorld]( [page:Boolean force] )</h3>
250274
Updates global transform of the object and its children.
251275
</div>
252276

253-
<h3>[method:Object3D clone]()</h3>
277+
<h3>[method:Object3D clone]( [page:Boolean recursive] )</h3>
278+
<div>
279+
recursive -- if true, descendants of the object are also cloned. Default is true.
280+
</div>
254281
<div>
255-
Creates a new clone of this object and all descendants.
282+
Returns a clone of this object and optionaly all descendants.
256283
</div>
257284

258285

‎docs/api/extras/SceneUtils.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -16,7 +16,7 @@ <h1>[name]</h1>
1616
<h2>Methods</h2>
1717

1818

19-
<h3>[method:Object3D createMultiMaterialObject]([page:Geometry geometry], [page:Array materials])</h3>
19+
<h3>[method:Object3D createMultiMaterialObject]( [page:Geometry geometry], [page:Array materials] )</h3>
2020
<div>
2121
geometry -- The geometry for the Object. <br />
2222
materials -- The materials for the object.
@@ -26,7 +26,7 @@ <h3>[method:Object3D createMultiMaterialObject]([page:Geometry geometry], [page:
2626
This is mostly useful for object that need a material and a wireframe implementation.
2727
</div>
2828

29-
<h3>[method:null attach]([page:Object3D child], [page:Object3D scene], [page:Object3D parent])</h3>
29+
<h3>[method:null attach]( [page:Object3D child], [page:Object3D scene], [page:Object3D parent] )</h3>
3030
<div>
3131
child -- The object to add to the parent <br />
3232
scene -- The scene to detach the object on. <br />
@@ -36,7 +36,7 @@ <h3>[method:null attach]([page:Object3D child], [page:Object3D scene], [page:Obj
3636
Attaches the object to the parent without the moving the object in the worldspace. Beware that to do this the matrixWorld needs to be updated, this can be done by calling the updateMatrixWorld method on the parent object.
3737
</div>
3838

39-
<h3>[method:null detach]([page:Object3D child], [page:Object3D parent], [page:Object3D scene])</h3>
39+
<h3>[method:null detach]( [page:Object3D child], [page:Object3D parent], [page:Object3D scene] )</h3>
4040
<div>
4141
child -- The object to remove from the parent <br />
4242
scene -- The scene to attach the object on. <br />

‎docs/api/extras/core/CurvePath.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -48,7 +48,7 @@ <h3>[property:boolean autoClose]</h3>
4848
<h2>Methods</h2>
4949

5050

51-
<h3>[method:Array getWrapPoints]([page:Array vertices], [page:Curve curve])</h3>
51+
<h3>[method:Array getWrapPoints]( [page:Array vertices], [page:Curve curve] )</h3>
5252
<div>
5353
vertices -- An array of [page:Vector2]s to modify<br />
5454
curve -- An array of 2d [page:Curve]s
@@ -59,31 +59,31 @@ <h3>[method:Array getWrapPoints]([page:Array vertices], [page:Curve curve])</h3>
5959
modification.
6060
</div>
6161

62-
<h3>[method:null addWrapPath]([page:Curve curve])</h3>
62+
<h3>[method:null addWrapPath]( [page:Curve curve] )</h3>
6363
<div>
6464
curve -- A [page:Curve] or object with a similar interface.
6565
</div>
6666
<div>
6767
Pushes a curve onto the bends array.
6868
</div>
6969

70-
<h3>[method:Geometry createGeometry]([page:Vector3 points])</h3>
70+
<h3>[method:Geometry createGeometry]( [page:Vector3 points] )</h3>
7171
<div>
7272
points -- An array of [page:Vector3]s
7373
</div>
7474
<div>
7575
Creates a geometry from points
7676
</div>
7777

78-
<h3>[method:Geometry createPointsGeometry]([page:Integer divisions])</h3>
78+
<h3>[method:Geometry createPointsGeometry]( [page:Integer divisions] )</h3>
7979
<div>
8080
divisions -- How many segments to create with [page:Vector3]s. Defaults to 12.
8181
</div>
8282
<div>
8383
Creates a [page:Geometry] object comprised of [page:Vector3]s
8484
</div>
8585

86-
<h3>[method:Geometry createSpacedPointsGeometry]([page:Integer divisions])</h3>
86+
<h3>[method:Geometry createSpacedPointsGeometry]( [page:Integer divisions] )</h3>
8787
<div>
8888
divisions -- How many segments to create with [page:Vector3]s. Defaults to 12.
8989
</div>
@@ -92,7 +92,7 @@ <h3>[method:Geometry createSpacedPointsGeometry]([page:Integer divisions])</h3>
9292
</div>
9393

9494

95-
<h3>[method:null add]([page:Curve curve])</h3>
95+
<h3>[method:null add]( [page:Curve curve] )</h3>
9696
<div>
9797
curve -- The [page:Curve curve] to add
9898
</div>
@@ -115,7 +115,7 @@ <h3>[method:Float getCurveLengths]()</h3>
115115
Adds together the length of the curves
116116
</div>
117117

118-
<h3>[method:Array getTransformedPoints]([page:Integer segments], [page:Array bends])</h3>
118+
<h3>[method:Array getTransformedPoints]( [page:Integer segments], [page:Array bends] )</h3>
119119
<div>
120120
segments -- The number of segments to create using the getPoints()<br />
121121
bends -- (optional) An array of [page:Curve]s used to transform the points. Defaults to this.bends if blank.
@@ -125,7 +125,7 @@ <h3>[method:Array getTransformedPoints]([page:Integer segments], [page:Array ben
125125
array of [page:Vector2]s.
126126
</div>
127127

128-
<h3>[method:Array getTransformedSpacedPoints]([page:Integer segments], [page:Array bends])</h3>
128+
<h3>[method:Array getTransformedSpacedPoints]( [page:Integer segments], [page:Array bends] )</h3>
129129
<div>
130130
segments -- The number of segments to create using the getPoints()<br />
131131
bends -- (optional) Defaults to this.bends if blank. An array of [page:Curve]s used to transform the points.

‎docs/api/extras/core/Path.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -21,7 +21,7 @@ <h1>[name]</h1>
2121
<h2>Constructor</h2>
2222

2323

24-
<h3>[name]([page:Array points])</h3>
24+
<h3>[name]( [page:Array points] )</h3>
2525
<div>
2626
points -- array of Vector2
2727
</div>

‎docs/api/extras/core/Shape.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,39 +62,39 @@ <h3>[property:array holes]</h3>
6262
<h2>Methods</h2>
6363

6464

65-
<h3>[method:ShapeGeometry makeGeometry]([page:Object options])</h3>
65+
<h3>[method:ShapeGeometry makeGeometry]( [page:Object options] )</h3>
6666
<div>
6767
options -- This is passed as the second argument to [page:ShapeGeometry ShapeGeometry]
6868
</div>
6969
<div>
7070
Convenience method to return ShapeGeometry
7171
</div>
7272

73-
<h3>[method:Array extractAllPoints]([page:Integer divisions])</h3>
73+
<h3>[method:Array extractAllPoints]( [page:Integer divisions] )</h3>
7474
<div>
7575
divisions -- The number of divisions to create on the shape
7676
</div>
7777
<div>
7878
Get points of shape and holes (keypoints based on segments parameter)
7979
</div>
8080

81-
<h3>[method:ExtrudeGeometry extrude]([page:Object options])</h3>
81+
<h3>[method:ExtrudeGeometry extrude]( [page:Object options] )</h3>
8282
<div>
8383
options -- This is passed as the second argument to [page:ExtrudeGeometry ExtrudeGeometry]
8484
</div>
8585
<div>
8686
Convenience method to return ExtrudeGeometry
8787
</div>
8888

89-
<h3>[method:Object extractPoints]([page:Integer divisions])</h3>
89+
<h3>[method:Object extractPoints]( [page:Integer divisions] )</h3>
9090
<div>
9191
divisions -- The number of divisions to create on the shape
9292
</div>
9393
<div>
9494
Returns an object with a *shape* and *holes* property that each reference an array of [page:Vector2 Vector2s].
9595
</div>
9696

97-
<h3>[method:Object extractAllSpacedPoints]([page:Integer divisions])</h3>
97+
<h3>[method:Object extractAllSpacedPoints]( [page:Integer divisions] )</h3>
9898
<div>
9999
divisions -- The number of divisions to create on the shape
100100
</div>
@@ -103,15 +103,15 @@ <h3>[method:Object extractAllSpacedPoints]([page:Integer divisions])</h3>
103103
points will all be equally spaced along the shape.
104104
</div>
105105

106-
<h3>[method:Array getPointsHoles]([page:Integer divisions])</h3>
106+
<h3>[method:Array getPointsHoles]( [page:Integer divisions] )</h3>
107107
<div>
108108
divisions -- The number of divisions to create on the shape
109109
</div>
110110
<div>
111111
Get an array of [page Vector2 Vector2s] that represent the holes in the shape.
112112
</div>
113113

114-
<h3>[method:Array getSpacedPointsHoles]([page:Integer divisions])</h3>
114+
<h3>[method:Array getSpacedPointsHoles]( [page:Integer divisions] )</h3>
115115
<div>
116116
divisions -- The number of divisions to create on the shape
117117
</div>

‎docs/api/extras/geometries/ConeBufferGeometry.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -29,13 +29,13 @@ <h2>Example</h2>
2929
<h2>Constructor</h2>
3030

3131

32-
<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>
32+
<h3>[name]([page:Float radius], [page:Float height], [page:Integer radiusSegments], [page:Integer heightSegments], [page:Boolean openEnded], [page:Float thetaStart], [page:Float thetaLength])</h3>
3333
<div>
3434
radius — Radius of the cone base. Default is 20.<br />
3535
height — Height of the cone. Default is 100.<br />
3636
radiusSegments — Number of segmented faces around the circumference of the cone. Default is 8<br />
3737
heightSegments — Number of rows of faces along the height of the cone. Default is 1.<br />
38-
openEnded — A Boolean indicating whether the ends of the cone are open or capped. Default is false, meaning capped.<br />
38+
openEnded — A Boolean indicating whether the base of the cone is open or capped. Default is false, meaning capped.<br />
3939
thetaStart — Start angle for first segment, default = 0 (three o'clock position).<br />
4040
thetaLength — The central angle, often called theta, of the circular sector. The default is 2*Pi, which makes for a complete cone.
4141
</div>

‎docs/api/extras/geometries/ConeGeometry.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -29,13 +29,13 @@ <h2>Example</h2>
2929
<h2>Constructor</h2>
3030

3131

32-
<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>
32+
<h3>[name]([page:Float radius], [page:Float height], [page:Integer radiusSegments], [page:Integer heightSegments], [page:Boolean openEnded], [page:Float thetaStart], [page:Float thetaLength])</h3>
3333
<div>
3434
radius — Radius of the cone at the base. Default is 20.<br />
3535
height — Height of the cone. Default is 100.<br />
3636
radiusSegments — Number of segmented faces around the circumference of the cone. Default is 8<br />
3737
heightSegments — Number of rows of faces along the height of the cone. Default is 1.<br />
38-
openEnded — A Boolean indicating whether the ends of the cone are open or capped. Default is false, meaning capped.<br />
38+
openEnded — A Boolean indicating whether the base of the cone is open or capped. Default is false, meaning capped.<br />
3939
thetaStart — Start angle for first segment, default = 0 (three o'clock position).<br />
4040
thetaLength — The central angle, often called theta, of the circular sector. The default is 2*Pi, which makes for a complete cone.
4141
</div>

‎docs/api/extras/helpers/BoxHelper.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
4+
<meta charset="utf-8" />
55
<base href="../../../" />
66
<script src="list.js"></script>
77
<script src="page.js"></script>
@@ -18,15 +18,19 @@ <h1>[name]</h1>
1818
<h2>Example</h2>
1919

2020
<code>var sphere = new THREE.SphereGeometry();
21-
var object = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial(0xff0000) );
21+
var object = new THREE.Mesh( sphere, new THREE.MeshBasicMaterial( 0xff0000 ) );
2222
var box = new THREE.BoxHelper( object );
2323
scene.add( box );
2424
</code>
2525

2626

2727
<h2>Constructor</h2>
2828

29-
<h3>[name]( [page:Object3D object] )</h3>
29+
<h3>[name]( [page:Object3D object], [page:Color color] )</h3>
30+
<div>
31+
object -- Object3D -- the object3D to show the world-axis-aligned boundingbox.<br />
32+
color -- The color of the helper. This can be a [page:Color], a hexadecimal value and an CSS-Color name. Default is 0xffff00
33+
</div>
3034
<div>Creates a new wireframe box matching the size of the passed box.</div>
3135

3236
<h2>Properties</h2>

‎docs/api/loaders/Loader.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ <h3>[method:String extractUrlBase]( [page:string url] )</h3>
6969
Extract the base from the URL.
7070
</div>
7171

72-
<h3>[method:DOMElement addStatusElement]()</h3>
73-
<div>
74-
Add a DOM element to indicate the progress and return the DOMElement
75-
</div>
76-
7772

7873
<h2>Source</h2>
7974

0 commit comments

Comments
 (0)