Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
c24a17b5
T
three.js
项目概览
车家大少爷
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c24a17b5
编写于
3月 17, 2016
作者:
R
Reece Lecrivain
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove THREE.AudioBuffer and add back removed whitespace
上级
a3897332
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
24 addition
and
55 deletion
+24
-55
src/audio/Audio.js
src/audio/Audio.js
+20
-20
src/audio/AudioBuffer.js
src/audio/AudioBuffer.js
+0
-30
src/loaders/AudioLoader.js
src/loaders/AudioLoader.js
+4
-4
utils/build/includes/common.json
utils/build/includes/common.json
+0
-1
未找到文件。
src/audio/Audio.js
浏览文件 @
c24a17b5
...
...
@@ -3,7 +3,7 @@
* @author Reece Aaron Lecrivain / http://reecenotes.com/
*/
THREE
.
Audio
=
function
(
listener
)
{
THREE
.
Audio
=
function
(
listener
)
{
THREE
.
Object3D
.
call
(
this
);
...
...
@@ -31,19 +31,19 @@ THREE.Audio = function( listener ) {
THREE
.
Audio
.
prototype
=
Object
.
create
(
THREE
.
Object3D
.
prototype
);
THREE
.
Audio
.
prototype
.
constructor
=
THREE
.
Audio
;
THREE
.
Audio
.
prototype
.
getOutput
=
function
()
{
THREE
.
Audio
.
prototype
.
getOutput
=
function
()
{
return
this
.
gain
;
};
THREE
.
Audio
.
prototype
.
load
=
function
(
file
)
{
THREE
.
Audio
.
prototype
.
load
=
function
(
file
)
{
console
.
warn
(
'
THREE.Audio: .load has been deprecated. Please use THREE.AudioLoader.
'
);
var
audioLoader
=
new
THREE
.
AudioLoader
(
this
.
context
);
audioLoader
.
load
(
file
,
function
(
buffer
)
{
audioLoader
.
load
(
file
,
function
(
buffer
)
{
this
.
setBuffer
(
buffer
);
});
...
...
@@ -51,7 +51,7 @@ THREE.Audio.prototype.load = function( file ) {
};
THREE
.
Audio
.
prototype
.
setNodeSource
=
function
(
audioNode
)
{
THREE
.
Audio
.
prototype
.
setNodeSource
=
function
(
audioNode
)
{
this
.
hasPlaybackControl
=
false
;
this
.
sourceType
=
'
audioNode
'
;
...
...
@@ -62,7 +62,7 @@ THREE.Audio.prototype.setNodeSource = function( audioNode ) {
};
THREE
.
Audio
.
prototype
.
setBuffer
=
function
(
audioBuffer
)
{
THREE
.
Audio
.
prototype
.
setBuffer
=
function
(
audioBuffer
)
{
var
scope
=
this
;
...
...
@@ -74,7 +74,7 @@ THREE.Audio.prototype.setBuffer = function( audioBuffer ) {
};
THREE
.
Audio
.
prototype
.
play
=
function
()
{
THREE
.
Audio
.
prototype
.
play
=
function
()
{
if
(
this
.
isPlaying
===
true
)
{
...
...
@@ -106,7 +106,7 @@ THREE.Audio.prototype.play = function() {
};
THREE
.
Audio
.
prototype
.
pause
=
function
()
{
THREE
.
Audio
.
prototype
.
pause
=
function
()
{
if
(
this
.
hasPlaybackControl
===
false
)
{
...
...
@@ -120,7 +120,7 @@ THREE.Audio.prototype.pause = function() {
};
THREE
.
Audio
.
prototype
.
stop
=
function
()
{
THREE
.
Audio
.
prototype
.
stop
=
function
()
{
if
(
this
.
hasPlaybackControl
===
false
)
{
...
...
@@ -134,7 +134,7 @@ THREE.Audio.prototype.stop = function() {
};
THREE
.
Audio
.
prototype
.
connect
=
function
()
{
THREE
.
Audio
.
prototype
.
connect
=
function
()
{
if
(
this
.
filter
!==
null
)
{
...
...
@@ -149,7 +149,7 @@ THREE.Audio.prototype.connect = function() {
};
THREE
.
Audio
.
prototype
.
disconnect
=
function
()
{
THREE
.
Audio
.
prototype
.
disconnect
=
function
()
{
if
(
this
.
filter
!==
null
)
{
...
...
@@ -164,13 +164,13 @@ THREE.Audio.prototype.disconnect = function() {
};
THREE
.
Audio
.
prototype
.
getFilter
=
function
()
{
THREE
.
Audio
.
prototype
.
getFilter
=
function
()
{
return
this
.
filter
;
};
THREE
.
Audio
.
prototype
.
setFilter
=
function
(
value
)
{
THREE
.
Audio
.
prototype
.
setFilter
=
function
(
value
)
{
if
(
value
===
undefined
)
value
=
null
;
...
...
@@ -188,7 +188,7 @@ THREE.Audio.prototype.setFilter = function( value ) {
};
THREE
.
Audio
.
prototype
.
setPlaybackRate
=
function
(
value
)
{
THREE
.
Audio
.
prototype
.
setPlaybackRate
=
function
(
value
)
{
if
(
this
.
hasPlaybackControl
===
false
)
{
...
...
@@ -207,19 +207,19 @@ THREE.Audio.prototype.setPlaybackRate = function( value ) {
};
THREE
.
Audio
.
prototype
.
getPlaybackRate
=
function
()
{
THREE
.
Audio
.
prototype
.
getPlaybackRate
=
function
()
{
return
this
.
playbackRate
;
};
THREE
.
Audio
.
prototype
.
onEnded
=
function
()
{
THREE
.
Audio
.
prototype
.
onEnded
=
function
()
{
this
.
isPlaying
=
false
;
};
THREE
.
Audio
.
prototype
.
setLoop
=
function
(
value
)
{
THREE
.
Audio
.
prototype
.
setLoop
=
function
(
value
)
{
if
(
this
.
hasPlaybackControl
===
false
)
{
...
...
@@ -232,7 +232,7 @@ THREE.Audio.prototype.setLoop = function( value ) {
};
THREE
.
Audio
.
prototype
.
getLoop
=
function
()
{
THREE
.
Audio
.
prototype
.
getLoop
=
function
()
{
if
(
this
.
hasPlaybackControl
===
false
)
{
...
...
@@ -246,13 +246,13 @@ THREE.Audio.prototype.getLoop = function() {
};
THREE
.
Audio
.
prototype
.
setVolume
=
function
(
value
)
{
THREE
.
Audio
.
prototype
.
setVolume
=
function
(
value
)
{
this
.
gain
.
gain
.
value
=
value
;
};
THREE
.
Audio
.
prototype
.
getVolume
=
function
()
{
THREE
.
Audio
.
prototype
.
getVolume
=
function
()
{
return
this
.
gain
.
gain
.
value
;
...
...
src/audio/AudioBuffer.js
已删除
100644 → 0
浏览文件 @
a3897332
/**
* @author mrdoob / http://mrdoob.com/
* @author Reece Aaron Lecrivain / http://reecenotes.com/
*/
THREE
.
AudioBuffer
=
function
(
context
)
{
console
.
warn
(
'
THREE.AudioBuffer has been deprecated. Please use THREE.AudioLoader.
'
);
this
.
context
=
context
;
};
THREE
.
AudioBuffer
.
prototype
.
load
=
function
(
file
)
{
console
.
warn
(
'
THREE.AudioBuffer: .load has been deprecated. Please use THREE.AudioLoader.
'
);
var
audioLoader
=
new
THREE
.
AudioLoader
(
this
.
context
);
audioLoader
.
load
(
file
,
function
(
buffer
)
{
return
buffer
;
});
};
THREE
.
AudioBuffer
.
prototype
.
onReady
=
function
(
callback
)
{
console
.
warn
(
'
THREE.AudioBuffer: .onReady has been deprecated. Please use THREE.AudioLoader.
'
);
};
src/loaders/AudioLoader.js
浏览文件 @
c24a17b5
...
...
@@ -2,7 +2,7 @@
* @author Reece Aaron Lecrivain / http://reecenotes.com/
*/
THREE
.
AudioLoader
=
function
(
context
,
manager
)
{
THREE
.
AudioLoader
=
function
(
context
,
manager
)
{
this
.
context
=
(
context
!==
undefined
)
?
context
:
new
(
window
.
AudioContext
||
window
.
webkitAudioContext
)();
...
...
@@ -14,15 +14,15 @@ THREE.AudioLoader.prototype = {
constructor
:
THREE
.
AudioLoader
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
scope
=
this
;
var
loader
=
new
THREE
.
XHRLoader
(
this
.
manager
);
loader
.
setResponseType
(
'
arraybuffer
'
);
loader
.
load
(
url
,
function
(
buffer
)
{
loader
.
load
(
url
,
function
(
buffer
)
{
scope
.
context
.
decodeAudioData
(
buffer
,
function
(
audioBuffer
)
{
scope
.
context
.
decodeAudioData
(
buffer
,
function
(
audioBuffer
)
{
onLoad
(
audioBuffer
);
...
...
utils/build/includes/common.json
浏览文件 @
c24a17b5
...
...
@@ -53,7 +53,6 @@
"src/animation/tracks/VectorKeyframeTrack.js"
,
"src/audio/Audio.js"
,
"src/audio/AudioAnalyser.js"
,
"src/audio/AudioBuffer.js"
,
"src/audio/PositionalAudio.js"
,
"src/audio/AudioListener.js"
,
"src/cameras/Camera.js"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录