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

Merge branch 'master' of git://github.com/Evildea/FlaxEngine into Evildea-master

Browse Source
This commit is contained in:
Wojtek Figat
2021-02-07 21:12:39 +01:00
parent 2325de3ddc c8b0773661
commit 57fab6a7f7
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,10 +342,14 @@ void MaterialGenerator::ProcessGroupMaterial(Box* box, Node* node, Value& value)
// Blend Normals
case 26:
{
const auto baseNormal = tryGetValue(node->GetBox(0), Value::Zero).AsVector3();
const auto additionalNormal = tryGetValue(node->GetBox(1), Value::Zero).AsVector3();
const String text = String::Format(TEXT("float3((float2({0}.xy) + float2({1}.xy) * 2.0), sqrt(saturate(1.0 - dot((float2({0}.xy) + float2({1}.xy) * 2.0).xy, (float2({0}.xy) + float2({1}.xy) * 2.0).xy))))"), baseNormal.Value, additionalNormal.Value);
value = writeLocal(ValueType::Vector3, text, node);
const auto baseNormal = tryGetValue(node->GetBox(0), getNormalZero).AsVector3();
const auto additionalNormal = tryGetValue(node->GetBox(1), getNormalZero).AsVector3();
const String text1 = String::Format(TEXT("(float2({0}.xy) + float2({1}.xy) * 2.0)"), baseNormal.Value, additionalNormal.Value);
const auto appendXY = writeLocal(ValueType::Vector2, text1, node);
const String text2 = String::Format(TEXT("float3({0}, sqrt(saturate(1.0 - dot({0}.xy, {0}.xy))))"), appendXY.Value);
value = writeLocal(ValueType::Vector3, text2, node);
break;
}
// Rotator

1
Source/Engine/Tools/MaterialGenerator/MaterialGenerator.cpp
View File

@@ -27,6 +27,7 @@ enum MaterialTemplateInputsMapping
MaterialValue MaterialGenerator::getUVs(VariantType::Vector2, TEXT("input.TexCoord"));
MaterialValue MaterialGenerator::getTime(VariantType::Float, TEXT("TimeParam"));
MaterialValue MaterialGenerator::getNormal(VariantType::Vector3, TEXT("input.TBN[2]"));
MaterialValue MaterialGenerator::getNormalZero(VariantType::Vector3, TEXT("float3(0, 0, 1)"));
MaterialValue MaterialGenerator::getVertexColor(VariantType::Vector4, TEXT("GetVertexColor(input)"));
MaterialGenerator::MaterialGenerator()

1
Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
View File

@@ -205,6 +205,7 @@ public:
static MaterialValue getUVs;
static MaterialValue getTime;
static MaterialValue getNormal;
static MaterialValue getNormalZero;
static MaterialValue getVertexColor;
static MaterialGraphBoxesMapping MaterialGraphBoxesMappings[];