Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
880c751d
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,发现更多精彩内容 >>
提交
880c751d
编写于
7月 21, 2017
作者:
D
Don McCurdy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge dev morph targets with PR; allow missing normals.
上级
2514542a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
20 deletion
+32
-20
examples/js/loaders/GLTF2Loader.js
examples/js/loaders/GLTF2Loader.js
+32
-20
未找到文件。
examples/js/loaders/GLTF2Loader.js
浏览文件 @
880c751d
...
...
@@ -1911,7 +1911,7 @@ THREE.GLTF2Loader = ( function () {
var
sampler
=
samplers
[
texture
.
sampler
]
||
{};
_texture
.
magFilter
=
WEBGL_FILTERS
[
sampler
.
magFilter
]
||
THREE
.
LinearFilter
;
_texture
.
minFilter
=
WEBGL_FILTERS
[
sampler
.
minFilter
]
||
THREE
.
Nearest
MipMapLinearFilter
;
_texture
.
minFilter
=
WEBGL_FILTERS
[
sampler
.
minFilter
]
||
THREE
.
Linear
MipMapLinearFilter
;
_texture
.
wrapS
=
WEBGL_WRAPPINGS
[
sampler
.
wrapS
]
||
THREE
.
RepeatWrapping
;
_texture
.
wrapT
=
WEBGL_WRAPPINGS
[
sampler
.
wrapT
]
||
THREE
.
RepeatWrapping
;
...
...
@@ -2235,14 +2235,18 @@ THREE.GLTF2Loader = ( function () {
positionAttribute
=
dependencies
.
accessors
[
target
.
POSITION
].
clone
();
var
position
=
geometry
.
attributes
.
position
;
for
(
var
j
=
0
,
jl
=
positionAttribute
.
array
.
length
;
j
<
jl
;
j
++
)
{
for
(
var
j
=
0
,
jl
=
positionAttribute
.
count
;
j
<
jl
;
j
++
)
{
positionAttribute
.
setXYZ
(
j
,
positionAttribute
.
getX
(
j
)
+
position
.
getX
(
j
),
positionAttribute
.
getY
(
j
)
+
position
.
getY
(
j
),
positionAttribute
.
getZ
(
j
)
+
position
.
getZ
(
j
)
);
positionAttribute
.
setXYZ
(
j
,
positionAttribute
.
getX
(
j
)
+
position
.
getX
(
j
),
positionAttribute
.
getY
(
j
)
+
position
.
getY
(
j
),
positionAttribute
.
getZ
(
j
)
+
position
.
getZ
(
j
));
}
}
else
{
}
else
if
(
geometry
.
attributes
.
position
)
{
// Copying the original position not to affect the final position.
// See the formula above.
...
...
@@ -2259,14 +2263,18 @@ THREE.GLTF2Loader = ( function () {
normalAttribute
=
dependencies
.
accessors
[
target
.
NORMAL
].
clone
();
var
normal
=
geometry
.
attributes
.
normal
;
for
(
var
j
=
0
,
jl
=
normalAttribute
.
array
.
length
;
j
<
jl
;
j
++
)
{
for
(
var
j
=
0
,
jl
=
normalAttribute
.
count
;
j
<
jl
;
j
++
)
{
normalAttribute
.
setXYZ
(
j
,
normalAttribute
.
getX
(
j
)
+
normal
.
getX
(
j
),
normalAttribute
.
getY
(
j
)
+
normal
.
getY
(
j
),
normalAttribute
.
getZ
(
j
)
+
normal
.
getZ
(
j
)
);
normalAttribute
.
setXYZ
(
j
,
normalAttribute
.
getX
(
j
)
+
normal
.
getX
(
j
),
normalAttribute
.
getY
(
j
)
+
normal
.
getY
(
j
),
normalAttribute
.
getZ
(
j
)
+
normal
.
getZ
(
j
));
}
}
else
{
}
else
if
(
geometry
.
attributes
.
normal
)
{
normalAttribute
=
geometry
.
attributes
.
normal
.
clone
();
...
...
@@ -2277,11 +2285,19 @@ THREE.GLTF2Loader = ( function () {
}
positionAttribute
.
name
=
attributeName
;
normalAttribute
.
name
=
attributeName
;
if
(
positionAttribute
)
{
positionAttribute
.
name
=
attributeName
;
morphAttributes
.
position
.
push
(
positionAttribute
);
}
if
(
normalAttribute
)
{
morphAttributes
.
position
.
push
(
positionAttribute
);
morphAttributes
.
normal
.
push
(
normalAttribute
);
normalAttribute
.
name
=
attributeName
;
morphAttributes
.
normal
.
push
(
normalAttribute
);
}
}
...
...
@@ -2698,11 +2714,7 @@ THREE.GLTF2Loader = ( function () {
break
;
default
:
// save morph targets before replace
// meshes
var
morph
=
child
.
morphTargetInfluences
;
child
=
new
THREE
.
Mesh
(
originalGeometry
,
material
);
child
.
morphTargetInfluences
=
morph
;
child
=
new
THREE
.
Mesh
(
originalGeometry
,
material
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录