|
@@ -20,13 +20,13 @@ THREE.Frustum = function ( ) {
|
|
|
|
|
|
THREE.Frustum.prototype.setFromMatrix = function ( m ) {
|
|
|
|
|
|
- var i, plane,
|
|
|
- planes = this.planes;
|
|
|
- var me = m.elements;
|
|
|
- var me0 = me[0], me1 = me[1], me2 = me[2], me3 = me[3];
|
|
|
- var me4 = me[4], me5 = me[5], me6 = me[6], me7 = me[7];
|
|
|
- var me8 = me[8], me9 = me[9], me10 = me[10], me11 = me[11];
|
|
|
- var me12 = me[12], me13 = me[13], me14 = me[14], me15 = me[15];
|
|
|
+ var i, plane, planes = this.planes;
|
|
|
+
|
|
|
+ var me = m.elements;
|
|
|
+ var me0 = me[0], me1 = me[1], me2 = me[2], me3 = me[3];
|
|
|
+ var me4 = me[4], me5 = me[5], me6 = me[6], me7 = me[7];
|
|
|
+ var me8 = me[8], me9 = me[9], me10 = me[10], me11 = me[11];
|
|
|
+ var me12 = me[12], me13 = me[13], me14 = me[14], me15 = me[15];
|
|
|
|
|
|
planes[ 0 ].set( me3 - me0, me7 - me4, me11 - me8, me15 - me12 );
|
|
|
planes[ 1 ].set( me3 + me0, me7 + me4, me11 + me8, me15 + me12 );
|
|
@@ -49,9 +49,8 @@ THREE.Frustum.prototype.contains = function ( object ) {
|
|
|
var distance,
|
|
|
planes = this.planes,
|
|
|
matrix = object.matrixWorld,
|
|
|
- me = matrix.elements,
|
|
|
- scale = THREE.Frustum.__v1.set( matrix.getColumnX().length(), matrix.getColumnY().length(), matrix.getColumnZ().length() ),
|
|
|
- radius = - object.geometry.boundingSphere.radius * Math.max( scale.x, Math.max( scale.y, scale.z ) );
|
|
|
+ me = matrix.elements,
|
|
|
+ radius = - object.geometry.boundingSphere.radius * matrix.getMaxScaleOnAxis();
|
|
|
|
|
|
for ( var i = 0; i < 6; i ++ ) {
|
|
|
|