Skip to content

Commit dbe619d

Browse files
Merge branch 'dev' into translation-zh
2 parents 06a9003 + 3b8869c commit dbe619d

File tree

723 files changed

+23276
-521713
lines changed

Some content is hidden

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

723 files changed

+23276
-521713
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
1919
##### Three.js version
2020

2121
- [ ] Dev
22-
- [ ] r97
22+
- [ ] r98
2323
- [ ] ...
2424

2525
##### Browser

README.md

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
three.js
22
========
33

4-
[![Latest NPM release][npm-badge]][npm-badge-url]
5-
[![License][license-badge]][license-badge-url]
6-
[![Dependencies][dependencies-badge]][dependencies-badge-url]
7-
[![Dev Dependencies][devDependencies-badge]][devDependencies-badge-url]
8-
[![Build Status](https://travis-ci.org/mrdoob/three.js.svg?branch=dev)](https://travis-ci.org/mrdoob/three.js)
9-
[![Language Grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/mrdoob/three.js.svg?label=code%20quality)](https://lgtm.com/projects/g/mrdoob/three.js/)
4+
[![NPM package][npm]][npm-url]
5+
[![Build Size][build-size]][build-size-url]
6+
[![Build Status][build-status]][build-status-url]
7+
[![Dependencies][dependencies]][dependencies-url]
8+
[![Dev Dependencies][dev-dependencies]][dev-dependencies-url]
9+
[![Language Grade][lgtm]][lgtm-url]
1010

1111
#### JavaScript 3D library ####
1212

@@ -77,11 +77,15 @@ If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
7777
[Releases](https://github.com/mrdoob/three.js/releases)
7878

7979

80-
[npm-badge]: https://img.shields.io/npm/v/three.svg
81-
[npm-badge-url]: https://www.npmjs.com/package/three
82-
[license-badge]: https://img.shields.io/npm/l/three.svg
83-
[license-badge-url]: ./LICENSE
84-
[dependencies-badge]: https://img.shields.io/david/mrdoob/three.js.svg
85-
[dependencies-badge-url]: https://david-dm.org/mrdoob/three.js
86-
[devDependencies-badge]: https://img.shields.io/david/dev/mrdoob/three.js.svg
87-
[devDependencies-badge-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
80+
[npm]: https://img.shields.io/npm/v/three.svg
81+
[npm-url]: https://www.npmjs.com/package/three
82+
[build-size]: https://badge-size.herokuapp.com/mrdoob/three.js/master/build/three.min.js.svg?compression=gzip
83+
[build-size-url]: https://github.com/mrdoob/three.js/tree/master/build
84+
[build-status]: https://travis-ci.org/mrdoob/three.js.svg?branch=dev
85+
[build-status-url]: https://travis-ci.org/mrdoob/three.js
86+
[dependencies]: https://img.shields.io/david/mrdoob/three.js.svg
87+
[dependencies-url]: https://david-dm.org/mrdoob/three.js
88+
[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js.svg
89+
[dev-dependencies-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
90+
[lgtm]: https://img.shields.io/lgtm/grade/javascript/g/mrdoob/three.js.svg?label=code%20quality
91+
[lgtm-url]: https://lgtm.com/projects/g/mrdoob/three.js/

build/three.js

Lines changed: 4635 additions & 5097 deletions
Large diffs are not rendered by default.

build/three.min.js

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

build/three.module.js

Lines changed: 4636 additions & 5100 deletions
Large diffs are not rendered by default.

docs/api/en/animation/AnimationClip.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ <h3>[method:Array CreateClipsFromMorphTargetSequences]( [param:String name], [pa
9696
<p>
9797
Returns an array of new AnimationClips created from the [page:Geometry.morphTargets morph
9898
target sequences] of a geometry, trying to sort morph target names into animation-group-based
99-
patterns like "Walk_001, Walk_002, Run_001, Run_002 ..."<br /><br />
100-
101-
This method is called by the [page:JSONLoader] internally, and it uses
102-
[page:.CreateFromMorphTargetSequence CreateFromMorphTargetSequence].
99+
patterns like "Walk_001, Walk_002, Run_001, Run_002 ...".
103100
</p>
104101

105102
<h3>[method:AnimationClip CreateFromMorphTargetSequence]( [param:String name], [param:Array morphTargetSequence], [param:Number fps], [param:Boolean noLoop] )</h3>

docs/api/en/audio/Audio.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@ <h3>[property:Boolean hasPlaybackControl]</h3>
7373
<p>Whether playback can be controlled using the [page:Audio.play play](),
7474
[page:Audio.pause pause]() etc. methods. Default is *true*.</p>
7575

76-
<h3>[property:Number playbackRate]</h3>
77-
<p>Speed of playback. Default is *1*.</p>
78-
7976
<h3>[property:Boolean isPlaying]</h3>
8077
<p>Whether the audio is currently playing.</p>
8178

79+
<h3>[property:AudioListener listener]</h3>
80+
<p>A reference to the listener object of this audio.</p>
81+
82+
<h3>[property:Number playbackRate]</h3>
83+
<p>Speed of playback. Default is *1*.</p>
84+
8285
<h3>[property:Number startTime]</h3>
8386
<p>The time at which the sound should begin to play. Same as the *when* paramter of [link:https://developer.mozilla.org/en-US/docs/Web/API/AudioBufferSourceNode/start AudioBufferSourceNode.start](). Default is *0*.</p>
8487

docs/api/en/audio/AudioListener.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ <h3>[property:GainNode gain]</h3>
6767
<h3>[property:AudioNode filter]</h3>
6868
<p>Default is *null*.</p>
6969

70+
<h3>[property:Number timeDelta]</h3>
71+
<p>Time delta value for audio entities. Use in context of [link:https://developer.mozilla.org/en-US/docs/Web/API/AudioParam/linearRampToValueAtTime AudioParam.linearRampToValueAtTimeDefault](). Default is *0*.</p>
7072

7173
<h2>Methods</h2>
7274

docs/api/en/cameras/CubeCamera.html

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,17 @@ <h2>Examples</h2>
4343
<h2>Constructor</h2>
4444

4545

46-
<h3>[name]( [param:Number near], [param:Number far], [param:Number cubeResolution] )</h3>
46+
<h3>[name]( [param:Number near], [param:Number far], [param:Number cubeResolution], [param:Object options] )</h3>
4747
<p>
4848
near -- The near clipping distance. <br />
4949
far -- The far clipping distance <br />
50-
cubeResolution -- Sets the length of the cube's edges.
50+
cubeResolution -- Sets the length of the cube's edges. <br />
51+
options - (optional) object that holds texture parameters passed to the auto-generated WebGLRenderTargetCube.
52+
If not specified, the options default to:
53+
<code>
54+
{ format: RGBFormat, magFilter: LinearFilter, minFilter: LinearFilter }
55+
</code>
56+
5157
</p>
5258
<p>
5359
Constructs a CubeCamera that contains 6 [page:PerspectiveCamera PerspectiveCameras] that

docs/api/en/cameras/OrthographicCamera.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ <h1>[name]</h1>
2424

2525
<h2>Example</h2>
2626

27-
<p>[example:canvas_camera_orthographic camera / orthographic ]</p>
2827
<p>[example:webgl_camera camera ]</p>
2928
<p>[example:webgl_interactive_cubes_ortho interactive / cubes / ortho ]</p>
3029
<p>[example:webgl_materials_cubemap_dynamic materials / cubemap / dynamic ]</p>

0 commit comments

Comments
 (0)