codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed particle by updating three.js and particle lib versions.

Browse source
This commit is contained in:
Nick Winter 2015-06-19 14:55:14 -07:00
parent d632119a6c
commit 37257d2477
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bower.json
View file

@ -47,7 +47,7 @@
"modernizr": "~2.8.3",
"backfire": "~0.3.0",
"fastclick": "~1.0.3",
"three.js": "*",
"three.js": "~0.71.0",
"lscache": "~1.0.5"
},
"overrides": {

20
vendor/scripts/ShaderParticles.js vendored
View file

@ -1,4 +1,4 @@
// ShaderParticleUtils 0.7.8
// ShaderParticleUtils 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@ -300,7 +300,7 @@ SPE.utils = {
}
};;
// ShaderParticleGroup 0.7.8
// ShaderParticleGroup 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@ -325,10 +325,10 @@ SPE.Group = function( options ) {
// Material properties
that.blending = typeof options.blending === 'number' ? options.blending : THREE.AdditiveBlending;
that.transparent = typeof options.transparent === 'number' ? options.transparent : 1;
that.transparent = typeof options.transparent === 'boolean' ? options.transparent : true;
that.alphaTest = typeof options.alphaTest === 'number' ? options.alphaTest : 0.5;
that.depthWrite = options.depthWrite || false;
that.depthTest = options.depthTest || true;
that.depthWrite = typeof options.depthWrite === 'boolean' ? options.depthWrite : false;
that.depthTest = typeof options.depthTest === 'boolean' ? options.depthTest : true;
// Create uniforms
that.uniforms = {
@ -845,7 +845,7 @@ SPE.shaders = {
};
;
// ShaderParticleEmitter 0.7.8
// ShaderParticleEmitter 0.7.9
//
// (c) 2014 Luke Moody (http://www.github.com/squarefeet)
// & Lee Stemkoski (http://www.adelphi.edu/~stemkoski/)
@ -957,6 +957,10 @@ SPE.Emitter = function( options ) {
that.alive = parseFloat( typeof options.alive === 'number' ? options.alive : 1.0 );
that.isStatic = typeof options.isStatic === 'number' ? options.isStatic : 0;
// Particle spawn callback function.
that.onParticleSpawn = typeof options.onParticleSpawn === 'function' ? options.onParticleSpawn : null;
// The following properties are used internally, and mostly set when this emitter
// is added to a particle group.
that.particlesPerSecond = 0;
@ -1023,6 +1027,10 @@ SPE.Emitter.prototype = {
that._randomizeExistingVector3OnDisk( particlePosition, that.position, that.radius, that.radiusSpread, that.radiusScale, that.radiusSpreadClamp );
that._randomizeExistingVelocityVector3OnSphere( particleVelocity, that.position, particlePosition, that.speed, that.speedSpread );
}
if( typeof that.onParticleSpawn === 'function' ) {
that.onParticleSpawn( a, i );
}
},
/**