Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
934d122a
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,发现更多精彩内容 >>
提交
934d122a
编写于
1月 11, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7939 from takahirox/MMDLoader
Update MMDLoader Animation
上级
955309af
e0e74578
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
20 addition
and
32 deletion
+20
-32
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+20
-32
未找到文件。
examples/js/loaders/MMDLoader.js
浏览文件 @
934d122a
...
...
@@ -2618,7 +2618,6 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
var
animation
=
{
name
:
name
===
undefined
?
THREE
.
Math
.
generateUUID
()
:
name
,
fps
:
30
,
length
:
0.0
,
hierarchy
:
[]
};
...
...
@@ -2633,8 +2632,6 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
var
maxTime
=
0.0
;
for
(
var
i
=
0
;
i
<
orderedMotions
.
length
;
i
++
)
{
var
array
=
orderedMotions
[
i
];
...
...
@@ -2651,16 +2648,8 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
if
(
keys
.
length
>
0
)
{
maxTime
=
Math
.
max
(
keys
[
keys
.
length
-
1
].
time
,
maxTime
);
}
}
animation
.
length
=
maxTime
;
for
(
var
i
=
0
;
i
<
orderedMotions
.
length
;
i
++
)
{
var
bone
=
bones
[
i
];
...
...
@@ -2676,7 +2665,13 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
mesh
.
geometry
.
animations
.
push
(
THREE
.
AnimationClip
.
parseAnimation
(
animation
,
mesh
.
geometry
.
bones
)
);
var
clip
=
THREE
.
AnimationClip
.
parseAnimation
(
animation
,
mesh
.
geometry
.
bones
);
if
(
clip
!==
null
)
{
mesh
.
geometry
.
animations
.
push
(
clip
);
}
};
...
...
@@ -2692,7 +2687,6 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
var
morphAnimation
=
{
fps
:
30
,
length
:
0.0
,
hierarchy
:
[]
};
...
...
@@ -2702,8 +2696,6 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
var
maxTime
=
0.0
;
for
(
var
i
=
0
;
i
<
orderedMorphs
.
length
;
i
++
)
{
var
array
=
orderedMorphs
[
i
];
...
...
@@ -2718,20 +2710,6 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
if
(
keys
.
length
>
0
)
{
maxTime
=
Math
.
max
(
keys
[
keys
.
length
-
1
].
time
,
maxTime
);
}
}
morphAnimation
.
length
=
maxTime
;
if
(
mesh
.
geometry
.
morphAnimations
===
undefined
)
{
mesh
.
geometry
.
morphAnimations
=
[];
}
var
tracks
=
[];
...
...
@@ -2750,7 +2728,19 @@ THREE.MMDLoader.prototype.createAnimation = function ( mesh, vmd, name ) {
}
mesh
.
geometry
.
morphAnimations
.
push
(
new
THREE
.
AnimationClip
(
name
===
undefined
?
THREE
.
Math
.
generateUUID
()
:
name
+
'
Morph
'
,
-
1
,
tracks
)
);
var
clip
=
new
THREE
.
AnimationClip
(
name
===
undefined
?
THREE
.
Math
.
generateUUID
()
:
name
+
'
Morph
'
,
-
1
,
tracks
);
if
(
clip
!==
null
)
{
if
(
mesh
.
geometry
.
morphAnimations
===
undefined
)
{
mesh
.
geometry
.
morphAnimations
=
[];
}
mesh
.
geometry
.
morphAnimations
.
push
(
clip
);
}
};
...
...
@@ -3221,7 +3211,6 @@ THREE.MMDLoader.VectorKeyframeTrackEx = function ( name, times, values, interpol
THREE
.
MMDLoader
.
VectorKeyframeTrackEx
.
prototype
=
Object
.
create
(
THREE
.
VectorKeyframeTrack
.
prototype
);
THREE
.
MMDLoader
.
VectorKeyframeTrackEx
.
prototype
.
constructor
=
THREE
.
MMDLoader
.
VectorKeyframeTrackEx
;
THREE
.
MMDLoader
.
VectorKeyframeTrackEx
.
prototype
.
TimeBufferType
=
Float64Array
;
THREE
.
MMDLoader
.
VectorKeyframeTrackEx
.
prototype
.
ValueBufferType
=
Float64Array
;
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
=
function
(
name
,
times
,
values
,
interpolation
)
{
...
...
@@ -3232,7 +3221,6 @@ THREE.MMDLoader.NumberKeyframeTrackEx = function ( name, times, values, interpol
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
.
prototype
=
Object
.
create
(
THREE
.
NumberKeyframeTrack
.
prototype
);
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
.
prototype
.
constructor
=
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
;
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
.
prototype
.
TimeBufferType
=
Float64Array
;
THREE
.
MMDLoader
.
NumberKeyframeTrackEx
.
prototype
.
ValueBufferType
=
Float64Array
;
THREE
.
MMDLoader
.
DataView
=
function
(
buffer
,
littleEndian
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录