WsModel fix and version bump

donkeyProgramming · Jan 9, 2025 · bd62688 · bd62688
1 parent 977526a
commit bd62688
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/GameWorld/View3D/Services/SceneSaving/Material/Strategies/PharaohWsModelStrategy.cs b/GameWorld/View3D/Services/SceneSaving/Material/Strategies/PharaohWsModelStrategy.cs
@@ -1,5 +1,4 @@
-using GameWorld.Core.Rendering.Materials;
-using GameWorld.Core.Rendering.Materials.Serialization;
+using GameWorld.Core.Rendering.Materials.Serialization;
 using GameWorld.Core.SceneNodes;
 using Shared.Core.Settings;
 
@@ -22,7 +21,7 @@ public PharaohWsModelStrategy(WsModelGeneratorService wsModelGeneratorService, M
 
         public void Generate(MainEditableNode mainNode, string outputPath, bool onlyVisibleNodes)
         {
-            var input = WsModelGeneratorInputHelper.Create(mainNode);
+            var input = WsModelGeneratorInputHelper.Create(mainNode, onlyVisibleNodes);
             _wsModelGeneratorService.GenerateWsModel(_wsMaterialGeneratorFactory.CreateInstance(GameTypeEnum.Pharaoh), outputPath, input);
         }
     }

diff --git a/GameWorld/View3D/Services/SceneSaving/Material/Strategies/Warhammer2WsModelStrategy.cs b/GameWorld/View3D/Services/SceneSaving/Material/Strategies/Warhammer2WsModelStrategy.cs
@@ -1,5 +1,4 @@
-using GameWorld.Core.Rendering.Materials;
-using GameWorld.Core.Rendering.Materials.Serialization;
+using GameWorld.Core.Rendering.Materials.Serialization;
 using GameWorld.Core.SceneNodes;
 using Shared.Core.Settings;
 
@@ -22,7 +21,7 @@ public Warhammer2WsModelStrategy(WsModelGeneratorService wsModelGeneratorService
 
         public void Generate(MainEditableNode mainNode, string outputPath, bool onlyVisibleNodes)
         {
-            var input = WsModelGeneratorInputHelper.Create(mainNode);
+            var input = WsModelGeneratorInputHelper.Create(mainNode, onlyVisibleNodes);
             _wsModelGeneratorService.GenerateWsModel(_wsMaterialGeneratorFactory.CreateInstance(GameTypeEnum.Warhammer2), outputPath, input);
         }
     }

diff --git a/GameWorld/View3D/Services/SceneSaving/Material/Strategies/Warhammer3WsModelStrategy.cs b/GameWorld/View3D/Services/SceneSaving/Material/Strategies/Warhammer3WsModelStrategy.cs
@@ -1,5 +1,4 @@
-using GameWorld.Core.Rendering.Materials;
-using GameWorld.Core.Rendering.Materials.Serialization;
+using GameWorld.Core.Rendering.Materials.Serialization;
 using GameWorld.Core.SceneNodes;
 using Shared.Core.Settings;
 
@@ -23,7 +22,7 @@ public Warhammer3WsModelStrategy(WsModelGeneratorService wsModelGeneratorService
 
         public void Generate(MainEditableNode mainNode, string outputPath, bool onlyVisibleNodes)
         {
-            var input = WsModelGeneratorInputHelper.Create(mainNode);
+            var input = WsModelGeneratorInputHelper.Create(mainNode, onlyVisibleNodes);
             _wsModelGeneratorService.GenerateWsModel(_wsMaterialGeneratorFactory.CreateInstance(GameTypeEnum.Warhammer3), outputPath, input);
         }
     }

diff --git a/GameWorld/View3D/Services/SceneSaving/Material/WsModelGeneratorService.cs b/GameWorld/View3D/Services/SceneSaving/Material/WsModelGeneratorService.cs
@@ -108,14 +108,14 @@ static private List<WsModelGeneratorInput> EnsureUniqueMeshNames(IEnumerable<WsM
 
     public static class WsModelGeneratorInputHelper
     {
-        public static List<WsModelGeneratorInput> Create(MainEditableNode node)
+        public static List<WsModelGeneratorInput> Create(MainEditableNode node, bool onlyVisibleNodes)
         {
             var lodNodes = node.GetLodNodes();
             var output = new List<WsModelGeneratorInput>();
 
             for (var lodIndex = 0; lodIndex < lodNodes.Count; lodIndex++)
             {
-                var meshes = node.GetMeshesInLod(lodIndex, false);
+                var meshes = node.GetMeshesInLod(lodIndex, onlyVisibleNodes);
 
                 for (var meshPart = 0; meshPart < meshes.Count; meshPart++)
                 {

diff --git a/Shared/SharedCore/Services/VersionChecker.cs b/Shared/SharedCore/Services/VersionChecker.cs
@@ -8,7 +8,7 @@ namespace Shared.Core.Services
     public class VersionChecker
     {
         private static readonly string GitHubLink = @"https://github.com/donkeyProgramming/TheAssetEditor/releases/latest";
-        public static string CurrentVersion { get => "0.58"; }
+        public static string CurrentVersion { get => "0.59"; }
 
         public static void CheckVersion()
         {