Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
5bdc5596
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,发现更多精彩内容 >>
提交
5bdc5596
编写于
7月 05, 2017
作者:
D
Don McCurdy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[gltf] Correct OrthographicCamera constructor args.
上级
bf4f6cba
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
16 deletion
+21
-16
examples/js/loaders/GLTF2Loader.js
examples/js/loaders/GLTF2Loader.js
+21
-16
未找到文件。
examples/js/loaders/GLTF2Loader.js
浏览文件 @
5bdc5596
...
...
@@ -2184,7 +2184,7 @@ THREE.GLTF2Loader = ( function () {
}
if
(
material
.
aoMap
!==
undefined
if
(
material
.
aoMap
&&
geometry
.
attributes
.
uv2
===
undefined
&&
geometry
.
attributes
.
uv
!==
undefined
)
{
...
...
@@ -2361,39 +2361,44 @@ THREE.GLTF2Loader = ( function () {
};
/**
* Specification: https://github.com/KhronosGroup/glTF/tree/master/specification/2.0#cameras
*/
GLTFParser
.
prototype
.
loadCameras
=
function
()
{
var
json
=
this
.
json
;
return
_each
(
json
.
cameras
,
function
(
camera
)
{
if
(
camera
.
type
==
"
perspective
"
&&
camera
.
perspective
)
{
var
_camera
;
var
yfov
=
camera
.
perspective
.
yfov
;
var
aspectRatio
=
camera
.
perspective
.
aspectRatio
!==
undefined
?
camera
.
perspective
.
aspectRatio
:
1
;
var
params
=
camera
[
camera
.
type
];
// According to COLLADA spec...
// aspectRatio = xfov / yfov
var
xfov
=
yfov
*
aspectRatio
;
if
(
!
params
)
{
var
_camera
=
new
THREE
.
PerspectiveCamera
(
THREE
.
Math
.
radToDeg
(
xfov
),
aspectRatio
,
camera
.
perspective
.
znear
||
1
,
camera
.
perspective
.
zfar
||
2
e6
);
if
(
camera
.
name
!==
undefined
)
_camera
.
name
=
camera
.
name
;
console
.
warn
(
'
GLTF2Loader: Missing camera parameters.
'
);
return
;
if
(
camera
.
extras
)
_camera
.
userData
=
camera
.
extras
;
}
return
_camera
;
if
(
camera
.
type
===
'
perspective
'
)
{
}
else
if
(
camera
.
type
==
"
orthographic
"
&&
camera
.
orthographic
)
{
var
aspectRatio
=
params
.
aspectRatio
||
1
;
var
xfov
=
params
.
yfov
*
aspectRatio
;
var
_camera
=
new
THREE
.
OrthographicCamera
(
window
.
innerWidth
/
-
2
,
window
.
innerWidth
/
2
,
window
.
innerHeight
/
2
,
window
.
innerHeight
/
-
2
,
camera
.
orthographic
.
znear
,
camera
.
orthographic
.
zfar
);
if
(
camera
.
name
!==
undefined
)
_camera
.
name
=
camera
.
name
;
_camera
=
new
THREE
.
PerspectiveCamera
(
THREE
.
Math
.
radToDeg
(
xfov
),
aspectRatio
,
params
.
znear
||
1
,
params
.
zfar
||
2
e6
);
if
(
camera
.
extras
)
_camera
.
userData
=
camera
.
extras
;
}
else
if
(
camera
.
type
===
'
orthographic
'
)
{
return
_camera
;
_camera
=
new
THREE
.
OrthographicCamera
(
params
.
xmag
/
-
2
,
params
.
xmag
/
2
,
params
.
ymag
/
2
,
params
.
ymag
/
-
2
,
params
.
znear
,
params
.
zfar
)
;
}
if
(
camera
.
name
!==
undefined
)
_camera
.
name
=
camera
.
name
;
if
(
camera
.
extras
)
_camera
.
userData
=
camera
.
extras
;
return
_camera
;
}
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录