Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
fbf78109
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,发现更多精彩内容 >>
提交
fbf78109
编写于
6月 16, 2016
作者:
S
sunag
提交者:
Mr.doob
6月 16, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix skin+morph and timeScale (#9156)
上级
d74ae20c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
5 addition
and
9 deletion
+5
-9
examples/js/loaders/sea3d/SEA3DLoader.js
examples/js/loaders/sea3d/SEA3DLoader.js
+5
-9
未找到文件。
examples/js/loaders/sea3d/SEA3DLoader.js
浏览文件 @
fbf78109
...
...
@@ -569,7 +569,7 @@ THREE.SEA3D.Animator.prototype.getTimeScale = function() {
THREE
.
SEA3D
.
Animator
.
prototype
.
updateTimeScale
=
function
()
{
this
.
currentAnimationAction
.
setEffectiveTimeScale
(
this
.
timeScale
*
(
this
.
currentAnimation
?
this
.
currentAnimation
.
timeScale
:
1
)
);
this
.
mixer
.
timeScale
=
this
.
timeScale
*
(
this
.
currentAnimation
?
this
.
currentAnimation
.
timeScale
:
1
);
};
...
...
@@ -580,7 +580,7 @@ THREE.SEA3D.Animator.prototype.play = function( name, crossfade, offset, weight
if
(
animation
==
this
.
currentAnimation
)
{
if
(
offset
!==
undefined
||
!
animation
.
loop
)
this
.
currentAnimationAction
.
time
=
offset
!==
undefined
?
offset
:
(
this
.
currentAnimationAction
.
timeScale
>=
0
?
0
:
this
.
currentAnimation
.
duration
);
(
this
.
mixer
.
timeScale
>=
0
?
0
:
this
.
currentAnimation
.
duration
);
this
.
currentAnimationAction
.
setEffectiveWeight
(
weight
!==
undefined
?
weight
:
1
);
this
.
currentAnimationAction
.
paused
=
false
;
...
...
@@ -605,7 +605,7 @@ THREE.SEA3D.Animator.prototype.play = function( name, crossfade, offset, weight
this
.
updateTimeScale
();
if
(
offset
!==
undefined
||
!
animation
.
loop
)
this
.
currentAnimationAction
.
time
=
offset
!==
undefined
?
offset
:
(
this
.
currentAnimationAction
.
timeScale
>=
0
?
0
:
this
.
currentAnimation
.
duration
);
(
this
.
mixer
.
timeScale
>=
0
?
0
:
this
.
currentAnimation
.
duration
);
this
.
currentAnimationAction
.
setEffectiveWeight
(
weight
!==
undefined
?
weight
:
1
);
...
...
@@ -928,9 +928,7 @@ THREE.SEA3D.SkinnedMesh = function( geometry, material, useVertexTexture ) {
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
=
Object
.
create
(
THREE
.
SkinnedMesh
.
prototype
);
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
.
constructor
=
THREE
.
SEA3D
.
SkinnedMesh
;
Object
.
assign
(
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
,
THREE
.
SEA3D
.
Object3D
.
prototype
);
Object
.
assign
(
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
,
THREE
.
SEA3D
.
Animator
.
prototype
);
Object
.
assign
(
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
,
THREE
.
SEA3D
.
Mesh
.
prototype
,
THREE
.
SEA3D
.
Animator
.
prototype
);
THREE
.
SEA3D
.
SkinnedMesh
.
prototype
.
boneByName
=
function
(
name
)
{
...
...
@@ -975,9 +973,7 @@ THREE.SEA3D.VertexAnimationMesh = function( geometry, material ) {
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
=
Object
.
create
(
THREE
.
Mesh
.
prototype
);
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
.
constructor
=
THREE
.
SEA3D
.
VertexAnimationMesh
;
Object
.
assign
(
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
,
THREE
.
SEA3D
.
Object3D
.
prototype
);
Object
.
assign
(
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
,
THREE
.
SEA3D
.
Animator
.
prototype
);
Object
.
assign
(
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
,
THREE
.
SEA3D
.
Mesh
.
prototype
,
THREE
.
SEA3D
.
Animator
.
prototype
);
THREE
.
SEA3D
.
VertexAnimationMesh
.
prototype
.
copy
=
function
(
source
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录