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

- included patch from willvarfar for animated attack particles (thanks will)

Browse Source
This commit is contained in:
Mark Vejvoda
2011-06-10 17:33:09 +00:00
parent ba3071c15b
commit 7c43628643
5 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/graphics/gl/particle_renderer_gl.h
View File

@@ -38,7 +38,7 @@ public:
virtual void renderSystem(ParticleSystem *ps);
virtual void renderSystemLine(ParticleSystem *ps);
virtual void renderSystemLineAlpha(ParticleSystem *ps);
virtual void renderSingleModel(AttackParticleSystem *ps, ModelRenderer *mr);
virtual void renderModel(AttackParticleSystem *ps, ModelRenderer *mr);
protected:
void renderBufferQuads(int quadCount);

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

@@ -351,6 +351,7 @@ protected:
float sizeNoEnergy;
float gravity;
float tween;
Vec3f direction;
public:
@@ -369,6 +370,8 @@ public:
void setGravity(float gravity) {this->gravity= gravity;}
void setPrimitive(Primitive primitive) {this->primitive= primitive;}
float getTween() { return tween; } // 0.0 -> 1.0 for animation of model
static Primitive strToPrimitive(const string &str);
};

2
source/shared_lib/include/graphics/particle_renderer.h
View File

@@ -31,7 +31,7 @@ public:
virtual void renderSystem(ParticleSystem *ps)=0;
virtual void renderSystemLine(ParticleSystem *ps)=0;
virtual void renderSystemLineAlpha(ParticleSystem *ps)=0;
virtual void renderSingleModel(AttackParticleSystem *ps, ModelRenderer *mr)=0;
virtual void renderModel(AttackParticleSystem *ps, ModelRenderer *mr)=0;
};
}}//end namespace