Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11273 from super626/v3 

PU Particle bug
This commit is contained in:
minggo 2015-04-04 07:12:36 +08:00
parent 42cc17621f 930ea8cd9c
commit 1aa95a21c5
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/Particle3D/CCParticle3DRender.cpp
View File

@ -269,8 +269,7 @@ void Particle3DModelRender::render(Renderer* renderer, const Mat4 &transform, Pa
for (auto iter : activeParticleList)
{
auto particle = iter;
q *= particle->orientation;
Mat4::createRotation(q, &rotMat);
Mat4::createRotation(q * particle->orientation, &rotMat);
sclMat.m[0] = particle->width / _spriteSize.x;
sclMat.m[5] = particle->height / _spriteSize.y;
sclMat.m[10] = particle->depth / _spriteSize.z;

3
extensions/Particle3D/PU/CCPURender.cpp
View File

@ -470,8 +470,7 @@ void PUParticle3DModelRender::render( Renderer* renderer, const Mat4 &transform,
for (auto iter : activeParticleList)
{
auto particle = static_cast<PUParticle3D *>(iter);
q *= particle->orientation;
Mat4::createRotation(q, &rotMat);
Mat4::createRotation(q * particle->orientation, &rotMat);
sclMat.m[0] = particle->width / _spriteSize.x;
sclMat.m[5] = particle->height / _spriteSize.y;
sclMat.m[10] = particle->depth / _spriteSize.z;