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

Change to TryGetBox

Browse Source
This commit is contained in:
Chandler Cox
2023-05-05 09:18:44 -05:00
parent 86044fcc05
commit 12a2a69ad7
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,32 +388,32 @@ void ParticleEmitterGPUGenerator::ProcessGroupParticles(Box* box, Node* node, Va
// Random Float Range // Random Float Range
case 213: case 213:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat();
value = writeLocal(VariantType::Float, String::Format(TEXT("lerp({0}, {1}, RAND)"), a.Value, b.Value), node); value = writeLocal(VariantType::Float, String::Format(TEXT("lerp({0}, {1}, RAND)"), a.Value, b.Value), node);
break; break;
} }
// Random Vector2 Range // Random Vector2 Range
case 214: case 214:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat2(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat2();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat2(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat2();
value = writeLocal(VariantType::Float2, String::Format(TEXT("float2(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND))"), a.Value, b.Value), node); value = writeLocal(VariantType::Float2, String::Format(TEXT("float2(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND))"), a.Value, b.Value), node);
break; break;
} }
// Random Vector3 Range // Random Vector3 Range
case 215: case 215:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat3(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat3();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat3(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat3();
value = writeLocal(VariantType::Float3, String::Format(TEXT("float3(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND), lerp({0}.z, {1}.z, RAND))"), a.Value, b.Value), node); value = writeLocal(VariantType::Float3, String::Format(TEXT("float3(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND), lerp({0}.z, {1}.z, RAND))"), a.Value, b.Value), node);
break; break;
} }
// Random Vector4 Range // Random Vector4 Range
case 216: case 216:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat4(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat4();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat4(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat4();
value = writeLocal(VariantType::Float4, String::Format(TEXT("float4(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND), lerp({0}.z, {1}.z, RAND), lerp({0}.w, {1}.w, RAND))"), a.Value, b.Value), node); value = writeLocal(VariantType::Float4, String::Format(TEXT("float4(lerp({0}.x, {1}.x, RAND), lerp({0}.y, {1}.y, RAND), lerp({0}.z, {1}.z, RAND), lerp({0}.w, {1}.w, RAND))"), a.Value, b.Value), node);
break; break;
} }

16
Source/Engine/Visject/VisjectGraph.cpp
View File

@@ -1273,16 +1273,16 @@ void VisjectExecutor::ProcessGroupParticles(Box* box, Node* node, Value& value)
// Random Float Range // Random Float Range
case 213: case 213:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat; auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat;
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat; auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat;
value = Math::Lerp(a, b, RAND); value = Math::Lerp(a, b, RAND);
break; break;
} }
// Random Vector2 Range // Random Vector2 Range
case 214: case 214:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat2(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat2();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat2(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat2();
value = Float2( value = Float2(
Math::Lerp(a.X, b.X, RAND), Math::Lerp(a.X, b.X, RAND),
Math::Lerp(a.Y, b.Y, RAND) Math::Lerp(a.Y, b.Y, RAND)
@@ -1292,8 +1292,8 @@ void VisjectExecutor::ProcessGroupParticles(Box* box, Node* node, Value& value)
// Random Vector3 Range // Random Vector3 Range
case 215: case 215:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat3(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat3();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat3(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat3();
value = Float3( value = Float3(
Math::Lerp(a.X, b.X, RAND), Math::Lerp(a.X, b.X, RAND),
Math::Lerp(a.Y, b.Y, RAND), Math::Lerp(a.Y, b.Y, RAND),
@@ -1304,8 +1304,8 @@ void VisjectExecutor::ProcessGroupParticles(Box* box, Node* node, Value& value)
// Random Vector4 Range // Random Vector4 Range
case 216: case 216:
{ {
auto a = tryGetValue(node->GetBox(1), node->Values[0]).AsFloat4(); auto a = tryGetValue(node->TryGetBox(1), node->Values[0]).AsFloat4();
auto b = tryGetValue(node->GetBox(2), node->Values[1]).AsFloat4(); auto b = tryGetValue(node->TryGetBox(2), node->Values[1]).AsFloat4();
value = Float4( value = Float4(
Math::Lerp(a.X, b.X, RAND), Math::Lerp(a.X, b.X, RAND),
Math::Lerp(a.Y, b.Y, RAND), Math::Lerp(a.Y, b.Y, RAND),