History

adding rave glove modes and changing API of particle system to accommodate

Jeffrey Ventrella committed 13 years ago

Commit 05039b41 parent ed278005 files · +203 −65Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+4−2
@@ -3587,10 +3587,12 @@ void Application::updateParticleSystem(float deltaTime) { · 3586 unmodified lines
3587 _particleSystem.setShowingEmitter(_coolDemoParticleEmitter, true);3587 _particleSystem.setShowingEmitter(_coolDemoParticleEmitter, true);
3588 glm::vec3 particleEmitterPosition = glm::vec3(5.0f, 1.0f, 5.0f); 3588 glm::vec3 particleEmitterPosition = glm::vec3(5.0f, 1.0f, 5.0f);
3589 _particleSystem.setEmitterPosition(_coolDemoParticleEmitter, particleEmitterPosition);3589 _particleSystem.setEmitterPosition(_coolDemoParticleEmitter, particleEmitterPosition);
3590
3591 _particleSystem.setEmitterParticleLifespan(_coolDemoParticleEmitter, 100000.0f);
3592
3590 int num = 1500;3593 int num = 1500;
3591 float thrust = 0.1f;3594 float thrust = 0.1f;
3592 float lifespan = 100000.0f;3595 _particleSystem.emitParticlesNow(_coolDemoParticleEmitter, num, thrust);
3593 _particleSystem.emitParticlesNow(_coolDemoParticleEmitter, num, thrust, lifespan);
3594 }3596 }
3595 3597
3596 // signal that the particle system has been initialized 3598 // signal that the particle system has been initialized

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t