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

Add Noise sampling nodes to graphs

Browse Source
This commit is contained in:
Wojtek Figat
2022-07-31 23:43:35 +02:00
parent 2104dbc682
commit 20572c53af
6 changed files with 82 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Editor/Particles/Smoke.flax (Stored with Git LFS)
View File

Binary file not shown.

22
Source/Editor/Surface/Archetypes/Tools.cs
View File

@@ -1260,6 +1260,23 @@ namespace FlaxEditor.Surface.Archetypes
}
}
private static NodeArchetype Noise(ushort id, string name, Type resultType, Type pointType, string desc)
{
return new NodeArchetype
{
TypeID = id,
Title = name,
Description = desc,
Flags = NodeFlags.MaterialGraph | NodeFlags.ParticleEmitterGraph | NodeFlags.AnimGraph,
Size = new Float2(150, 20),
Elements = new[]
{
NodeElementArchetype.Factory.Input(0, "Point", true, pointType, 0),
NodeElementArchetype.Factory.Output(0, string.Empty, resultType, 1),
}
};
}
/// <summary>
/// The nodes for that group.
/// </summary>
@@ -1736,6 +1753,11 @@ namespace FlaxEditor.Surface.Archetypes
NodeElementArchetype.Factory.Output(0, string.Empty, null, 1, true),
}
},
Noise(30, "Perlin Noise", typeof(float), typeof(Float2), "Classic Perlin noise (normalized to 0-1)."),
Noise(31, "Simplex Noise", typeof(float), typeof(Float2), "Simplex noise (normalized to 0-1)."),
Noise(32, "Worley Noise", typeof(Float2), typeof(Float2), "Worley noise (cellar noise with standard 3x3 search window for F1 and F2 values)."),
Noise(33, "Voronoi Noise", typeof(Float3), typeof(Float2), "Voronoi noise (X=minDistToCell, Y=randomColor, Z=minEdgeDistance)."),
Noise(34, "Custom Noise", typeof(float), typeof(Float3), "Custom noise function (3D -> 1D)."),
};
}
}

2
Source/Engine/Utilities/Noise.h
View File

@@ -42,7 +42,7 @@ public:
API_FUNCTION() static Float2 WorleyNoise(const Float2& p);
/// <summary>
/// Voronoi noise.
/// Voronoi noise (X=minDistToCell, Y=randomColor, Z=minEdgeDistance).
/// </summary>
/// <param name="p">Point on a 2D grid to sample noise at.</param>
/// <returns>Noise result with: X=minDistToCell, Y=randomColor, Z=minEdgeDistance.</returns>

35
Source/Engine/Visject/ShaderGraph.cpp
View File

@@ -793,6 +793,41 @@ void ShaderGenerator::ProcessGroupTools(Box* box, Node* node, Value& value)
case 29:
value = tryGetValue(node->GetBox(0), Value::Zero);
break;
// Noises
case 30:
case 31:
case 32:
case 33:
case 34:
{
_includes.Add(TEXT("./Flax/Noise.hlsl"));
const Char* format;
ValueType pointType = VariantType::Float2;
ValueType resultType = VariantType::Float;
switch (node->TypeID)
{
case 30:
format = TEXT("PerlinNoise({0})");
break;
case 31:
format = TEXT("SimplexNoise({0})");
break;
case 32:
format = TEXT("WorleyNoise({0})");
resultType = VariantType::Float2;
break;
case 33:
format = TEXT("VoronoiNoise({0})");
resultType = VariantType::Float3;
break;
case 34:
format = TEXT("CustomNoise({0})");
pointType = VariantType::Float3;
break;
}
value = writeLocal(resultType, String::Format(format, tryGetValue(node->GetBox(0), Value::Zero).Cast(pointType).Value), node);
break;
}
default:
break;
}

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

@@ -15,6 +15,7 @@
#include "Engine/Scripting/ManagedCLR/MUtils.h"
#include "Engine/Serialization/MemoryReadStream.h"
#include "Engine/Utilities/StringConverter.h"
#include "Engine/Utilities/Noise.h"
#define RAND Random::Rand()
#define ENSURE(condition, errorMsg) if (!(condition)) { OnError(node, box, errorMsg); return; }
@@ -1052,6 +1053,22 @@ void VisjectExecutor::ProcessGroupTools(Box* box, Node* node, Value& value)
case 29:
value = tryGetValue(node->GetBox(0), Value::Zero);
break;
// Noises
case 30:
value = Noise::PerlinNoise((Float2)tryGetValue(node->GetBox(0)));
break;
case 31:
value = Noise::SimplexNoise((Float2)tryGetValue(node->GetBox(0)));
break;
case 32:
value = Noise::WorleyNoise((Float2)tryGetValue(node->GetBox(0)));
break;
case 33:
value = Noise::VoronoiNoise((Float2)tryGetValue(node->GetBox(0)));
break;
case 34:
value = Noise::CustomNoise((Float3)tryGetValue(node->GetBox(0)));
break;
default:
break;
}

5
Source/Engine/Visject/VisjectGraph.h
View File

@@ -259,6 +259,11 @@ protected:
return defaultValue;
}
FORCE_INLINE Value tryGetValue(Box* box)
{
return box && box->HasConnection() ? eatBox(box->GetParent<Node>(), box->FirstConnection()) : Value::Zero;
}
FORCE_INLINE Value tryGetValue(Box* box, const Value& defaultValue)
{
return box && box->HasConnection() ? eatBox(box->GetParent<Node>(), box->FirstConnection()) : defaultValue;