Merge pull request WolvenKit#2665 from WolvenKit/fixes

General fixes

Author: seberoth

WolvenKit.App/ViewModels/Shell/ChunkViewModel.cs

@@ -2954,7 +2954,7 @@ private void ReindexChildren()
             // Lightweight fix: renumber remaining children and notify once
             if (Data is IRedArray)
             {
-                Properties[i].PropertyName = $"[{i}]";
+                Properties[i].PropertyName = $"{i}";
             }
         }
 

WolvenKit.App/ViewModels/Tools/ImportExportItemViewModel.cs

@@ -22,14 +22,7 @@ protected ImportExportItemViewModel(string baseFile, ImportExportArgs properties
         Properties.PropertyChanged += Properties_PropertyChanged;
     }
 
-    private void Properties_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-    {
-        if (e.PropertyName == nameof(XbmImportArgs.TextureGroup) && Properties is XbmImportArgs xbmImportArgs)
-        {
-            Properties = CommonFunctions.TextureSetupFromTextureGroup(xbmImportArgs.TextureGroup);
-        }
-        PropertiesDisplay = Properties.ToString();
-    }
+    protected virtual void Properties_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e) => PropertiesDisplay = Properties.ToString();
 
     public string BaseFile { get; set; }
 

WolvenKit.App/ViewModels/Tools/ImportableItemViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -14,27 +14,20 @@ namespace WolvenKit.App.ViewModels.Tools;
 
 public class ImportableItemViewModel : ImportExportItemViewModel
 {
-    public ImportableItemViewModel(string fileName, IArchiveManager archiveManager, IProjectManager projectManager,
-        Red4ParserService parserService)
-        : base(fileName, DecideImportOptions(fileName, archiveManager, projectManager, parserService)) =>
-        Properties.PropertyChanged += delegate(object? _, PropertyChangedEventArgs args)
+    public ImportableItemViewModel(string fileName, IArchiveManager archiveManager, IProjectManager projectManager, Red4ParserService parserService)
+        : base(fileName, DecideImportOptions(fileName, archiveManager, projectManager, parserService))
+    {
+    }
+
+    protected override void Properties_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(XbmImportArgs.TextureGroup) && Properties is XbmImportArgs importArgs)
         {
-            OnPropertyChanged(nameof(Properties));
-
-            if (args.PropertyName != nameof(XbmImportArgs.TextureGroup) || Properties is not XbmImportArgs importArgs)
-            {
-                return;
-            }
-
-            // when manually changing texture group, recalculate values
-            // IsGamma, RawFormat, Compression, GenerateMipMaps, IsStreamable
-            var propArgs = CommonFunctions.TextureSetupFromTextureGroup(importArgs.TextureGroup);
-            importArgs.IsGamma = propArgs.IsGamma;
-            importArgs.RawFormat = propArgs.RawFormat;
-            importArgs.Compression = propArgs.Compression;
-            importArgs.GenerateMipMaps = propArgs.GenerateMipMaps;
-            importArgs.IsStreamable = propArgs.IsStreamable;
-        };
+            SetProperties(CommonFunctions.TextureSetupFromTextureGroup(importArgs.TextureGroup));
+        }
+
+        base.Properties_PropertyChanged(sender, e);
+    }
 
     private static ImportArgs DecideImportOptions(string fileName, IArchiveManager archiveManager, IProjectManager projectManager, Red4ParserService parserService)
     {

WolvenKit.RED4/Types/DynamicBaseClass.cs

@@ -109,6 +109,11 @@ public CName ClassName
         get => GetPropertyValue<CName>();
         set => SetPropertyValue<CName>(value);
     }
+
+    public DynamicGraphNodeDefinition()
+    {
+        Sockets = new();
+    }
 }
 
 public class DynamicSceneGraphNode : scnSceneGraphNode, IDynamicClass
@@ -120,4 +125,4 @@ public CName ClassName
         get => GetPropertyValue<CName>();
         set => SetPropertyValue<CName>(value);
     }
-}
+}

WolvenKit/Views/Tools/RedTreeView.xaml.cs

@@ -387,11 +387,11 @@ public bool IsArrayItemSelected
 
         /// <summary>Identifies the <see cref="IsHandleSelected"/> dependency property.</summary>
         public static readonly DependencyProperty IsHandleSelectedProperty =
-            DependencyProperty.Register(nameof(IsHandleSelected), typeof(object), typeof(RedTreeView));
+            DependencyProperty.Register(nameof(IsHandleSelected), typeof(bool), typeof(RedTreeView));
 
-        public object IsHandleSelected
+        public bool IsHandleSelected
         {
-            get => GetValue(IsHandleSelectedProperty);
+            get => (bool)GetValue(IsHandleSelectedProperty);
             set => SetValue(IsHandleSelectedProperty, value);
         }