Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
0fddd786
T
three.js
项目概览
Ablesons
/
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,发现更多精彩内容 >>
提交
0fddd786
编写于
10月 21, 2017
作者:
T
Takahiro
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix FileLoader duplicate request issues
上级
b83561c0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
19 deletion
+41
-19
src/loaders/FileLoader.js
src/loaders/FileLoader.js
+41
-19
未找到文件。
src/loaders/FileLoader.js
浏览文件 @
0fddd786
...
@@ -45,9 +45,11 @@ Object.assign( FileLoader.prototype, {
...
@@ -45,9 +45,11 @@ Object.assign( FileLoader.prototype, {
if
(
loading
[
url
]
!==
undefined
)
{
if
(
loading
[
url
]
!==
undefined
)
{
loading
[
url
].
push
(
function
()
{
loading
[
url
].
push
(
{
scope
.
load
(
url
,
onLoad
,
onProgress
,
onError
);
onLoad
:
onLoad
,
onProgress
:
onProgress
,
onError
:
onError
}
);
}
);
...
@@ -150,6 +152,14 @@ Object.assign( FileLoader.prototype, {
...
@@ -150,6 +152,14 @@ Object.assign( FileLoader.prototype, {
loading
[
url
]
=
[];
loading
[
url
]
=
[];
loading
[
url
].
push
(
{
onLoad
:
onLoad
,
onProgress
:
onProgress
,
onError
:
onError
}
);
var
request
=
new
XMLHttpRequest
();
var
request
=
new
XMLHttpRequest
();
request
.
open
(
'
GET
'
,
url
,
true
);
request
.
open
(
'
GET
'
,
url
,
true
);
...
@@ -160,9 +170,17 @@ Object.assign( FileLoader.prototype, {
...
@@ -160,9 +170,17 @@ Object.assign( FileLoader.prototype, {
Cache
.
add
(
url
,
response
);
Cache
.
add
(
url
,
response
);
var
callbacks
=
loading
[
url
];
delete
loading
[
url
];
if
(
this
.
status
===
200
)
{
if
(
this
.
status
===
200
)
{
if
(
onLoad
)
onLoad
(
response
);
for
(
var
i
=
0
,
il
=
callbacks
.
length
;
i
<
il
;
i
++
)
{
if
(
callbacks
[
i
].
onLoad
)
callbacks
[
i
].
onLoad
(
response
);
}
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemEnd
(
url
);
...
@@ -173,46 +191,50 @@ Object.assign( FileLoader.prototype, {
...
@@ -173,46 +191,50 @@ Object.assign( FileLoader.prototype, {
console
.
warn
(
'
THREE.FileLoader: HTTP Status 0 received.
'
);
console
.
warn
(
'
THREE.FileLoader: HTTP Status 0 received.
'
);
if
(
onLoad
)
onLoad
(
response
);
for
(
var
i
=
0
,
il
=
callbacks
.
length
;
i
<
il
;
i
++
)
{
if
(
callbacks
[
i
].
onLoad
)
callbacks
[
i
].
onLoad
(
response
);
}
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemEnd
(
url
);
}
else
{
}
else
{
if
(
onError
)
onError
(
event
);
for
(
var
i
=
0
,
il
=
callbacks
.
length
;
i
<
il
;
i
++
)
{
if
(
callbacks
[
i
].
onError
)
callbacks
[
i
].
onError
(
event
);
}
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemError
(
url
);
scope
.
manager
.
itemError
(
url
);
}
}
// Clean up duplicate requests.
},
false
);
request
.
addEventListener
(
'
progress
'
,
function
(
event
)
{
var
callbacks
=
loading
[
url
];
var
callbacks
=
loading
[
url
];
for
(
var
i
=
0
;
i
<
callbacks
.
length
;
i
++
)
{
for
(
var
i
=
0
,
il
=
callbacks
.
length
;
i
<
il
;
i
++
)
{
callbacks
[
i
](
response
);
if
(
callbacks
[
i
].
onProgress
)
callbacks
[
i
].
onProgress
(
event
);
}
}
delete
loading
[
url
];
},
false
);
},
false
);
if
(
onProgress
!==
undefined
)
{
request
.
addEventListener
(
'
error
'
,
function
(
event
)
{
request
.
addEventListener
(
'
progress
'
,
function
(
event
)
{
onProgress
(
event
);
},
false
)
;
var
callbacks
=
loading
[
url
]
;
}
for
(
var
i
=
0
,
il
=
callbacks
.
length
;
i
<
il
;
i
++
)
{
request
.
addEventListener
(
'
error
'
,
function
(
event
)
{
if
(
callbacks
[
i
].
onError
)
callbacks
[
i
].
onError
(
event
);
if
(
onError
)
onError
(
event
);
}
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemEnd
(
url
);
scope
.
manager
.
itemError
(
url
);
scope
.
manager
.
itemError
(
url
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录