TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #605 from Azaezel/alpha40/followup604

Browse source 
don't try and sort ribbon particles
This commit is contained in:
Brian Roberts 2021-10-08 10:57:29 -05:00 • committed by GitHub
commit 3b8d1f4031
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Engine/source/T3D/fx/particleEmitter.cpp
View file

@ -1908,50 +1908,21 @@ void ParticleEmitter::copyToVB( const Point3F &camPos, const LinearColorF &ambie
if (mDataBlock->reverseOrder) if (mDataBlock->reverseOrder)
{ {
buffPtr += 4 * (n_parts - 1);
// do sorted-oriented particles
if (mDataBlock->sortParticles)
{
SortParticle* partPtr = orderedVector.address();
for (U32 i = 0; i < n_parts - 1; i++, partPtr++, buffPtr -= 4)
{
SortParticle* part = partPtr;
partPtr++;
setupRibbon(part->p, partPtr->p, partPtr->p, camPos, ambientColor, buffPtr);
}
}
// do unsorted-oriented particles
else
{
Particle* oldPtr = NULL; Particle* oldPtr = NULL;
for (Particle* partPtr = part_list_head.next; partPtr != NULL; partPtr = partPtr->next, buffPtr -= 4) { for (Particle* partPtr = part_list_head.next; partPtr != NULL; partPtr = partPtr->next, buffPtr -= 4)
{
setupRibbon(partPtr, partPtr->next, oldPtr, camPos, ambientColor, buffPtr); setupRibbon(partPtr, partPtr->next, oldPtr, camPos, ambientColor, buffPtr);
oldPtr = partPtr; oldPtr = partPtr;
} }
}
} }
else else
{ {
// do sorted-oriented particles
if (mDataBlock->sortParticles)
{
SortParticle* partPtr = orderedVector.address();
for (U32 i = 0; i < n_parts - 1; i++, partPtr++, buffPtr += 4)
{
SortParticle* part = partPtr;
partPtr++;
setupRibbon(part->p, partPtr->p, partPtr->p, camPos, ambientColor, buffPtr);
}
}
// do unsorted-oriented particles
else
{
Particle* oldPtr = NULL; Particle* oldPtr = NULL;
for (Particle* partPtr = part_list_head.next; partPtr != NULL; partPtr = partPtr->next, buffPtr += 4) { for (Particle* partPtr = part_list_head.next; partPtr != NULL; partPtr = partPtr->next, buffPtr += 4)
{
setupRibbon(partPtr, partPtr->next, oldPtr, camPos, ambientColor, buffPtr); setupRibbon(partPtr, partPtr->next, oldPtr, camPos, ambientColor, buffPtr);
oldPtr = partPtr; oldPtr = partPtr;
} }
}
} }
PROFILE_END(); PROFILE_END();
} }