1.1 --- a/examples/tests/02.ParticleSystems/CTest2.cpp	Sun Mar 16 21:11:48 2008 +0100
     1.2 +++ b/examples/tests/02.ParticleSystems/CTest2.cpp	Mon May 26 01:16:47 2008 +0200
     1.3 @@ -252,7 +252,7 @@
     1.4  	psnode8->setPosition(core::vector3df(0.0f,5.0f,50.0f));
     1.5  	smgr->addSceneNode(psnode8);
     1.6  
     1.7 -	res::CTexture *firetex = rmgr->loadTexture("vparticle.bmp","vparticle");
     1.8 +	res::CTexture *firetex = rmgr->loadTexture("vparticle.png","vparticle");
     1.9  	firetex->makeColorKey(core::CColorI(0,0,0,255));
    1.10  
    1.11  
    1.12 @@ -579,10 +579,13 @@
    1.13  	nxNode->setPosition(core::vector3df(-50.0f,30.0f,0.0f));
    1.14  	nxNode->drop();
    1.15  
    1.16 -	res::CEyePointBillboardParticleSystem *eppsys = new res::CEyePointBillboardParticleSystem( "meshpsys", rmgr->getResource<res::CTexture>("vparticle.bmp"), 500);
    1.17 +	res::CParticleSystem *eppsys = new res::CParticleSystem("meshpsys");
    1.18 +	res::CEyePointBillboardParticleEmitter *eppemit = new res::CEyePointBillboardParticleEmitter( "meshpsys/emitter0", rmgr->getResource<res::CTexture>("vparticle.png"), 500);
    1.19 +	eppsys->add(eppemit);
    1.20 +	eppemit->drop();
    1.21  
    1.22 -	res::CParticleEmissionShaperMesh *eppshpr = new res::CParticleEmissionShaperMesh(nxlogo->getMesh(0), core::vector3df(1.2f,1.2f,1.2f) );
    1.23 -	eppsys->add(eppshpr);
    1.24 +	res::CParticleShaperPositionMesh *eppshpr = new res::CParticleShaperPositionMesh(nxlogo->getMesh(0), core::vector3df(1.2f,1.2f,1.2f) );
    1.25 +	eppemit->add(eppshpr);
    1.26  	eppshpr->drop();
    1.27  	eppshpr = 0;
    1.28  
    1.29 @@ -599,10 +602,13 @@
    1.30  	nxNode2->drop();
    1.31  	nxNode2->setPosition(core::vector3df(-100.0f,30.0f,0.0f));
    1.32  
    1.33 -	res::CEyePointBillboardParticleSystem *epmsys = new res::CEyePointBillboardParticleSystem( "modelpsys", rmgr->getResource<res::CTexture>("vparticle.bmp"), 500);
    1.34 +	res::CParticleSystem *epmsys = new res::CParticleSystem("modelpsys");
    1.35 +	res::CEyePointBillboardParticleEmitter *epmemit = new res::CEyePointBillboardParticleEmitter( "modelpsys/emitter0", rmgr->getResource<res::CTexture>("vparticle.png"), 500);
    1.36 +	epmsys->add(epmemit);
    1.37 +	epmemit->drop();
    1.38  
    1.39 -	res::CParticleEmissionShaperModel *epmshpr = new res::CParticleEmissionShaperModel(nxlogo, core::vector3df(1.1f,1.1f,1.1f) );
    1.40 -	epmsys->add(epmshpr);
    1.41 +	res::CParticleShaperPositionModel *epmshpr = new res::CParticleShaperPositionModel(nxlogo, core::vector3df(1.1f,1.1f,1.1f) );
    1.42 +	epmemit->add(epmshpr);
    1.43  	epmshpr->drop();
    1.44  
    1.45  	scene::CModelSceneNode *epmsysNode = new scene::CModelSceneNode(epmsys);
    1.46 @@ -617,10 +623,11 @@
    1.47  	nxNode3->setPosition(core::vector3df(-150.0f,30.0f,0.0f));
    1.48  	nxNode3->drop();
    1.49  
    1.50 -	res::CEyePointBillboardParticleSystem *epnsys = new res::CEyePointBillboardParticleSystem( "nodepsys1", rmgr->getResource<res::CTexture>("vparticle.bmp"), 500, true); // last one is worldspace mode
    1.51 +	res::CParticleSystem *epnsys = new res::CParticleSystem("nodepsys1");
    1.52 +	res::CEyePointBillboardParticleEmitter *epnemit = new res::CEyePointBillboardParticleEmitter( "nodepsys1/emitter0", rmgr->getResource<res::CTexture>("vparticle.png"), 500, true); // last one is worldspace mode
    1.53  
    1.54 -	res::CParticleEmissionShaperModelNode *epnshpr = new res::CParticleEmissionShaperModelNode(nxNode3, -1, core::vector3df(1.1f,1.1f,1.1f) );
    1.55 -	epnsys->add(epnshpr);
    1.56 +	res::CParticleShaperPositionModelNode *epnshpr = new res::CParticleShaperPositionModelNode(nxNode3, -1, core::vector3df(1.1f,1.1f,1.1f) );
    1.57 +	epnemit->add(epnshpr);
    1.58  	epnshpr->drop();
    1.59  
    1.60  	scene::CModelSceneNode *epnsysNode = new scene::CModelSceneNode(epnsys);