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

Fix #3342 to properly place new param in Constant Buffer

Browse Source 
#3299
This commit is contained in:
Wojtek Figat
2025-08-14 11:53:25 +02:00
parent 5e19a9729b
commit 1087bd2445
12 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,28 +48,14 @@ void MaterialGenerator::ProcessGroupTools(Box* box, Node* node, Value& value)
}
// Time
case 3:
{
switch (box->ID)
{
// Scaled Time
case 0:
value = getScaledTime;
break;
// Unscaled Time
case 1:
value = getUnscaledTime;
break;
default:
break;
}
value = box->ID == 1 ? getUnscaledTime : getTime;
break;
}
// Panner
case 6:
{
// Get inputs
const Value uv = tryGetValue(node->GetBox(0), getUVs).AsFloat2();
const Value time = tryGetValue(node->GetBox(1), getUnscaledTime).AsFloat();
const Value time = tryGetValue(node->GetBox(1), getTime).AsFloat();
const Value speed = tryGetValue(node->GetBox(2), Value::One).AsFloat2();
const bool useFractionalPart = (bool)node->Values[0];

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

@@ -106,8 +106,8 @@ bool FeatureData::Init()
}
MaterialValue MaterialGenerator::getUVs(VariantType::Float2, TEXT("input.TexCoord"));
MaterialValue MaterialGenerator::getTime(VariantType::Float, TEXT("TimeParam"));
MaterialValue MaterialGenerator::getUnscaledTime(VariantType::Float, TEXT("UnscaledTimeParam"));
MaterialValue MaterialGenerator::getScaledTime(VariantType::Float, TEXT("ScaledTimeParam"));
MaterialValue MaterialGenerator::getNormal(VariantType::Float3, TEXT("input.TBN[2]"));
MaterialValue MaterialGenerator::getNormalZero(VariantType::Float3, TEXT("float3(0, 0, 1)"));
MaterialValue MaterialGenerator::getVertexColor(VariantType::Float4, TEXT("GetVertexColor(input)"));

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

@@ -209,8 +209,8 @@ private:
public:
static MaterialValue getUVs;
static MaterialValue getTime;
static MaterialValue getUnscaledTime;
static MaterialValue getScaledTime;
static MaterialValue getNormal;
static MaterialValue getNormalZero;
static MaterialValue getVertexColor;