Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
0223ca66
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,发现更多精彩内容 >>
未验证
提交
0223ca66
编写于
3月 04, 2019
作者:
M
Mr.doob
提交者:
GitHub
3月 04, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15893 from donmccurdy/bug-gltfloader-interp-warning
GLTFLoader: Fix warning on cubicspline interpolation.
上级
c867016f
ec1d5a7a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
17 deletion
+7
-17
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+7
-17
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
0223ca66
...
...
@@ -1218,10 +1218,8 @@ THREE.GLTFLoader = ( function () {
};
var
INTERPOLATION
=
{
CUBICSPLINE
:
THREE
.
InterpolateSmooth
,
// We use custom interpolation GLTFCubicSplineInterpolation for CUBICSPLINE.
// KeyframeTrack.optimize() can't handle glTF Cubic Spline output values layout,
// using THREE.InterpolateSmooth for KeyframeTrack instantiation to prevent optimization.
// See KeyframeTrack.optimize() for the detail.
CUBICSPLINE
:
undefined
,
// We use a custom interpolant (GLTFCubicSplineInterpolation) for CUBICSPLINE tracks. Each
// keyframe track will be initialized with a default interpolation type, then modified.
LINEAR
:
THREE
.
InterpolateLinear
,
STEP
:
THREE
.
InterpolateDiscrete
};
...
...
@@ -2880,10 +2878,7 @@ THREE.GLTFLoader = ( function () {
if
(
PATH_PROPERTIES
[
target
.
path
]
===
PATH_PROPERTIES
.
weights
)
{
// node can be THREE.Group here but
// PATH_PROPERTIES.weights(morphTargetInfluences) should be
// the property of a mesh object under group.
// Node may be a THREE.Group (glTF mesh with several primitives) or a THREE.Mesh.
node
.
traverse
(
function
(
object
)
{
if
(
object
.
isMesh
===
true
&&
object
.
morphTargetInfluences
)
{
...
...
@@ -2900,20 +2895,16 @@ THREE.GLTFLoader = ( function () {
}
// KeyframeTrack.optimize() will modify given 'times' and 'values'
// buffers before creating a truncated copy to keep. Because buffers may
// be reused by other tracks, make copies here.
for
(
var
j
=
0
,
jl
=
targetNames
.
length
;
j
<
jl
;
j
++
)
{
var
track
=
new
TypedKeyframeTrack
(
targetNames
[
j
]
+
'
.
'
+
PATH_PROPERTIES
[
target
.
path
],
THREE
.
AnimationUtils
.
arraySlice
(
inputAccessor
.
array
,
0
)
,
THREE
.
AnimationUtils
.
arraySlice
(
outputAccessor
.
array
,
0
)
,
inputAccessor
.
array
,
outputAccessor
.
array
,
interpolation
);
// Here is the trick to enable custom interpolation.
// Overrides .createInterpolant in a factory method which creates custom interpolation.
// Override interpolation with custom factory method.
if
(
sampler
.
interpolation
===
'
CUBICSPLINE
'
)
{
track
.
createInterpolant
=
function
InterpolantFactoryMethodGLTFCubicSpline
(
result
)
{
...
...
@@ -2926,8 +2917,7 @@ THREE.GLTFLoader = ( function () {
};
// Workaround, provide an alternate way to know if the interpolant type is cubis spline to track.
// track.getInterpolation() doesn't return valid value for custom interpolant.
// Mark as CUBICSPLINE. `track.getInterpolation()` doesn't support custom interpolants.
track
.
createInterpolant
.
isInterpolantFactoryMethodGLTFCubicSpline
=
true
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录