Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
748159e4
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,发现更多精彩内容 >>
提交
748159e4
编写于
11月 09, 2012
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Transplanted @WestLangley's normal matrix fix from Geometry.applyMatrix to BufferGeometry.
See #2610
上级
42104287
变更
4
展开全部
隐藏空白更改
内联
并排
Showing
4 changed file
with
132 addition
and
63 deletion
+132
-63
build/three.js
build/three.js
+56
-22
build/three.min.js
build/three.min.js
+20
-20
src/core/BufferGeometry.js
src/core/BufferGeometry.js
+28
-17
src/core/Matrix3.js
src/core/Matrix3.js
+28
-4
未找到文件。
build/three.js
浏览文件 @
748159e4
...
...
@@ -1565,13 +1565,35 @@ THREE.Matrix3.prototype = {
},
multiplyVector3Array: function ( a ) {
var tmp = THREE.Matrix3.__v1;
for ( var i = 0, il = a.length; i < il; i += 3 ) {
tmp.x = a[ i ];
tmp.y = a[ i + 1 ];
tmp.z = a[ i + 2 ];
this.multiplyVector3( tmp );
a[ i ] = tmp.x;
a[ i + 1 ] = tmp.y;
a[ i + 2 ] = tmp.z;
}
return a;
},
getInverse: function ( matrix ) {
// input: THREE.Matrix4
// ( based on http://code.google.com/p/webgl-mjs/ )
var me = matrix.elements;
var me = matrix.elements;
var a11 = me[10] * me[5] - me[6] * me[9];
var a21 = - me[10] * me[1] + me[2] * me[9];
var a31 = me[6] * me[1] - me[2] * me[5];
...
...
@@ -1604,7 +1626,7 @@ THREE.Matrix3.prototype = {
},
transpose: function () {
var tmp, m = this.elements;
...
...
@@ -1616,7 +1638,7 @@ THREE.Matrix3.prototype = {
return this;
},
transposeIntoArray: function ( r ) {
...
...
@@ -1637,7 +1659,8 @@ THREE.Matrix3.prototype = {
}
};
/**
THREE.Matrix3.__v1 = new THREE.Vector3();/**
* @author mrdoob / http://mrdoob.com/
* @author supereggbert / http://www.paulbrunt.co.uk/
* @author philogb / http://blog.thejit.org/
...
...
@@ -5714,10 +5737,13 @@ THREE.BufferGeometry.prototype = {
if ( normalArray !== undefined ) {
var matrixRotation = new THREE.Matrix4();
matrixRotation.extractRotation( matrix );
var normalMatrix = new THREE.Matrix3();
normalMatrix.getInverse( matrix ).transpose();
normalMatrix.multiplyVector3Array( normalArray );
this.normalizeNormals();
matrixRotation.multiplyVector3Array( normalArray );
this.normalsNeedUpdate = true;
}
...
...
@@ -5900,15 +5926,15 @@ THREE.BufferGeometry.prototype = {
ab.sub( pA, pB );
cb.crossSelf( ab );
normals[ vA * 3 ] += cb.x;
normals[ vA * 3 ]
+= cb.x;
normals[ vA * 3 + 1 ] += cb.y;
normals[ vA * 3 + 2 ] += cb.z;
normals[ vB * 3 ] += cb.x;
normals[ vB * 3 ]
+= cb.x;
normals[ vB * 3 + 1 ] += cb.y;
normals[ vB * 3 + 2 ] += cb.z;
normals[ vC * 3 ] += cb.x;
normals[ vC * 3 ]
+= cb.x;
normals[ vC * 3 + 1 ] += cb.y;
normals[ vC * 3 + 2 ] += cb.z;
...
...
@@ -5916,23 +5942,31 @@ THREE.BufferGeometry.prototype = {
}
// normalize normals
this.normalizeNormals();
for ( i = 0, il = normals.length; i < il; i += 3 ) {
this.normalsNeedUpdate = true;
x = normals[ i ];
y = normals[ i + 1 ];
z = normals[ i + 2 ];
}
var n = 1.0 / Math.sqrt( x * x + y * y + z * z );
},
normals[ i ] *= n;
normals[ i + 1 ] *= n;
normals[ i + 2 ] *= n;
normalizeNormals: function () {
}
var normals = this.attributes[ "normal" ].array;
this.normalsNeedUpdate = true;
var x, y, z, n;
for ( var i = 0, il = normals.length; i < il; i += 3 ) {
x = normals[ i ];
y = normals[ i + 1 ];
z = normals[ i + 2 ];
n = 1.0 / Math.sqrt( x * x + y * y + z * z );
normals[ i ] *= n;
normals[ i + 1 ] *= n;
normals[ i + 2 ] *= n;
}
...
...
build/three.min.js
浏览文件 @
748159e4
此差异已折叠。
点击以展开。
src/core/BufferGeometry.js
浏览文件 @
748159e4
...
...
@@ -50,10 +50,13 @@ THREE.BufferGeometry.prototype = {
if
(
normalArray
!==
undefined
)
{
var
matrixRotation
=
new
THREE
.
Matrix4
();
matrixRotation
.
extractRotation
(
matrix
);
var
normalMatrix
=
new
THREE
.
Matrix3
();
normalMatrix
.
getInverse
(
matrix
).
transpose
();
normalMatrix
.
multiplyVector3Array
(
normalArray
);
this
.
normalizeNormals
();
matrixRotation
.
multiplyVector3Array
(
normalArray
);
this
.
normalsNeedUpdate
=
true
;
}
...
...
@@ -236,15 +239,15 @@ THREE.BufferGeometry.prototype = {
ab
.
sub
(
pA
,
pB
);
cb
.
crossSelf
(
ab
);
normals
[
vA
*
3
]
+=
cb
.
x
;
normals
[
vA
*
3
]
+=
cb
.
x
;
normals
[
vA
*
3
+
1
]
+=
cb
.
y
;
normals
[
vA
*
3
+
2
]
+=
cb
.
z
;
normals
[
vB
*
3
]
+=
cb
.
x
;
normals
[
vB
*
3
]
+=
cb
.
x
;
normals
[
vB
*
3
+
1
]
+=
cb
.
y
;
normals
[
vB
*
3
+
2
]
+=
cb
.
z
;
normals
[
vC
*
3
]
+=
cb
.
x
;
normals
[
vC
*
3
]
+=
cb
.
x
;
normals
[
vC
*
3
+
1
]
+=
cb
.
y
;
normals
[
vC
*
3
+
2
]
+=
cb
.
z
;
...
...
@@ -252,23 +255,31 @@ THREE.BufferGeometry.prototype = {
}
// normalize normals
this
.
normalizeNormals
();
for
(
i
=
0
,
il
=
normals
.
length
;
i
<
il
;
i
+=
3
)
{
this
.
normalsNeedUpdate
=
true
;
x
=
normals
[
i
];
y
=
normals
[
i
+
1
];
z
=
normals
[
i
+
2
];
}
var
n
=
1.0
/
Math
.
sqrt
(
x
*
x
+
y
*
y
+
z
*
z
);
},
normals
[
i
]
*=
n
;
normals
[
i
+
1
]
*=
n
;
normals
[
i
+
2
]
*=
n
;
normalizeNormals
:
function
()
{
}
var
normals
=
this
.
attributes
[
"
normal
"
].
array
;
this
.
normalsNeedUpdate
=
true
;
var
x
,
y
,
z
,
n
;
for
(
var
i
=
0
,
il
=
normals
.
length
;
i
<
il
;
i
+=
3
)
{
x
=
normals
[
i
];
y
=
normals
[
i
+
1
];
z
=
normals
[
i
+
2
];
n
=
1.0
/
Math
.
sqrt
(
x
*
x
+
y
*
y
+
z
*
z
);
normals
[
i
]
*=
n
;
normals
[
i
+
1
]
*=
n
;
normals
[
i
+
2
]
*=
n
;
}
...
...
src/core/Matrix3.js
浏览文件 @
748159e4
...
...
@@ -27,13 +27,35 @@ THREE.Matrix3.prototype = {
},
multiplyVector3Array
:
function
(
a
)
{
var
tmp
=
THREE
.
Matrix3
.
__v1
;
for
(
var
i
=
0
,
il
=
a
.
length
;
i
<
il
;
i
+=
3
)
{
tmp
.
x
=
a
[
i
];
tmp
.
y
=
a
[
i
+
1
];
tmp
.
z
=
a
[
i
+
2
];
this
.
multiplyVector3
(
tmp
);
a
[
i
]
=
tmp
.
x
;
a
[
i
+
1
]
=
tmp
.
y
;
a
[
i
+
2
]
=
tmp
.
z
;
}
return
a
;
},
getInverse
:
function
(
matrix
)
{
// input: THREE.Matrix4
// ( based on http://code.google.com/p/webgl-mjs/ )
var
me
=
matrix
.
elements
;
var
me
=
matrix
.
elements
;
var
a11
=
me
[
10
]
*
me
[
5
]
-
me
[
6
]
*
me
[
9
];
var
a21
=
-
me
[
10
]
*
me
[
1
]
+
me
[
2
]
*
me
[
9
];
var
a31
=
me
[
6
]
*
me
[
1
]
-
me
[
2
]
*
me
[
5
];
...
...
@@ -66,7 +88,7 @@ THREE.Matrix3.prototype = {
},
transpose
:
function
()
{
var
tmp
,
m
=
this
.
elements
;
...
...
@@ -78,7 +100,7 @@ THREE.Matrix3.prototype = {
return
this
;
},
transposeIntoArray
:
function
(
r
)
{
...
...
@@ -99,3 +121,5 @@ THREE.Matrix3.prototype = {
}
};
THREE
.
Matrix3
.
__v1
=
new
THREE
.
Vector3
();
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录