Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
34d45165
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,发现更多精彩内容 >>
未验证
提交
34d45165
编写于
6月 22, 2021
作者:
M
Michael Herzog
提交者:
GitHub
6月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ObjectLoader: Add async API. (#22031)
上级
c55e5591
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
154 addition
and
16 deletion
+154
-16
editor/js/Editor.js
editor/js/Editor.js
+3
-9
examples/webgl_materials_lightmap.html
examples/webgl_materials_lightmap.html
+4
-7
src/loaders/ObjectLoader.js
src/loaders/ObjectLoader.js
+147
-0
未找到文件。
editor/js/Editor.js
浏览文件 @
34d45165
...
...
@@ -640,12 +640,10 @@ Editor.prototype = {
//
fromJSON
:
function
(
json
)
{
var
scope
=
this
;
fromJSON
:
async
function
(
json
)
{
var
loader
=
new
THREE
.
ObjectLoader
();
var
camera
=
loader
.
parse
(
json
.
camera
);
var
camera
=
await
loader
.
parseAsync
(
json
.
camera
);
this
.
camera
.
copy
(
camera
);
this
.
signals
.
cameraResetted
.
dispatch
();
...
...
@@ -653,11 +651,7 @@ Editor.prototype = {
this
.
history
.
fromJSON
(
json
.
history
);
this
.
scripts
=
json
.
scripts
;
loader
.
parse
(
json
.
scene
,
function
(
scene
)
{
scope
.
setScene
(
scene
);
}
);
this
.
setScene
(
await
loader
.
parseAsync
(
json
.
scene
)
);
},
...
...
examples/webgl_materials_lightmap.html
浏览文件 @
34d45165
...
...
@@ -56,10 +56,10 @@
let
container
,
stats
;
let
camera
,
scene
,
renderer
;
init
();
await
init
();
animate
();
function
init
()
{
async
function
init
()
{
container
=
document
.
createElement
(
'
div
'
);
document
.
body
.
appendChild
(
container
);
...
...
@@ -126,12 +126,9 @@
// MODEL
const
loader
=
new
THREE
.
ObjectLoader
();
loader
.
load
(
"
models/json/lightmap/lightmap.json
"
,
function
(
object
)
{
const
object
=
await
loader
.
loadAsync
(
"
models/json/lightmap/lightmap.json
"
);
scene
.
add
(
object
);
}
);
//
window
.
addEventListener
(
'
resize
'
,
onWindowResize
);
...
...
src/loaders/ObjectLoader.js
浏览文件 @
34d45165
...
...
@@ -113,6 +113,34 @@ class ObjectLoader extends Loader {
}
async
loadAsync
(
url
,
onProgress
)
{
const
scope
=
this
;
const
path
=
(
this
.
path
===
''
)
?
LoaderUtils
.
extractUrlBase
(
url
)
:
this
.
path
;
this
.
resourcePath
=
this
.
resourcePath
||
path
;
const
loader
=
new
FileLoader
(
this
.
manager
);
loader
.
setPath
(
this
.
path
);
loader
.
setRequestHeader
(
this
.
requestHeader
);
loader
.
setWithCredentials
(
this
.
withCredentials
);
const
text
=
await
loader
.
loadAsync
(
url
,
onProgress
);
const
json
=
JSON
.
parse
(
text
);
const
metadata
=
json
.
metadata
;
if
(
metadata
===
undefined
||
metadata
.
type
===
undefined
||
metadata
.
type
.
toLowerCase
()
===
'
geometry
'
)
{
throw
new
Error
(
'
THREE.ObjectLoader: Can
\'
t load
'
+
url
);
}
return
await
scope
.
parseAsync
(
json
);
}
parse
(
json
,
onLoad
)
{
const
animations
=
this
.
parseAnimations
(
json
.
animations
);
...
...
@@ -158,6 +186,26 @@ class ObjectLoader extends Loader {
}
async
parseAsync
(
json
)
{
const
animations
=
this
.
parseAnimations
(
json
.
animations
);
const
shapes
=
this
.
parseShapes
(
json
.
shapes
);
const
geometries
=
this
.
parseGeometries
(
json
.
geometries
,
shapes
);
const
images
=
await
this
.
parseImagesAsync
(
json
.
images
);
const
textures
=
this
.
parseTextures
(
json
.
textures
,
images
);
const
materials
=
this
.
parseMaterials
(
json
.
materials
,
textures
);
const
object
=
this
.
parseObject
(
json
.
object
,
geometries
,
materials
,
textures
,
animations
);
const
skeletons
=
this
.
parseSkeletons
(
json
.
skeletons
,
object
);
this
.
bindSkeletons
(
object
,
skeletons
);
return
object
;
}
parseShapes
(
json
)
{
const
shapes
=
{};
...
...
@@ -686,6 +734,105 @@ class ObjectLoader extends Loader {
}
async
parseImagesAsync
(
json
)
{
const
scope
=
this
;
const
images
=
{};
let
loader
;
async
function
deserializeImage
(
image
)
{
if
(
typeof
image
===
'
string
'
)
{
const
url
=
image
;
const
path
=
/^
(\/\/)
|
([
a-z
]
+:
(\/\/)?)
/i
.
test
(
url
)
?
url
:
scope
.
resourcePath
+
url
;
return
await
loader
.
loadAsync
(
path
);
}
else
{
if
(
image
.
data
)
{
return
{
data
:
getTypedArray
(
image
.
type
,
image
.
data
),
width
:
image
.
width
,
height
:
image
.
height
};
}
else
{
return
null
;
}
}
}
if
(
json
!==
undefined
&&
json
.
length
>
0
)
{
loader
=
new
ImageLoader
(
this
.
manager
);
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
for
(
let
i
=
0
,
il
=
json
.
length
;
i
<
il
;
i
++
)
{
const
image
=
json
[
i
];
const
url
=
image
.
url
;
if
(
Array
.
isArray
(
url
)
)
{
// load array of images e.g CubeTexture
images
[
image
.
uuid
]
=
[];
for
(
let
j
=
0
,
jl
=
url
.
length
;
j
<
jl
;
j
++
)
{
const
currentUrl
=
url
[
j
];
const
deserializedImage
=
await
deserializeImage
(
currentUrl
);
if
(
deserializedImage
!==
null
)
{
if
(
deserializedImage
instanceof
HTMLImageElement
)
{
images
[
image
.
uuid
].
push
(
deserializedImage
);
}
else
{
// special case: handle array of data textures for cube textures
images
[
image
.
uuid
].
push
(
new
DataTexture
(
deserializedImage
.
data
,
deserializedImage
.
width
,
deserializedImage
.
height
)
);
}
}
}
}
else
{
// load single image
const
deserializedImage
=
await
deserializeImage
(
image
.
url
);
if
(
deserializedImage
!==
null
)
{
images
[
image
.
uuid
]
=
deserializedImage
;
}
}
}
}
return
images
;
}
parseTextures
(
json
,
images
)
{
function
parseConstant
(
value
,
type
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录