Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
091b1f79
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,发现更多精彩内容 >>
提交
091b1f79
编写于
7月 24, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up.
上级
b81cbbe2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
12 deletion
+14
-12
src/extras/animation/MorphAnimation.js
src/extras/animation/MorphAnimation.js
+6
-4
src/objects/MorphAnimMesh.js
src/objects/MorphAnimMesh.js
+8
-7
src/renderers/webgl/WebGLShadowMap.js
src/renderers/webgl/WebGLShadowMap.js
+0
-1
未找到文件。
src/extras/animation/MorphAnimation.js
浏览文件 @
091b1f79
...
...
@@ -47,8 +47,8 @@ THREE.MorphAnimation.prototype = {
this
.
currentTime
=
Math
.
min
(
this
.
currentTime
,
this
.
duration
);
var
interpolation
=
this
.
duration
/
this
.
frames
;
var
frame
=
Math
.
floor
(
this
.
currentTime
/
interpolation
);
var
frameTime
=
this
.
duration
/
this
.
frames
;
var
frame
=
Math
.
floor
(
this
.
currentTime
/
frameTime
);
var
influences
=
this
.
mesh
.
morphTargetInfluences
;
...
...
@@ -63,8 +63,10 @@ THREE.MorphAnimation.prototype = {
}
influences
[
frame
]
=
(
this
.
currentTime
%
interpolation
)
/
interpolation
;
influences
[
this
.
lastFrame
]
=
1
-
influences
[
frame
];
var
mix
=
(
this
.
currentTime
%
frameTime
)
/
frameTime
;
influences
[
frame
]
=
mix
;
influences
[
this
.
lastFrame
]
=
1
-
mix
;
}
...
...
src/objects/MorphAnimMesh.js
浏览文件 @
091b1f79
...
...
@@ -22,7 +22,7 @@ THREE.MorphAnimMesh = function ( geometry, material ) {
this
.
direction
=
1
;
this
.
directionBackwards
=
false
;
this
.
setFrameRange
(
0
,
this
.
geometry
.
morphTargets
.
length
-
1
);
this
.
setFrameRange
(
0
,
geometry
.
morphTargets
.
length
-
1
);
};
...
...
@@ -152,12 +152,13 @@ THREE.MorphAnimMesh.prototype.updateAnimation = function ( delta ) {
var
keyframe
=
this
.
startKeyframe
+
THREE
.
Math
.
clamp
(
Math
.
floor
(
this
.
time
/
frameTime
),
0
,
this
.
length
-
1
);
if
(
keyframe
!==
this
.
currentKeyframe
)
{
var
influences
=
this
.
morphTargetInfluences
;
this
.
morphTargetInfluences
[
this
.
lastKeyframe
]
=
0
;
this
.
morphTargetInfluences
[
this
.
currentKeyframe
]
=
1
;
if
(
keyframe
!==
this
.
currentKeyframe
)
{
this
.
morphTargetInfluences
[
keyframe
]
=
0
;
influences
[
this
.
lastKeyframe
]
=
0
;
influences
[
this
.
currentKeyframe
]
=
1
;
influences
[
keyframe
]
=
0
;
this
.
lastKeyframe
=
this
.
currentKeyframe
;
this
.
currentKeyframe
=
keyframe
;
...
...
@@ -172,8 +173,8 @@ THREE.MorphAnimMesh.prototype.updateAnimation = function ( delta ) {
}
this
.
morphTargetI
nfluences
[
this
.
currentKeyframe
]
=
mix
;
this
.
morphTargetI
nfluences
[
this
.
lastKeyframe
]
=
1
-
mix
;
i
nfluences
[
this
.
currentKeyframe
]
=
mix
;
i
nfluences
[
this
.
lastKeyframe
]
=
1
-
mix
;
};
...
...
src/renderers/webgl/WebGLShadowMap.js
浏览文件 @
091b1f79
...
...
@@ -308,7 +308,6 @@ THREE.WebGLShadowMap = function ( _renderer, _lights, _objects ) {
}
_renderer
.
setMaterialFaces
(
objectMaterial
);
_renderer
.
renderBufferDirect
(
shadowCamera
,
_lights
,
fog
,
material
,
object
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录