Merge remote-tracking branch 'upstream/master' into particles

Jeffrey Ventrella committed 13 years ago

Commit ea7e1662 parents be56127 7ceb54910 files · +282 −138Browse files

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

Unified · Split

@@ -86,6 +86,7 @@ private: · 85 unmodified lines
86	86	void updateEmitter(int e, float deltaTime);
87	87	void updateParticle(int index, float deltaTime);
88	88	void createParticle(int e, glm::vec3 position, glm::vec3 velocity, float radius, glm::vec4 color, float lifespan);
	89	+ //void runSpecialEffectsTest(int e, float deltaTime); // for debugging and artistic exploration
89	90	void killParticle(int p);
90	91	void renderEmitter(int emitterIndex, float size);
91	92	void renderParticle(int p);