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

- updated patch from willvarfar for animated models in particles

Browse Source
This commit is contained in:
Mark Vejvoda
2011-06-11 00:26:26 +00:00
parent 90fcb0abe7
commit 4aca4af404
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/shared_lib/sources/graphics/interpolation.cpp
View File

@@ -73,6 +73,9 @@ void InterpolationData::update(float t, bool cycle){
}
void InterpolationData::updateVertices(float t, bool cycle) {
if(t <0.0f || t>1.0f) {
printf("ERROR t = [%f] for cycle [%d] f [%d] v [%d]\n",t,cycle,mesh->getFrameCount(),mesh->getVertexCount());
}
assert(t>=0.0f && t<=1.0f);
uint32 frameCount= mesh->getFrameCount();

23
source/shared_lib/sources/graphics/particle.cpp
View File

@@ -747,6 +747,7 @@ ProjectileParticleSystem::~ProjectileParticleSystem(){
void ProjectileParticleSystem::link(SplashParticleSystem *particleSystem){
nextParticleSystem= particleSystem;
nextParticleSystem->setVisible(false);
nextParticleSystem->setState(sPause);
nextParticleSystem->prevParticleSystem= this;
}
@@ -761,17 +762,30 @@ void ProjectileParticleSystem::update(){
Vec3f currentVector= flatPos - startPos;
// ratio
tween = clamp(currentVector.length() / targetVector.length(), 0.0f, 1.0f);
float t= clamp(currentVector.length() / targetVector.length(), 0.0f, 1.0f);
// animation?
if(modelCycle == 0.0f) {
tween= t;
}
else {
#ifdef USE_STREFLOP
tween= streflop::fmod(currentVector.length(), modelCycle);
#else
tween= fmod(currentVector.length(), modelCycle);
#endif
tween= clamp(tween / currentVector.length(), 0.0f, 1.0f);
}
// trajectory
switch(trajectory){
switch(trajectory) {
case tLinear: {
pos= flatPos;
}
break;
case tParabolic: {
float scaledT= 2.0f * (tween - 0.5f);
float scaledT= 2.0f * (t - 0.5f);
float paraboleY= (1.0f - scaledT * scaledT) * trajectoryScale;
pos= flatPos;
@@ -808,6 +822,7 @@ void ProjectileParticleSystem::update(){
}
if(nextParticleSystem != NULL){
nextParticleSystem->setVisible(true);
nextParticleSystem->setState(sPlay);
nextParticleSystem->setPos(endPos);
}
@@ -917,7 +932,7 @@ void SplashParticleSystem::initParticleSystem() {
startEmissionRate = emissionRate;
}
void SplashParticleSystem::update(){
void SplashParticleSystem::update() {
ParticleSystem::update();
if(state != sPause) {
emissionRate-= emissionRateFade;