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

added AAStep and resolved stefnotch reviewe

Browse Source
This commit is contained in:
NoriteSC
2023-10-04 13:13:45 +02:00
parent 367eaf2f89
commit d7b9056d94
2 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Editor/Surface/Archetypes/Material.cs
View File

@@ -885,8 +885,8 @@ namespace FlaxEditor.Surface.Archetypes
new NodeArchetype
{
TypeID = 40,
Title = "Ratangle Mask",
Description = "Creates a Ratangle mask",
Title = "Rectangle Mask",
Description = "Creates a Rectangle mask",
Flags = NodeFlags.MaterialGraph,
Size = new Float2(150, 40),
ConnectionsHints = ConnectionsHint.Vector,
@@ -898,7 +898,7 @@ namespace FlaxEditor.Surface.Archetypes
Elements = new[]
{
NodeElementArchetype.Factory.Input(0, "UV", true, typeof(Float2), 0),
NodeElementArchetype.Factory.Input(1, "Ratangle", true, typeof(Float2), 1),
NodeElementArchetype.Factory.Input(1, "Rectangle", true, typeof(Float2), 1),
NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 5),
}
},
@@ -906,7 +906,7 @@ namespace FlaxEditor.Surface.Archetypes
{
TypeID = 41,
Title = "FWidth",
Description = "Creates a Partial Derivatives (fwidth)",
Description = "Creates a partial derivative (fwidth)",
Flags = NodeFlags.MaterialGraph,
Size = new Float2(150, 20),
ConnectionsHints = ConnectionsHint.Vector,
@@ -920,6 +920,25 @@ namespace FlaxEditor.Surface.Archetypes
NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 5),
}
},
new NodeArchetype
{
TypeID = 42,
Title = "AAStep",
Description = "Smooth version of step",
Flags = NodeFlags.MaterialGraph,
Size = new Float2(150, 20),
ConnectionsHints = ConnectionsHint.Vector,
DefaultValues = new object[]
{
1,
0
},
Elements = new[]
{
NodeElementArchetype.Factory.Input(0, "value", true, typeof(float), 0),
NodeElementArchetype.Factory.Output(0, string.Empty, typeof(float), 5),
}
},
};
}
}

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

@@ -523,11 +523,10 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value)
case 40:
{
const auto uv = tryGetValue(node->GetBox(0), getUVs).AsFloat2();
const auto ratangle = tryGetValue(node->GetBox(1), node->Values[1]).AsFloat2();
const auto rectangle = tryGetValue(node->GetBox(1), node->Values[1]).AsFloat2();
auto d = writeLocal(ValueType::Float2, String::Format(TEXT("abs({0} * 2 - 1) - {1}"),uv.Value, ratangle.Value), node);
auto fwidth = writeLocal(ValueType::Float , String::Format(TEXT("abs(ddx({0})) + abs(ddy({0}))"), d.Value), node);
auto d2 = writeLocal(ValueType::Float2 , String::Format(TEXT("1 - {0} / {1}"), d.Value, fwidth.Value), node);
auto d = writeLocal(ValueType::Float2, String::Format(TEXT("abs({0} * 2 - 1) - {1}"),uv.Value, rectangle.Value), node);
auto d2 = writeLocal(ValueType::Float2 , String::Format(TEXT("1 - {0} / fwidth({0})"), d.Value), node);
value = writeLocal(ValueType::Float , String::Format(TEXT("saturate(min({0}.x, {0}.y))"), d2.Value), node);
break;
}
@@ -538,6 +537,23 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value)
value = writeLocal(ValueType::Float, String::Format(TEXT("abs(ddx({0})) + abs(ddy({0}))"), d.Value), node);
break;
}
//AAStep (smooth version of step)
case 42:
{
//source https://www.ronja-tutorials.com/post/046-fwidth/#a-better-step
const auto compValue = tryGetValue(node->GetBox(0), getUVs).AsFloat();
const auto gradient = tryGetValue(node->GetBox(1), node->Values[1]).AsFloat();
auto change = writeLocal(ValueType::Float, String::Format(TEXT("fwidth({0})"), gradient.Value), node);
//base the range of the inverse lerp on the change over two pixels
auto lowerEdge = writeLocal(ValueType::Float, String::Format(TEXT("{0} - {1})"), compValue.Value, change.Value), node);
auto upperEdge = writeLocal(ValueType::Float, String::Format(TEXT("{0} + {1})"), compValue.Value, change.Value), node);
//do the inverse interpolation and saturate it
value = writeLocal(ValueType::Float, String::Format(TEXT("saturate((({0} - {1}) / ({2} - {1})))"), gradient.Value, lowerEdge.Value, upperEdge.Value), node);
}
default:
break;
}