update user template manager, add pipt presets

igorseabra4 · Apr 28, 2020 · 59ff16e · 59ff16e
1 parent 27ba693
commit 59ff16e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 47 deletions.
diff --git a/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetEditing.cs b/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetEditing.cs
@@ -584,11 +584,11 @@ public void ApplyScale(Vector3 factor)
 
                     TRIG.FixPosition();
                 }
-                else if (a is IClickableAsset clickableAsset)
+                else if (a is IClickableAsset ica)
                 {
-                    ((IClickableAsset)a).PositionX *= factor.X;
-                    ((IClickableAsset)a).PositionY *= factor.Y;
-                    ((IClickableAsset)a).PositionZ *= factor.Z;
+                    ica.PositionX *= factor.X;
+                    ica.PositionY *= factor.Y;
+                    ica.PositionZ *= factor.Z;
 
                     if (a is AssetMVPT MVPT)
                     {

diff --git a/IndustrialPark/Assets/Binary/AssetPIPT.cs b/IndustrialPark/Assets/Binary/AssetPIPT.cs
@@ -22,6 +22,17 @@ public enum BlendFactorType
         SourceAlphaSaturated           = 0x0B
     }
 
+    public enum PiptPreset
+    {
+        None = 0,
+        Default = 9961474,
+        VertexColors = 9961538,
+        AlphaBlend = 9987330,
+        AlphaBlendVertexColors = 9987394,
+        AdditiveAlpha = 10036486,
+        AdditiveAlphaVertexColors = 10036550,
+    }
+
     public class EntryPIPT
     {
         [Category("PIPT Entry")]
@@ -30,7 +41,22 @@ public class EntryPIPT
         public int SubObjectBits { get; set; }
         [Category("PIPT Entry")]
         public int PipeFlags { get; set; }
-
+        [Category("PIPT Entry")]
+        public PiptPreset Preset
+        {
+            get
+            {
+                foreach (PiptPreset v in Enum.GetValues(typeof(PiptPreset)))
+                    if ((int)v == PipeFlags)
+                        return v;
+                return PiptPreset.None;
+            }
+            set
+            {
+                PipeFlags = (int)value;
+            }
+        }
+
         [Category("PIPT Pipe Flags")]
         public byte AlphaCompareValue
         {

diff --git a/IndustrialPark/IndustrialPark.csproj b/IndustrialPark/IndustrialPark.csproj
@@ -552,7 +552,6 @@
     <EmbeddedResource Include="MainForm\ViewConfig.resx">
       <DependentUpon>ViewConfig.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="IndustrialPark_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">

diff --git a/IndustrialPark/MainForm/UserTemplateManager.Designer.cs b/IndustrialPark/MainForm/UserTemplateManager.Designer.cs
diff --git a/IndustrialPark/MainForm/UserTemplateManager.cs b/IndustrialPark/MainForm/UserTemplateManager.cs
@@ -24,20 +24,7 @@ protected override void OnFormClosing(FormClosingEventArgs e)
             e.Cancel = true;
             Hide();
         }
-
-        private void buttonImportRawData_Click(object sender, EventArgs e)
-        {
-            OpenFileDialog openFileDialog = new OpenFileDialog() { Multiselect = true };
-
-            if (openFileDialog.ShowDialog() == DialogResult.OK)
-            {
-                foreach (string s in openFileDialog.FileNames)
-                    File.Copy(s, Path.Combine(Program.MainForm.userTemplatesFolder, Path.GetFileName(s)));
-
-                UpdateListBox();
-            }
-        }
-
+
         private void UpdateListBox()
         {
             listBoxTemplates.Items.Clear();