Skip to content

Commit f381aa4

Browse files
mrdoobmrdoob
committed
Updated builds.
1 parent 56bd34c commit f381aa4

File tree

2 files changed

+113
-52
lines changed

2 files changed

+113
-52
lines changed

‎build/three.js

Lines changed: 101 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,6 +1785,20 @@ THREE.Vector2.prototype = {
17851785

17861786
return this;
17871787

1788+
},
1789+
1790+
rotateAround: function ( center, angle ) {
1791+
1792+
var c = Math.cos( angle ), s = Math.sin( angle );
1793+
1794+
var x = this.x - center.x;
1795+
var y = this.y - center.y;
1796+
1797+
this.x = x * c - y * s + center.x;
1798+
this.y = x * s + y * c + center.y;
1799+
1800+
return this;
1801+
17881802
}
17891803

17901804
};
@@ -7253,6 +7267,48 @@ THREE.Triangle.prototype = {
72537267

72547268
};
72557269

7270+
// File:src/core/Channels.js
7271+
7272+
/**
7273+
* @author mrdoob / http://mrdoob.com/
7274+
*/
7275+
7276+
THREE.Channels = function () {
7277+
7278+
this.mask = 1;
7279+
7280+
};
7281+
7282+
THREE.Channels.prototype = {
7283+
7284+
constructor: THREE.Channels,
7285+
7286+
set: function ( channel ) {
7287+
7288+
this.mask = 1 << channel;
7289+
7290+
},
7291+
7292+
enable: function ( channel ) {
7293+
7294+
this.mask |= 1 << channel;
7295+
7296+
},
7297+
7298+
toggle: function ( channel ) {
7299+
7300+
this.mask ^= 1 << channel;
7301+
7302+
},
7303+
7304+
disable: function ( channel ) {
7305+
7306+
this.mask &= ~ ( 1 << channel );
7307+
7308+
}
7309+
7310+
};
7311+
72567312
// File:src/core/Clock.js
72577313

72587314
/**
@@ -7593,6 +7649,7 @@ THREE.Object3D = function () {
75937649
this.type = 'Object3D';
75947650

75957651
this.parent = null;
7652+
this.channels = new THREE.Channels();
75967653
this.children = [];
75977654

75987655
this.up = THREE.Object3D.DefaultUp.clone();
@@ -12637,7 +12694,7 @@ THREE.KeyframeTrack.prototype = {
1263712694
return;
1263812695
}
1263912696

12640-
if ( ( typeof currKey.time ) !== 'number' || Number.isNaN( currKey.time ) ) {
12697+
if ( ( typeof currKey.time ) !== 'number' || isNaN( currKey.time ) ) {
1264112698
console.error( " key.time is not a valid number", this, i, currKey );
1264212699
return;
1264312700
}
@@ -22295,7 +22352,7 @@ THREE.WebGLRenderer = function ( parameters ) {
2229522352
sprites.length = 0;
2229622353
lensFlares.length = 0;
2229722354

22298-
projectObject( scene );
22355+
projectObject( scene, camera );
2229922356

2230022357
opaqueObjects.length = opaqueObjectsLastIndex + 1;
2230122358
transparentObjects.length = transparentObjectsLastIndex + 1;
@@ -22426,77 +22483,81 @@ THREE.WebGLRenderer = function ( parameters ) {
2242622483

2242722484
}
2242822485

22429-
function projectObject( object ) {
22486+
function projectObject( object, camera ) {
2243022487

2243122488
if ( object.visible === false ) return;
2243222489

22433-
if ( object instanceof THREE.Light ) {
22490+
if ( ( object.channels.mask & camera.channels.mask ) !== 0 ) {
2243422491

22435-
lights.push( object );
22492+
if ( object instanceof THREE.Light ) {
2243622493

22437-
} else if ( object instanceof THREE.Sprite ) {
22494+
lights.push( object );
2243822495

22439-
sprites.push( object );
22496+
} else if ( object instanceof THREE.Sprite ) {
2244022497

22441-
} else if ( object instanceof THREE.LensFlare ) {
22498+
sprites.push( object );
2244222499

22443-
lensFlares.push( object );
22500+
} else if ( object instanceof THREE.LensFlare ) {
2244422501

22445-
} else if ( object instanceof THREE.ImmediateRenderObject ) {
22502+
lensFlares.push( object );
2244622503

22447-
if ( _this.sortObjects === true ) {
22504+
} else if ( object instanceof THREE.ImmediateRenderObject ) {
2244822505

22449-
_vector3.setFromMatrixPosition( object.matrixWorld );
22450-
_vector3.applyProjection( _projScreenMatrix );
22506+
if ( _this.sortObjects === true ) {
2245122507

22452-
}
22508+
_vector3.setFromMatrixPosition( object.matrixWorld );
22509+
_vector3.applyProjection( _projScreenMatrix );
2245322510

22454-
pushRenderItem( object, null, object.material, _vector3.z, null );
22511+
}
2245522512

22456-
} else if ( object instanceof THREE.Mesh || object instanceof THREE.Line || object instanceof THREE.Points ) {
22513+
pushRenderItem( object, null, object.material, _vector3.z, null );
2245722514

22458-
if ( object instanceof THREE.SkinnedMesh ) {
22515+
} else if ( object instanceof THREE.Mesh || object instanceof THREE.Line || object instanceof THREE.Points ) {
2245922516

22460-
object.skeleton.update();
22517+
if ( object instanceof THREE.SkinnedMesh ) {
2246122518

22462-
}
22519+
object.skeleton.update();
2246322520

22464-
if ( object.frustumCulled === false || _frustum.intersectsObject( object ) === true ) {
22521+
}
2246522522

22466-
var material = object.material;
22523+
if ( object.frustumCulled === false || _frustum.intersectsObject( object ) === true ) {
2246722524

22468-
if ( material.visible === true ) {
22525+
var material = object.material;
2246922526

22470-
if ( _this.sortObjects === true ) {
22527+
if ( material.visible === true ) {
2247122528

22472-
_vector3.setFromMatrixPosition( object.matrixWorld );
22473-
_vector3.applyProjection( _projScreenMatrix );
22529+
if ( _this.sortObjects === true ) {
2247422530

22475-
}
22531+
_vector3.setFromMatrixPosition( object.matrixWorld );
22532+
_vector3.applyProjection( _projScreenMatrix );
2247622533

22477-
var geometry = objects.update( object );
22534+
}
22535+
22536+
var geometry = objects.update( object );
2247822537

22479-
if ( material instanceof THREE.MeshFaceMaterial ) {
22538+
if ( material instanceof THREE.MeshFaceMaterial ) {
2248022539

22481-
var groups = geometry.groups;
22482-
var materials = material.materials;
22540+
var groups = geometry.groups;
22541+
var materials = material.materials;
2248322542

22484-
for ( var i = 0, l = groups.length; i < l; i ++ ) {
22543+
for ( var i = 0, l = groups.length; i < l; i ++ ) {
2248522544

22486-
var group = groups[ i ];
22487-
var groupMaterial = materials[ group.materialIndex ];
22545+
var group = groups[ i ];
22546+
var groupMaterial = materials[ group.materialIndex ];
2248822547

22489-
if ( groupMaterial.visible === true ) {
22548+
if ( groupMaterial.visible === true ) {
2249022549

22491-
pushRenderItem( object, geometry, groupMaterial, _vector3.z, group );
22550+
pushRenderItem( object, geometry, groupMaterial, _vector3.z, group );
22551+
22552+
}
2249222553

2249322554
}
2249422555

22495-
}
22556+
} else {
2249622557

22497-
} else {
22558+
pushRenderItem( object, geometry, material, _vector3.z, null );
2249822559

22499-
pushRenderItem( object, geometry, material, _vector3.z, null );
22560+
}
2250022561

2250122562
}
2250222563

@@ -22510,7 +22571,7 @@ THREE.WebGLRenderer = function ( parameters ) {
2251022571

2251122572
for ( var i = 0, l = children.length; i < l; i ++ ) {
2251222573

22513-
projectObject( children[ i ] );
22574+
projectObject( children[ i ], camera );
2251422575

2251522576
}
2251622577

@@ -24036,7 +24097,7 @@ THREE.WebGLRenderer = function ( parameters ) {
2403624097
}
2403724098

2403824099
uploadTexture( textureProperties, texture, slot );
24039-
24100+
2404024101
return;
2404124102

2404224103
}

0 commit comments

Comments
 (0)