Cleaned up model::Mapfile axis related keys in the map reader, added warning messages where approriate. Support for multiple particle systems in render::ParticleScript. Cleaned up render::ParticleScript member variable names. Added support for axis related keys and scale key in particle scripts.

1 files changed, 21 insertions, 11 deletions

diff --git a/src/model/tags.cc b/src/model/tags.cc
index a47a16c..c1467a1 100644
--- a/src/model/tags.cc
+++ b/src/model/tags.cc
@@ -19,10 +19,6 @@ Tag::Tag(const Tag& other) : tag_location(other.location())
 {
 }
 
-Tag::Tag(const math::Vector3f& location) : tag_location(location)
-{
-}
-
 Tag::~Tag()
 {
 }
@@ -71,12 +67,16 @@ Light::~Light()
 
 /* ---- class Flare ------------------------------------------------ */
 
-Flare::Flare() : Light()
+Flare::Flare() : 
+	Light(),
+	flare_axis()
 {
 	flare_cull = CullBack;
 }
 
-Flare::Flare(const Flare& other) : Light(other)
+Flare::Flare(const Flare& other) : 
+	Light(other),
+	flare_axis(other.axis())
 {
 	flare_cull = other.cull();
 }
@@ -86,17 +86,26 @@ Flare::~Flare()
 
 /* ---- class Particles -------------------------------------------- */
 
-Particles::Particles() : Tag()
+Particles::Particles() : 
+	Tag(),
+	particles_axis(),
+	particles_script()
 {
 	particles_entity = false;
 	particles_engine = false;
-	particles_radius = 0.0f;
+	particles_scale = 1.0f;
 	particles_cull = CullNone;
 }
 
-Particles::Particles(const math::Vector3f& location) :
-		Tag(location)
+Particles::Particles(const Particles & other) : 
+	Tag(other), 
+	particles_axis(other.axis()),
+	particles_script(other.script())
 {
+	particles_entity = other.entity();
+	particles_engine = other.engine();
+	particles_scale = other.scale();
+	particles_cull = other.cull();
 }
 
 Particles::~Particles()
@@ -113,6 +122,7 @@ Dock::Dock() : Tag()
 Dock::Dock(const Dock& other) : Tag(other)
 {
 	dock_radius = other.radius();
+	dock_axis.assign(other.axis());
 }
 
 Dock::~Dock()
@@ -126,7 +136,7 @@ Sound::Sound() : Tag()
 }
 
 Sound::Sound(const Sound& other) : Tag(other),
-		sound_name(other.name())
+	sound_name(other.name())
 {
 }