Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
64c3845e
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,发现更多精彩内容 >>
提交
64c3845e
编写于
6月 15, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
d5a5d651
变更
2
展开全部
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
54 deletion
+55
-54
build/three.js
build/three.js
+29
-28
build/three.min.js
build/three.min.js
+26
-26
未找到文件。
build/three.js
浏览文件 @
64c3845e
...
...
@@ -7271,9 +7271,7 @@ THREE.Object3D.prototype = {
return function ( axis, distance ) {
v1.copy( axis );
v1.applyQuaternion( this.quaternion );
v1.copy( axis ).applyQuaternion( this.quaternion );
this.position.add( v1.multiplyScalar( distance ) );
...
...
@@ -21575,7 +21573,7 @@ THREE.WebGLRenderer = function ( parameters ) {
vertexColors, faceColor,
vertexTangents,
uv, uv2, v1, v2, v3, v4, t1, t2, t3, t4, n1, n2, n3, n4,
c1, c2, c3,
c4,
c1, c2, c3,
sw1, sw2, sw3, sw4,
si1, si2, si3, si4,
sa1, sa2, sa3, sa4,
...
...
@@ -27284,11 +27282,11 @@ THREE.FontUtils = {
cpx = outline[ i ++ ] * scaleX + offset;
cpy = outline[ i ++ ] * scaleY;
cpx1 = outline[ i ++ ] * scaleX + offset;
cpy1 = outline[ i ++ ] *
-
scaleY;
cpy1 = outline[ i ++ ] * scaleY;
cpx2 = outline[ i ++ ] * scaleX + offset;
cpy2 = outline[ i ++ ] *
-
scaleY;
cpy2 = outline[ i ++ ] * scaleY;
path.bezierCurveTo( cpx
, cpy, cpx1, cpy1, cpx2, cpy2
);
path.bezierCurveTo( cpx
1, cpy1, cpx2, cpy2, cpx, cpy
);
laste = pts[ pts.length - 1 ];
...
...
@@ -30297,6 +30295,7 @@ THREE.Animation.prototype.update = (function(){
};
return function ( delta ) {
if ( this.isPlaying === false ) return;
this.currentTime += delta * this.timeScale;
...
...
@@ -30306,7 +30305,6 @@ THREE.Animation.prototype.update = (function(){
//
var vector;
var duration = this.data.length;
if ( this.loop === true && this.currentTime > duration ) {
...
...
@@ -30368,8 +30366,6 @@ THREE.Animation.prototype.update = (function(){
if ( type === "pos" ) {
vector = object.position;
if ( this.interpolationType === THREE.AnimationHandler.LINEAR ) {
newVector.x = prevXYZ[ 0 ] + ( nextXYZ[ 0 ] - prevXYZ[ 0 ] ) * scale;
...
...
@@ -30377,17 +30373,21 @@ THREE.Animation.prototype.update = (function(){
newVector.z = prevXYZ[ 2 ] + ( nextXYZ[ 2 ] - prevXYZ[ 2 ] ) * scale;
// blend
if (
object instanceof THREE.Bone
) {
if (
object instanceof THREE.Bone
) {
var proportionalWeight = this.weight / ( this.weight + object.accumulatedPosWeight );
vector
.lerp( newVector, proportionalWeight );
object.position
.lerp( newVector, proportionalWeight );
object.accumulatedPosWeight += this.weight;
} else
vector = newVector;
} else {
object.position.copy( newVector );
}
} else if ( this.interpolationType === THREE.AnimationHandler.CATMULLROM ||
this.interpolationType === THREE.AnimationHandler.CATMULLROM_FORWARD ) {
this.interpolationType === THREE.AnimationHandler.CATMULLROM_FORWARD ) {
points[ 0 ] = this.getPrevKeyWith( "pos", h, prevKey.index - 1 )[ "pos" ];
points[ 1 ] = prevXYZ;
...
...
@@ -30397,17 +30397,19 @@ THREE.Animation.prototype.update = (function(){
scale = scale * 0.33 + 0.33;
var currentPoint = interpolateCatmullRom( points, scale );
var proportionalWeight = 1;
if ( object instanceof THREE.Bone ) {
var
proportionalWeight = this.weight / ( this.weight + object.accumulatedPosWeight );
proportionalWeight = this.weight / ( this.weight + object.accumulatedPosWeight );
object.accumulatedPosWeight += this.weight;
}
else
var proportionalWeight = 1;
// blend
var vector = object.position;
vector.x = vector.x + ( currentPoint[ 0 ] - vector.x ) * proportionalWeight;
vector.y = vector.y + ( currentPoint[ 1 ] - vector.y ) * proportionalWeight;
vector.z = vector.z + ( currentPoint[ 2 ] - vector.z ) * proportionalWeight;
...
...
@@ -30437,14 +30439,12 @@ THREE.Animation.prototype.update = (function(){
object.quaternion.copy(newQuat);
}
else if ( object.accumulatedRotWeight === 0) {
} else if ( object.accumulatedRotWeight === 0 ) {
object.quaternion.copy(newQuat);
object.accumulatedRotWeight = this.weight;
}
else {
} else {
var proportionalWeight = this.weight / ( this.weight + object.accumulatedRotWeight );
THREE.Quaternion.slerp( object.quaternion, newQuat, object.quaternion, proportionalWeight );
...
...
@@ -30454,8 +30454,6 @@ THREE.Animation.prototype.update = (function(){
} else if ( type === "scl" ) {
vector = object.scale;
newVector.x = prevXYZ[ 0 ] + ( nextXYZ[ 0 ] - prevXYZ[ 0 ] ) * scale;
newVector.y = prevXYZ[ 1 ] + ( nextXYZ[ 1 ] - prevXYZ[ 1 ] ) * scale;
newVector.z = prevXYZ[ 2 ] + ( nextXYZ[ 2 ] - prevXYZ[ 2 ] ) * scale;
...
...
@@ -30463,11 +30461,14 @@ THREE.Animation.prototype.update = (function(){
if ( object instanceof THREE.Bone ) {
var proportionalWeight = this.weight / ( this.weight + object.accumulatedSclWeight);
vector
.lerp( newVector, proportionalWeight );
object.scale
.lerp( newVector, proportionalWeight );
object.accumulatedSclWeight += this.weight;
} else
vector = newVector;
} else {
object.scale.copy( newVector );
}
}
...
...
build/three.min.js
浏览文件 @
64c3845e
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录