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

detect materials dynamically

Browse Source
This commit is contained in:
GoaLitiuM
2021-09-02 22:10:34 +03:00
parent 4e2b122257
commit 26221be7a9
3 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Content/Materials/dev/slick.flax → Content/Materials/common/slick.flax
View File

21
Content/Settings/GameSettings/BrushMaterialAssets.json
View File

@@ -1,21 +0,0 @@
{
"ID": "29a0b0c54b40eb3e6857ffb4c9cab71e",
"TypeName": "Game.BrushMaterialList",
"EngineBuild": 6224,
"Data": {
"materialAssets": [
{
"name": "common/slick",
"asset": "c27c22ec429a17e827421e9a82ac79e4"
},
{
"name": "dev/dev_128_gray",
"asset": "cfe2d8d64700dc00dc2c5088ee028477"
},
{
"name": "dev/dev_128_red",
"asset": "a75d425f40ef7ba5df0fdb8d470e8a78"
}
]
}
}

31
Source/Game/Q3MapImporter.cs
View File

@@ -181,27 +181,15 @@ namespace Game
if (!oneMesh)
{
Dictionary<string, MaterialBase> materials = new Dictionary<string, MaterialBase>();
{
BrushMaterialList brushMaterialList = Engine.GetCustomSettings("BrushMaterials")
BrushMaterialList brushMaterialList = Engine.GetCustomSettings("BrushMaterialsLegacy")
?.CreateInstance<BrushMaterialList>();
if (brushMaterialList != null)
{
foreach (var m in brushMaterialList.materialAssets)
materials.Add(m.name, m.asset);
Console.Print("materials dictionary with " + materials.Count + " entries");
}
else
{
Console.Print("no materials dictionary found");
}
BrushMaterialList brushMaterialList2 = Engine.GetCustomSettings("BrushMaterialsLegacy")
?.CreateInstance<BrushMaterialList>();
if (brushMaterialList2 != null)
{
foreach (var m in brushMaterialList2.materialAssets)
materials.Add(m.name, m.asset);
}
}
@@ -238,9 +226,18 @@ namespace Game
if (!materials.TryGetValue(textureName, out var brushMaterial))
{
Console.Print("Material '" + textureName + "' not found for brush");
materials.Add(textureName, material);
brushMaterial = material;
var workDir = Directory.GetCurrentDirectory();
var matBasePath = Path.Combine(workDir, "Content", "Materials");
var assetPath = Path.Combine(matBasePath, textureName + ".flax");
brushMaterial = Content.Load<MaterialBase>(assetPath);
if (brushMaterial != null)
materials.Add(textureName, brushMaterial);
else
{
Console.Print("Material '" + textureName + "' not found for brush");
materials.Add(textureName, material);
brushMaterial = material;
}
}
brushMaterials.Add(textureName, brushMaterial);
}