single file particle scripts

1 files changed, 104 insertions, 41 deletions

diff --git a/src/render/particles.cc b/src/render/particles.cc
index f9271ab..3a9521b 100644
--- a/src/render/particles.cc
+++ b/src/render/particles.cc
@@ -31,6 +31,31 @@ Particle::Particle(const math::Vector3f &location, const math::Axis &axis, float
 
 ParticleScript::Registry ParticleScript::particles_registry;
 
+void ParticleScript::list()
+{
+	std::string str;
+	for (Registry::iterator it = particles_registry.begin(); it != particles_registry.end(); it++) {
+		
+		ParticleScript *script = (*it).second;
+		switch (script->type()) {
+			case Flame:
+				str.assign("flame");
+				break;
+			case Jet:
+				str.assign("jet");
+				break;
+			case Spray:
+				str.assign("spray");
+				break;
+			case Trail:
+				str.assign("trail");
+				break;
+		}
+		con_print << "  " << script->label() << " " << str << std::endl;
+		con_print << particles_registry.size() << " particle scripts" << std::endl;
+	}
+}
+
 void ParticleScript::clear()
 {
 	for (Registry::iterator it = particles_registry.begin(); it != particles_registry.end(); it++) {
@@ -50,22 +75,24 @@ ParticleScript *ParticleScript::find(const std::string &label)
 		return 0;
 	}
 }
-	
-void ParticleScript::init()
-{
-	clear();
 
-	ParticleScript *script = 0;
+ParticleScript *ParticleScript::load(const std::string &label)
+{
+	ParticleScript *script = find(label);
+	if (script)
+		return script;
 
 	filesystem::IniFile inifile;
-	inifile.open("particles");
+
+	inifile.open("particles/" + label);
 
 	if (!inifile.is_open()) {
-		con_error << "Could not open " << inifile.name() << std::endl;
-		return;
+		con_warn << "Could not open " << inifile.name() << std::endl;
+		return 0;
 	}
 
-	con_print << "^BLoading particle systems..." << std::endl;
+	script = new ParticleScript(label);
+	con_debug << "  " << inifile.name() << std::endl;
 
 	std::string strval;
 
@@ -73,29 +100,16 @@ void ParticleScript::init()
 
 		if (inifile.got_section()) {
 			if (inifile.got_section("particles")) {
-				if (script) {
-					if (script->label().size()) {
-						if (find(script->label())) {
-							con_warn << "Duplicate particle system '" << script->label() << "'" << std::endl;
-							delete script;
-						} else {
-							particles_registry[script->label()] = script;
-						}
-					} else {
-						con_warn << "Particle system without label" << std::endl;
-						delete script;
-					}
-				}
-				script = new ParticleScript();
+				continue;
+			} else {
+				inifile.unknown_section();
 			}
 
 		} else if (inifile.got_key()) {
 
 			if (inifile.in_section("particles")) {
 
-				if (inifile.got_key_string("label", script->particles_label)) {
-					continue;
-				} else if (inifile.got_key_string("type", strval)) {
+				if (inifile.got_key_string("type", strval)) {
 					aux::to_label(strval);
 					if (strval.compare("flame") == 0) {
 						script->particles_type = ParticleScript::Flame;
@@ -132,28 +146,17 @@ void ParticleScript::init()
 			}
 		}
 	}
+
 	inifile.close();
 
-	if (script) {
-		if (script->label().size()) {
-			if (find(script->label())) {
-				con_warn << "Duplicate particle system '" << script->label() << "'" << std::endl;
-				delete script;
-			} else {
-				particles_registry[script->label()] = script;
-			}
-		} else {
-			con_warn << "Particle system without label" << std::endl;
-			delete script;
-		}
-	}
+	particles_registry[script->label()] = script;
 
-	con_debug << "  " << inifile.name() << " " << particles_registry.size() << " " << aux::plural("particle system", particles_registry.size()) << std::endl;
+	return script;
 }
 
 /* ---- class ParticleScript --------------------------------------- */
 
-ParticleScript::ParticleScript()
+ParticleScript::ParticleScript(const std::string label) : particles_label(label)
 {
 	particles_radius = 1.0f;
 	particles_alpha = 1.0f;
@@ -324,6 +327,66 @@ void Jet::draw(float elapsed) {
 		gl::end();
 	}
 }
+/* ---- class Spray ------------------------------------------------ */
+
+Spray::Spray(ParticleScript *script, core::Entity *entity, model::Particles *modelclass) :
+		ParticleSystem(script, entity, modelclass) {
+}
+
+Spray::~Spray()
+{}
+
+void Spray::draw(float elapsed) {
+	if (!particlesystem_script)
+		return;
+
+	ParticleSystem::draw(elapsed);
+
+	math::Vector3f quad[4];
+
+	if (particlesystem_stream.size()) {
+		Textures::bind(particlesystem_texture);
+		gl::begin(gl::Quads);
+
+		for (Stream::iterator it = particlesystem_stream.begin(); it != particlesystem_stream.end(); it++) {
+			Particle *particle = (*it);
+			
+			quad[0].assign(Camera::axis().up() - Camera::axis().left());
+			quad[1].assign(Camera::axis().up() + Camera::axis().left());
+			quad[2].assign(Camera::axis().up() * -1 + Camera::axis().left());
+			quad[3].assign(Camera::axis().up() * -1 - Camera::axis().left());
+			
+			float t = now - particle->time();
+			float f = 0;
+
+			if (t < particlesystem_script->timeout() * 0.1f) {
+				f = t / (0.1f * particlesystem_script->timeout());
+			} else {
+				t = t - particlesystem_script->timeout() * 0.1f;
+				f = t / (0.9f * particlesystem_script->timeout());
+				f = 1.0 - f;
+			}
+
+			f *= f;
+			float radius = particlesystem_script->radius() * f;
+			color.a = f * particlesystem_script->alpha();
+			gl::color(color);
+	
+			glTexCoord2f(0,1);
+			gl::vertex(particle->location() + quad[0] * radius);
+			glTexCoord2f(0,0);
+			gl::vertex(particle->location() + quad[1] * radius);
+			glTexCoord2f(1,0);
+			gl::vertex(particle->location() + quad[2] * radius);
+			glTexCoord2f(1,1);
+			gl::vertex(particle->location() + quad[3] * radius);
+			Stats::quads++;
+		}
+
+		gl::end();
+	}
+}
+
 
 /* ---- class Trail ------------------------------------------------ */