diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 50218fc94b..9b8fb2be93 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3556,14 +3556,6 @@ void Application::updateParticleSystem(float deltaTime) { if (_coolDemoParticleEmitter != -1) { - glm::vec3 tilt = glm::vec3 - ( - 30.0f * sinf( t * 0.55f ), - 0.0f, - 30.0f * cosf( t * 0.75f ) - ); - - //_particleSystem.setEmitterRotation(_coolDemoParticleEmitter, glm::quat(glm::radians(tilt))); _particleSystem.setEmitterDirection(_coolDemoParticleEmitter, glm::vec3(0.0f, 1.0f, 0.0f)); ParticleSystem::ParticleAttributes attributes; diff --git a/interface/src/Hand.cpp b/interface/src/Hand.cpp index 3f8b4d6a0f..b896ffcd0e 100755 --- a/interface/src/Hand.cpp +++ b/interface/src/Hand.cpp @@ -254,8 +254,6 @@ void Hand::updateFingerParticles(float deltaTime) { for ( int f = 0; f< NUM_FINGERS_PER_HAND; f ++ ) { - //_particleSystem.setShowingEmitter(f, true); - _fingerParticleEmitter[f] = _particleSystem.addEmitter(); assert( _fingerParticleEmitter[f] != -1 ); diff --git a/interface/src/ParticleSystem.cpp b/interface/src/ParticleSystem.cpp index 2115dd42b9..efc57c2e18 100644 --- a/interface/src/ParticleSystem.cpp +++ b/interface/src/ParticleSystem.cpp @@ -210,10 +210,6 @@ void ParticleSystem::updateParticle(int p, float deltaTime) { } // apply tornado force - - - //glm::vec3 emitterUp = myEmitter.rotation * IDENTITY_UP; - glm::vec3 tornadoDirection = glm::cross(vectorToHome, myEmitter.direction); _particle[p].velocity += tornadoDirection * myEmitter.particleAttributes[lifeStage].tornadoForce * deltaTime;