more work on particle system

Jeffrey Ventrella committed 13 years ago

Commit e6b751e1 parent c348c5e3 files · +137 −60Browse files

Showing the changes to interface/src/ParticleSystem.h (1 of 3 files). Show all

Unified · Split

 #ifndef hifi_ParticleSystem_h
 #define hifi_ParticleSystem_h
+#include <glm/gtc/quaternion.hpp>
 const int MAX_PARTICLES = 5000;
 const int MAX_EMITTERS  = 10;
 public:
     ParticleSystem();
+    void setEmitterPosition(int e, glm::vec3 position) { _emitter[e].position = position; }
     void simulate(float deltaTime);
     void render();
         glm::vec3   color;
         float       age;
         float       radius;
+        int         emitterIndex;
     };
     struct Emitter {
         glm::vec3 position;
-        glm::vec3 direction;
+        glm::quat rotation;
+        glm::vec3 right;
+        glm::vec3 up;
+        glm::vec3 front;
     };
     float      _bounce;
     float      _timer;
     Emitter    _emitter[MAX_EMITTERS];
     Particle   _particle[MAX_PARTICLES];
-    int        _numberOfParticles;
+    int        _numParticles;
-    glm::vec3  _home;
+    int        _numEmitters;
-    glm::vec3  _tornadoAxis;
     float      _airFriction;
     float      _jitter;
     float      _homeAttraction;
     glm::vec3  _TEST_bigSpherePosition;
     // private methods
+    void updateEmitter(int e, float deltaTime);
     void updateParticle(int index, float deltaTime);
     void runSpecialEffectsTest(float deltaTime);
+    void renderEmitter(int emitterIndex, float size);
+    void renderParticle(int p);
 };
 #endif

Keyboard shortcuts