more templates and some refactoring

igorseabra4 · Apr 17, 2019 · d9893f9 · d9893f9
1 parent cb9940c
commit d9893f9
Show file tree

Hide file tree

Showing 12 changed files with 513 additions and 436 deletions.
diff --git a/IndustrialPark/ArchiveEditor/ArchiveEditor.cs b/IndustrialPark/ArchiveEditor/ArchiveEditor.cs
@@ -28,7 +28,7 @@ public ArchiveEditor(string filePath)
             if (!string.IsNullOrWhiteSpace(filePath))
                 OpenFile(filePath);
 
-            MainForm.PopulateTemplateMenusAt(addTemplateToolStripMenuItem, TemplateToolStripMenuItem_Click);
+            ArchiveEditorFunctions.PopulateTemplateMenusAt(addTemplateToolStripMenuItem, TemplateToolStripMenuItem_Click);
             listViewAssets_SizeChanged(null, null);
         }
 
@@ -529,7 +529,7 @@ private void buttonView_Click(object sender, EventArgs e)
             if (archive.GetFromAssetID(CurrentlySelectedAssetIDs()[0]) is AssetCAM cam)
                 Program.MainForm.renderer.Camera.SetPositionCamera(cam);
             else if (archive.GetFromAssetID(CurrentlySelectedAssetIDs()[0]) is IClickableAsset a)
-                Program.MainForm.renderer.Camera.SetPosition(new Vector3(a.PositionX, a.PositionY, a.PositionZ) - 8 * Program.MainForm.renderer.Camera.GetForward());
+                Program.MainForm.renderer.Camera.SetPosition(new Vector3(a.PositionX, a.PositionY, a.PositionZ) - 8 * Program.MainForm.renderer.Camera.Forward);
         }
 
         private void buttonEditAsset_Click(object sender, EventArgs e)
@@ -883,7 +883,7 @@ private void TemplateToolStripMenuItem_Click(object sender, EventArgs e)
             {
                 if (text == template.ToString())
                 {
-                    Vector3 Position = Program.MainForm.renderer.Camera.Position + 2 * Program.MainForm.renderer.Camera.GetForward();
+                    Vector3 Position = Program.MainForm.renderer.Camera.Position + 3 * Program.MainForm.renderer.Camera.Forward;
                     PlaceTemplate(Position, template);
                     return;
                 }

diff --git a/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions.cs b/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions.cs
@@ -438,7 +438,6 @@ private void AddAssetToDictionary(Section_AHDR AHDR, bool fast = false)
                 case AssetType.VIL: newAsset = new AssetVIL(AHDR); break;
                 case AssetType.VILP: newAsset = new AssetVILP(AHDR); break;
                 case AssetType.VOLU: newAsset = new AssetVOLU(AHDR); break;
-
                 case AssetType.CCRV:
                 case AssetType.DTRK:
                 case AssetType.DUPC:
@@ -482,6 +481,25 @@ private void AddAssetToDictionary(Section_AHDR AHDR, bool fast = false)
 
             assetDictionary.Add(AHDR.assetID, newAsset);
 
+            // THIS IS TEMPORARY, REMOVE AFTER FINISHING ENEMY HIPS
+            //if (newAsset is AssetMINF minf)
+            //{
+            //    uint hash = BKDRHash(AHDR.ADBG.assetName.Replace(".MINF", ""));
+            //    if (assetDictionary.ContainsKey(hash))
+            //        assetDictionary[hash] = newAsset;
+            //    else
+            //        assetDictionary.Add(hash, newAsset);
+            //}
+            //if (newAsset is AssetMODL modl)
+            //{
+            //    uint hash = BKDRHash(AHDR.ADBG.assetName.ToLower().Replace(".dff", ""));
+            //    if (assetDictionary.ContainsKey(hash))
+            //        assetDictionary[hash] = newAsset;
+            //    else
+            //        assetDictionary.Add(hash, newAsset);
+            //}
+            // ...
+
             if (hiddenAssets.Contains(AHDR.assetID))
                 assetDictionary[AHDR.assetID].isInvisible = true;
 

diff --git a/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetTemplates.cs b/IndustrialPark/ArchiveEditor/ArchiveEditorFunctions_AssetTemplates.cs
diff --git a/IndustrialPark/ArchiveEditor/InternalEditors/InternalCamEditor.cs b/IndustrialPark/ArchiveEditor/InternalEditors/InternalCamEditor.cs
@@ -31,9 +31,9 @@ private void buttonGetPos_Click(object sender, System.EventArgs e)
 
         private void buttonGetDir_Click(object sender, System.EventArgs e)
         {
-            asset.SetNormalizedForward(Program.MainForm.renderer.Camera.GetForward());
-            asset.SetNormalizedUp(Program.MainForm.renderer.Camera.GetUp());
-            asset.SetNormalizedLeft(Program.MainForm.renderer.Camera.GetRight());
+            asset.SetNormalizedForward(Program.MainForm.renderer.Camera.Forward);
+            asset.SetNormalizedUp(Program.MainForm.renderer.Camera.Up);
+            asset.SetNormalizedLeft(Program.MainForm.renderer.Camera.Right);
         }
 
         public uint GetAssetID()

diff --git a/IndustrialPark/ArchiveEditor/InternalEditors/InternalFlyEditor.cs b/IndustrialPark/ArchiveEditor/InternalEditors/InternalFlyEditor.cs
@@ -109,9 +109,9 @@ private void buttonGetPos_Click(object sender, EventArgs e)
 
         private void buttonGetDir_Click(object sender, EventArgs e)
         {
-            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedLeft = -Program.MainForm.renderer.Camera.GetRight();
-            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedUp = Program.MainForm.renderer.Camera.GetUp();
-            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedBackward = -Program.MainForm.renderer.Camera.GetForward();
+            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedLeft = -Program.MainForm.renderer.Camera.Right;
+            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedUp = Program.MainForm.renderer.Camera.Up;
+            ((EntryFLY)propertyGridSpecific.SelectedObject).CameraNormalizedBackward = -Program.MainForm.renderer.Camera.Forward;
             UpdateAssetEntries();
         }
 
@@ -158,4 +158,4 @@ public void Play()
             }
         }
     }
-}
+}
diff --git a/IndustrialPark/ArchiveEditor/Other/AssetTemplate.cs b/IndustrialPark/ArchiveEditor/Other/AssetTemplate.cs
@@ -125,6 +125,11 @@ public enum AssetTemplate
         BungeeHook,
         BungeeDrop,
 
+        Swinger,
+        Swinger_PLAT,
+        Ring,
+        RingControl,
+
         // ...but not for user
         PressurePlateBase,
         BusStop_DYNA,

diff --git a/IndustrialPark/Assets/DYNA/MovieGame/RenderableDynas/DynaRing.cs b/IndustrialPark/Assets/DYNA/MovieGame/RenderableDynas/DynaRing.cs
@@ -335,7 +335,7 @@ public override float ScaleZ
         [Category("Ring"), TypeConverter(typeof(FloatTypeConverter))]
         public float UnknownFloat1 { get; set; }
 
-        [Category("Ring")]
+        [Category("Ring"), TypeConverter(typeof(FloatTypeConverter))]
         public float UnknownFloat2 { get; set; }
 
         [Category("Ring"), TypeConverter(typeof(FloatTypeConverter))]