Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
e66e8690
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,发现更多精彩内容 >>
未验证
提交
e66e8690
编写于
12月 12, 2019
作者:
M
Mr.doob
提交者:
GitHub
12月 12, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18123 from zeux/basisworkers
BasisTextureLoader: Fix severe work distribution imbalance
上级
3766464d
f19d9795
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
18 deletion
+22
-18
examples/js/loaders/BasisTextureLoader.js
examples/js/loaders/BasisTextureLoader.js
+11
-9
examples/jsm/loaders/BasisTextureLoader.js
examples/jsm/loaders/BasisTextureLoader.js
+11
-9
未找到文件。
examples/js/loaders/BasisTextureLoader.js
浏览文件 @
e66e8690
...
...
@@ -119,7 +119,9 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
var
worker
;
var
taskID
;
var
texturePending
=
this
.
_getWorker
()
var
taskCost
=
buffer
.
byteLength
;
var
texturePending
=
this
.
_allocateWorker
(
taskCost
)
.
then
(
(
_worker
)
=>
{
worker
=
_worker
;
...
...
@@ -128,8 +130,6 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
return
new
Promise
(
(
resolve
,
reject
)
=>
{
worker
.
_callbacks
[
taskID
]
=
{
resolve
,
reject
};
worker
.
_taskCosts
[
taskID
]
=
buffer
.
byteLength
;
worker
.
_taskLoad
+=
worker
.
_taskCosts
[
taskID
];
worker
.
postMessage
(
{
type
:
'
transcode
'
,
id
:
taskID
,
buffer
},
[
buffer
]
);
...
...
@@ -181,9 +181,8 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
if
(
worker
&&
taskID
)
{
worker
.
_taskLoad
-=
worker
.
_taskCosts
[
taskID
]
;
worker
.
_taskLoad
-=
taskCost
;
delete
worker
.
_callbacks
[
taskID
];
delete
worker
.
_taskCosts
[
taskID
];
}
...
...
@@ -195,7 +194,7 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
_initTranscoder
:
function
()
{
if
(
!
this
.
transcoder
Binary
)
{
if
(
!
this
.
transcoder
Pending
)
{
// Load transcoder wrapper.
var
jsLoader
=
new
THREE
.
FileLoader
(
this
.
manager
);
...
...
@@ -239,7 +238,7 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
},
_
getWorker
:
function
(
)
{
_
allocateWorker
:
function
(
taskCost
)
{
return
this
.
_initTranscoder
().
then
(
()
=>
{
...
...
@@ -248,7 +247,6 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
var
worker
=
new
Worker
(
this
.
workerSourceURL
);
worker
.
_callbacks
=
{};
worker
.
_taskCosts
=
{};
worker
.
_taskLoad
=
0
;
worker
.
postMessage
(
{
...
...
@@ -290,7 +288,11 @@ THREE.BasisTextureLoader.prototype = Object.assign( Object.create( THREE.Loader.
}
return
this
.
workerPool
[
this
.
workerPool
.
length
-
1
];
var
worker
=
this
.
workerPool
[
this
.
workerPool
.
length
-
1
];
worker
.
_taskLoad
+=
taskCost
;
return
worker
;
}
);
...
...
examples/jsm/loaders/BasisTextureLoader.js
浏览文件 @
e66e8690
...
...
@@ -132,7 +132,9 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
var
worker
;
var
taskID
;
var
texturePending
=
this
.
_getWorker
()
var
taskCost
=
buffer
.
byteLength
;
var
texturePending
=
this
.
_allocateWorker
(
taskCost
)
.
then
(
(
_worker
)
=>
{
worker
=
_worker
;
...
...
@@ -141,8 +143,6 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
return
new
Promise
(
(
resolve
,
reject
)
=>
{
worker
.
_callbacks
[
taskID
]
=
{
resolve
,
reject
};
worker
.
_taskCosts
[
taskID
]
=
buffer
.
byteLength
;
worker
.
_taskLoad
+=
worker
.
_taskCosts
[
taskID
];
worker
.
postMessage
(
{
type
:
'
transcode
'
,
id
:
taskID
,
buffer
},
[
buffer
]
);
...
...
@@ -194,9 +194,8 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
if
(
worker
&&
taskID
)
{
worker
.
_taskLoad
-=
worker
.
_taskCosts
[
taskID
]
;
worker
.
_taskLoad
-=
taskCost
;
delete
worker
.
_callbacks
[
taskID
];
delete
worker
.
_taskCosts
[
taskID
];
}
...
...
@@ -208,7 +207,7 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
_initTranscoder
:
function
()
{
if
(
!
this
.
transcoder
Binary
)
{
if
(
!
this
.
transcoder
Pending
)
{
// Load transcoder wrapper.
var
jsLoader
=
new
FileLoader
(
this
.
manager
);
...
...
@@ -252,7 +251,7 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
},
_
getWorker
:
function
(
)
{
_
allocateWorker
:
function
(
taskCost
)
{
return
this
.
_initTranscoder
().
then
(
()
=>
{
...
...
@@ -261,7 +260,6 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
var
worker
=
new
Worker
(
this
.
workerSourceURL
);
worker
.
_callbacks
=
{};
worker
.
_taskCosts
=
{};
worker
.
_taskLoad
=
0
;
worker
.
postMessage
(
{
...
...
@@ -303,7 +301,11 @@ BasisTextureLoader.prototype = Object.assign( Object.create( Loader.prototype ),
}
return
this
.
workerPool
[
this
.
workerPool
.
length
-
1
];
var
worker
=
this
.
workerPool
[
this
.
workerPool
.
length
-
1
];
worker
.
_taskLoad
+=
taskCost
;
return
worker
;
}
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录