diff options
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/tags.cc | 31 | ||||
| -rw-r--r-- | src/model/tags.h | 16 | 
2 files changed, 35 insertions, 12 deletions
| diff --git a/src/model/tags.cc b/src/model/tags.cc index baf70a4..a47a16c 100644 --- a/src/model/tags.cc +++ b/src/model/tags.cc @@ -9,11 +9,29 @@  namespace model  { +/* ---- class Tag -------------------------------------------------- */ + +Tag::Tag() : tag_location() +{ +} + +Tag::Tag(const Tag& other) : tag_location(other.location()) +{ +} + +Tag::Tag(const math::Vector3f& location) : tag_location(location) +{ +} + +Tag::~Tag() +{ +} +  /* ---- class Light ------------------------------------------------ */  Light::Light() : -		Tag(), -		light_color(1.0f, 1.0f, 1.0f) +	Tag(), +	light_color(1.0f, 1.0f, 1.0f)  {  	light_entity = false;  	light_engine = false; @@ -29,8 +47,9 @@ Light::Light() :  	light_texture = 0;  } -Light::Light(const Light& other) : Tag(other), -		light_color(other.color()) +Light::Light(const Light& other) :  +	Tag(other), +	light_color(other.color())  {  	light_entity = other.entity();  	light_engine = other.engine(); @@ -45,8 +64,10 @@ Light::Light(const Light& other) : Tag(other),  	light_texture = other.texture();  } +  Light::~Light() -{} +{ +}  /* ---- class Flare ------------------------------------------------ */ diff --git a/src/model/tags.h b/src/model/tags.h index 0c97910..881b914 100644 --- a/src/model/tags.h +++ b/src/model/tags.h @@ -39,21 +39,23 @@ public:  	/**  	 * @brief default constructor  	 */ -	inline Tag() : tag_location() { -	} +	Tag();  	/**  	 * @brief copy constructor  	 */ -	inline Tag(const Tag& other) : tag_location(other.location()) { -	} +	Tag(const Tag& other);  	/**  	 * @brief constructor with location  	 * @param location location of this part within the parent model  	 */ -	inline Tag(const math::Vector3f& location) : tag_location(location) { -	} +	Tag(const math::Vector3f& location); +	 +	/** +	 * @brief default destructor +	 */ +	~Tag();  	/* ---- inspectors ----------------------------------------- */ @@ -208,7 +210,7 @@ public:  	 * @brief set the light on time, from 0.0 (always off) to 1.0 (always on)  	 */  	inline void set_time(const float time) { -		light_radius = time; +		light_time = time;  	}  	/** | 
