diff options
| author | Stijn Buys <ingar@osirion.org> | 2008-07-24 00:47:13 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2008-07-24 00:47:13 +0000 |
| commit | aaa4ff61f7b17759c4f4ccb3ac9011dd5f8a93f5 (patch) | |
| tree | fafec5ef0c99f28cfa6b5b652d98b63b7a4673de /src/core/entity.cc | |
| parent | 11c122eb1cc86ca1a40c84eb411ccd97791dc47d (diff) | |
primary, secondary, tertiary color rendering
Diffstat (limited to 'src/core/entity.cc')
| -rw-r--r-- | src/core/entity.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc index a0b859b..bc1c698 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -80,7 +80,8 @@ void Entity::list() Entity::Entity(unsigned int flags) : entity_location(0.0f, 0.0f, 0.0f), - entity_color(1.0f, 1.0f, 1.0f, 1.0f) + entity_color(1.0f, 1.0f, 1.0f, 1.0f), + entity_color_second(1.0f, 1.0f, 1.0f, 1.0f) { entity_id = 0; entity_flags = flags; @@ -114,6 +115,7 @@ Entity::Entity(std::istream & is) is >> entity_flags; is >> entity_location; is >> entity_color; + is >> entity_color_second; is >> s; // shape entity_shape = (Shape) s; @@ -153,7 +155,6 @@ Entity::Entity(std::istream & is) // this entity is created clientside entity_clientstate = 0; - add(this, entity_id); } @@ -171,6 +172,7 @@ void Entity::serialize(std::ostream & os) const << entity_flags << " " << entity_location << " " << entity_color << " " + << entity_color_second << " " << entity_shape << " " << entity_radius << " " << entity_axis.forward() << " " |