Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
788c7ee2
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,发现更多精彩内容 >>
提交
788c7ee2
编写于
2月 06, 2018
作者:
D
Don McCurdy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
GLTFLoader: Revert merging primitives.
上级
ff3911c2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
52 deletion
+7
-52
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+7
-52
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
788c7ee2
...
...
@@ -2150,9 +2150,6 @@ THREE.GLTFLoader = ( function () {
var
primitives
=
meshDef
.
primitives
;
var
typesUsed
=
new
Set
();
var
drawModesUsed
=
new
Set
();
return
scope
.
loadGeometries
(
primitives
).
then
(
function
(
geometries
)
{
for
(
var
i
=
0
,
il
=
primitives
.
length
;
i
<
il
;
i
++
)
{
...
...
@@ -2316,63 +2313,21 @@ THREE.GLTFLoader = ( function () {
}
if
(
primitives
.
length
===
1
)
return
mesh
;
mesh
.
name
+=
'
_
'
+
i
;
group
.
add
(
mesh
);
typesUsed
.
add
(
mesh
.
constructor
);
drawModesUsed
.
add
(
mesh
.
drawMode
);
}
// Merge primitives into a single mesh with multiple buffer geometry
// groups. Merging requires BufferGeometryUtils, and that all primitives
// use the constructor, draw mode, and set of attributes. If any
// requirements are not met, a THREE.Group is returned instead.
if
(
THREE
.
BufferGeometryUtils
===
undefined
)
return
group
;
if
(
typesUsed
.
size
>
1
||
drawModesUsed
.
size
>
1
)
return
group
;
var
TypedMesh
=
Array
.
from
(
typesUsed
)[
0
];
var
drawMode
=
Array
.
from
(
drawModesUsed
)[
0
];
if
(
primitives
.
length
>
1
)
{
if
(
TypedMesh
!==
THREE
.
Mesh
&&
TypedMesh
!==
THREE
.
SkinnedMesh
)
{
mesh
.
name
+=
'
_
'
+
i
;
return
group
;
group
.
add
(
mesh
)
;
}
var
groupGeometries
=
[];
var
groupMaterials
=
[];
for
(
var
i
=
0
;
i
<
group
.
children
.
length
;
++
i
)
{
var
geometry
=
group
.
children
[
i
].
geometry
;
var
material
=
group
.
children
[
i
].
material
;
}
else
{
// Can't update spec/gloss uniforms on a multi-material mesh,
// so skip this case for now.
if
(
material
.
isGLTFSpecularGlossinessMaterial
)
return
group
;
return
mesh
;
groupGeometries
.
push
(
geometry
);
groupMaterials
.
push
(
material
);
}
}
var
mergedGeometry
=
THREE
.
BufferGeometryUtils
.
mergeBufferGeometries
(
groupGeometries
);
if
(
!
mergedGeometry
)
return
group
;
var
mergedMesh
=
new
TypedMesh
(
mergedGeometry
,
groupMaterials
);
mergedMesh
.
drawMode
=
drawMode
;
if
(
meshDef
.
name
!==
undefined
)
mergedMesh
.
name
=
meshDef
.
name
;
if
(
meshDef
.
extras
!==
undefined
)
mergedMesh
.
userData
=
meshDef
.
extras
;
return
mergedMesh
;
return
group
;
}
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录