Merge pull request #40 from glassfish777/glassfishpull

Custom class fixes and re-enabling of the flow diagram
WolvenKit · Aug 5, 2023 · f0a558f · f0a558f
2 parents 0b86517 + ed21b23
commit f0a558f
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 29 deletions.
diff --git a/WolvenKit.CR2W/CR2WManager.cs b/WolvenKit.CR2W/CR2WManager.cs
@@ -174,13 +174,17 @@ public static Type GetEnumByName(string typeName)
 
 
 
-        private const string header = @"
+        private const string header1 = @"
 using System.IO;
 using FastMember;
 using WolvenKit.CR2W.Reflection;
 using static WolvenKit.CR2W.Types.Enums;
 
 
+namespace WolvenKit.CR2W
+{
+";
+        private const string header2 = @"
 namespace WolvenKit.CR2W.Types
 {
 ";
@@ -210,7 +214,7 @@ private static (int, string) InterpretScriptClasses()
             using (StringWriter sw = new StringWriter())
             {
                 // usings and namespace
-                sw.WriteLine(header);
+                sw.WriteLine(header1);
 
                 FileInfo[] projectScriptFiles = m_projectinfo.GetFiles("*.ws", SearchOption.AllDirectories);
 
@@ -289,6 +293,8 @@ private static (int, string) InterpretScriptClasses()
                 }
                 #endregion
                 sw.WriteLine("\t}\r\n");
+                sw.WriteLine("}\r\n");
+                sw.WriteLine(header2);
 
                 // interpret classes
                 #region Classes

diff --git a/WolvenKit.CR2W/Reflection/REDReflection.cs b/WolvenKit.CR2W/Reflection/REDReflection.cs
@@ -1,4 +1,4 @@
-using DotNetHelper.FastMember.Extension.Extension;
+using DotNetHelper.FastMember.Extension.Extension;
 using FastMember;
 using System;
 using System.Collections.Generic;
@@ -123,6 +123,8 @@ public static string GetWKitBaseTypeFromREDBaseType(string typename)
                 case "float": return "CFloat";
                 case "String": return "CString";
                 case "string": return "CString";
+                case "Name": return "CName";
+                case "name": return "CName";
                 case "Color": return "CColor";
                 case "Matrix": return "CMatrix";
                 default:

diff --git a/WolvenKit.CR2W/Types/Generic/CPtr.cs b/WolvenKit.CR2W/Types/Generic/CPtr.cs
@@ -29,17 +29,17 @@ public CPtr(CR2WFile cr2w, CVariable parent, string name) : base(cr2w, parent, n
         #region Methods
         public string GetPtrTargetType()
         {
-            return ReferenceType;
-            //try
-            //{
-            //    if (Reference == null)
-            //        return "NULL";
-            //    return Reference.REDType;
-            //}
-            //catch (Exception ex)
-            //{
-            //    throw new InvalidPtrException(ex.Message);
-            //}
+            //return ReferenceType;
+            try
+            {
+                if (Reference == null)
+                    return "NULL";
+                return Reference.REDType;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidPtrException(ex.Message);
+            }
         }
 
         /// <summary>

diff --git a/WolvenKit/Forms/Dialog/frmAddChunk.cs b/WolvenKit/Forms/Dialog/frmAddChunk.cs
@@ -1,16 +1,21 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using WolvenKit.CR2W;
 using WolvenKit.CR2W.Types;
 using WolvenKit.CR2W.Reflection;
+using System.Windows.Documents;
 
 namespace WolvenKit
 {
     public partial class frmAddChunk : Form
     {
         private string[] classTypes = null;
         private string[] enumTypes = null;
+        private List<string> vanillaClasses = null;
+        private List<string> customClasses = null;
+        private List<string> vanillaEnums = null;
+        private List<string> customEnums = null;
         public frmAddChunk(List<string> list = null, bool isVariant = false, bool allowEditName = false)
         {
             InitializeComponent();
@@ -29,11 +34,19 @@ public frmAddChunk(List<string> list = null, bool isVariant = false, bool allowE
                 list = AssemblyDictionary.TypeNames;
             }
             list.Sort();
-            classTypes = list.ToArray();
 
-            list = AssemblyDictionary.EnumNames;
-            list.Sort();
-            enumTypes = list.ToArray();
+            customClasses = CR2WManager.TypeNames;
+            customClasses.Sort();
+
+            classTypes = list.Concat(customClasses).Distinct().ToArray();
+
+            vanillaEnums = AssemblyDictionary.EnumNames;
+            vanillaEnums.Sort();
+            customEnums = CR2WManager.EnumNames;
+            customEnums.Sort();
+
+            enumTypes = vanillaEnums.Concat(customEnums).Distinct().ToArray();
+
             UpdateTypeChoices();
         }
 

diff --git a/WolvenKit/Forms/MVVM/frmCR2WDocument.cs b/WolvenKit/Forms/MVVM/frmCR2WDocument.cs
@@ -518,12 +518,12 @@ public void PostLoadFile(string filename = "", bool openrenderer = false)
                 case ".w2quest":
                 case ".w2phase":
                     {
-                        //this.flowDiagram = new frmChunkFlowDiagram();
-                        //this.flowDiagram.OnOutput += MainController.LogString;
-                        //this.flowDiagram.File = this.File;
-                        //this.flowDiagram.DockAreas = DockAreas.Document;
-                        //this.flowDiagram.OnSelectChunk += this.frmCR2WDocument_OnSelectChunk;
-                        //this.flowDiagram.Show(this.FormPanel, DockState.Document);
+                        this.flowDiagram = new frmChunkFlowDiagram();
+                        this.flowDiagram.OnOutput += MainController.LogString;
+                        this.flowDiagram.File = this.File;
+                        this.flowDiagram.DockAreas = DockAreas.Document;
+                        this.flowDiagram.OnSelectChunk += this.frmCR2WDocument_OnSelectChunk;
+                        this.flowDiagram.Show(this.FormPanel, DockState.Document);
                         break;
                     }
 

diff --git a/WolvenKit/Forms/frmChunkFlowDiagram.cs b/WolvenKit/Forms/frmChunkFlowDiagram.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
@@ -51,7 +51,6 @@ public partial class frmChunkFlowDiagram : DockContent
         public frmChunkFlowDiagram()
         {
             InitializeComponent();
-
             selectionBackground = new SolidBrush(Color.FromArgb(100, SystemColors.Highlight));
             selectionBorder = new Pen(Color.FromArgb(200, SystemColors.Highlight));
             selectionItemHighlight = new Pen(Color.Green, 2.0f);
@@ -292,7 +291,7 @@ private void frmChunkFlowView_Paint(object sender, PaintEventArgs e)
                     // eat the exception, allready logging the exception when creating the node editor
                 }
 
-                if (conns != null)
+                if (conns != null && !isMoving)
                 {
                     foreach (var conn in conns)
                     {
@@ -590,4 +589,4 @@ private void copyDisplayTextToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
     }
-}
+}