Merging with @alteredq's experimental branches.

This commit is contained in:
Mr.doob
2011-10-23 12:34:46 +02:00
parent 20c96f52e9
commit 6b151b552e
150 changed files with 4982 additions and 3249 deletions
+2 -2
View File
@@ -2,12 +2,12 @@
* @author alteredq / http://alteredqualia.com/
*/
THREE.ParticleSystem = function ( geometry, materials ) {
THREE.ParticleSystem = function ( geometry, material ) {
THREE.Object3D.call( this );
this.geometry = geometry;
this.materials = materials instanceof Array ? materials : [ materials ];
this.material = material;
this.sortParticles = false;