Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
75a5d82d
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,发现更多精彩内容 >>
未验证
提交
75a5d82d
编写于
12月 16, 2019
作者:
M
Michael Herzog
提交者:
GitHub
12月 16, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18164 from Mugen87/dev29
GLTFLoader: Make .computeBounds() more robust.
上级
14d486a8
31331a69
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
50 addition
and
16 deletion
+50
-16
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+25
-8
examples/jsm/loaders/GLTFLoader.js
examples/jsm/loaders/GLTFLoader.js
+25
-8
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
75a5d82d
...
@@ -2291,9 +2291,14 @@ THREE.GLTFLoader = ( function () {
...
@@ -2291,9 +2291,14 @@ THREE.GLTFLoader = ( function () {
if
(
attributes
.
POSITION
!==
undefined
)
{
if
(
attributes
.
POSITION
!==
undefined
)
{
var
accessor
=
parser
.
json
.
accessors
[
attributes
.
POSITION
];
var
accessor
=
parser
.
json
.
accessors
[
attributes
.
POSITION
];
var
min
=
accessor
.
min
;
var
min
=
accessor
.
min
;
var
max
=
accessor
.
max
;
var
max
=
accessor
.
max
;
// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
if
(
min
!==
undefined
&&
max
!==
undefined
)
{
box
.
set
(
box
.
set
(
new
THREE
.
Vector3
(
min
[
0
],
min
[
1
],
min
[
2
]
),
new
THREE
.
Vector3
(
min
[
0
],
min
[
1
],
min
[
2
]
),
new
THREE
.
Vector3
(
max
[
0
],
max
[
1
],
max
[
2
]
)
);
new
THREE
.
Vector3
(
max
[
0
],
max
[
1
],
max
[
2
]
)
);
...
@@ -2304,6 +2309,12 @@ THREE.GLTFLoader = ( function () {
...
@@ -2304,6 +2309,12 @@ THREE.GLTFLoader = ( function () {
}
}
}
else
{
return
;
}
var
targets
=
primitiveDef
.
targets
;
var
targets
=
primitiveDef
.
targets
;
if
(
targets
!==
undefined
)
{
if
(
targets
!==
undefined
)
{
...
@@ -2320,6 +2331,10 @@ THREE.GLTFLoader = ( function () {
...
@@ -2320,6 +2331,10 @@ THREE.GLTFLoader = ( function () {
var
min
=
accessor
.
min
;
var
min
=
accessor
.
min
;
var
max
=
accessor
.
max
;
var
max
=
accessor
.
max
;
// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
if
(
min
!==
undefined
&&
max
!==
undefined
)
{
// we need to get max of absolute components because target weight is [-1,1]
// we need to get max of absolute components because target weight is [-1,1]
vector
.
setX
(
Math
.
max
(
Math
.
abs
(
min
[
0
]
),
Math
.
abs
(
max
[
0
]
)
)
);
vector
.
setX
(
Math
.
max
(
Math
.
abs
(
min
[
0
]
),
Math
.
abs
(
max
[
0
]
)
)
);
vector
.
setY
(
Math
.
max
(
Math
.
abs
(
min
[
1
]
),
Math
.
abs
(
max
[
1
]
)
)
);
vector
.
setY
(
Math
.
max
(
Math
.
abs
(
min
[
1
]
),
Math
.
abs
(
max
[
1
]
)
)
);
...
@@ -2333,6 +2348,8 @@ THREE.GLTFLoader = ( function () {
...
@@ -2333,6 +2348,8 @@ THREE.GLTFLoader = ( function () {
}
}
}
geometry
.
boundingBox
=
box
;
geometry
.
boundingBox
=
box
;
var
sphere
=
new
THREE
.
Sphere
();
var
sphere
=
new
THREE
.
Sphere
();
...
...
examples/jsm/loaders/GLTFLoader.js
浏览文件 @
75a5d82d
...
@@ -2358,9 +2358,14 @@ var GLTFLoader = ( function () {
...
@@ -2358,9 +2358,14 @@ var GLTFLoader = ( function () {
if
(
attributes
.
POSITION
!==
undefined
)
{
if
(
attributes
.
POSITION
!==
undefined
)
{
var
accessor
=
parser
.
json
.
accessors
[
attributes
.
POSITION
];
var
accessor
=
parser
.
json
.
accessors
[
attributes
.
POSITION
];
var
min
=
accessor
.
min
;
var
min
=
accessor
.
min
;
var
max
=
accessor
.
max
;
var
max
=
accessor
.
max
;
// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
if
(
min
!==
undefined
&&
max
!==
undefined
)
{
box
.
set
(
box
.
set
(
new
Vector3
(
min
[
0
],
min
[
1
],
min
[
2
]
),
new
Vector3
(
min
[
0
],
min
[
1
],
min
[
2
]
),
new
Vector3
(
max
[
0
],
max
[
1
],
max
[
2
]
)
);
new
Vector3
(
max
[
0
],
max
[
1
],
max
[
2
]
)
);
...
@@ -2371,6 +2376,12 @@ var GLTFLoader = ( function () {
...
@@ -2371,6 +2376,12 @@ var GLTFLoader = ( function () {
}
}
}
else
{
return
;
}
var
targets
=
primitiveDef
.
targets
;
var
targets
=
primitiveDef
.
targets
;
if
(
targets
!==
undefined
)
{
if
(
targets
!==
undefined
)
{
...
@@ -2387,6 +2398,10 @@ var GLTFLoader = ( function () {
...
@@ -2387,6 +2398,10 @@ var GLTFLoader = ( function () {
var
min
=
accessor
.
min
;
var
min
=
accessor
.
min
;
var
max
=
accessor
.
max
;
var
max
=
accessor
.
max
;
// glTF requires 'min' and 'max', but VRM (which extends glTF) currently ignores that requirement.
if
(
min
!==
undefined
&&
max
!==
undefined
)
{
// we need to get max of absolute components because target weight is [-1,1]
// we need to get max of absolute components because target weight is [-1,1]
vector
.
setX
(
Math
.
max
(
Math
.
abs
(
min
[
0
]
),
Math
.
abs
(
max
[
0
]
)
)
);
vector
.
setX
(
Math
.
max
(
Math
.
abs
(
min
[
0
]
),
Math
.
abs
(
max
[
0
]
)
)
);
vector
.
setY
(
Math
.
max
(
Math
.
abs
(
min
[
1
]
),
Math
.
abs
(
max
[
1
]
)
)
);
vector
.
setY
(
Math
.
max
(
Math
.
abs
(
min
[
1
]
),
Math
.
abs
(
max
[
1
]
)
)
);
...
@@ -2400,6 +2415,8 @@ var GLTFLoader = ( function () {
...
@@ -2400,6 +2415,8 @@ var GLTFLoader = ( function () {
}
}
}
geometry
.
boundingBox
=
box
;
geometry
.
boundingBox
=
box
;
var
sphere
=
new
Sphere
();
var
sphere
=
new
Sphere
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录