Merge remote-tracking branch 'origin/master' into 1.9

This commit is contained in:
Wojtek Figat
2024-08-05 11:08:51 +02:00
62 changed files with 9529 additions and 2700 deletions

View File

@@ -735,6 +735,25 @@ void MaterialGenerator::ProcessGroupTextures(Box* box, Node* node, Value& value)
_writer.Write(*triplanarTexture);
value = result;
}
// Get Lightmap UV
case 18:
{
auto output = writeLocal(Value::InitForZero(ValueType::Float2), node);
auto lightmapUV = String::Format(TEXT(
"{{\n"
"#if USE_LIGHTMAP\n"
"\t {0} = input.LightmapUV;\n"
"#else\n"
"\t {0} = float2(0,0);\n"
"#endif\n"
"}}\n"
), output.Value);
_writer.Write(*lightmapUV);
value = output;
break;
}
default:
break;
}