home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-24 20:36:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added color parameter to Sprite.

Browse Source 
Also removed unused material Sprite parameter.
This commit is contained in:
alteredq
2011-09-17 00:36:44 +02:00
parent 578feace08
commit d4b2e4a8e0
7 changed files with 221 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objects/Sprite.js
+8 -18
View File
@@ -6,25 +6,15 @@ THREE.Sprite = function( parameters ) {
THREE.Object3D.call( this );
if( parameters.material !== undefined ) {
this.color = ( parameters.color !== undefined ) ? new THREE.Color( parameters.color ) : new THREE.Color( 0xffffff );
this.map = ( parameters.map instanceof THREE.Texture ) ? parameters.map : THREE.ImageUtils.loadTexture( parameters.map );
this.blending = ( parameters.blending !== undefined ) ? parameters.blending : THREE.NormalBlending;
this.material = parameters.material;
this.map = undefined;
this.blending = material.blending;
} else if( parameters.map !== undefined ) {
this.map = parameters.map instanceof THREE.Texture ? parameters.map : THREE.ImageUtils.loadTexture( parameters.map );
this.material = undefined;
this.blending = parameters.blending !== undefined ? parameters.blending : THREE.NormalBlending;
}
this.useScreenCoordinates = parameters.useScreenCoordinates !== undefined ? parameters.useScreenCoordinates : true;
this.mergeWith3D = parameters.mergeWith3D !== undefined ? parameters.mergeWith3D : !this.useScreenCoordinates;
this.affectedByDistance = parameters.affectedByDistance !== undefined ? parameters.affectedByDistance : !this.useScreenCoordinates;
this.scaleByViewport = parameters.scaleByViewport !== undefined ? parameters.scaleByViewport : !this.affectedByDistance;
this.alignment = parameters.alignment instanceof THREE.Vector2 ? parameters.alignment : THREE.SpriteAlignment.center;
this.useScreenCoordinates = ( parameters.useScreenCoordinates !== undefined ) ? parameters.useScreenCoordinates : true;
this.mergeWith3D = ( parameters.mergeWith3D !== undefined ) ? parameters.mergeWith3D : !this.useScreenCoordinates;
this.affectedByDistance = ( parameters.affectedByDistance !== undefined ) ? parameters.affectedByDistance : !this.useScreenCoordinates;
this.scaleByViewport = ( parameters.scaleByViewport !== undefined ) ? parameters.scaleByViewport : !this.affectedByDistance;
this.alignment = ( parameters.alignment instanceof THREE.Vector2 ) ? parameters.alignment : THREE.SpriteAlignment.center;
this.rotation3d = this.rotation;
this.rotation = 0;