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

Format code for shader generators

Browse Source
This commit is contained in:
Wojciech Figat
2022-03-28 14:01:29 +02:00
parent a685962d32
commit e56b280f5b
13 changed files with 234 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.ParticleModules.cpp
View File

@@ -10,7 +10,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
auto nodeGpu = (ParticleEmitterGraphGPUNode*)node;
switch (node->TypeID)
{
// Orient Sprite
// Orient Sprite
case 201:
case 303:
{
@@ -28,7 +28,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
}
break;
}
// Orient Model
// Orient Model
case 213:
case 309:
{
@@ -39,14 +39,14 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
}
break;
}
// Update Age
// Update Age
case 300:
{
auto attribute = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::ReadWrite);
_writer.Write(TEXT("\t{0} += DeltaTime;\n"), attribute.Value);
break;
}
// Gravity/Force
// Gravity/Force
case 301:
case 304:
{
@@ -55,7 +55,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
_writer.Write(TEXT("\t{0} += {1} * DeltaTime;\n"), attribute.Value, force.Value);
break;
}
// Conform to Sphere
// Conform to Sphere
case 305:
{
auto position = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Read);
@@ -94,7 +94,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), position.Value, velocity.Value, mass.Value, sphereCenter.Value, sphereRadius.Value, attractionSpeed.Value, attractionForce.Value, stickDistance.Value, stickForce.Value);
break;
}
// Kill (sphere)
// Kill (sphere)
case 306:
{
UseKill();
@@ -119,7 +119,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), position.Value, sphereCenter.Value, sphereRadius.Value, sign);
break;
}
// Kill (box)
// Kill (box)
case 307:
{
UseKill();
@@ -149,7 +149,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), position.Value, boxCenter.Value, boxSize.Value, invert);
break;
}
// Kill (custom)
// Kill (custom)
case 308:
{
UseKill();
@@ -162,7 +162,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), kill.Value);
break;
}
// Linear Drag
// Linear Drag
case 310:
{
const bool useSpriteSize = node->Values[3].AsBool;
@@ -195,7 +195,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
}
break;
}
// Turbulence
// Turbulence
case 311:
{
auto position = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Read);
@@ -225,7 +225,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), position.Value, velocity.Value, mass.Value, fieldPosition.Value, fieldRotation.Value, fieldScale.Value, roughness.Value, intensity.Value, octavesCount.Value);
break;
}
// Set Attribute
// Set Attribute
case 200:
case 302:
{
@@ -235,7 +235,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
SET_ATTRIBUTE(attribute, value.Value);
break;
}
// Set Position/Lifetime/Age/..
// Set Position/Lifetime/Age/..
case 250:
case 251:
case 252:
@@ -271,7 +271,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
SET_ATTRIBUTE(attribute, value.Value);
break;
}
// Position (sphere surface)
// Position (sphere surface)
case 202:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -298,7 +298,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, 0, center.Value, radius.Value, arc.Value);
break;
}
// Position (plane)
// Position (plane)
case 203:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -318,7 +318,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, center.Value, size.Value);
break;
}
// Position (circle)
// Position (circle)
case 204:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -343,7 +343,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, 0, center.Value, radius.Value, arc.Value);
break;
}
// Position (disc)
// Position (disc)
case 205:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -368,7 +368,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, 0, center.Value, radius.Value, arc.Value);
break;
}
// Position (box surface)
// Position (box surface)
case 206:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -400,7 +400,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, center.Value, size.Value);
break;
}
// Position (box volume)
// Position (box volume)
case 207:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -420,7 +420,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, center.Value, size.Value);
break;
}
// Position (cylinder)
// Position (cylinder)
case 208:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -447,7 +447,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, center.Value, radius.Value, height.Value, arc.Value);
break;
}
// Position (line)
// Position (line)
case 209:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -467,7 +467,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, start.Value, end.Value);
break;
}
// Position (torus)
// Position (torus)
case 210:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -513,7 +513,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, 0, center.Value, radius.Value, thickness.Value, arc.Value);
break;
}
// Position (sphere volume)
// Position (sphere volume)
case 211:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -540,7 +540,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, 0, center.Value, radius.Value, arc.Value);
break;
}
// Position (depth)
// Position (depth)
case 212:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -574,7 +574,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), positionAttr.Value, uv.Value, depthCullRange.Value, depthOffset.Value, linearDepth.Value, lifetimeAttr.Value);
break;
}
// Position (spiral)
// Position (spiral)
case 214:
{
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Write);
@@ -632,7 +632,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
break;
}
// Helper macros for collision modules to share the code
// Helper macros for collision modules to share the code
#define COLLISION_BEGIN() \
auto positionAttr = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::ReadWrite); \
auto velocityAttr = AccessParticleAttribute(node, nodeGpu->Attributes[1], AccessMode::ReadWrite); \
@@ -662,7 +662,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
" {2} += {9};\n" \
" }}\n"
// Collision (plane)
// Collision (plane)
case 330:
{
COLLISION_BEGIN();
@@ -690,7 +690,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
);
break;
}
// Collision (sphere)
// Collision (sphere)
case 331:
{
COLLISION_BEGIN();
@@ -721,7 +721,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
);
break;
}
// Collision (box)
// Collision (box)
case 332:
{
COLLISION_BEGIN();
@@ -767,7 +767,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
);
break;
}
// Collision (cylinder)
// Collision (cylinder)
case 333:
{
COLLISION_BEGIN();
@@ -817,7 +817,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
);
break;
}
// Collision (depth)
// Collision (depth)
case 334:
{
COLLISION_BEGIN();
@@ -872,18 +872,18 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
);
break;
}
// Conform to Global SDF
// Conform to Global SDF
case 335:
{
auto position = AccessParticleAttribute(node, nodeGpu->Attributes[0], AccessMode::Read);
auto velocity = AccessParticleAttribute(node, nodeGpu->Attributes[1], AccessMode::ReadWrite);
auto mass = AccessParticleAttribute(node, nodeGpu->Attributes[2], AccessMode::Read);
const Value attractionSpeed = GetValue(node->GetBox(0), 2).AsFloat();
const Value attractionForce = GetValue(node->GetBox(1), 3).AsFloat();
const Value stickDistance = GetValue(node->GetBox(2), 4).AsFloat();
const Value stickForce = GetValue(node->GetBox(3), 5).AsFloat();
auto param = findOrAddGlobalSDF();
_includes.Add(TEXT("./Flax/GlobalSignDistanceField.hlsl"));
_writer.Write(
@@ -904,7 +904,7 @@ void ParticleEmitterGPUGenerator::ProcessModule(Node* node)
), position.Value, velocity.Value, mass.Value, param.ShaderName, attractionSpeed.Value, attractionForce.Value, stickDistance.Value, stickForce.Value);
break;
}
// Collision (Global SDF)
// Collision (Global SDF)
case 336:
{
COLLISION_BEGIN();

125
Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Particles.cpp
View File

@@ -117,7 +117,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParameters(Box* box, Node* node, V
{
switch (node->TypeID)
{
// Get
// Get
case 1:
case 2:
{
@@ -188,7 +188,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParameters(Box* box, Node* node, V
value = Value(VariantType::Object, param->ShaderName);
break;
default:
CRASH;
CRASH;
break;
}
}
@@ -208,7 +208,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupTools(Box* box, Node* node, Value&
{
switch (node->TypeID)
{
// Linearize Depth
// Linearize Depth
case 7:
{
// Get input
@@ -218,11 +218,11 @@ void ParticleEmitterGPUGenerator::ProcessGroupTools(Box* box, Node* node, Value&
linearizeSceneDepth(node, depth, value);
break;
}
// Time
// Time
case 8:
value = box->ID == 0 ? Value(VariantType::Float, TEXT("Time")) : Value(VariantType::Float, TEXT("DeltaTime"));
break;
// Transform Position To Screen UV
// Transform Position To Screen UV
case 9:
{
const Value position = tryGetValue(node->GetBox(0), Value::Zero).AsVector3();
@@ -242,13 +242,11 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
{
switch (node->TypeID)
{
// Particle Attribute
// Particle Attribute
case 100:
{
value = AccessParticleAttribute(node, (StringView)node->Values[0], static_cast<ParticleAttribute::ValueTypes>(node->Values[1].AsInt), AccessMode::Read);
break;
}
// Particle Attribute (by index)
// Particle Attribute (by index)
case 303:
{
const Char* format;
@@ -285,61 +283,43 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeLocal(type, String::Format(format, attribute.Offset, particleIndex.Value), node);
break;
}
// Particle Position
// Particle Position
case 101:
{
value = AccessParticleAttribute(node, TEXT("Position"), ParticleAttribute::ValueTypes::Vector3, AccessMode::Read);
break;
}
// Particle Lifetime
// Particle Lifetime
case 102:
{
value = AccessParticleAttribute(node, TEXT("Lifetime"), ParticleAttribute::ValueTypes::Float, AccessMode::Read);
break;
}
// Particle Age
// Particle Age
case 103:
{
value = AccessParticleAttribute(node, TEXT("Age"), ParticleAttribute::ValueTypes::Float, AccessMode::Read);
break;
}
// Particle Color
// Particle Color
case 104:
{
value = AccessParticleAttribute(node, TEXT("Color"), ParticleAttribute::ValueTypes::Vector4, AccessMode::Read);
break;
}
// Particle Velocity
// Particle Velocity
case 105:
{
value = AccessParticleAttribute(node, TEXT("Velocity"), ParticleAttribute::ValueTypes::Vector3, AccessMode::Read);
break;
}
// Particle Sprite Size
// Particle Sprite Size
case 106:
{
value = AccessParticleAttribute(node, TEXT("SpriteSize"), ParticleAttribute::ValueTypes::Vector2, AccessMode::Read);
break;
}
// Particle Mass
// Particle Mass
case 107:
{
value = AccessParticleAttribute(node, TEXT("Mass"), ParticleAttribute::ValueTypes::Float, AccessMode::Read);
break;
}
// Particle Rotation
// Particle Rotation
case 108:
{
value = AccessParticleAttribute(node, TEXT("Rotation"), ParticleAttribute::ValueTypes::Vector3, AccessMode::Read);
break;
}
// Particle Angular Velocity
// Particle Angular Velocity
case 109:
{
value = AccessParticleAttribute(node, TEXT("AngularVelocity"), ParticleAttribute::ValueTypes::Vector3, AccessMode::Read);
break;
}
// Particle Normalized Age
// Particle Normalized Age
case 110:
{
const auto age = AccessParticleAttribute(node, TEXT("Age"), ParticleAttribute::ValueTypes::Float, AccessMode::Read);
@@ -347,91 +327,65 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeOperation2(node, age, lifetime, '/');
break;
}
// Particle Radius
// Particle Radius
case 111:
{
value = AccessParticleAttribute(node, TEXT("Radius"), ParticleAttribute::ValueTypes::Float, AccessMode::Read);
break;
}
// Effect Position
// Effect Position
case 200:
{
value = Value(VariantType::Vector3, TEXT("EffectPosition"));
break;
}
// Effect Rotation
// Effect Rotation
case 201:
{
value = Value(VariantType::Quaternion, TEXT("EffectRotation"));
break;
}
// Effect Scale
// Effect Scale
case 202:
{
value = Value(VariantType::Vector3, TEXT("EffectScale"));
break;
}
// Simulation Mode
// Simulation Mode
case 203:
{
value = Value(box->ID == 1);
break;
}
// View Position
// View Position
case 204:
{
value = Value(VariantType::Vector3, TEXT("ViewPos"));
break;
}
// View Direction
// View Direction
case 205:
{
value = Value(VariantType::Vector3, TEXT("ViewDir"));
break;
}
// View Far Plane
// View Far Plane
case 206:
{
value = Value(VariantType::Float, TEXT("ViewFar"));
break;
}
// Screen Size
// Screen Size
case 207:
{
value = Value(VariantType::Vector2, box->ID == 0 ? TEXT("ScreenSize.xy") : TEXT("ScreenSize.zw"));
break;
}
// Random Float
// Random Float
case 208:
{
value = writeLocal(VariantType::Float, TEXT("RAND"), node);
break;
}
// Random Vector2
// Random Vector2
case 209:
{
value = writeLocal(VariantType::Vector2, TEXT("RAND2"), node);
break;
}
// Random Vector3
// Random Vector3
case 210:
{
value = writeLocal(VariantType::Vector3, TEXT("RAND3"), node);
break;
}
// Random Vector4
// Random Vector4
case 211:
{
value = writeLocal(VariantType::Vector4, TEXT("RAND4"), node);
break;
}
// Particle Position (world space)
// Particle Position (world space)
case 212:
value = AccessParticleAttribute(node, TEXT("Position"), ParticleAttribute::ValueTypes::Vector3, AccessMode::Read);
if (IsLocalSimulationSpace())
value = writeLocal(VariantType::Vector3, String::Format(TEXT("mul(float4({0}, 1), WorldMatrix).xyz"), value.Value), node);
break;
// Random Float Range
// Random Float Range
case 213:
{
auto& a = node->Values[0].AsFloat;
@@ -439,7 +393,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeLocal(VariantType::Float, String::Format(TEXT("lerp({0}, {1}, RAND)"), a, b), node);
break;
}
// Random Vector2 Range
// Random Vector2 Range
case 214:
{
auto& a = node->Values[0].AsVector2();
@@ -447,7 +401,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeLocal(VariantType::Vector2, String::Format(TEXT("float2(lerp({0}, {1}, RAND), lerp({2}, {3}, RAND))"), a.X, b.X, a.Y, b.Y), node);
break;
}
// Random Vector3 Range
// Random Vector3 Range
case 215:
{
auto& a = node->Values[0].AsVector3();
@@ -455,7 +409,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeLocal(VariantType::Vector3, String::Format(TEXT("float3(lerp({0}, {1}, RAND), lerp({2}, {3}, RAND), lerp({4}, {5}, RAND))"), a.X, b.X, a.Y, b.Y, a.Z, b.Z), node);
break;
}
// Random Vector4 Range
// Random Vector4 Range
case 216:
{
auto& a = node->Values[0].AsVector4();
@@ -463,7 +417,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
value = writeLocal(VariantType::Vector4, String::Format(TEXT("float4(lerp({0}, {1}, RAND), lerp({2}, {3}, RAND), lerp({4}, {5}, RAND), lerp({6}, {7}, RAND))"), a.X, b.X, a.Y, b.Y, a.Z, b.Z, a.W, b.W), node);
break;
}
// Particle Emitter Function
// Particle Emitter Function
case 300:
{
// Load function asset
@@ -518,11 +472,11 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
_graphStack.Pop();
break;
}
// Particle Index
// Particle Index
case 301:
value = Value(VariantType::Uint, TEXT("context.ParticleIndex"));
break;
// Particles Count
// Particles Count
case 302:
value = Value(VariantType::Uint, TEXT("context.ParticlesCount"));
break;
@@ -535,7 +489,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupFunction(Box* box, Node* node, Val
{
switch (node->TypeID)
{
// Function Input
// Function Input
case 1:
{
// Find the function call
@@ -595,7 +549,6 @@ void ParticleEmitterGPUGenerator::ProcessGroupFunction(Box* box, Node* node, Val
}
break;
}
default:
break;
}

10
Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp
View File

@@ -120,7 +120,7 @@ bool ParticleEmitterGPUGenerator::sampleSceneTexture(Node* caller, Box* box, con
result = Value(VariantType::Float, valueBox->Cache.Value + _subs[3]);
break;
default:
CRASH;
CRASH;
break;
}
@@ -151,7 +151,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val
{
switch (node->TypeID)
{
// Scene Texture
// Scene Texture
case 6:
{
// Get texture type
@@ -255,11 +255,11 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val
}
break;
}
// Scene Depth
// Scene Depth
case 8:
sampleSceneDepth(node, value, box);
break;
// Texture
// Texture
case 11:
{
// Check if texture has been selected
@@ -276,7 +276,7 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val
}
break;
}
// Load Texture
// Load Texture
case 13:
{
// Get input texture

2
Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.cpp
View File

@@ -208,7 +208,7 @@ bool ParticleEmitterGPUGenerator::Generate(WriteStream& source, BytesContainer&
typeName = TEXT("uint");
break;
default:
CRASH;
CRASH;
}
_writer.Write(TEXT("// {0:^6} | {1:^6} | {2}\n"), a.Offset, typeName, a.Name);
}