GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for multi-threaded CPU particles simulation

Browse Source
This commit is contained in:
Wojtek Figat
2021-06-15 23:48:00 +02:00
parent 2a73d18d14
commit d2d8a83461
11 changed files with 245 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
Source/Engine/Particles/Graph/CPU/ParticleEmitterGraph.CPU.ParticleModules.cpp
View File

@@ -103,7 +103,8 @@ namespace
int32 ParticleEmitterGraphCPUExecutor::ProcessSpawnModule(int32 index)
{
const auto node = _graph.SpawnModules[index];
auto& data = _data->SpawnModulesData[index];
auto& context = Context.Get();
auto& data = context.Data->SpawnModulesData[index];
// Accumulate the previous frame fraction
float spawnCount = data.SpawnCounter;
@@ -115,13 +116,13 @@ int32 ParticleEmitterGraphCPUExecutor::ProcessSpawnModule(int32 index)
case 100:
{
const float rate = Math::Max((float)TryGetValue(node->GetBox(0), node->Values[2]), 0.0f);
spawnCount += rate * _deltaTime;
spawnCount += rate * context.DeltaTime;
break;
}
// Single Burst
case 101:
{
const bool isFirstUpdate = (_data->Time - _deltaTime) <= 0.0f;
const bool isFirstUpdate = (context.Data->Time - context.DeltaTime) <= 0.0f;
if (isFirstUpdate)
{
const float count = Math::Max((float)TryGetValue(node->GetBox(0), node->Values[2]), 0.0f);
@@ -133,11 +134,11 @@ int32 ParticleEmitterGraphCPUExecutor::ProcessSpawnModule(int32 index)
case 102:
{
float& nextSpawnTime = data.NextSpawnTime;
if (nextSpawnTime - _data->Time <= 0.0f)
if (nextSpawnTime - context.Data->Time <= 0.0f)
{
const float count = Math::Max((float)TryGetValue(node->GetBox(0), node->Values[2]), 0.0f);
const float delay = Math::Max((float)TryGetValue(node->GetBox(1), node->Values[3]), 0.0f);
nextSpawnTime = _data->Time + delay;
nextSpawnTime = context.Data->Time + delay;
spawnCount += count;
}
break;
@@ -146,13 +147,13 @@ int32 ParticleEmitterGraphCPUExecutor::ProcessSpawnModule(int32 index)
case 103:
{
float& nextSpawnTime = data.NextSpawnTime;
if (nextSpawnTime - _data->Time <= 0.0f)
if (nextSpawnTime - context.Data->Time <= 0.0f)
{
const Vector2 countMinMax = (Vector2)TryGetValue(node->GetBox(0), node->Values[2]);
const Vector2 delayMinMax = (Vector2)TryGetValue(node->GetBox(1), node->Values[3]);
const float count = Math::Max(countMinMax.X + RAND * (countMinMax.Y - countMinMax.X), 0.0f);
const float delay = Math::Max(delayMinMax.X + RAND * (delayMinMax.Y - delayMinMax.X), 0.0f);
nextSpawnTime = _data->Time + delay;
nextSpawnTime = context.Data->Time + delay;
spawnCount += count;
}
break;
@@ -170,8 +171,9 @@ int32 ParticleEmitterGraphCPUExecutor::ProcessSpawnModule(int32 index)
void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode* node, int32 particlesStart, int32 particlesEnd)
{
auto stride = _data->Buffer->Stride;
auto start = _data->Buffer->GetParticleCPU(particlesStart);
auto& context = Context.Get();
auto stride = context.Data->Buffer->Stride;
auto start = context.Data->Buffer->GetParticleCPU(particlesStart);
switch (node->TypeID)
{
@@ -181,7 +183,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
auto spriteFacingMode = node->Values[2].AsInt;
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* spriteFacingModePtr = start + attribute.Offset;
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
@@ -192,14 +194,14 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
if ((ParticleSpriteFacingMode)spriteFacingMode == ParticleSpriteFacingMode::CustomFacingVector ||
(ParticleSpriteFacingMode)spriteFacingMode == ParticleSpriteFacingMode::FixedAxis)
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[1]];
byte* customFacingVectorPtr = start + attribute.Offset;
auto box = node->GetBox(0);
if (node->UsePerParticleDataResolve())
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
const Vector3 vector = (Vector3)GetValue(box, 3);
*((Vector3*)customFacingVectorPtr) = vector;
customFacingVectorPtr += stride;
@@ -223,7 +225,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
auto modelFacingMode = node->Values[2].AsInt;
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* modelFacingModePtr = start + attribute.Offset;
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
@@ -236,11 +238,11 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Update Age
case 300:
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* agePtr = start + attribute.Offset;
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
*((float*)agePtr) += _deltaTime;
*((float*)agePtr) += context.DeltaTime;
agePtr += stride;
}
break;
@@ -249,16 +251,16 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
case 301:
case 304:
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* velocityPtr = start + attribute.Offset;
auto box = node->GetBox(0);
if (node->UsePerParticleDataResolve())
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
const Vector3 force = (Vector3)GetValue(box, 2);
*((Vector3*)velocityPtr) += force * _deltaTime;
*((Vector3*)velocityPtr) += force * context.DeltaTime;
velocityPtr += stride;
}
}
@@ -267,7 +269,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
const Vector3 force = (Vector3)GetValue(box, 2);
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
*((Vector3*)velocityPtr) += force * _deltaTime;
*((Vector3*)velocityPtr) += force * context.DeltaTime;
velocityPtr += stride;
}
}
@@ -276,9 +278,9 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Conform to Sphere
case 305:
{
auto& position = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocity = _data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& mass = _data->Buffer->Layout->Attributes[node->Attributes[2]];
auto& position = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocity = context.Data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& mass = context.Data->Buffer->Layout->Attributes[node->Attributes[2]];
byte* positionPtr = start + position.Offset;
byte* velocityPtr = start + velocity.Offset;
@@ -308,7 +310,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
float ratio = Math::SmoothStep(0.0f, stickDistance * 2.0f, Math::Abs(distToSurface)); \
float tgtSpeed = Math::Sign(distToSurface) * attractionSpeed * ratio; \
float deltaSpeed = tgtSpeed - spdNormal; \
Vector3 deltaVelocity = dir * (Math::Sign(deltaSpeed) * Math::Min(Math::Abs(deltaSpeed), _deltaTime * Math::Lerp(stickForce, attractionForce, ratio)) / Math::Max(*(float*)massPtr, ZeroTolerance)); \
Vector3 deltaVelocity = dir * (Math::Sign(deltaSpeed) * Math::Min(Math::Abs(deltaSpeed), context.DeltaTime * Math::Lerp(stickForce, attractionForce, ratio)) / Math::Max(*(float*)massPtr, ZeroTolerance)); \
*(Vector3*)velocityPtr = velocity + deltaVelocity; \
positionPtr += stride; \
velocityPtr += stride; \
@@ -318,7 +320,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -338,7 +340,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Kill (sphere)
case 306:
{
auto& position = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& position = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + position.Offset;
@@ -356,8 +358,8 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
if (sign * lengthSqr <= sign * sphereRadiusSqr) \
{ \
particlesEnd--; \
_data->Buffer->CPU.Count--; \
Platform::MemoryCopy(_data->Buffer->GetParticleCPU(particleIndex), _data->Buffer->GetParticleCPU(_data->Buffer->CPU.Count), _data->Buffer->Stride); \
context.Data->Buffer->CPU.Count--; \
Platform::MemoryCopy(context.Data->Buffer->GetParticleCPU(particleIndex), context.Data->Buffer->GetParticleCPU(context.Data->Buffer->CPU.Count), context.Data->Buffer->Stride); \
particleIndex--; \
} \
positionPtr += stride
@@ -366,7 +368,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -386,7 +388,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Kill (box)
case 307:
{
auto& position = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& position = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + position.Offset;
@@ -409,8 +411,8 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
if (collision) \
{ \
particlesEnd--; \
_data->Buffer->CPU.Count--; \
Platform::MemoryCopy(_data->Buffer->GetParticleCPU(particleIndex), _data->Buffer->GetParticleCPU(_data->Buffer->CPU.Count), _data->Buffer->Stride); \
context.Data->Buffer->CPU.Count--; \
Platform::MemoryCopy(context.Data->Buffer->GetParticleCPU(particleIndex), context.Data->Buffer->GetParticleCPU(context.Data->Buffer->CPU.Count), context.Data->Buffer->Stride); \
particleIndex--; \
} \
positionPtr += stride
@@ -419,7 +421,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -447,8 +449,8 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
if (kill) \
{ \
particlesEnd--; \
_data->Buffer->CPU.Count--; \
Platform::MemoryCopy(_data->Buffer->GetParticleCPU(particleIndex), _data->Buffer->GetParticleCPU(_data->Buffer->CPU.Count), _data->Buffer->Stride); \
context.Data->Buffer->CPU.Count--; \
Platform::MemoryCopy(context.Data->Buffer->GetParticleCPU(particleIndex), context.Data->Buffer->GetParticleCPU(context.Data->Buffer->CPU.Count), context.Data->Buffer->Stride); \
particleIndex--; \
}
@@ -456,7 +458,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -479,9 +481,9 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
auto box = node->GetBox(0);
const bool useSpriteSize = node->Values[3].AsBool;
auto& velocity = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& mass = _data->Buffer->Layout->Attributes[node->Attributes[1]];
byte* spriteSizePtr = useSpriteSize ? start + _data->Buffer->Layout->Attributes[node->Attributes[2]].Offset : nullptr;
auto& velocity = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& mass = context.Data->Buffer->Layout->Attributes[node->Attributes[1]];
byte* spriteSizePtr = useSpriteSize ? start + context.Data->Buffer->Layout->Attributes[node->Attributes[2]].Offset : nullptr;
byte* velocityPtr = start + velocity.Offset;
byte* massPtr = start + mass.Offset;
@@ -492,7 +494,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
float particleDrag = drag; \
if (useSpriteSize) \
particleDrag *= ((Vector2*)spriteSizePtr)->MulValues(); \
*((Vector3*)velocityPtr) *= Math::Max(0.0f, 1.0f - (particleDrag * _deltaTime) / Math::Max(*(float*)massPtr, ZeroTolerance)); \
*((Vector3*)velocityPtr) *= Math::Max(0.0f, 1.0f - (particleDrag * context.DeltaTime) / Math::Max(*(float*)massPtr, ZeroTolerance)); \
velocityPtr += stride; \
massPtr += stride; \
spriteSizePtr += stride
@@ -501,7 +503,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -521,9 +523,9 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Turbulence
case 311:
{
auto& position = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocity = _data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& mass = _data->Buffer->Layout->Attributes[node->Attributes[2]];
auto& position = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocity = context.Data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& mass = context.Data->Buffer->Layout->Attributes[node->Attributes[2]];
byte* positionPtr = start + position.Offset;
byte* velocityPtr = start + velocity.Offset;
@@ -551,7 +553,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
Vector3 vectorFieldUVW = Vector3::Transform(*((Vector3*)positionPtr), invFieldTransformMatrix); \
Vector3 force = Noise3D(vectorFieldUVW + 0.5f, octavesCount, roughness); \
force = Vector3::Transform(force, fieldTransformMatrix) * intensity; \
*((Vector3*)velocityPtr) += force * (_deltaTime / Math::Max(*(float*)massPtr, ZeroTolerance)); \
*((Vector3*)velocityPtr) += force * (context.DeltaTime / Math::Max(*(float*)massPtr, ZeroTolerance)); \
positionPtr += stride; \
velocityPtr += stride; \
massPtr += stride
@@ -560,7 +562,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -581,7 +583,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
case 200:
case 302:
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* dataPtr = start + attribute.Offset;
int32 dataSize = attribute.GetSize();
auto box = node->GetBox(0);
@@ -590,7 +592,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
const Value value = GetValue(box, 4).Cast(type);
Platform::MemoryCopy(dataPtr, &value.AsPointer, dataSize);
dataPtr += stride;
@@ -637,7 +639,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
case 362:
case 363:
{
auto& attribute = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& attribute = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* dataPtr = start + attribute.Offset;
int32 dataSize = attribute.GetSize();
auto box = node->GetBox(0);
@@ -646,7 +648,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
const Value value = GetValue(box, 2).Cast(type);
Platform::MemoryCopy(dataPtr, &value.AsPointer, dataSize);
dataPtr += stride;
@@ -666,7 +668,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (sphere surface)
case 202:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -691,7 +693,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -711,7 +713,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (plane)
case 203:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -729,7 +731,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -749,7 +751,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (circle)
case 204:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -772,7 +774,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -792,7 +794,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (disc)
case 205:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -815,7 +817,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -835,7 +837,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (box surface)
case 206:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -865,7 +867,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -885,7 +887,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (box volume)
case 207:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -903,7 +905,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -923,7 +925,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (cylinder)
case 208:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -948,7 +950,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -968,7 +970,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (line)
case 209:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -986,7 +988,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1006,7 +1008,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (torus)
case 210:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -1050,7 +1052,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1070,7 +1072,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (sphere volume)
case 211:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
byte* positionPtr = start + positionAttr.Offset;
@@ -1095,7 +1097,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1121,8 +1123,8 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Position (spiral)
case 214:
{
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocityAttr = _data->Buffer->Layout->Attributes[node->Attributes[1]];
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]];
auto& velocityAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[1]];
byte* positionPtr = start + positionAttr.Offset;
byte* velocityPtr = start + velocityAttr.Offset;
@@ -1131,7 +1133,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
auto rotationSpeedBox = node->GetBox(1);
auto velocityScaleBox = node->GetBox(2);
auto& arc = node->SpiralModuleProgress;
auto& arc = *(float*)&context.Data->CustomData[node->CustomDataOffset];
#define INPUTS_FETCH() \
const Vector3 center = (Vector3)GetValue(centerBox, 2); \
@@ -1151,7 +1153,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1171,9 +1173,9 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
// Helper macros for collision modules to share the code
#define COLLISION_BEGIN() \
auto& positionAttr = _data->Buffer->Layout->Attributes[node->Attributes[0]]; \
auto& velocityAttr = _data->Buffer->Layout->Attributes[node->Attributes[1]]; \
auto& ageAttr = _data->Buffer->Layout->Attributes[node->Attributes[2]]; \
auto& positionAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[0]]; \
auto& velocityAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[1]]; \
auto& ageAttr = context.Data->Buffer->Layout->Attributes[node->Attributes[2]]; \
byte* positionPtr = start + positionAttr.Offset; \
byte* velocityPtr = start + velocityAttr.Offset; \
byte* agePtr = start + ageAttr.Offset; \
@@ -1221,7 +1223,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
#define LOGIC() \
Vector3 position = *(Vector3*)positionPtr; \
Vector3 velocity = *(Vector3*)velocityPtr; \
Vector3 nextPos = position + velocity * _deltaTime; \
Vector3 nextPos = position + velocity * context.DeltaTime; \
Vector3 n = planeNormal; \
float distToPlane = Vector3::Dot(nextPos, n) - Vector3::Dot(planePosition, n) - radius; \
if (distToPlane < 0.0f) \
@@ -1233,7 +1235,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1263,7 +1265,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
#define LOGIC() \
Vector3 position = *(Vector3*)positionPtr; \
Vector3 velocity = *(Vector3*)velocityPtr; \
Vector3 nextPos = position + velocity * _deltaTime; \
Vector3 nextPos = position + velocity * context.DeltaTime; \
Vector3 dir = nextPos - spherePosition; \
float sqrLength = Vector3::Dot(dir, dir); \
float totalRadius = sphereRadius + sign * radius; \
@@ -1278,7 +1280,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1308,7 +1310,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
#define LOGIC() \
Vector3 position = *(Vector3*)positionPtr; \
Vector3 velocity = *(Vector3*)velocityPtr; \
Vector3 nextPos = position + velocity * _deltaTime; \
Vector3 nextPos = position + velocity * context.DeltaTime; \
Vector3 dir = nextPos - boxPosition; \
Vector3 absDir = Vector3::Abs(dir); \
Vector3 halfBoxSize = boxSize * 0.5f + radius * sign; \
@@ -1338,7 +1340,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}
@@ -1370,7 +1372,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
#define LOGIC() \
Vector3 position = *(Vector3*)positionPtr; \
Vector3 velocity = *(Vector3*)velocityPtr; \
Vector3 nextPos = position + velocity * _deltaTime; \
Vector3 nextPos = position + velocity * context.DeltaTime; \
Vector3 dir = nextPos - cylinderPosition; \
float halfHeight = cylinderHeight * 0.5f + radius * sign; \
float cylinderRadiusT = cylinderRadius + radius * sign; \
@@ -1403,7 +1405,7 @@ void ParticleEmitterGraphCPUExecutor::ProcessModule(ParticleEmitterGraphCPUNode*
{
for (int32 particleIndex = particlesStart; particleIndex < particlesEnd; particleIndex++)
{
_particleIndex = particleIndex;
context.ParticleIndex = particleIndex;
INPUTS_FETCH();
LOGIC();
}