Merge pull request #113 from Kozmeker/ImportFrameQOL

Map Editor Translokator Update Part 2

Author: Greavesy1899

M2FBX/M2FBX/Source/MTObject/MT_ObjectHandler.cpp

@@ -81,6 +81,14 @@ void MT_ObjectHandler::WriteBundleToFile(const std::string& FileName, const MT_O
 		WriteObjectToFile(OutStream, *Object);
 	}
 
+	// Write animations
+	const MT_Animation* BundleAnim = Bundle.GetAnimation();
+	FileUtils::Write<uint32_t>(OutStream, (BundleAnim != nullptr ? 1 : 0));
+	if (BundleAnim)
+	{
+		BundleAnim->WriteToFile(OutStream);
+	}
+
 	fclose(OutStream);
 }
 

Mafia2Libs/Controls/RenderOptions.Designer.cs

@@ -25,6 +25,7 @@ private void Localise()
             TexBrowser.Description = Language.GetString("$SELECT_TEX_FOLDER");
             ExperimentalBox.Text = Language.GetString("$ENABLE_EXPERIMENTAL");
             Checkbox_EnableNavigation.Text = Language.GetString("$ENABLE_NAVIGATION");
+            Checkbox_EnableTranslokatorTint.Text = Language.GetString("$TOGGLE_TRANSLOKATOR_TINT");
         }
 
         private void LoadSettings()
@@ -36,6 +37,7 @@ private void LoadSettings()
             TexDirectoryBox.Text = ToolkitSettings.TexturePath;
             ExperimentalBox.Checked = ToolkitSettings.Experimental;
             Checkbox_EnableNavigation.Checked = ToolkitSettings.bNavigation;
+            Checkbox_EnableTranslokatorTint.Checked = ToolkitSettings.bTranslokatorTint;
             UseMIPsBox.Checked = ToolkitSettings.UseMIPS;
             CheckBox_VSync.Checked = ToolkitSettings.VSync;
         }
@@ -104,5 +106,11 @@ private void Button_EnableNavigation_CheckedChanged(object sender, EventArgs e)
             ToolkitSettings.bNavigation = Checkbox_EnableNavigation.Checked;
             ToolkitSettings.WriteKey("EnableNavigation", "ModelViewer", ToolkitSettings.bNavigation.ToString());
         }
+        
+        private void Button_EnableTranslokatorTint_CheckedChanged(object sender, EventArgs e)
+        {
+            ToolkitSettings.bTranslokatorTint = Checkbox_EnableTranslokatorTint.Checked;
+            ToolkitSettings.WriteKey("EnableTranslokator", "ModelViewer", ToolkitSettings.bTranslokatorTint.ToString());
+        }
     }
 }

Mafia2Libs/Controls/RenderOptions.cs

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.Numerics;
 using System.Windows.Forms;
+using ResourceTypes.Actors;
 using ResourceTypes.Translokator;
 using Utils.Language;
 using Utils.VorticeUtils;
@@ -29,6 +30,8 @@ public TreeNode SelectedNode {
 
         public event EventHandler<TreeViewDragEventArgs> TreeViewNodeDropped;
 
+        public bool hasTranslokatorData = false;//this should be managed better in the future alongside openentrycontext
+
         public DockSceneTree()
         {
             InitializeComponent();
@@ -313,6 +316,8 @@ private void OpenEntryContext(object sender, System.ComponentModel.CancelEventAr
             Export3DButton.Visible = false;
             EntryMenuStrip.Items[4].Visible = false;
             FrameActions.DropDownItems[3].Visible = false;
+            EntryMenuStrip.Items[5].Visible = false;
+            EntryMenuStrip.Items[6].Visible = false;
 
             if (TreeView_Explorer.SelectedNode != null && TreeView_Explorer.SelectedNode.Tag != null)
             {
@@ -349,10 +354,20 @@ private void OpenEntryContext(object sender, System.ComponentModel.CancelEventAr
                     }
                 }
 
-                if (TreeView_Explorer.SelectedNode.Tag is Instance || TreeView_Explorer.SelectedNode.Tag is Object)
+                if (TreeView_Explorer.SelectedNode.Tag is Instance || TreeView_Explorer.SelectedNode.Tag is Object)//this will need solid cleanup later
                 {
                     EntryMenuStrip.Items[0].Visible = true;
                 }
+
+                if (TreeView_Explorer.SelectedNode.Tag is Object)
+                {
+                    EntryMenuStrip.Items[5].Visible = true;
+                }
+
+                if (TreeView_Explorer.SelectedNode.Tag is ActorEntry && hasTranslokatorData)
+                {
+                    EntryMenuStrip.Items[6].Visible = true;
+                }
             }
         }
 
@@ -503,6 +518,36 @@ private void TreeView_Searcher_OnKeyUp(object sender, KeyEventArgs e)
                 InternalGotoExplorerNode();
             }
         }
+
+        public TreeNode GetObjectGroupByActorType(TreeNode translokatorRoot, int ActorTypeID)
+        {
+            foreach (TreeNode ogNode in translokatorRoot.Nodes[0].Nodes)
+            {
+                if (ogNode.Tag is ObjectGroup og)
+                {
+                    if (og.ActorType.ToString().Equals(((ActorTypes)ActorTypeID).ToString()))
+                    {
+                        return ogNode;
+                    }
+                }
+            }
+            return null;
+        }
+
+        public bool ObjectGroupHasObject(TreeNode ogNode, ulong frameRefHash)
+        {
+            foreach (TreeNode objNode in ogNode.Nodes)
+            {
+                if (objNode.Tag is Object obj)
+                {
+                    if (obj.Name.Hash == frameRefHash)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
     }
 }
 public class TreeViewDragEventArgs : EventArgs