mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-09 01:46:28 +02:00
Code Issues Projects Releases Wiki Activity

bugfix/improvement for teamcolor particles ** units can morph to flying units ** tech faction with particles

Browse Source
This commit is contained in:
Titus Tscharntke
2010-02-27 00:34:03 +00:00
parent 3b02f9c9b7
commit 59faabfe14
9 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/shared_lib/include/graphics/particle.h
View File

@@ -114,6 +114,9 @@ protected:
int varParticleEnergy;
float particleSize;
float speed;
Vec3f factionColor;
bool teamcolorNoEnergy;
bool teamcolorEnergy;
ParticleObserver *particleObserver;
@@ -152,6 +155,9 @@ public:
void setObserver(ParticleObserver *particleObserver);
void setVisible(bool visible);
void setBlendMode(BlendMode blendMode) {this->blendMode= blendMode;}
void setTeamcolorNoEnergy(bool teamcolorNoEnergy) {this->teamcolorNoEnergy= teamcolorNoEnergy;}
void setTeamcolorEnergy(bool teamcolorEnergy) {this->teamcolorEnergy= teamcolorEnergy;}
virtual void setFactionColor(Vec3f factionColor);
static BlendMode strToBlendMode(const string &str);
//misc
@@ -209,9 +215,6 @@ public:
};
bool relative;
bool fixed;
int teamNumber;
bool teamcolorNoEnergy;
bool teamcolorEnergy;
Model *model;
Primitive primitive;
Vec3f offset;
@@ -227,7 +230,6 @@ public:
virtual void initParticle(Particle *p, int particleIndex);
virtual void updateParticle(Particle *p);
virtual void update();
virtual void setTeamNumber(int teamNumber);
virtual void render(ParticleRenderer *pr, ModelRenderer *mr);
//set params
@@ -241,8 +243,6 @@ public:
void setRotation(float rotation) {this->rotation= rotation;}
void setRelative(bool relative) {this->relative= relative;}
void setFixed(bool fixed) {this->fixed= fixed;}
void setTeamcolorNoEnergy(bool teamcolorNoEnergy) {this->teamcolorNoEnergy= teamcolorNoEnergy;}
void setTeamcolorEnergy(bool teamcolorEnergy) {this->teamcolorEnergy= teamcolorEnergy;}
void setPrimitive(Primitive primitive) {this->primitive= primitive;}
static Primitive strToPrimitive(const string &str);