diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | visualization/extrasmeltutils.cpp | 73 | ||||
| -rw-r--r-- | visualization/extrasmeltutils.hpp | 6 |
3 files changed, 74 insertions, 9 deletions
@@ -1,3 +1,7 @@ +2016-05-16 0.8.1 alpha +Finish the particle system. +It should become a part of SMELT someday. + 2016-05-15 0.8.1 alpha Initial stubs for the particle system. Use layouts in the effects window. diff --git a/visualization/extrasmeltutils.cpp b/visualization/extrasmeltutils.cpp index 160f7d6..a2ccf2c 100644 --- a/visualization/extrasmeltutils.cpp +++ b/visualization/extrasmeltutils.cpp @@ -1,7 +1,10 @@ #include <cstdarg> +#include <ctime> +#include <algorithm> #include "extrasmeltutils.hpp" SMELT* smEntity3DBuffer::sm=NULL; SMELT* smParticle::sm=NULL; +SMELT* smParticleSystem::sm=NULL; smVertex makeVertex(float x,float y,float z,DWORD color,float tx,float ty) {smVertex v;v.x=x;v.y=y;v.z=z;v.col=color;v.tx=tx;v.ty=ty;return v;} void smEntity3D::addVerices(int n,...) @@ -60,13 +63,14 @@ void smEntity3DBuffer::drawBatch() sm->smDrawCustomIndexedVertices(&vertices[0],&indices[0],vertices.size(),indices.size(),BLEND_ALPHABLEND,0); vertices.clear();indices.clear(); } -smParticle::smParticle(){sm=smGetInterface(SMELT_APILEVEL);} +smParticle::smParticle() +{sm=smGetInterface(SMELT_APILEVEL);dead=false;lifespan=0;} smParticle::~smParticle(){sm->smRelease();} void smParticle::render() {sm->smRenderQuad(&q);} void smParticle::update() { - clifespan+=sm->smGetDelta(); + clifespan+=sm->smGetDelta();if(clifespan>lifespan){dead=true;return;} vel=vel+accel;pos=pos+vel;rotv=rotv+rota;rot=rot+rotv; size=clifespan/lifespan*(finalsize-initsize)+initsize; color=ARGB( @@ -74,21 +78,72 @@ void smParticle::update() (DWORD)(clifespan/lifespan*(GETR(finalcolor)-GETR(initcolor)+GETR(initcolor))), (DWORD)(clifespan/lifespan*(GETG(finalcolor)-GETG(initcolor)+GETG(initcolor))), (DWORD)(clifespan/lifespan*(GETB(finalcolor)-GETB(initcolor)+GETB(initcolor)))); - //set up the quad + for(int i=0;i<4;++i)q.v[i].col=color; + smMatrix m;m.loadIdentity();m.rotate(rot.x,1,0,0);m.rotate(rot.y,0,1,0);m.rotate(rot.z,0,0,1); + smvec3d v0=m*smvec3d(-size,-size,0),v1=m*smvec3d(size,-size,0); + smvec3d v2=m*smvec3d(size,size,0),v3=m*smvec3d(-size,size,0); + q.v[0].x=v0.x;q.v[0].y=v0.y;q.v[0].z=v0.z; + q.v[1].x=v1.x;q.v[1].y=v1.y;q.v[1].z=v1.z; + q.v[2].x=v2.x;q.v[2].y=v2.y;q.v[2].z=v2.z; + q.v[3].x=v3.x;q.v[3].y=v3.y;q.v[3].z=v3.z; } -smParticleSystem::smParticleSystem(){particles.clear();posGenerator=NULL;} +smParticleSystem::smParticleSystem() +{sm=smGetInterface(SMELT_APILEVEL);particles.clear();posGenerator=NULL;} smParticleSystem::~smParticleSystem() -{for(int i=0;i<particles.size();++i)delete particles[i];particles.clear();} +{for(unsigned i=0;i<particles.size();++i)delete particles[i];particles.clear();} void smParticleSystem::setParticleSystemInfo(smParticleSystemInfo _psinfo) {psinfo=_psinfo;} void smParticleSystem::setPos(smvec3d _pos){pos=_pos;} void smParticleSystem::setPSEmissionPosGen(smPSEmissionPositionGenerator *_gen) {posGenerator=_gen;} void smParticleSystem::startPS() -{} +{active=true;nemdelay=0;re.setSeed(time(NULL));} void smParticleSystem::stopPS() -{} +{active=false;} void smParticleSystem::updatePS() -{} +{ + cemdelay+=sm->smGetDelta(); + if(cemdelay>nemdelay) + { + int ec=re.nextInt(psinfo.emissioncount-psinfo.ecvar,psinfo.emissioncount+psinfo.ecvar); + for(int i=0;i<ec;++i) + { + smParticle *p=new smParticle(); + p->pos=pos+(posGenerator?posGenerator->genPos():smvec3d(0,0,0)); + p->rot=smvec3d(0,0,0); + p->lifespan=re.nextDouble(psinfo.lifespan-psinfo.lifespanvar,psinfo.lifespan+psinfo.lifespanvar); + p->initsize=re.nextDouble(psinfo.initsize-psinfo.initsizevar,psinfo.initsize+psinfo.initsizevar); + p->finalsize=re.nextDouble(psinfo.finalsize-psinfo.finalsizevar,psinfo.finalsize+psinfo.finalsizevar); + p->size=p->initsize; + p->initcolor=ARGB( + re.nextInt(GETA(psinfo.initcolor)-GETA(psinfo.initcolorvar),GETA(psinfo.initcolor)+GETA(psinfo.initcolorvar)), + re.nextInt(GETR(psinfo.initcolor)-GETR(psinfo.initcolorvar),GETR(psinfo.initcolor)+GETR(psinfo.initcolorvar)), + re.nextInt(GETG(psinfo.initcolor)-GETG(psinfo.initcolorvar),GETG(psinfo.initcolor)+GETG(psinfo.initcolorvar)), + re.nextInt(GETB(psinfo.initcolor)-GETB(psinfo.initcolorvar),GETB(psinfo.initcolor)+GETB(psinfo.initcolorvar))); + p->finalcolor=ARGB( + re.nextInt(GETA(psinfo.finalcolor)-GETA(psinfo.finalcolorvar),GETA(psinfo.finalcolor)+GETA(psinfo.finalcolorvar)), + re.nextInt(GETR(psinfo.finalcolor)-GETR(psinfo.finalcolorvar),GETR(psinfo.finalcolor)+GETR(psinfo.finalcolorvar)), + re.nextInt(GETG(psinfo.finalcolor)-GETG(psinfo.finalcolorvar),GETG(psinfo.finalcolor)+GETG(psinfo.finalcolorvar)), + re.nextInt(GETB(psinfo.finalcolor)-GETB(psinfo.finalcolorvar),GETB(psinfo.finalcolor)+GETB(psinfo.finalcolorvar))); + p->color=p->initcolor;p->q.tex=psinfo.texture;p->q.blend=psinfo.blend; + p->q.v[0].tx=p->q.v[3].tx=0;p->q.v[0].ty=p->q.v[1].ty=0; + p->q.v[1].tx=p->q.v[2].tx=1;p->q.v[2].ty=p->q.v[3].ty=1; + particles.push_back(p); + } + cemdelay=0; + nemdelay=re.nextDouble(psinfo.emissiondelay-psinfo.edvar,psinfo.emissiondelay+psinfo.edvar); + } + for(unsigned i=0,j;i<particles.size()&&!particles[i]->dead;++i) + { + particles[i]->update(); + if(particles[i]->dead) + { + for(j=particles.size()-1;j>i&&particles[j]->dead;--j); + std::swap(particles[i],particles[j]); + } + } + while(!particles.empty()&&particles.back()->dead) + {delete particles.back();particles.back()=NULL;particles.pop_back();} +} void smParticleSystem::renderPS() -{} +{for(unsigned i=0;i<particles.size();++i)particles[i]->render();} diff --git a/visualization/extrasmeltutils.hpp b/visualization/extrasmeltutils.hpp index 092fbfb..bd103b0 100644 --- a/visualization/extrasmeltutils.hpp +++ b/visualization/extrasmeltutils.hpp @@ -3,6 +3,7 @@ #include <vector> #include <smelt.hpp> #include <smmath.hpp> +#include <smrandom.hpp> class smEntity3D { friend class smEntity3DBuffer; @@ -59,6 +60,7 @@ class smParticle double initsize,finalsize,size; DWORD color,initcolor,finalcolor; smQuad q; + bool dead; public: smParticle(); ~smParticle(); @@ -68,10 +70,14 @@ class smParticle class smParticleSystem { private: + static SMELT* sm; std::vector<smParticle*> particles; smParticleSystemInfo psinfo; smvec3d pos; + smRandomEngine re; smPSEmissionPositionGenerator* posGenerator; + bool active; + double cemdelay,nemdelay; public: smParticleSystem(); ~smParticleSystem(); |