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

Fix sampling particle position/velocity in material for emitters simulated in Local space

Browse Source
This commit is contained in:
Wojtek Figat
2021-03-05 13:56:53 +01:00
parent 1dee615d6e
commit 96cd3e560c
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Particles.cpp
View File

@@ -4,7 +4,7 @@
#include "MaterialGenerator.h"
MaterialValue MaterialGenerator::AccessParticleAttribute(Node* caller, const StringView& name, ParticleAttributeValueTypes valueType, const Char* index)
MaterialValue MaterialGenerator::AccessParticleAttribute(Node* caller, const StringView& name, ParticleAttributeValueTypes valueType, const Char* index, ParticleAttributeSpace space)
{
// TODO: cache the attribute value during material tree execution (eg. reuse the same Particle Color read for many nodes in graph)
@@ -69,7 +69,23 @@ MaterialValue MaterialGenerator::AccessParticleAttribute(Node* caller, const Str
default:
return MaterialValue::Zero;
}
return writeLocal(type, String::Format(format, attributeMapping->ShaderName, index ? index : TEXT("input.ParticleIndex")), caller);
auto result = writeLocal(type, String::Format(format, attributeMapping->ShaderName, index ? index : TEXT("input.ParticleIndex")), caller);
// Apply transformation to world-space
switch (space)
{
case ParticleAttributeSpace::AsIs:
break;
case ParticleAttributeSpace::LocalPosition:
_writer.Write(TEXT("\t{0} = TransformParticlePosition({0});\n"), result.Value);
break;
case ParticleAttributeSpace::LocalDirection:
_writer.Write(TEXT("\t{0} = TransformParticleVector({0});\n"), result.Value);
break;
default: ;
}
return result;
}
void MaterialGenerator::ProcessGroupParticles(Box* box, Node* node, Value& value)
@@ -99,7 +115,7 @@ void MaterialGenerator::ProcessGroupParticles(Box* box, Node* node, Value& value
// Particle Position
case 101:
{
value = AccessParticleAttribute(node, TEXT("Position"), ParticleAttributeValueTypes::Vector3);
value = AccessParticleAttribute(node, TEXT("Position"), ParticleAttributeValueTypes::Vector3, nullptr, ParticleAttributeSpace::LocalPosition);
break;
}
// Particle Lifetime
@@ -123,7 +139,7 @@ void MaterialGenerator::ProcessGroupParticles(Box* box, Node* node, Value& value
// Particle Velocity
case 105:
{
value = AccessParticleAttribute(node, TEXT("Velocity"), ParticleAttributeValueTypes::Vector3);
value = AccessParticleAttribute(node, TEXT("Velocity"), ParticleAttributeValueTypes::Vector3, nullptr, ParticleAttributeSpace::LocalDirection);
break;
}
// Particle Sprite Size