Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
0d3d49ff
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，发现更多精彩内容 >>
未验证
提交
0d3d49ff
编写于
11月 04, 2019
作者:
M
Michael Herzog
提交者：
GitHub
11月 04, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #17859 from Mugen87/dev33
3MFLoader: Better handle face colors.
上级
e0d0b2f1
4b9a508a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
36 deletion
+52
-36
examples/js/loaders/3MFLoader.js
examples/js/loaders/3MFLoader.js
+26
-18
examples/jsm/loaders/3MFLoader.js
examples/jsm/loaders/3MFLoader.js
+26
-18
examples/models/3mf/facecolors.3mf
examples/models/3mf/facecolors.3mf
+0
-0
未找到文件。
examples/js/loaders/3MFLoader.js
浏览文件 @
0d3d49ff
...
...
@@ -981,31 +981,39 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto
var
triangleProperty
=
triangleProperties
[
i
];
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
0
]
)
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
1
]
)
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
2
]
)
;
var
v1
=
triangleProperty
.
v1
;
var
v2
=
triangleProperty
.
v2
;
var
v3
=
triangleProperty
.
v3
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
2
]
);
//
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
3
]
);
var
p1
=
triangleProperty
.
p1
;
var
p2
=
triangleProperty
.
p2
;
var
p3
=
triangleProperty
.
p3
;
colorData
.
push
(
colors
[
(
p1
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
p1
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
p1
*
3
)
+
3
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
2
]
);
}
...
...
examples/jsm/loaders/3MFLoader.js
浏览文件 @
0d3d49ff
...
...
@@ -1004,31 +1004,39 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var
triangleProperty
=
triangleProperties
[
i
];
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
0
]
)
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
1
]
)
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v1
*
3
)
+
2
]
)
;
var
v1
=
triangleProperty
.
v1
;
var
v2
=
triangleProperty
.
v2
;
var
v3
=
triangleProperty
.
v3
;
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v2
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v1
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
triangleProperty
.
v3
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v2
*
3
)
+
2
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
0
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
1
]
);
positionData
.
push
(
vertices
[
(
v3
*
3
)
+
2
]
);
//
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p1
*
3
)
+
3
]
);
var
p1
=
triangleProperty
.
p1
;
var
p2
=
triangleProperty
.
p2
;
var
p3
=
triangleProperty
.
p3
;
colorData
.
push
(
colors
[
(
p1
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
p1
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
p1
*
3
)
+
3
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p2
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
(
p2
||
p1
)
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
triangleProperty
.
p3
*
3
)
+
2
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
0
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
1
]
);
colorData
.
push
(
colors
[
(
(
p3
||
p1
)
*
3
)
+
2
]
);
}
...
...
examples/models/3mf/facecolors.3mf
0 → 100644
浏览文件 @
0d3d49ff
文件已添加
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑！
取消
想要评论请
注册
或
登录
