Skip to content

Commit 5d5ec83

Browse files
authored
Merge branch 'dev' into dev-viewport
2 parents 4e2e96d + 0f67138 commit 5d5ec83

File tree

694 files changed

+188269
-8728
lines changed

Some content is hidden

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

694 files changed

+188269
-8728
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-
- [ ] r99
22+
- [ ] r101
2323
- [ ] ...
2424

2525
##### Browser

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright © 2010-2018 three.js authors
3+
Copyright © 2010-2019 three.js authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

build/three.js

Lines changed: 527 additions & 190 deletions
Large diffs are not rendered by default.

build/three.min.js

Lines changed: 800 additions & 790 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: 523 additions & 187 deletions
Large diffs are not rendered by default.

docs/api/en/animation/AnimationClip.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ <h3>[property:String uuid]</h3>
6666
<h2>Methods</h2>
6767

6868

69+
<h3>[method:AnimationClip clone]()</h3>
70+
<p>
71+
Returns a copy of this clip.
72+
</p>
73+
6974
<h3>[method:this optimize]()</h3>
7075
<p>
7176
Optimizes each track by removing equivalent sequential keys (which are common in morph target

docs/api/en/animation/KeyframeTrack.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ <h3>[property:Constant ValueBufferType ]</h3>
160160
<h2>Methods</h2>
161161

162162

163+
<h3>[method:KeyframeTrack clone]()</h3>
164+
<p>
165+
Returns a copy of this track.
166+
</p>
167+
163168
<h3>[method:null createInterpolant]()</h3>
164169
<p>
165170
Creates a [page:LinearInterpolant LinearInterpolant], [page:CubicInterpolant CubicInterpolant]

docs/api/en/audio/Audio.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>[name]</h1>
2222
<h2>Example</h2>
2323

2424
<p>
25-
[example:webaudio_sandbox webaudio / sandbox ]</br>
25+
[example:webaudio_sandbox webaudio / sandbox ]<br />
2626
[example:webaudio_visualizer webaudio / visualizer ]
2727
</p>
2828

docs/api/en/audio/AudioAnalyser.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>[name]</h1>
2222
<h2>Example</h2>
2323

2424
<p>
25-
[example:webaudio_sandbox webaudio / sandbox ]</br>
25+
[example:webaudio_sandbox webaudio / sandbox ]<br />
2626
[example:webaudio_visualizer webaudio / visualizer ]
2727
</p>
2828

docs/api/en/audio/AudioListener.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
<h1>[name]</h1>
1414

1515
<p class="desc">
16-
The [name] represents a virtual [link:https://developer.mozilla.org/de/docs/Web/API/AudioListener listener] of the all positional and non-positional audio effects in the scene.</br>
17-
A three.js application usually creates a single instance of [name]. It is a mandatory construtor parameter for audios entities like [page:Audio Audio] and [page:PositionalAudio PositionalAudio].</br>
16+
The [name] represents a virtual [link:https://developer.mozilla.org/de/docs/Web/API/AudioListener listener] of the all positional and non-positional audio effects in the scene.<br />
17+
A three.js application usually creates a single instance of [name]. It is a mandatory construtor parameter for audios entities like [page:Audio Audio] and [page:PositionalAudio PositionalAudio].<br />
1818
In most cases, the listener object is a child of the camera. So the 3D transformation of the camera represents the 3D transformation of the listener.
1919
</p>
2020

2121

2222
<h2>Example</h2>
2323

2424
<p>
25-
[example:webaudio_sandbox webaudio / sandbox ]</br>
26-
[example:webaudio_timing webaudio / timing ]</br>
25+
[example:webaudio_sandbox webaudio / sandbox ]<br />
26+
[example:webaudio_timing webaudio / timing ]<br />
2727
[example:webaudio_visualizer webaudio / visualizer ]
2828
</p>
2929

0 commit comments

Comments
 (0)