Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 748159e4 编写于 作者: A alteredq
浏览文件
操作

Transplanted @WestLangley's normal matrix fix from Geometry.applyMatrix to BufferGeometry. 

See #2610
上级 42104287
展开全部 隐藏空白更改
内联 并排
Showing with 132 addition and 63 deletion
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.
先完成此消息的编辑！
想要评论请 注册 或