Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 13:24:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up

Browse source
This commit is contained in:
Jeffrey Ventrella 2013-07-19 16:08:19 -07:00
parent d2d8019e73
commit 7f3750f1f0
3 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Application.cpp
View file

@ -3556,14 +3556,6 @@ void Application::updateParticleSystem(float deltaTime) {
if (_coolDemoParticleEmitter != -1) { 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.setEmitterDirection(_coolDemoParticleEmitter, glm::vec3(0.0f, 1.0f, 0.0f));
ParticleSystem::ParticleAttributes attributes; ParticleSystem::ParticleAttributes attributes;

2
interface/src/Hand.cpp
View file

@ -254,8 +254,6 @@ void Hand::updateFingerParticles(float deltaTime) {
for ( int f = 0; f< NUM_FINGERS_PER_HAND; f ++ ) { for ( int f = 0; f< NUM_FINGERS_PER_HAND; f ++ ) {
//_particleSystem.setShowingEmitter(f, true);
_fingerParticleEmitter[f] = _particleSystem.addEmitter(); _fingerParticleEmitter[f] = _particleSystem.addEmitter();
assert( _fingerParticleEmitter[f] != -1 ); assert( _fingerParticleEmitter[f] != -1 );

4
interface/src/ParticleSystem.cpp
View file

@ -210,10 +210,6 @@ void ParticleSystem::updateParticle(int p, float deltaTime) {
} }
// apply tornado force // apply tornado force
//glm::vec3 emitterUp = myEmitter.rotation * IDENTITY_UP;
glm::vec3 tornadoDirection = glm::cross(vectorToHome, myEmitter.direction); glm::vec3 tornadoDirection = glm::cross(vectorToHome, myEmitter.direction);
_particle[p].velocity += tornadoDirection * myEmitter.particleAttributes[lifeStage].tornadoForce * deltaTime; _particle[p].velocity += tornadoDirection * myEmitter.particleAttributes[lifeStage].tornadoForce * deltaTime;