Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
390b2147
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,发现更多精彩内容 >>
提交
390b2147
编写于
2月 24, 2013
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
e5d3ea7b
变更
2
展开全部
隐藏空白更改
内联
并排
Showing
2 changed file
with
72 addition
and
39 deletion
+72
-39
build/three.js
build/three.js
+62
-30
build/three.min.js
build/three.min.js
+10
-9
未找到文件。
build/three.js
浏览文件 @
390b2147
...
...
@@ -594,6 +594,12 @@ THREE.extend( THREE.Color.prototype, {
},
equals: function ( c ) {
return ( c.r === this.r ) && ( c.g === this.g ) && ( c.b === this.b );
},
clone: function () {
return new THREE.Color().setRGB( this.r, this.g, this.b );
...
...
@@ -6203,6 +6209,7 @@ THREE.EventDispatcher = function () {
* @author mrdoob / http://mrdoob.com/
* @author mikael emtinger / http://gomo.se/
* @author alteredq / http://alteredqualia.com/
* @author WestLangley / http://github.com/WestLangley
*/
THREE.Object3D = function () {
...
...
@@ -6252,18 +6259,33 @@ THREE.Object3D.prototype = {
constructor: THREE.Object3D,
applyMatrix: function (
matrix
) {
applyMatrix: function () {
this.matrix.multiplyMatrices( matrix, this.matrix
);
var m1 = new THREE.Matrix4(
);
this.scale.getScaleFromMatrix( this.matrix );
return function ( matrix ) {
var mat = new THREE.Matrix4().extractRotation( this.matrix );
this.rotation.setEulerFromRotationMatrix( mat, this.eulerOrder );
this.matrix.multiplyMatrices( matrix, this.matrix );
this.position.getPositionFromMatrix( this.matrix );
this.position.getPositionFromMatrix( this.matrix );
},
this.scale.getScaleFromMatrix( this.matrix );
m1.extractRotation( this.matrix );
if ( this.useQuaternion === true ) {
this.quaternion.setFromRotationMatrix( m1 );
} else {
this.rotation.setEulerFromRotationMatrix( m1, this.eulerOrder );
}
}
}(),
translate: function ( distance, axis ) {
...
...
@@ -6296,33 +6318,41 @@ THREE.Object3D.prototype = {
},
worldToLocal: function (
vector
) {
worldToLocal: function () {
return vector.applyMatrix4( THREE.Object3D.__m1.getInverse( this.matrixWorld )
);
var m1 = new THREE.Matrix4(
);
},
return function ( vector ) {
return vector.applyMatrix4( m1.getInverse( this.matrixWorld ) );
};
lookAt: function ( vector ) {
}(),
// TODO: Add hierarchy support.
lookAt: function () {
this.matrix.lookAt( vector, this.position, this.up );
// This routine does not support objects with rotated and/or translated parent(s)
if ( this.rotationAutoUpdate ) {
var m1 = new THREE.Matrix4();
if ( this.useQuaternion === false )
{
return function ( vector )
{
this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
m1.lookAt( vector, this.position, this.up );
if ( this.useQuaternion === true ) {
this.quaternion.setFromRotationMatrix( m1 );
} else {
this.
quaternion.copy( this.matrix.decompose()[ 1 ]
);
this.
rotation.setEulerFromRotationMatrix( m1, this.eulerOrder
);
}
}
}
;
},
}
()
,
add: function ( object ) {
...
...
@@ -6554,7 +6584,6 @@ THREE.Object3D.prototype = {
};
THREE.Object3D.__m1 = new THREE.Matrix4();
THREE.Object3D.defaultEulerOrder = 'XYZ',
THREE.Object3DIdCount = 0;
...
...
@@ -8680,7 +8709,8 @@ THREE.BufferGeometry.prototype = {
/**
* @author mrdoob / http://mrdoob.com/
* @author mikael emtinger / http://gomo.se/
*/
* @author WestLangley / http://github.com/WestLangley
*/
THREE.Camera = function () {
...
...
@@ -8695,27 +8725,29 @@ THREE.Camera = function () {
THREE.Camera.prototype = Object.create( THREE.Object3D.prototype );
THREE.Camera.prototype.lookAt = function (
vector
) {
THREE.Camera.prototype.lookAt = function () {
// T
ODO: Add hierarchy support.
// T
his routine does not support cameras with rotated and/or translated parent(s)
this.matrix.lookAt( this.position, vector, this.up
);
var m1 = new THREE.Matrix4(
);
if ( this.rotationAutoUpdate === true
) {
return function ( vector
) {
if ( this.useQuaternion === false ) {
m1.lookAt( this.position, vector, this.up );
this.rotation.setEulerFromRotationMatrix( this.matrix, this.eulerOrder );
if ( this.useQuaternion === true ) {
this.quaternion.setFromRotationMatrix( m1 );
} else {
this.
quaternion.copy( this.matrix.decompose()[ 1 ]
);
this.
rotation.setEulerFromRotationMatrix( m1, this.eulerOrder
);
}
}
}
;
};
}
()
;
/**
* @author alteredq / http://alteredqualia.com/
*/
...
...
build/three.min.js
浏览文件 @
390b2147
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录