Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
b293519b
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,发现更多精彩内容 >>
未验证
提交
b293519b
编写于
7月 10, 2018
作者:
M
Mr.doob
提交者:
GitHub
7月 10, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14438 from mrdoob/revert-14393-dev2
Revert "AudioListener: Use linearRampToValueAtTime()"
上级
17264b95
02b8270b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
39 deletion
+11
-39
src/audio/Audio.js
src/audio/Audio.js
+0
-1
src/audio/AudioListener.js
src/audio/AudioListener.js
+9
-19
src/audio/PositionalAudio.js
src/audio/PositionalAudio.js
+2
-19
未找到文件。
src/audio/Audio.js
浏览文件 @
b293519b
...
...
@@ -11,7 +11,6 @@ function Audio( listener ) {
this
.
type
=
'
Audio
'
;
this
.
listener
=
listener
;
this
.
context
=
listener
.
context
;
this
.
gain
=
this
.
context
.
createGain
();
...
...
src/audio/AudioListener.js
浏览文件 @
b293519b
...
...
@@ -4,7 +4,6 @@
import
{
Vector3
}
from
'
../math/Vector3.js
'
;
import
{
Quaternion
}
from
'
../math/Quaternion.js
'
;
import
{
Clock
}
from
'
../core/Clock.js
'
;
import
{
Object3D
}
from
'
../core/Object3D.js
'
;
import
{
AudioContext
}
from
'
./AudioContext.js
'
;
...
...
@@ -21,8 +20,6 @@ function AudioListener() {
this
.
filter
=
null
;
this
.
timeDelta
=
0
;
}
AudioListener
.
prototype
=
Object
.
assign
(
Object
.
create
(
Object3D
.
prototype
),
{
...
...
@@ -98,7 +95,6 @@ AudioListener.prototype = Object.assign( Object.create( Object3D.prototype ), {
var
scale
=
new
Vector3
();
var
orientation
=
new
Vector3
();
var
clock
=
new
Clock
();
return
function
updateMatrixWorld
(
force
)
{
...
...
@@ -107,27 +103,21 @@ AudioListener.prototype = Object.assign( Object.create( Object3D.prototype ), {
var
listener
=
this
.
context
.
listener
;
var
up
=
this
.
up
;
this
.
timeDelta
=
clock
.
getDelta
();
this
.
matrixWorld
.
decompose
(
position
,
quaternion
,
scale
);
orientation
.
set
(
0
,
0
,
-
1
).
applyQuaternion
(
quaternion
);
if
(
listener
.
positionX
)
{
// code path for Chrome (see #14393)
var
endTime
=
this
.
context
.
currentTime
+
this
.
timeDelta
;
listener
.
positionX
.
linearRampToValueAtTime
(
position
.
x
,
endTime
);
listener
.
positionY
.
linearRampToValueAtTime
(
position
.
y
,
endTime
);
listener
.
positionZ
.
linearRampToValueAtTime
(
position
.
z
,
endTime
);
listener
.
forwardX
.
linearRampToValueAtTime
(
orientation
.
x
,
endTime
);
listener
.
forwardY
.
linearRampToValueAtTime
(
orientation
.
y
,
endTime
);
listener
.
forwardZ
.
linearRampToValueAtTime
(
orientation
.
z
,
endTime
);
listener
.
upX
.
linearRampToValueAtTime
(
up
.
x
,
endTime
);
listener
.
upY
.
linearRampToValueAtTime
(
up
.
y
,
endTime
);
listener
.
upZ
.
linearRampToValueAtTime
(
up
.
z
,
endTime
);
listener
.
positionX
.
setValueAtTime
(
position
.
x
,
this
.
context
.
currentTime
);
listener
.
positionY
.
setValueAtTime
(
position
.
y
,
this
.
context
.
currentTime
);
listener
.
positionZ
.
setValueAtTime
(
position
.
z
,
this
.
context
.
currentTime
);
listener
.
forwardX
.
setValueAtTime
(
orientation
.
x
,
this
.
context
.
currentTime
);
listener
.
forwardY
.
setValueAtTime
(
orientation
.
y
,
this
.
context
.
currentTime
);
listener
.
forwardZ
.
setValueAtTime
(
orientation
.
z
,
this
.
context
.
currentTime
);
listener
.
upX
.
setValueAtTime
(
up
.
x
,
this
.
context
.
currentTime
);
listener
.
upY
.
setValueAtTime
(
up
.
y
,
this
.
context
.
currentTime
);
listener
.
upZ
.
setValueAtTime
(
up
.
z
,
this
.
context
.
currentTime
);
}
else
{
...
...
src/audio/PositionalAudio.js
浏览文件 @
b293519b
...
...
@@ -109,25 +109,8 @@ PositionalAudio.prototype = Object.assign( Object.create( Audio.prototype ), {
orientation
.
set
(
0
,
0
,
1
).
applyQuaternion
(
quaternion
);
if
(
panner
.
positionX
)
{
// code path for Chrome and Firefox (see #14393)
var
endTime
=
this
.
context
.
currentTime
+
this
.
listener
.
timeDelta
;
panner
.
positionX
.
linearRampToValueAtTime
(
position
.
x
,
endTime
);
panner
.
positionY
.
linearRampToValueAtTime
(
position
.
y
,
endTime
);
panner
.
positionZ
.
linearRampToValueAtTime
(
position
.
z
,
endTime
);
panner
.
orientationX
.
linearRampToValueAtTime
(
orientation
.
x
,
endTime
);
panner
.
orientationY
.
linearRampToValueAtTime
(
orientation
.
y
,
endTime
);
panner
.
orientationZ
.
linearRampToValueAtTime
(
orientation
.
z
,
endTime
);
}
else
{
panner
.
setPosition
(
position
.
x
,
position
.
y
,
position
.
z
);
panner
.
setOrientation
(
orientation
.
x
,
orientation
.
y
,
orientation
.
z
);
}
panner
.
setPosition
(
position
.
x
,
position
.
y
,
position
.
z
);
panner
.
setOrientation
(
orientation
.
x
,
orientation
.
y
,
orientation
.
z
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录