KeepersCompound
/
thief-mission-viewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: KeepersCompound:eaf20f7f4a7bd88dd5ea9b1fd2670ed232893ebd
Branches Tags
KeepersCompound:main
..
compare: KeepersCompound:6db4d75a37e974aad5883769ef6a3d78c8ae1901
Branches Tags
KeepersCompound:main

No commits in common. "eaf20f7f4a7bd88dd5ea9b1fd2670ed232893ebd" and "6db4d75a37e974aad5883769ef6a3d78c8ae1901" have entirely different histories.
eaf20f7f4a ... 6db4d75a37

3 changed files with 10 additions and 21 deletions
Show Stats Expand all files Collapse all files

21
project/code/TMV/Model.cs
View File

@ -62,7 +62,7 @@ public partial class Model : Node3D
}
}
var surfaceDataMap = new Dictionary<int, MeshSurfaceData>();
var mesh = new ArrayMesh();
foreach (var poly in modelFile.Polygons)
{
var vertices = new List<Vector3>();
@ -83,26 +83,17 @@ public partial class Model : Node3D
}
}
if (!surfaceDataMap.ContainsKey(poly.Data))
{
surfaceDataMap.Add(poly.Data, new MeshSurfaceData());
}
surfaceDataMap[poly.Data].AddPolygon(vertices, normal, uvs, uvs);
}
var mesh = new ArrayMesh();
foreach (var (materialId, surfaceData) in surfaceDataMap)
{
var surfaceData = new MeshSurfaceData();
surfaceData.AddPolygon(vertices, normal, uvs, uvs);
var array = surfaceData.BuildSurfaceArray();
var surfaceIdx = mesh.GetSurfaceCount();
mesh.AddSurfaceFromArrays(Mesh.PrimitiveType.Triangles, array);
for (var i = 0; i < materials.Count; i++)
{
var m = modelFile.Materials[i];
if (m.Slot == materialId)
if (m.Slot == poly.Data)
{
mesh.SurfaceSetMaterial(surfaceIdx, materials[i]);
mesh.SurfaceSetMaterial(poly.Index, materials[i]);
break;
}
}

7
project/code/TMV/UI/MissionSelector.cs
View File

@ -60,8 +60,7 @@ public partial class MissionSelector : Control
_LoadButton.Disabled = true;
_Campaigns.AddItem("Original Missions");
var paths = Directory.GetDirectories(_installPaths.fmsPath);
foreach (var c in paths.OrderBy(s => s))
foreach (var c in Directory.GetDirectories(_installPaths.fmsPath))
{
_Campaigns.AddItem(c.TrimPrefix(_installPaths.fmsPath));
}
@ -83,8 +82,8 @@ public partial class MissionSelector : Control
}
string[] extensions = { "mis", "cow" };
var paths = Directory.GetFiles(campaignPath);
foreach (var f in paths.OrderBy(s => s))
campaignPath = idx == 0 ? _installPaths.omsPath : _installPaths.fmsPath + _Campaigns.GetItemText((int)idx);
foreach (var f in Directory.GetFiles(campaignPath))
{
if (extensions.Contains(f.GetExtension().ToLower()))
{

3
project/code/TMV/UI/ModelSelector.cs
View File

@ -59,8 +59,7 @@ public partial class ModelSelector : Control
_Models.Clear();
_LoadButton.Disabled = true;
var paths = Directory.GetFiles(_extractedObjectsPath, "*.bin", SearchOption.AllDirectories);
foreach (var m in paths.OrderBy(s => s))
foreach (var m in Directory.GetFiles(_extractedObjectsPath, "*.bin", SearchOption.AllDirectories))
{
_Models.AddItem(m.TrimPrefix(_extractedObjectsPath));
}