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

missing texture, split map scenes

Browse Source
This commit is contained in:
GoaLitiuM
2021-09-11 22:48:59 +03:00
parent eb3329f853
commit 7ed2f712b2
9 changed files with 554 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Game/Q3MapImporter.cs
View File

@@ -30,15 +30,15 @@ namespace Game
public class Q3MapImporter : Script
{
//private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\cube_q1.map";
private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\cube_q3.map";
//private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\cube_q3.map";
//private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\cube_valve.map";
//private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\dm4.map";
//private string mapPath = @"C:\dev\Goake\maps\aerowalk\aerowalk.map";
public string mapPath = @"C:\dev\Goake\maps\aerowalk\aerowalk.map";
//private string mapPath = @"C:\dev\GoakeFlax\Assets\Maps\problematic.map";
Model model;
public MaterialBase material;
private MaterialBase missingMaterial;
static void QuickHull(Vector3[] points, out Vector3[] outVertices)
{
@@ -188,9 +188,15 @@ namespace Game
public override void OnStart()
{
byte[] mapChars = File.ReadAllBytes(mapPath);
{
var workDir = Directory.GetCurrentDirectory();
var matBasePath = Path.Combine(workDir, "Content", "Materials");
var assetPath = Path.Combine(matBasePath, "missing.flax");
missingMaterial = Content.Load<MaterialBase>(assetPath);
}
Stopwatch sw = Stopwatch.StartNew();
byte[] mapChars = File.ReadAllBytes(mapPath);
root = MapParser.Parse(mapChars);
sw.Stop();
@@ -201,7 +207,6 @@ namespace Game
if (!oneMesh)
{
Dictionary<string, MaterialBase> materials = new Dictionary<string, MaterialBase>();
{
BrushMaterialList brushMaterialList = Engine.GetCustomSettings("BrushMaterialsLegacy")
@@ -213,9 +218,8 @@ namespace Game
}
}
var mapRootActor = Actor.AddChild<Actor>();
mapRootActor.Name = "MapRootActor";
var worldSpawnActor = Actor.AddChild<Actor>();
worldSpawnActor.Name = "WorldSpawn";
List<BrushGeometry> brushGeometries = new List<BrushGeometry>(root.entities[0].brushes.Count);
@@ -262,8 +266,8 @@ namespace Game
else
{
Console.Print("Material '" + textureName + "' not found for brush");
materials.Add(textureName, material);
brushMaterial = material;
materials.Add(textureName, missingMaterial);
brushMaterial = missingMaterial;
}
}
brushMaterials.Add(textureName, brushMaterial);
@@ -416,7 +420,7 @@ namespace Game
{
StaticModel childModel = Actor.AddChild<StaticModel>();
childModel.Name = "Brush_" + brushIndex;
childModel.Parent = mapRootActor;
childModel.Parent = worldSpawnActor;
childModel.Model = geom.model;
childModel.Position = geom.offset;
@@ -582,7 +586,7 @@ namespace Game
StaticModel childModel = Actor.AddChild<StaticModel>();
childModel.Name = "MapModel";
childModel.Model = model;
childModel.SetMaterial(0, material);
childModel.SetMaterial(0, missingMaterial);
CollisionData collisionData = Content.CreateVirtualAsset<CollisionData>();
if (collisionData.CookCollision(CollisionDataType.TriangleMesh, vertices.ToArray(),