Skip to content

Commit 250c5d5

Browse files
mrdoobmrdoob
committed
r77
1 parent 4fc4a9c commit 250c5d5

File tree

261 files changed

+9534
-16468
lines changed

Some content is hidden

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

261 files changed

+9534
-16468
lines changed

‎build/three.js

Lines changed: 4054 additions & 3818 deletions
Large diffs are not rendered by default.

‎build/three.min.js

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

‎docs/api/core/Clock.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>
@@ -18,7 +18,7 @@ <h2>Constructor</h2>
1818

1919
<h3>[name]( [page:Boolean autoStart] )</h3>
2020
<div>
21-
autoStart — Automatically start the clock.
21+
autoStart — Automatically start the clock. Default is true.
2222
</div>
2323

2424
<h2>Properties</h2>

‎docs/api/core/Geometry.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ <h3>[property:Boolean colorsNeedUpdate]</h3>
175175
Set to *true* if the colors array or a face3 color has been updated.
176176
</div>
177177

178-
<h3>[property:Boolean groupdsNeedUpdate]</h3>
178+
<h3>[property:Boolean groupsNeedUpdate]</h3>
179179
<div>
180180
Set to *true* if a face3 materialIndex has been updated.
181181
</div>

‎docs/api/core/Object3D.html

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,6 @@ <h3>[property:Boolean matrixWorldNeedsUpdate]</h3>
128128
default – false
129129
</div>
130130

131-
<h3>[property:Boolean rotationAutoUpdate]</h3>
132-
<div>
133-
When this is set, then the rotationMatrix gets calculated every frame.
134-
</div>
135-
<div>
136-
default – true
137-
</div>
138-
139131
<h3>[property:object userData]</h3>
140132
<div>
141133
An object that can be used to store custom data about the Object3d. It should not hold references to functions as these will not be cloned.
@@ -230,7 +222,7 @@ <h3>[method:null traverse]( [page:Function callback] )</h3>
230222
<div>
231223
Executes the callback on this object and all descendants.
232224
</div>
233-
225+
234226
<h3>[method:null traverseVisible]( [page:Function callback] )</h3>
235227
<div>
236228
callback - A function with as first argument an object3D object.<br />
@@ -239,13 +231,13 @@ <h3>[method:null traverseVisible]( [page:Function callback] )</h3>
239231
Like traverse, but the callback will only be executed for visible objects.
240232
Descendants of invisible objects are not traversed.
241233
</div>
242-
234+
243235
<h3>[method:null traverseAncestors]( [page:Function callback] )</h3>
244236
<div>
245237
callback - A function with as first argument an object3D object.<br />
246238
</div>
247239
<div>
248-
Executes the callback on this object and all ancestors.
240+
Executes the callback on all ancestors.
249241
</div>
250242

251243
<h3>[method:null updateMatrix]()</h3>

‎docs/api/core/Raycaster.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ <h3>[method:Array intersectObject]( [page:Object3D object], [page:Boolean recurs
129129
<div>
130130
<p>
131131
[page:Object3D object] — The object to check for intersection with the ray.<br />
132-
[page:Boolean recursive] — If set, it also checks all descendants. Otherwise it only checks intersecton with the object.
132+
[page:Boolean recursive] — If true, it also checks all descendants. Otherwise it only checks intersecton with the object. Default is false.
133133
</p>
134134
</div>
135135
<div>
@@ -159,7 +159,7 @@ <h3>[method:Array intersectObject]( [page:Object3D object], [page:Boolean recurs
159159
<h3>[method:Array intersectObjects]( [page:Array objects], [page:Boolean recursive] )</h3>
160160
<div>
161161
[page:Array objects] — The objects to check for intersection with the ray.<br />
162-
[page:Boolean recursive] — If set, it also checks all descendants of the objects. Otherwise it only checks intersecton with the objects.
162+
[page:Boolean recursive] — If true, it also checks all descendants of the objects. Otherwise it only checks intersecton with the objects. Default is false.
163163
</div>
164164
<div>
165165
Checks all intersection between the ray and the objects with or without the descendants. Intersections are returned sorted by distance, closest first. Intersections are of the same form as those returned by [page:.intersectObject].

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<base href="../../../" />
6+
<script src="list.js"></script>
7+
<script src="page.js"></script>
8+
<link type="text/css" rel="stylesheet" href="page.css" />
9+
</head>
10+
<body>
11+
[page:BufferGeometry] &rarr;
12+
13+
<h1>[name]</h1>
14+
15+
<div class="desc">This is the [page:BufferGeometry] port of [page:ConeGeometry].</div>
16+
17+
18+
<h2>Example</h2>
19+
20+
<iframe src='scenes/geometry-browser.html#ConeBufferGeometry'></iframe>
21+
22+
<code>var geometry = new THREE.ConeBufferGeometry( 5, 20, 32 );
23+
var material = new THREE.MeshBasicMaterial( {color: 0xffff00} );
24+
var cone = new THREE.Mesh( geometry, material );
25+
scene.add( cone );
26+
</code>
27+
28+
29+
<h2>Constructor</h2>
30+
31+
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>
33+
<div>
34+
radius — Radius of the cone base. Default is 20.<br />
35+
height — Height of the cone. Default is 100.<br />
36+
radiusSegments — Number of segmented faces around the circumference of the cone. Default is 8<br />
37+
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 />
39+
thetaStart — Start angle for first segment, default = 0 (three o'clock position).<br />
40+
thetaLength — The central angle, often called theta, of the circular sector. The default is 2*Pi, which makes for a complete cone.
41+
</div>
42+
43+
44+
<h2>Properties</h2>
45+
46+
<div>
47+
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.
48+
</div>
49+
50+
51+
<h2>Source</h2>
52+
53+
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
54+
</body>
55+
</html>

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

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<base href="../../../" />
6+
<script src="list.js"></script>
7+
<script src="page.js"></script>
8+
<link type="text/css" rel="stylesheet" href="page.css" />
9+
</head>
10+
<body>
11+
[page:Geometry] &rarr;
12+
13+
<h1>[name]</h1>
14+
15+
<div class="desc">A class for generating cone geometries</div>
16+
17+
18+
<h2>Example</h2>
19+
20+
<iframe src='scenes/geometry-browser.html#ConeGeometry'></iframe>
21+
22+
<code>var geometry = new THREE.ConeGeometry( 5, 20, 32 );
23+
var material = new THREE.MeshBasicMaterial( {color: 0xffff00} );
24+
var cone = new THREE.Mesh( geometry, material );
25+
scene.add( cone );
26+
</code>
27+
28+
29+
<h2>Constructor</h2>
30+
31+
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>
33+
<div>
34+
radius — Radius of the cone at the base. Default is 20.<br />
35+
height — Height of the cone. Default is 100.<br />
36+
radiusSegments — Number of segmented faces around the circumference of the cone. Default is 8<br />
37+
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 />
39+
thetaStart — Start angle for first segment, default = 0 (three o'clock position).<br />
40+
thetaLength — The central angle, often called theta, of the circular sector. The default is 2*Pi, which makes for a complete cone.
41+
</div>
42+
43+
44+
<h2>Properties</h2>
45+
46+
<div>
47+
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.
48+
</div>
49+
50+
51+
<h2>Source</h2>
52+
53+
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
54+
</body>
55+
</html>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h3>[name]([page:String text], [page:Object parameters])</h3>
4444
<h2>Available Fonts</h2>
4545

4646
<div>
47-
TextGeometry uses <a href='http://gero3.github.io/facetype.js/' target="_top">typeface.js</a> generated fonts.
47+
TextGeometry uses <a href='http://gero3.github.io/facetype.js/' target="_top">typeface.json</a> generated fonts.
4848
Some existing fonts can be found located in <b>/examples/fonts</b> and must be included in the page.
4949
</div>
5050
<table>
@@ -58,61 +58,61 @@ <h2>Available Fonts</h2>
5858
<td>helvetiker</td>
5959
<td>normal</td>
6060
<td>normal</td>
61-
<td>/examples/fonts/helvetiker_regular.typeface.js</td>
61+
<td>/examples/fonts/helvetiker_regular.typeface.json</td>
6262
</tr>
6363
<tr>
6464
<td>helvetiker</td>
6565
<td>bold</td>
6666
<td>normal</td>
67-
<td>/examples/fonts/helvetiker_bold.typeface.js</td>
67+
<td>/examples/fonts/helvetiker_bold.typeface.json</td>
6868
</tr>
6969
<tr>
7070
<td>optimer</td>
7171
<td>normal</td>
7272
<td>normal</td>
73-
<td>/examples/fonts/optimer_regular.typeface.js</td>
73+
<td>/examples/fonts/optimer_regular.typeface.json</td>
7474
</tr>
7575
<tr>
7676
<td>optimer</td>
7777
<td>bold</td>
7878
<td>normal</td>
79-
<td>/examples/fonts/optimer_bold.typeface.js</td>
79+
<td>/examples/fonts/optimer_bold.typeface.json</td>
8080
</tr>
8181
<tr>
8282
<td>gentilis</td>
8383
<td>normal</td>
8484
<td>normal</td>
85-
<td>/examples/fonts/gentilis_regular.typeface.js</td>
85+
<td>/examples/fonts/gentilis_regular.typeface.json</td>
8686
</tr>
8787
<tr>
8888
<td>gentilis</td>
8989
<td>bold</td>
9090
<td>normal</td>
91-
<td>/examples/fonts/gentilis_bold.typeface.js</td>
91+
<td>/examples/fonts/gentilis_bold.typeface.json</td>
9292
</tr>
9393
<tr>
9494
<td>droid sans</td>
9595
<td>normal</td>
9696
<td>normal</td>
97-
<td>/examples/fonts/droid/droid_sans_regular.typeface.js</td>
97+
<td>/examples/fonts/droid/droid_sans_regular.typeface.json</td>
9898
</tr>
9999
<tr>
100100
<td>droid sans</td>
101101
<td>bold</td>
102102
<td>normal</td>
103-
<td>/examples/fonts/droid/droid_sans_bold.typeface.js</td>
103+
<td>/examples/fonts/droid/droid_sans_bold.typeface.json</td>
104104
</tr>
105105
<tr>
106106
<td>droid serif</td>
107107
<td>normal</td>
108108
<td>normal</td>
109-
<td>/examples/fonts/droid/droid_serif_regular.typeface.js</td>
109+
<td>/examples/fonts/droid/droid_serif_regular.typeface.json</td>
110110
</tr>
111111
<tr>
112112
<td>droid serif</td>
113113
<td>bold</td>
114114
<td>normal</td>
115-
<td>/examples/fonts/droid/droid_serif_bold.typeface.js</td>
115+
<td>/examples/fonts/droid/droid_serif_bold.typeface.json</td>
116116
</tr>
117117
</table>
118118

‎docs/api/lights/SpotLight.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />

‎docs/api/loaders/JSONLoader.html

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,33 @@ <h1>[name]</h1>
1616

1717
<h2>Constructor</h2>
1818

19-
<h3>[name]()</h3>
19+
<h3>[name]( [page:LoadingManager manager] )</h3>
20+
<div>
21+
[page:LoadingManager manager] — The [page:LoadingManager loadingManager] for the loader to use. Default is [page:LoadingManager THREE.DefaultLoadingManager].
22+
</div>
2023
<div>
2124
Creates a new [name].
2225
</div>
2326

27+
<h2>Methods</h2>
2428

25-
<h2>Properties</h2>
26-
27-
<h3>[property:boolean withCredentials]</h3>
29+
<h3>[method:null load]( [page:String url], [page:Function onLoad], [page:Function onProgress], [page:Function onError] )</h3>
2830
<div>
29-
If true, the ajax request will use cookies.
31+
[page:String url] — required.<br />
32+
[page:Function onLoad] — Will be called when load completes. The argument will be the loaded text response.<br />
33+
[page:Function onProgress] — Will be called while load progresses. The argument will be the XmlHttpRequest instance, that contain .[page:Integer total] and .[page:Integer loaded] bytes.<br />
34+
[page:Function onError] — Will be called when load errors.<br />
35+
</div>
36+
<div>
37+
Begin loading from url and pass the <em>JSON</em> to onLoad.
3038
</div>
3139

32-
33-
<h2>Methods</h2>
34-
35-
<h3>[method:null load]( [page:String url], [page:Function callback], [page:String texturePath] )</h3>
40+
<h3>[method:null setTexturePath]( [page:String texturePath] )</h3>
41+
<div>
42+
[page:String texturePath] — Base path for textures.
43+
</div>
3644
<div>
37-
[page:String url] — required<br />
38-
[page:Function callback] — required. Will be called when load completes. The arguments will be the loaded [page:Object3D] and the loaded [page:Array materials].<br />
39-
[page:String texturePath] — optional. If not specified, textures will be assumed to be in the same folder as the Javascript model file.
45+
Set the base path for textures.
4046
</div>
4147

4248
<h3>[method:Object3D parse]( [page:Object json], [page:String texturePath] )</h3>
@@ -45,10 +51,9 @@ <h3>[method:Object3D parse]( [page:Object json], [page:String texturePath] )</h3
4551
[page:String texturePath] — Base path for textures.
4652
</div>
4753
<div>
48-
Parse a <em>JSON</em> structure and return an [page:Object] containing the parsed .[page:Geometry] and .[page:Array materials].
54+
Parse a <em>JSON</em> structure and return an [page:object] containing the parsed [page:Geometry geometry] and [page:Array materials].
4955
</div>
5056

51-
5257
<h2>Example</h2>
5358

5459
<code>

‎docs/api/materials/MeshPhongMaterial.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h3>[name]([page:Object parameters])</h3>
3838
bumpMap — Set bump map. Default is null.<br />
3939
bumpMapScale — Set bump map scale. Default is 1.<br />
4040
normalMap — Set normal map. Default is null.<br />
41-
normalMapScale — Set normal map scale. Default is (1, 1).<br />
41+
normalScale — Set normal map scale. Default is (1, 1).<br />
4242
displacementMap — Set displacement map. Default is null.<br />
4343
displacementScale — Set displacement scale. Default is 1.<br />
4444
displacementBias — Set displacement offset. Default is 0.<br />

‎docs/api/materials/ShaderMaterial.html

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ <h1>[name]</h1>
2222
<ul>
2323
<li>A *ShaderMaterial* will only be rendered properly by [page:WebGLRenderer], since the GLSL code in the *vertexShader* and *fragmentShader* properties must be compiled and run on the GPU using WebGL.</li>
2424
<li>As of THREE r72, directly assigning attributes in a *ShaderMaterial* is no longer supported. A [page:BufferGeometry] instance (instead of a [page:Geometry] instance) must be used instead, using [page:BufferAttribute] instances to define custom attributes.</li>
25+
<li>As of THREE r77, [page:WebGLRenderTarget] or [page:WebGLRenderTargetCube] instances are no longer supposed to be used as uniforms. Their [page:Texture texture] property must be used instead.</li>
2526
</ul>
2627
</div>
2728

@@ -261,18 +262,10 @@ <h3>Custom attributes and uniforms</h3>
261262
<td>sampler2D</td>
262263
<td>[page:Texture THREE.Texture]</td>
263264
</tr>
264-
<tr>
265-
<td>sampler2D</td>
266-
<td>[page:WebGLRenderTarget THREE.WebGLRenderTarget]</td>
267-
</tr>
268265
<tr>
269266
<td>samplerCube</td>
270267
<td>[page:CubeTexture THREE.CubeTexture]</tr>
271268
</tr>
272-
<tr>
273-
<td>samplerCube</td>
274-
<td>[page:WebGLRenderTargetCube THREE.WebGLRenderTargetCube]</td>
275-
</tr>
276269

277270
</tbody>
278271
</table>

0 commit comments

Comments
 (0)