diff --git a/LaunchCamPlus/CameraEditorForm.Designer.cs b/LaunchCamPlus/CameraEditorForm.Designer.cs index 962b688..7e87557 100644 --- a/LaunchCamPlus/CameraEditorForm.Designer.cs +++ b/LaunchCamPlus/CameraEditorForm.Designer.cs @@ -40,6 +40,7 @@ private void InitializeComponent() this.AddCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AddDefaultCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AddNewFromClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -157,7 +158,8 @@ private void InitializeComponent() // this.AddCameraToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AddDefaultCameraToolStripMenuItem, - this.PresetsToolStripMenuItem}); + this.PresetsToolStripMenuItem, + this.AddNewFromClipboardToolStripMenuItem}); this.AddCameraToolStripMenuItem.Image = global::LaunchCamPlus.Properties.Resources.AddCamera; this.AddCameraToolStripMenuItem.Name = "AddCameraToolStripMenuItem"; this.AddCameraToolStripMenuItem.Size = new System.Drawing.Size(215, 22); @@ -167,7 +169,7 @@ private void InitializeComponent() // this.AddDefaultCameraToolStripMenuItem.Name = "AddDefaultCameraToolStripMenuItem"; this.AddDefaultCameraToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.AddDefaultCameraToolStripMenuItem.Size = new System.Drawing.Size(224, 22); + this.AddDefaultCameraToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.AddDefaultCameraToolStripMenuItem.Text = "Default Camera"; this.AddDefaultCameraToolStripMenuItem.Click += new System.EventHandler(this.AddDefaultCameraToolStripMenuItem_Click); // @@ -175,10 +177,19 @@ private void InitializeComponent() // this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"; this.PresetsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(224, 22); + this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.PresetsToolStripMenuItem.Text = "Choose from Presets"; this.PresetsToolStripMenuItem.Click += new System.EventHandler(this.PresetsToolStripMenuItem_Click); // + // AddNewFromClipboardToolStripMenuItem + // + this.AddNewFromClipboardToolStripMenuItem.Name = "AddNewFromClipboardToolStripMenuItem"; + this.AddNewFromClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + | System.Windows.Forms.Keys.V))); + this.AddNewFromClipboardToolStripMenuItem.Size = new System.Drawing.Size(230, 22); + this.AddNewFromClipboardToolStripMenuItem.Text = "From Clipboard"; + this.AddNewFromClipboardToolStripMenuItem.Click += new System.EventHandler(this.AddNewFromClipboardToolStripMenuItem_Click); + // // DeleteCameraToolStripMenuItem // this.DeleteCameraToolStripMenuItem.Image = global::LaunchCamPlus.Properties.Resources.Delete; @@ -274,6 +285,7 @@ private void InitializeComponent() // // ExportPresetToolStripMenuItem // + this.ExportPresetToolStripMenuItem.Enabled = false; this.ExportPresetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ExportPresetToolStripMenuItem.Image"))); this.ExportPresetToolStripMenuItem.Name = "ExportPresetToolStripMenuItem"; this.ExportPresetToolStripMenuItem.Size = new System.Drawing.Size(194, 22); @@ -417,5 +429,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem DeleteCameraToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GithubReleasesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ExportPresetToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem AddNewFromClipboardToolStripMenuItem; } } \ No newline at end of file diff --git a/LaunchCamPlus/CameraEditorForm.cs b/LaunchCamPlus/CameraEditorForm.cs index 04804c4..97b10e3 100644 --- a/LaunchCamPlus/CameraEditorForm.cs +++ b/LaunchCamPlus/CameraEditorForm.cs @@ -13,7 +13,6 @@ using LaunchCamPlus.Properties; using System.Media; using System.Diagnostics; -using System.Runtime.InteropServices; namespace LaunchCamPlus { @@ -42,8 +41,9 @@ public CameraEditorForm(string[] args) PreBufferedPanels = new Dictionary { { "DEFAULT", new DefaultCameraPanel() { Dock = DockStyle.Fill } }, - { "CAM_TYPE_XZ_PARA", new XZParaCameraPanel() { Dock = DockStyle.Fill } }, - { "CAM_TYPE_EYEPOS_FIX_THERE", new EyeposFixThereCameraPanel() { Dock = DockStyle.Fill } } + { "CAM_TYPE_EYEPOS_FIX_THERE", new EyeposFixThereCameraPanel() { Dock = DockStyle.Fill } }, + { "CAM_TYPE_WONDER_PLANET", new WanderPlanetCameraPanel() { Dock = DockStyle.Fill } }, + { "CAM_TYPE_XZ_PARA", new XZParaCameraPanel() { Dock = DockStyle.Fill } } }; ReloadTheme(); @@ -90,6 +90,7 @@ private void NewToolStripMenuItem_Click(object sender, EventArgs e) CameraListBox.Enabled = true; SaveToolStripMenuItem.Enabled = true; SaveAsToolStripMenuItem.Enabled = true; + ExportPresetToolStripMenuItem.Enabled = true; CameraListBox.Items.Clear(); Console.WriteLine("New File Started!"); AddDefaultCameraToolStripMenuItem_Click(null, null); @@ -139,7 +140,12 @@ private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) private void AddDefaultCameraToolStripMenuItem_Click(object sender, EventArgs e) { if (Cameras == null) + { + Console.WriteLine(Program.ConsoleHalfSplitter); + Console.WriteLine("Failed to add the camera!\nNo camera file is active"); + Console.WriteLine(Program.ConsoleHalfSplitter); return; + } BCAMEntry newcamera = CameraDefaults.Defaults["CAM_TYPE_XZ_PARA"]; newcamera.Identification = "c:" + BCAMEx.CalculateNextCameraArea(Cameras).ToString("x4"); newcamera.Type = "CAM_TYPE_XZ_PARA"; @@ -156,6 +162,26 @@ private void PresetsToolStripMenuItem_Click(object sender, EventArgs e) MainSplitContainer.Panel2.Controls.Add(PreBufferedPresets); } + private void AddNewFromClipboardToolStripMenuItem_Click(object sender, EventArgs e) + { + BCAMEntry NewFromClipboard = new BCAMEntry(); + + if (NewFromClipboard.FromClipboard(Clipboard.GetText())) + { + if (Cameras == null) + { + Console.WriteLine(Program.ConsoleHalfSplitter); + Console.WriteLine("Failed to add the camera!\nNo camera file is active"); + Console.WriteLine(Program.ConsoleHalfSplitter); + return; + } + AddCamera(NewFromClipboard); + Console.WriteLine("Camera Added from Clipboard!"); + } + else + Console.WriteLine("Clipboard doesn't contain a Valid LCP Camera!"+(Cameras == null ? "\nAnd there is no camera file currently active":"")); + } + private void DeleteCameraToolStripMenuItem_Click(object sender, EventArgs e) { if (CameraListBox.SelectedIndex == -1) @@ -277,6 +303,8 @@ private void IdentificationAssistantToolStripMenuItem_Click(object sender, Event private void ExportPresetToolStripMenuItem_Click(object sender, EventArgs e) { + if (MainSplitContainer.Panel2.Controls.Count > 0 && MainSplitContainer.Panel2.Controls[0] is CameraPanelBase pnl) + pnl.UnLoadCamera(Cameras[PrevListID]); CameraListBox.SelectedIndex = -1; MainSplitContainer.Panel2.Controls.Clear(); EditToolStripMenuItem.Enabled = false; @@ -375,6 +403,7 @@ public void Open(string file) CameraListBox.Enabled = true; SaveToolStripMenuItem.Enabled = true; SaveAsToolStripMenuItem.Enabled = true; + ExportPresetToolStripMenuItem.Enabled = true; Patience.Stop(); if (Program.CanPlaySfx(Program.SuccessSfx)) @@ -472,6 +501,7 @@ private void Save() break; } Console.WriteLine("Save Complete!"); + Console.WriteLine("Current time of Save: "+DateTime.Now.ToString("h:mm tt")); Program.IsUnsavedChanges = false; Console.WriteLine(); @@ -498,7 +528,6 @@ private void AdvancedSave() { if (Cameras.EntryCount == 0) return; - Console.WriteLine("Processing the cameras for advanced saving:"); CameraListBox.Enabled = false; Control ReturnControl = null; @@ -616,12 +645,14 @@ public void RefreshSelected(string newID) } } - public void ReloadEditor(bool DoUnload = false) + public void ReloadEditor(bool DoUnload = false, bool SetType = false) { if (MainSplitContainer.Panel2.Controls[0] is CameraPanelBase CurrentPanel) { if (DoUnload) CurrentPanel.UnLoadCamera(Cameras[PrevListID]); + else if (SetType) + Cameras[PrevListID].Type = CurrentPanel.CurrentCameraType; string PanelKey = GetPanelKey(Cameras[PrevListID].Type); if (PanelKey.Equals(CurrentPanel.CameraType)) @@ -695,9 +726,9 @@ private void PasteCamera() int temp = CameraListBox.SelectedIndex; CameraListBox.SelectedIndex = -1; if (Cameras[temp].FromClipboard(Clipboard.GetText())) - { Console.WriteLine("Paste Successful!"); - } + else + Console.WriteLine("Clipboard doesn't contain a Valid LCP Camera!"); CameraListBox.SelectedIndex = temp; CameraListBox.Items[temp] = Cameras[temp].GetTranslatedName(); } @@ -752,6 +783,11 @@ private void CameraListBox_KeyDown(object sender, KeyEventArgs e) e.SuppressKeyPress = true; PasteCamera(); } + else if (e.Control && e.Shift && e.KeyCode == Keys.V) + { + e.SuppressKeyPress = true; + AddNewFromClipboardToolStripMenuItem_Click(null, null); + } else if (e.Control && e.KeyCode == Keys.A) { e.SuppressKeyPress = true; diff --git a/LaunchCamPlus/CameraPanels/CameraPanelBase.cs b/LaunchCamPlus/CameraPanels/CameraPanelBase.cs index e475446..066742b 100644 --- a/LaunchCamPlus/CameraPanels/CameraPanelBase.cs +++ b/LaunchCamPlus/CameraPanels/CameraPanelBase.cs @@ -44,7 +44,7 @@ protected CameraPanelBase() } public string CameraType { get; set; } - private bool Loading = false; + protected bool Loading = false; protected override CreateParams CreateParams { @@ -116,6 +116,8 @@ void TypeComboBox_MouseWheel(object sender, MouseEventArgs e) if (sender is ComboBox cb && !cb.DroppedDown) ((HandledMouseEventArgs)e).Handled = true; } + + public string CurrentCameraType { get { return TypeComboBox.Text; } } } /// diff --git a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs index cca1f7e..60bba56 100644 --- a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs @@ -222,27 +222,27 @@ private void InitializeComponent() this.FrontOffsetLabel.AutoSize = true; this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 189); this.FrontOffsetLabel.Name = "FrontOffsetLabel"; - this.FrontOffsetLabel.Size = new System.Drawing.Size(55, 13); + this.FrontOffsetLabel.Size = new System.Drawing.Size(62, 13); this.FrontOffsetLabel.TabIndex = 29; - this.FrontOffsetLabel.Text = "Front Dist."; + this.FrontOffsetLabel.Text = "Look Offset"; // // HeightOffsetLabel // this.HeightOffsetLabel.AutoSize = true; this.HeightOffsetLabel.Location = new System.Drawing.Point(3, 214); this.HeightOffsetLabel.Name = "HeightOffsetLabel"; - this.HeightOffsetLabel.Size = new System.Drawing.Size(43, 13); + this.HeightOffsetLabel.Size = new System.Drawing.Size(54, 13); this.HeightOffsetLabel.TabIndex = 31; - this.HeightOffsetLabel.Text = "Air Dist."; + this.HeightOffsetLabel.Text = "↪ Vertical"; // // SharpZoomCheckBox // this.SharpZoomCheckBox.AutoSize = true; this.SharpZoomCheckBox.Location = new System.Drawing.Point(261, 279); this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; - this.SharpZoomCheckBox.Size = new System.Drawing.Size(108, 17); + this.SharpZoomCheckBox.Size = new System.Drawing.Size(111, 17); this.SharpZoomCheckBox.TabIndex = 33; - this.SharpZoomCheckBox.Text = "Dist. Interpolation"; + this.SharpZoomCheckBox.Text = "Static Look Offset"; this.SharpZoomCheckBox.UseVisualStyleBackColor = true; // // HeightOffsetNumericUpDown diff --git a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs index e8e57db..a7a4ed6 100644 --- a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs +++ b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs @@ -18,33 +18,6 @@ public DefaultCameraPanel() : base() InitializeComponent(); } - public override void ResizeEnd() - { - //ZoomLabel.Location = new Point(146 - (int)((MinimumSize.Width - Width) / 3.5f), Num1Label.Location.Y); - //ZoomNumericUpDown.Location = new Point(ZoomLabel.Location.X + ZoomLabel.Width + 6, ZoomNumericUpDown.Location.Y); - - //FieldOfViewLabel.Location = new Point(ZoomLabel.Location.X, FieldOfViewLabel.Location.Y); - //FieldOfViewNumericUpDown.Location = new Point(FieldOfViewLabel.Location.X + FieldOfViewLabel.Width + 6, FieldOfViewNumericUpDown.Location.Y); - - //Num1Label.Location = new Point(305 - (int)((MinimumSize.Width-Width)/1.5f), Num1Label.Location.Y); - //Num1NumericUpDown.Location = new Point(Num1Label.Location.X + Num1Label.Width + 6, Num1NumericUpDown.Location.Y); - - //Num2Label.Location = new Point(305 - (int)((MinimumSize.Width - Width) / 1.5f), Num2Label.Location.Y); - //Num2NumericUpDown.Location = new Point(Num1NumericUpDown.Location.X, Num2NumericUpDown.Location.Y); - //JumpingYNumericUpDown.Location = new Point(Num1NumericUpDown.Location.X, JumpingYNumericUpDown.Location.Y); - //FallingYNumericUpDown.Location = new Point(Num1NumericUpDown.Location.X, FallingYNumericUpDown.Location.Y); - - //MaxYLabel.Location = new Point(305 - (int)((MinimumSize.Width - Width) / 1.5f), MaxYLabel.Location.Y); - //MinYLabel.Location = new Point(305 - (int)((MinimumSize.Width - Width) / 1.5f), MinYLabel.Location.Y); - - //RotationZNumericUpDown.Width = RotationYNumericUpDown.Width = RotationXNumericUpDown.Width = (ZoomLabel.Location.X - RotationXNumericUpDown.Location.X) - 6; - - //ZoomNumericUpDown.Width = (Num1Label.Location.X - ZoomNumericUpDown.Location.X) - 6; - //FieldOfViewNumericUpDown.Width = (Num2Label.Location.X - FieldOfViewNumericUpDown.Location.X) - 6; - - //JumpingYNumericUpDown.Width = FallingYNumericUpDown.Width = Num1NumericUpDown.Width = Num2NumericUpDown.Width = (Width - Num1NumericUpDown.Location.X) - 6; - } - public override void ReloadTheme() { base.ReloadTheme(); @@ -89,8 +62,8 @@ public override void LoadCamera(BCAMEntry Entry) FallingYNumericUpDown.Value = (decimal)Entry.MinY; CamIntNumericUpDown.Value = Entry.TransitionTime; CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; - FrontOffsetNumericUpDown.Value = (decimal)Entry.FrontOffset; - HeightOffsetNumericUpDown.Value = (decimal)Entry.HeightOffset; + FrontOffsetNumericUpDown.Value = (decimal)Entry.LookOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.LookOffsetVertical; GroundDelayNumericUpDown.Value = Entry.GroundMoveDelay; AirDelayNumericUpDown.Value = Entry.AirMoveDelay; UpperBorderNumericUpDown.Value = (decimal)Entry.UpperBorder; @@ -106,7 +79,7 @@ public override void LoadCamera(BCAMEntry Entry) DisableResetCheckBox.Checked = !Entry.DisableReset; FieldOfViewCheckBox.Checked = Entry.EnableFoV; - SharpZoomCheckBox.Checked = !Entry.SharpZoom; + SharpZoomCheckBox.Checked = Entry.StaticLookOffset; DisableAntiBlurCheckBox.Checked = Entry.DisableAntiBlur; DisableCollisionCheckBox.Checked = !Entry.DisableCollision; DisableFirstPersonCheckBox.Checked = !Entry.DisableFirstPerson; @@ -133,8 +106,8 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.MinY = (float)FallingYNumericUpDown.Value; Entry.TransitionTime = (int)CamIntNumericUpDown.Value; Entry.TransitionEndTime = (int)CamEndIntNumericUpDown.Value; - Entry.FrontOffset = (float)FrontOffsetNumericUpDown.Value; - Entry.HeightOffset = (float)HeightOffsetNumericUpDown.Value; + Entry.LookOffset = (float)FrontOffsetNumericUpDown.Value; + Entry.LookOffsetVertical = (float)HeightOffsetNumericUpDown.Value; Entry.GroundMoveDelay = (int)GroundDelayNumericUpDown.Value; Entry.AirMoveDelay = (int)AirDelayNumericUpDown.Value; Entry.UpperBorder = (float)UpperBorderNumericUpDown.Value; @@ -148,7 +121,7 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); Entry.DisableReset = !DisableResetCheckBox.Checked; Entry.EnableFoV = FieldOfViewCheckBox.Checked; - Entry.SharpZoom = !SharpZoomCheckBox.Checked; + Entry.StaticLookOffset = SharpZoomCheckBox.Checked; Entry.DisableAntiBlur = DisableAntiBlurCheckBox.Checked; Entry.DisableCollision = !DisableCollisionCheckBox.Checked; Entry.DisableFirstPerson = !DisableFirstPersonCheckBox.Checked; diff --git a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs index e1b5ff0..64abfbf 100644 --- a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs @@ -262,9 +262,9 @@ private void InitializeComponent() this.HeightOffsetLabel.AutoSize = true; this.HeightOffsetLabel.Location = new System.Drawing.Point(3, 110); this.HeightOffsetLabel.Name = "HeightOffsetLabel"; - this.HeightOffsetLabel.Size = new System.Drawing.Size(62, 13); + this.HeightOffsetLabel.Size = new System.Drawing.Size(54, 13); this.HeightOffsetLabel.TabIndex = 88; - this.HeightOffsetLabel.Text = "Air distance"; + this.HeightOffsetLabel.Text = "↪ Vertical"; // // FrontOffsetNumericUpDown // @@ -295,9 +295,9 @@ private void InitializeComponent() this.FrontOffsetLabel.AutoSize = true; this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 84); this.FrontOffsetLabel.Name = "FrontOffsetLabel"; - this.FrontOffsetLabel.Size = new System.Drawing.Size(74, 13); + this.FrontOffsetLabel.Size = new System.Drawing.Size(62, 13); this.FrontOffsetLabel.TabIndex = 86; - this.FrontOffsetLabel.Text = "Front distance"; + this.FrontOffsetLabel.Text = "Look Offset"; // // FixpointVector3NumericUpDown // @@ -324,9 +324,9 @@ private void InitializeComponent() this.SharpZoomCheckBox.AutoSize = true; this.SharpZoomCheckBox.Location = new System.Drawing.Point(270, 97); this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; - this.SharpZoomCheckBox.Size = new System.Drawing.Size(129, 17); + this.SharpZoomCheckBox.Size = new System.Drawing.Size(111, 17); this.SharpZoomCheckBox.TabIndex = 92; - this.SharpZoomCheckBox.Text = "Distance Interpolation"; + this.SharpZoomCheckBox.Text = "Static Look Offset"; this.SharpZoomCheckBox.UseVisualStyleBackColor = true; // // GFlagEndTimeLabel diff --git a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs index c068561..c96538c 100644 --- a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs +++ b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs @@ -61,14 +61,14 @@ public override void LoadCamera(BCAMEntry Entry) StringTextBox.Text = Entry.String; CamIntNumericUpDown.Value = Entry.TransitionTime; CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; - FrontOffsetNumericUpDown.Value = (decimal)Entry.FrontOffset; - HeightOffsetNumericUpDown.Value = (decimal)Entry.HeightOffset; + FrontOffsetNumericUpDown.Value = (decimal)Entry.LookOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.LookOffsetVertical; EventFrameNumericUpDown.Value = Entry.EventFrames; FixpointVector3NumericUpDown.LoadVector3(Entry.FixPointOffset); UpAxisVector3NumericUpDown.LoadVector3(Entry.UpAxis); - SharpZoomCheckBox.Checked = !Entry.SharpZoom; + SharpZoomCheckBox.Checked = Entry.StaticLookOffset; DisableFirstPersonCheckBox.Checked = !Entry.DisableFirstPerson; GFlagEndErpFrameCheckBox.Checked = Entry.GFlagEndErpFrame; GFlagThroughCheckBox.Checked = Entry.GFlagThrough; @@ -91,8 +91,8 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.MinY = 0; Entry.TransitionTime = (int)CamIntNumericUpDown.Value; Entry.TransitionEndTime = (int)CamEndIntNumericUpDown.Value; - Entry.FrontOffset = (float)FrontOffsetNumericUpDown.Value; - Entry.HeightOffset = (float)HeightOffsetNumericUpDown.Value; + Entry.LookOffset = (float)FrontOffsetNumericUpDown.Value; + Entry.LookOffsetVertical = (float)HeightOffsetNumericUpDown.Value; Entry.GroundMoveDelay = 0; Entry.AirMoveDelay = 0; Entry.UpperBorder = 0.0f; @@ -104,7 +104,7 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); Entry.DisableReset = false; Entry.EnableFoV = false; - Entry.SharpZoom = !SharpZoomCheckBox.Checked; + Entry.StaticLookOffset = SharpZoomCheckBox.Checked; Entry.DisableAntiBlur = false; Entry.DisableCollision = false; Entry.DisableFirstPerson = !DisableFirstPersonCheckBox.Checked; diff --git a/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.Designer.cs new file mode 100644 index 0000000..3a2f7d9 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.Designer.cs @@ -0,0 +1,623 @@ +namespace LaunchCamPlus.CameraPanels +{ + partial class WanderPlanetCameraPanel + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.GFlagEndErpFrameCheckBox = new System.Windows.Forms.CheckBox(); + this.DisableAntiBlurCheckBox = new System.Windows.Forms.CheckBox(); + this.EventUseTimeCheckBox = new System.Windows.Forms.CheckBox(); + this.DisableCollisionCheckBox = new System.Windows.Forms.CheckBox(); + this.EventUseEndTimeCheckBox = new System.Windows.Forms.CheckBox(); + this.SharpZoomCheckBox = new System.Windows.Forms.CheckBox(); + this.DisableFirstPersonCheckBox = new System.Windows.Forms.CheckBox(); + this.StringTextBox = new LaunchCamPlus.ColourTextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.EventFrameLabel = new System.Windows.Forms.Label(); + this.EventFrameNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.GFlagThroughCheckBox = new System.Windows.Forms.CheckBox(); + this.GFlagEndTimeLabel = new System.Windows.Forms.Label(); + this.GFlagEndTimeNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.CamEndIntLabel = new System.Windows.Forms.Label(); + this.CamIntLabel = new System.Windows.Forms.Label(); + this.CamIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.HeightOffsetNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.HeightOffsetLabel = new System.Windows.Forms.Label(); + this.FrontOffsetNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.FrontOffsetLabel = new System.Windows.Forms.Label(); + this.FieldOfViewCheckBox = new System.Windows.Forms.CheckBox(); + this.FixpointVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.CamEndIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.FieldOfViewNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.FieldOfViewLabel = new System.Windows.Forms.Label(); + this.RotationYLabel = new System.Windows.Forms.Label(); + this.RotationYNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.PlayerOffsetYNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.PlayerOffsetYLabel = new System.Windows.Forms.Label(); + this.PlayerOffsetXNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.PlayerOffsetXLabel = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.FieldOfViewNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PlayerOffsetYNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PlayerOffsetXNumericUpDown)).BeginInit(); + this.SuspendLayout(); + // + // GFlagEndErpFrameCheckBox + // + this.GFlagEndErpFrameCheckBox.AutoSize = true; + this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(320, 148); + this.GFlagEndErpFrameCheckBox.Name = "GFlagEndErpFrameCheckBox"; + this.GFlagEndErpFrameCheckBox.Size = new System.Drawing.Size(118, 17); + this.GFlagEndErpFrameCheckBox.TabIndex = 100; + this.GFlagEndErpFrameCheckBox.Text = "GFlagEndErpFrame"; + this.GFlagEndErpFrameCheckBox.UseVisualStyleBackColor = true; + // + // DisableAntiBlurCheckBox + // + this.DisableAntiBlurCheckBox.AutoSize = true; + this.DisableAntiBlurCheckBox.Location = new System.Drawing.Point(320, 217); + this.DisableAntiBlurCheckBox.Name = "DisableAntiBlurCheckBox"; + this.DisableAntiBlurCheckBox.Size = new System.Drawing.Size(97, 17); + this.DisableAntiBlurCheckBox.TabIndex = 98; + this.DisableAntiBlurCheckBox.Text = "Sharp Rotation"; + this.DisableAntiBlurCheckBox.UseVisualStyleBackColor = true; + // + // EventUseTimeCheckBox + // + this.EventUseTimeCheckBox.AutoSize = true; + this.EventUseTimeCheckBox.Location = new System.Drawing.Point(320, 171); + this.EventUseTimeCheckBox.Name = "EventUseTimeCheckBox"; + this.EventUseTimeCheckBox.Size = new System.Drawing.Size(108, 17); + this.EventUseTimeCheckBox.TabIndex = 104; + this.EventUseTimeCheckBox.Text = "Event Enter Time"; + this.EventUseTimeCheckBox.UseVisualStyleBackColor = true; + // + // DisableCollisionCheckBox + // + this.DisableCollisionCheckBox.AutoSize = true; + this.DisableCollisionCheckBox.Location = new System.Drawing.Point(320, 56); + this.DisableCollisionCheckBox.Name = "DisableCollisionCheckBox"; + this.DisableCollisionCheckBox.Size = new System.Drawing.Size(102, 17); + this.DisableCollisionCheckBox.TabIndex = 93; + this.DisableCollisionCheckBox.Text = "Disable Collision"; + this.DisableCollisionCheckBox.UseVisualStyleBackColor = true; + // + // EventUseEndTimeCheckBox + // + this.EventUseEndTimeCheckBox.AutoSize = true; + this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(320, 194); + this.EventUseEndTimeCheckBox.Name = "EventUseEndTimeCheckBox"; + this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(100, 17); + this.EventUseEndTimeCheckBox.TabIndex = 105; + this.EventUseEndTimeCheckBox.Text = "Event Exit Time"; + this.EventUseEndTimeCheckBox.UseVisualStyleBackColor = true; + // + // SharpZoomCheckBox + // + this.SharpZoomCheckBox.AutoSize = true; + this.SharpZoomCheckBox.Location = new System.Drawing.Point(320, 125); + this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; + this.SharpZoomCheckBox.Size = new System.Drawing.Size(111, 17); + this.SharpZoomCheckBox.TabIndex = 91; + this.SharpZoomCheckBox.Text = "Static Look Offset"; + this.SharpZoomCheckBox.UseVisualStyleBackColor = true; + // + // DisableFirstPersonCheckBox + // + this.DisableFirstPersonCheckBox.AutoSize = true; + this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(320, 102); + this.DisableFirstPersonCheckBox.Name = "DisableFirstPersonCheckBox"; + this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(81, 17); + this.DisableFirstPersonCheckBox.TabIndex = 99; + this.DisableFirstPersonCheckBox.Text = "First Person"; + this.DisableFirstPersonCheckBox.UseVisualStyleBackColor = true; + // + // StringTextBox + // + this.StringTextBox.Location = new System.Drawing.Point(191, 219); + this.StringTextBox.Multiline = true; + this.StringTextBox.Name = "StringTextBox"; + this.StringTextBox.Size = new System.Drawing.Size(123, 39); + this.StringTextBox.TabIndex = 109; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(191, 203); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 108; + this.label1.Text = "String"; + // + // EventFrameLabel + // + this.EventFrameLabel.AutoSize = true; + this.EventFrameLabel.Location = new System.Drawing.Point(3, 214); + this.EventFrameLabel.Name = "EventFrameLabel"; + this.EventFrameLabel.Size = new System.Drawing.Size(71, 13); + this.EventFrameLabel.TabIndex = 106; + this.EventFrameLabel.Text = "Event Length"; + // + // EventFrameNumericUpDown + // + this.EventFrameNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.EventFrameNumericUpDown.Location = new System.Drawing.Point(86, 212); + this.EventFrameNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.EventFrameNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.EventFrameNumericUpDown.Name = "EventFrameNumericUpDown"; + this.EventFrameNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.EventFrameNumericUpDown.TabIndex = 107; + this.EventFrameNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // GFlagThroughCheckBox + // + this.GFlagThroughCheckBox.AutoSize = true; + this.GFlagThroughCheckBox.Location = new System.Drawing.Point(320, 240); + this.GFlagThroughCheckBox.Name = "GFlagThroughCheckBox"; + this.GFlagThroughCheckBox.Size = new System.Drawing.Size(94, 17); + this.GFlagThroughCheckBox.TabIndex = 101; + this.GFlagThroughCheckBox.Text = "GFlagThrough"; + this.GFlagThroughCheckBox.UseVisualStyleBackColor = true; + // + // GFlagEndTimeLabel + // + this.GFlagEndTimeLabel.AutoSize = true; + this.GFlagEndTimeLabel.Location = new System.Drawing.Point(3, 240); + this.GFlagEndTimeLabel.Name = "GFlagEndTimeLabel"; + this.GFlagEndTimeLabel.Size = new System.Drawing.Size(57, 13); + this.GFlagEndTimeLabel.TabIndex = 102; + this.GFlagEndTimeLabel.Text = "GEndTime"; + // + // GFlagEndTimeNumericUpDown + // + this.GFlagEndTimeNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.GFlagEndTimeNumericUpDown.Location = new System.Drawing.Point(86, 238); + this.GFlagEndTimeNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.GFlagEndTimeNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.GFlagEndTimeNumericUpDown.Name = "GFlagEndTimeNumericUpDown"; + this.GFlagEndTimeNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.GFlagEndTimeNumericUpDown.TabIndex = 103; + this.GFlagEndTimeNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // CamEndIntLabel + // + this.CamEndIntLabel.AutoSize = true; + this.CamEndIntLabel.Location = new System.Drawing.Point(191, 182); + this.CamEndIntLabel.Name = "CamEndIntLabel"; + this.CamEndIntLabel.Size = new System.Drawing.Size(50, 13); + this.CamEndIntLabel.TabIndex = 94; + this.CamEndIntLabel.Text = "Exit Time"; + // + // CamIntLabel + // + this.CamIntLabel.AutoSize = true; + this.CamIntLabel.Location = new System.Drawing.Point(191, 156); + this.CamIntLabel.Name = "CamIntLabel"; + this.CamIntLabel.Size = new System.Drawing.Size(58, 13); + this.CamIntLabel.TabIndex = 90; + this.CamIntLabel.Text = "Enter Time"; + // + // CamIntNumericUpDown + // + this.CamIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.CamIntNumericUpDown.Location = new System.Drawing.Point(253, 154); + this.CamIntNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.CamIntNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.CamIntNumericUpDown.Name = "CamIntNumericUpDown"; + this.CamIntNumericUpDown.Size = new System.Drawing.Size(58, 20); + this.CamIntNumericUpDown.TabIndex = 92; + this.CamIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // HeightOffsetNumericUpDown + // + this.HeightOffsetNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.HeightOffsetNumericUpDown.DecimalPlaces = 3; + this.HeightOffsetNumericUpDown.Location = new System.Drawing.Point(86, 134); + this.HeightOffsetNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.HeightOffsetNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.HeightOffsetNumericUpDown.Name = "HeightOffsetNumericUpDown"; + this.HeightOffsetNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.HeightOffsetNumericUpDown.TabIndex = 88; + this.HeightOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // HeightOffsetLabel + // + this.HeightOffsetLabel.AutoSize = true; + this.HeightOffsetLabel.Location = new System.Drawing.Point(3, 136); + this.HeightOffsetLabel.Name = "HeightOffsetLabel"; + this.HeightOffsetLabel.Size = new System.Drawing.Size(54, 13); + this.HeightOffsetLabel.TabIndex = 87; + this.HeightOffsetLabel.Text = "↪ Vertical"; + // + // FrontOffsetNumericUpDown + // + this.FrontOffsetNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.FrontOffsetNumericUpDown.DecimalPlaces = 3; + this.FrontOffsetNumericUpDown.Location = new System.Drawing.Point(86, 108); + this.FrontOffsetNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.FrontOffsetNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.FrontOffsetNumericUpDown.Name = "FrontOffsetNumericUpDown"; + this.FrontOffsetNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.FrontOffsetNumericUpDown.TabIndex = 86; + this.FrontOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // FrontOffsetLabel + // + this.FrontOffsetLabel.AutoSize = true; + this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 110); + this.FrontOffsetLabel.Name = "FrontOffsetLabel"; + this.FrontOffsetLabel.Size = new System.Drawing.Size(62, 13); + this.FrontOffsetLabel.TabIndex = 85; + this.FrontOffsetLabel.Text = "Look Offset"; + // + // FieldOfViewCheckBox + // + this.FieldOfViewCheckBox.AutoSize = true; + this.FieldOfViewCheckBox.Location = new System.Drawing.Point(320, 79); + this.FieldOfViewCheckBox.Name = "FieldOfViewCheckBox"; + this.FieldOfViewCheckBox.Size = new System.Drawing.Size(86, 17); + this.FieldOfViewCheckBox.TabIndex = 89; + this.FieldOfViewCheckBox.Text = "Field of View"; + this.FieldOfViewCheckBox.UseVisualStyleBackColor = true; + this.FieldOfViewCheckBox.CheckedChanged += new System.EventHandler(this.FieldOfViewCheckBox_CheckedChanged); + // + // FixpointVector3NumericUpDown + // + this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(191, 56); + this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.FixpointVector3NumericUpDown.Name = "FixpointVector3NumericUpDown"; + this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(123, 92); + this.FixpointVector3NumericUpDown.TabIndex = 97; + this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; + // + // CamEndIntNumericUpDown + // + this.CamEndIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.CamEndIntNumericUpDown.Location = new System.Drawing.Point(253, 180); + this.CamEndIntNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.CamEndIntNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.CamEndIntNumericUpDown.Name = "CamEndIntNumericUpDown"; + this.CamEndIntNumericUpDown.Size = new System.Drawing.Size(58, 20); + this.CamEndIntNumericUpDown.TabIndex = 95; + this.CamEndIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // FieldOfViewNumericUpDown + // + this.FieldOfViewNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.FieldOfViewNumericUpDown.DecimalPlaces = 3; + this.FieldOfViewNumericUpDown.Enabled = false; + this.FieldOfViewNumericUpDown.Location = new System.Drawing.Point(86, 82); + this.FieldOfViewNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.FieldOfViewNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.FieldOfViewNumericUpDown.Name = "FieldOfViewNumericUpDown"; + this.FieldOfViewNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.FieldOfViewNumericUpDown.TabIndex = 84; + this.FieldOfViewNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // FieldOfViewLabel + // + this.FieldOfViewLabel.AutoSize = true; + this.FieldOfViewLabel.Location = new System.Drawing.Point(3, 84); + this.FieldOfViewLabel.Name = "FieldOfViewLabel"; + this.FieldOfViewLabel.Size = new System.Drawing.Size(67, 13); + this.FieldOfViewLabel.TabIndex = 83; + this.FieldOfViewLabel.Text = "Field of View"; + // + // RotationYLabel + // + this.RotationYLabel.AutoSize = true; + this.RotationYLabel.Location = new System.Drawing.Point(3, 58); + this.RotationYLabel.Name = "RotationYLabel"; + this.RotationYLabel.Size = new System.Drawing.Size(57, 13); + this.RotationYLabel.TabIndex = 81; + this.RotationYLabel.Text = "X Rotation"; + // + // RotationYNumericUpDown + // + this.RotationYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.RotationYNumericUpDown.DecimalPlaces = 3; + this.RotationYNumericUpDown.Location = new System.Drawing.Point(86, 56); + this.RotationYNumericUpDown.Minimum = new decimal(new int[] { + 100, + 0, + 0, + -2147483648}); + this.RotationYNumericUpDown.Name = "RotationYNumericUpDown"; + this.RotationYNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.RotationYNumericUpDown.TabIndex = 82; + this.RotationYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // PlayerOffsetYNumericUpDown + // + this.PlayerOffsetYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.PlayerOffsetYNumericUpDown.DecimalPlaces = 3; + this.PlayerOffsetYNumericUpDown.Location = new System.Drawing.Point(86, 186); + this.PlayerOffsetYNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.PlayerOffsetYNumericUpDown.Name = "PlayerOffsetYNumericUpDown"; + this.PlayerOffsetYNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.PlayerOffsetYNumericUpDown.TabIndex = 113; + this.PlayerOffsetYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // PlayerOffsetYLabel + // + this.PlayerOffsetYLabel.AutoSize = true; + this.PlayerOffsetYLabel.Location = new System.Drawing.Point(3, 188); + this.PlayerOffsetYLabel.Name = "PlayerOffsetYLabel"; + this.PlayerOffsetYLabel.Size = new System.Drawing.Size(72, 13); + this.PlayerOffsetYLabel.TabIndex = 112; + this.PlayerOffsetYLabel.Text = "Max Distance"; + // + // PlayerOffsetXNumericUpDown + // + this.PlayerOffsetXNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.PlayerOffsetXNumericUpDown.DecimalPlaces = 3; + this.PlayerOffsetXNumericUpDown.Location = new System.Drawing.Point(86, 160); + this.PlayerOffsetXNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.PlayerOffsetXNumericUpDown.Name = "PlayerOffsetXNumericUpDown"; + this.PlayerOffsetXNumericUpDown.Size = new System.Drawing.Size(99, 20); + this.PlayerOffsetXNumericUpDown.TabIndex = 111; + this.PlayerOffsetXNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // PlayerOffsetXLabel + // + this.PlayerOffsetXLabel.AutoSize = true; + this.PlayerOffsetXLabel.Location = new System.Drawing.Point(3, 162); + this.PlayerOffsetXLabel.Name = "PlayerOffsetXLabel"; + this.PlayerOffsetXLabel.Size = new System.Drawing.Size(72, 13); + this.PlayerOffsetXLabel.TabIndex = 110; + this.PlayerOffsetXLabel.Text = "Min. Distance"; + // + // WanderPlanetCameraPanel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CameraType = "CAM_TYPE_WONDER_PLANET"; + this.Controls.Add(this.PlayerOffsetYNumericUpDown); + this.Controls.Add(this.PlayerOffsetYLabel); + this.Controls.Add(this.PlayerOffsetXNumericUpDown); + this.Controls.Add(this.PlayerOffsetXLabel); + this.Controls.Add(this.GFlagEndErpFrameCheckBox); + this.Controls.Add(this.DisableAntiBlurCheckBox); + this.Controls.Add(this.EventUseTimeCheckBox); + this.Controls.Add(this.DisableCollisionCheckBox); + this.Controls.Add(this.EventUseEndTimeCheckBox); + this.Controls.Add(this.SharpZoomCheckBox); + this.Controls.Add(this.DisableFirstPersonCheckBox); + this.Controls.Add(this.StringTextBox); + this.Controls.Add(this.label1); + this.Controls.Add(this.EventFrameLabel); + this.Controls.Add(this.EventFrameNumericUpDown); + this.Controls.Add(this.GFlagThroughCheckBox); + this.Controls.Add(this.GFlagEndTimeLabel); + this.Controls.Add(this.GFlagEndTimeNumericUpDown); + this.Controls.Add(this.CamEndIntLabel); + this.Controls.Add(this.CamIntLabel); + this.Controls.Add(this.CamIntNumericUpDown); + this.Controls.Add(this.HeightOffsetNumericUpDown); + this.Controls.Add(this.HeightOffsetLabel); + this.Controls.Add(this.FrontOffsetNumericUpDown); + this.Controls.Add(this.FrontOffsetLabel); + this.Controls.Add(this.FieldOfViewCheckBox); + this.Controls.Add(this.FixpointVector3NumericUpDown); + this.Controls.Add(this.CamEndIntNumericUpDown); + this.Controls.Add(this.FieldOfViewNumericUpDown); + this.Controls.Add(this.FieldOfViewLabel); + this.Controls.Add(this.RotationYLabel); + this.Controls.Add(this.RotationYNumericUpDown); + this.Name = "WanderPlanetCameraPanel"; + this.Controls.SetChildIndex(this.RotationYNumericUpDown, 0); + this.Controls.SetChildIndex(this.RotationYLabel, 0); + this.Controls.SetChildIndex(this.FieldOfViewLabel, 0); + this.Controls.SetChildIndex(this.FieldOfViewNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamEndIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.FixpointVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.FieldOfViewCheckBox, 0); + this.Controls.SetChildIndex(this.FrontOffsetLabel, 0); + this.Controls.SetChildIndex(this.FrontOffsetNumericUpDown, 0); + this.Controls.SetChildIndex(this.HeightOffsetLabel, 0); + this.Controls.SetChildIndex(this.HeightOffsetNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamIntLabel, 0); + this.Controls.SetChildIndex(this.CamEndIntLabel, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeNumericUpDown, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeLabel, 0); + this.Controls.SetChildIndex(this.GFlagThroughCheckBox, 0); + this.Controls.SetChildIndex(this.EventFrameNumericUpDown, 0); + this.Controls.SetChildIndex(this.EventFrameLabel, 0); + this.Controls.SetChildIndex(this.label1, 0); + this.Controls.SetChildIndex(this.StringTextBox, 0); + this.Controls.SetChildIndex(this.DisableFirstPersonCheckBox, 0); + this.Controls.SetChildIndex(this.SharpZoomCheckBox, 0); + this.Controls.SetChildIndex(this.EventUseEndTimeCheckBox, 0); + this.Controls.SetChildIndex(this.DisableCollisionCheckBox, 0); + this.Controls.SetChildIndex(this.EventUseTimeCheckBox, 0); + this.Controls.SetChildIndex(this.DisableAntiBlurCheckBox, 0); + this.Controls.SetChildIndex(this.GFlagEndErpFrameCheckBox, 0); + this.Controls.SetChildIndex(this.PlayerOffsetXLabel, 0); + this.Controls.SetChildIndex(this.PlayerOffsetXNumericUpDown, 0); + this.Controls.SetChildIndex(this.PlayerOffsetYLabel, 0); + this.Controls.SetChildIndex(this.PlayerOffsetYNumericUpDown, 0); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.FieldOfViewNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PlayerOffsetYNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PlayerOffsetXNumericUpDown)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.CheckBox GFlagEndErpFrameCheckBox; + private System.Windows.Forms.CheckBox DisableAntiBlurCheckBox; + private System.Windows.Forms.CheckBox EventUseTimeCheckBox; + private System.Windows.Forms.CheckBox DisableCollisionCheckBox; + private System.Windows.Forms.CheckBox EventUseEndTimeCheckBox; + private System.Windows.Forms.CheckBox SharpZoomCheckBox; + private System.Windows.Forms.CheckBox DisableFirstPersonCheckBox; + private ColourTextBox StringTextBox; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label EventFrameLabel; + private ColourNumericUpDown EventFrameNumericUpDown; + private System.Windows.Forms.CheckBox GFlagThroughCheckBox; + private System.Windows.Forms.Label GFlagEndTimeLabel; + private ColourNumericUpDown GFlagEndTimeNumericUpDown; + private System.Windows.Forms.Label CamEndIntLabel; + private System.Windows.Forms.Label CamIntLabel; + private ColourNumericUpDown CamIntNumericUpDown; + private ColourNumericUpDown HeightOffsetNumericUpDown; + private System.Windows.Forms.Label HeightOffsetLabel; + private ColourNumericUpDown FrontOffsetNumericUpDown; + private System.Windows.Forms.Label FrontOffsetLabel; + private System.Windows.Forms.CheckBox FieldOfViewCheckBox; + private Vector3NumericUpDown FixpointVector3NumericUpDown; + private ColourNumericUpDown CamEndIntNumericUpDown; + private ColourNumericUpDown FieldOfViewNumericUpDown; + private System.Windows.Forms.Label FieldOfViewLabel; + private System.Windows.Forms.Label RotationYLabel; + private ColourNumericUpDown RotationYNumericUpDown; + private ColourNumericUpDown PlayerOffsetYNumericUpDown; + private System.Windows.Forms.Label PlayerOffsetYLabel; + private ColourNumericUpDown PlayerOffsetXNumericUpDown; + private System.Windows.Forms.Label PlayerOffsetXLabel; + } +} diff --git a/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.cs b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.cs new file mode 100644 index 0000000..edc9ea8 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.cs @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Hackio.IO.BCAM; + +namespace LaunchCamPlus.CameraPanels +{ + public partial class WanderPlanetCameraPanel : CameraPanelBase + { + public WanderPlanetCameraPanel() + { + InitializeComponent(); + PlayerOffsetYNumericUpDown.ValueChange2 = PlayerOffsetYNumericUpDown_ValueChange2; + PlayerOffsetXNumericUpDown.ValueChange2 = PlayerOffsetXNumericUpDown_ValueChange2; + } + + public override void ReloadTheme() + { + base.ReloadTheme(); + + for (int i = 0; i < Controls.Count; i++) + { + if (Controls[i] is Label || Controls[i] is CheckBox) + { + Controls[i].ForeColor = ProgramColours.TextColour; + } + if (Controls[i] is ColourNumericUpDown) + { + Controls[i].BackColor = ProgramColours.WindowColour; + Controls[i].ForeColor = ProgramColours.TextColour; + ((ColourNumericUpDown)Controls[i]).BorderColor = ProgramColours.BorderColour; + } + if (Controls[i] is Vector3NumericUpDown) + { + ((Vector3NumericUpDown)Controls[i]).ReloadTheme(); + } + if (Controls[i] is ColourTextBox) + { + Controls[i].BackColor = ProgramColours.WindowColour; + Controls[i].ForeColor = ProgramColours.TextColour; + ((ColourTextBox)Controls[i]).BorderColor = ProgramColours.BorderColour; + } + if (Controls[i] is GroupBox) + { + Controls[i].ForeColor = ProgramColours.TextColour; + Controls[i].BackColor = ProgramColours.ControlBackColor; + } + } + } + + public override void LoadCamera(BCAMEntry Entry) + { + base.LoadCamera(Entry); + RotationYNumericUpDown.Value = Math.Min(RotationYNumericUpDown.Maximum, Math.Max(RotationYNumericUpDown.Minimum, (decimal)Entry.RotationY.RadianToDegree())); + StringTextBox.Text = Entry.String; + FieldOfViewNumericUpDown.Value = (decimal)Entry.FieldOfView; + CamIntNumericUpDown.Value = Entry.TransitionTime; + CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; + FrontOffsetNumericUpDown.Value = (decimal)Entry.LookOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.LookOffsetVertical; + EventFrameNumericUpDown.Value = Entry.EventFrames; + + FixpointVector3NumericUpDown.LoadVector3(Entry.FixPointOffset); + Vector3 PlayerOffset = Entry.PlayerOffset; + PlayerOffsetYNumericUpDown.Value = (decimal)PlayerOffset.YValue; + PlayerOffsetXNumericUpDown.Value = (decimal)PlayerOffset.XValue; + + FieldOfViewCheckBox.Checked = Entry.EnableFoV; + SharpZoomCheckBox.Checked = Entry.StaticLookOffset; + DisableAntiBlurCheckBox.Checked = Entry.DisableAntiBlur; + DisableCollisionCheckBox.Checked = Entry.DisableCollision; + DisableFirstPersonCheckBox.Checked = !Entry.DisableFirstPerson; + GFlagEndErpFrameCheckBox.Checked = Entry.GFlagEndErpFrame; + GFlagThroughCheckBox.Checked = Entry.GFlagThrough; + GFlagEndTimeNumericUpDown.Value = (decimal)Entry.GFlagEndTime; + EventUseTimeCheckBox.Checked = Entry.EventUseTransitionTime; + EventUseEndTimeCheckBox.Checked = Entry.EventUseTransitionEndTime; + } + + public override void UnLoadCamera(BCAMEntry Entry) + { + base.UnLoadCamera(Entry); + Entry.RotationX = 0.0f; + Entry.RotationY = ((float)RotationYNumericUpDown.Value).DegreeToRadian(); + Entry.RotationZ = 0.0f; + Entry.Zoom = 0; + Entry.Num1 = 0; + Entry.Num2 = 0; + Entry.String = StringTextBox.Text; + Entry.FieldOfView = (float)FieldOfViewNumericUpDown.Value; + Entry.MaxY = 300; + Entry.MinY = 800; + Entry.TransitionTime = (int)CamIntNumericUpDown.Value; + Entry.TransitionEndTime = (int)CamEndIntNumericUpDown.Value; + Entry.LookOffset = (float)FrontOffsetNumericUpDown.Value; + Entry.LookOffsetVertical = (float)HeightOffsetNumericUpDown.Value; + Entry.GroundMoveDelay = 120; + Entry.AirMoveDelay = 120; + Entry.UpperBorder = 0.3f; + Entry.LowerBorder = 0.3f; + Entry.EventFrames = (int)EventFrameNumericUpDown.Value; + Entry.EventPriority = Entry.IsOfCategory("e") ? 1 : 0; + Entry.FixPointOffset = FixpointVector3NumericUpDown.GetVector3(); + Entry.PlayerOffset = new Vector3((float)PlayerOffsetXNumericUpDown.Value, (float)PlayerOffsetYNumericUpDown.Value, 0); + Entry.VerticalPanAxis = new Vector3(0,0,0); + Entry.UpAxis = new Vector3(0, 0, 0); + Entry.DisableReset = false; + Entry.EnableFoV = FieldOfViewCheckBox.Checked; + Entry.StaticLookOffset = SharpZoomCheckBox.Checked; + Entry.DisableAntiBlur = DisableAntiBlurCheckBox.Checked; + Entry.DisableCollision = DisableCollisionCheckBox.Checked; + Entry.DisableFirstPerson = !DisableFirstPersonCheckBox.Checked; + Entry.GFlagEndErpFrame = GFlagEndErpFrameCheckBox.Checked; + Entry.GFlagThrough = GFlagThroughCheckBox.Checked; + Entry.GFlagEndTime = (int)GFlagEndTimeNumericUpDown.Value; + Entry.EnableVerticalPanAxis = false; + Entry.EventUseTransitionTime = EventUseTimeCheckBox.Checked; + Entry.EventUseTransitionEndTime = EventUseEndTimeCheckBox.Checked; + + Entry.UDown = 120; + Entry.TransitionGroundTime = 160; + } + + private void FieldOfViewCheckBox_CheckedChanged(object sender, EventArgs e) + { + FieldOfViewNumericUpDown.Enabled = FieldOfViewCheckBox.Checked; + } + + private void PlayerOffsetYNumericUpDown_ValueChange2(EventArgs e) + { + if (PlayerOffsetYNumericUpDown.Value < PlayerOffsetXNumericUpDown.Value) + PlayerOffsetXNumericUpDown.Value = PlayerOffsetYNumericUpDown.Value; + } + + private void PlayerOffsetXNumericUpDown_ValueChange2(EventArgs e) + { + if (PlayerOffsetYNumericUpDown.Value < PlayerOffsetXNumericUpDown.Value) + PlayerOffsetYNumericUpDown.Value = PlayerOffsetXNumericUpDown.Value; + } + } +} diff --git a/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.resx b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/WanderPlanetCameraPanel.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs index 393326f..3061fde 100644 --- a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs @@ -123,6 +123,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.RotationXNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // RotationXLabel // @@ -174,6 +175,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.RotationZNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // RotationYNumericUpDown // @@ -198,6 +200,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.RotationYNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // LowerBorderNumericUpDown // @@ -222,6 +225,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.LowerBorderNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // LowerBorderLabel // @@ -256,6 +260,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.UpperBorderNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // UpperBorderLabel // @@ -290,6 +295,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.HeightOffsetNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // HeightOffsetLabel // @@ -297,9 +303,9 @@ private void InitializeComponent() this.HeightOffsetLabel.AutoSize = true; this.HeightOffsetLabel.Location = new System.Drawing.Point(3, 214); this.HeightOffsetLabel.Name = "HeightOffsetLabel"; - this.HeightOffsetLabel.Size = new System.Drawing.Size(62, 13); + this.HeightOffsetLabel.Size = new System.Drawing.Size(57, 13); this.HeightOffsetLabel.TabIndex = 57; - this.HeightOffsetLabel.Text = "Air distance"; + this.HeightOffsetLabel.Text = "↪ Vertical"; // // FrontOffsetNumericUpDown // @@ -324,15 +330,16 @@ private void InitializeComponent() 0, 0, 196608}); + this.FrontOffsetNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // FrontOffsetLabel // this.FrontOffsetLabel.AutoSize = true; this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 188); this.FrontOffsetLabel.Name = "FrontOffsetLabel"; - this.FrontOffsetLabel.Size = new System.Drawing.Size(74, 13); + this.FrontOffsetLabel.Size = new System.Drawing.Size(62, 13); this.FrontOffsetLabel.TabIndex = 55; - this.FrontOffsetLabel.Text = "Front distance"; + this.FrontOffsetLabel.Text = "Look Offset"; // // JumpingYNumericUpDown // @@ -357,6 +364,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.JumpingYNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // MaxYLabel // @@ -401,6 +409,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.FallingYNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // FieldOfViewNumericUpDown // @@ -426,6 +435,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.FieldOfViewNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // FieldOfViewLabel // @@ -460,6 +470,7 @@ private void InitializeComponent() 0, 0, 196608}); + this.ZoomNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // ZoomLabel // @@ -515,6 +526,7 @@ private void InitializeComponent() this.GFlagEndErpFrameCheckBox.TabIndex = 70; this.GFlagEndErpFrameCheckBox.Text = "GFlagEndErpFrame"; this.GFlagEndErpFrameCheckBox.UseVisualStyleBackColor = true; + this.GFlagEndErpFrameCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // GFlagThroughCheckBox // @@ -526,6 +538,7 @@ private void InitializeComponent() this.GFlagThroughCheckBox.TabIndex = 71; this.GFlagThroughCheckBox.Text = "GFlagThrough"; this.GFlagThroughCheckBox.UseVisualStyleBackColor = true; + this.GFlagThroughCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // Num2CheckBox // @@ -533,10 +546,11 @@ private void InitializeComponent() this.Num2CheckBox.AutoSize = true; this.Num2CheckBox.Location = new System.Drawing.Point(203, 75); this.Num2CheckBox.Name = "Num2CheckBox"; - this.Num2CheckBox.Size = new System.Drawing.Size(87, 17); + this.Num2CheckBox.Size = new System.Drawing.Size(104, 17); this.Num2CheckBox.TabIndex = 76; - this.Num2CheckBox.Text = "D-Pad Reset"; + this.Num2CheckBox.Text = "No D-Pad Reset"; this.Num2CheckBox.UseVisualStyleBackColor = true; + this.Num2CheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // DisableAntiBlurCheckBox // @@ -548,6 +562,7 @@ private void InitializeComponent() this.DisableAntiBlurCheckBox.TabIndex = 68; this.DisableAntiBlurCheckBox.Text = "Sharp Rotation"; this.DisableAntiBlurCheckBox.UseVisualStyleBackColor = true; + this.DisableAntiBlurCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // Num1CheckBox // @@ -559,6 +574,7 @@ private void InitializeComponent() this.Num1CheckBox.TabIndex = 75; this.Num1CheckBox.Text = "D-Pad Rotation"; this.Num1CheckBox.UseVisualStyleBackColor = true; + this.Num1CheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // FieldOfViewCheckBox // @@ -581,6 +597,7 @@ private void InitializeComponent() this.EventUseTimeCheckBox.TabIndex = 73; this.EventUseTimeCheckBox.Text = "Event Enter Time"; this.EventUseTimeCheckBox.UseVisualStyleBackColor = true; + this.EventUseTimeCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // DisableCollisionCheckBox // @@ -592,6 +609,7 @@ private void InitializeComponent() this.DisableCollisionCheckBox.TabIndex = 66; this.DisableCollisionCheckBox.Text = "Disable Collision"; this.DisableCollisionCheckBox.UseVisualStyleBackColor = true; + this.DisableCollisionCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // EventUseEndTimeCheckBox // @@ -603,16 +621,18 @@ private void InitializeComponent() this.EventUseEndTimeCheckBox.TabIndex = 74; this.EventUseEndTimeCheckBox.Text = "Event Exit Time"; this.EventUseEndTimeCheckBox.UseVisualStyleBackColor = true; + this.EventUseEndTimeCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // SharpZoomCheckBox // this.SharpZoomCheckBox.AutoSize = true; this.SharpZoomCheckBox.Location = new System.Drawing.Point(6, 75); this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; - this.SharpZoomCheckBox.Size = new System.Drawing.Size(80, 17); + this.SharpZoomCheckBox.Size = new System.Drawing.Size(79, 17); this.SharpZoomCheckBox.TabIndex = 65; - this.SharpZoomCheckBox.Text = "Dist. Interp."; + this.SharpZoomCheckBox.Text = "Static L. O."; this.SharpZoomCheckBox.UseVisualStyleBackColor = true; + this.SharpZoomCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // DisableFirstPersonCheckBox // @@ -624,6 +644,7 @@ private void InitializeComponent() this.DisableFirstPersonCheckBox.TabIndex = 69; this.DisableFirstPersonCheckBox.Text = "First Person"; this.DisableFirstPersonCheckBox.UseVisualStyleBackColor = true; + this.DisableFirstPersonCheckBox.CheckedChanged += new System.EventHandler(this.AnyValueChanged); // // CamEndIntLabel // @@ -658,6 +679,7 @@ private void InitializeComponent() 0, 0, 0}); + this.CamEndIntNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // CamIntLabel // @@ -691,6 +713,7 @@ private void InitializeComponent() 0, 0, 0}); + this.CamIntNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // FixpointVector3NumericUpDown // @@ -701,6 +724,7 @@ private void InitializeComponent() this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); this.FixpointVector3NumericUpDown.TabIndex = 68; this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; + this.FixpointVector3NumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // UpAxisVector3NumericUpDown // @@ -711,6 +735,7 @@ private void InitializeComponent() this.UpAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); this.UpAxisVector3NumericUpDown.TabIndex = 70; this.UpAxisVector3NumericUpDown.Text = "Up Axis"; + this.UpAxisVector3NumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // VerticalPanAxisVector3NumericUpDown // @@ -722,6 +747,7 @@ private void InitializeComponent() this.VerticalPanAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); this.VerticalPanAxisVector3NumericUpDown.TabIndex = 69; this.VerticalPanAxisVector3NumericUpDown.Text = "Vertical Axis"; + this.VerticalPanAxisVector3NumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // GFlagEndTimeLabel // @@ -756,6 +782,7 @@ private void InitializeComponent() 0, 0, 0}); + this.GFlagEndTimeNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // AirDelayLabel // @@ -789,6 +816,7 @@ private void InitializeComponent() 0, 0, 0}); + this.AirDelayNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // GroundDelayLabel // @@ -822,6 +850,7 @@ private void InitializeComponent() 0, 0, 0}); + this.GroundDelayNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // EventFrameLabel // @@ -856,6 +885,7 @@ private void InitializeComponent() 0, 0, 0}); + this.EventFrameNumericUpDown.ValueChanged += new System.EventHandler(this.AnyValueChanged); // // StringTextBox // @@ -866,6 +896,7 @@ private void InitializeComponent() this.StringTextBox.Name = "StringTextBox"; this.StringTextBox.Size = new System.Drawing.Size(165, 112); this.StringTextBox.TabIndex = 80; + this.StringTextBox.TextChanged += new System.EventHandler(this.AnyValueChanged); // // label1 // diff --git a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs index b650c19..48b8041 100644 --- a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs +++ b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs @@ -17,7 +17,7 @@ public XZParaCameraPanel() { InitializeComponent(); } - + public override void ReloadTheme() { base.ReloadTheme(); @@ -67,8 +67,8 @@ public override void LoadCamera(BCAMEntry Entry) FallingYNumericUpDown.Value = (decimal)Entry.MinY; CamIntNumericUpDown.Value = Entry.TransitionTime; CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; - FrontOffsetNumericUpDown.Value = (decimal)Entry.FrontOffset; - HeightOffsetNumericUpDown.Value = (decimal)Entry.HeightOffset; + FrontOffsetNumericUpDown.Value = (decimal)Entry.LookOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.LookOffsetVertical; GroundDelayNumericUpDown.Value = Entry.GroundMoveDelay; AirDelayNumericUpDown.Value = Entry.AirMoveDelay; UpperBorderNumericUpDown.Value = (decimal)Entry.UpperBorder; @@ -78,9 +78,9 @@ public override void LoadCamera(BCAMEntry Entry) FixpointVector3NumericUpDown.LoadVector3(Entry.FixPointOffset); VerticalPanAxisVector3NumericUpDown.LoadVector3(Entry.VerticalPanAxis); UpAxisVector3NumericUpDown.LoadVector3(Entry.UpAxis); - + FieldOfViewCheckBox.Checked = Entry.EnableFoV; - SharpZoomCheckBox.Checked = !Entry.SharpZoom; + SharpZoomCheckBox.Checked = Entry.StaticLookOffset; DisableAntiBlurCheckBox.Checked = Entry.DisableAntiBlur; DisableCollisionCheckBox.Checked = Entry.DisableCollision; DisableFirstPersonCheckBox.Checked = !Entry.DisableFirstPerson; @@ -91,7 +91,7 @@ public override void LoadCamera(BCAMEntry Entry) EventUseTimeCheckBox.Checked = Entry.EventUseTransitionTime; EventUseEndTimeCheckBox.Checked = Entry.EventUseTransitionEndTime; } - + public override void UnLoadCamera(BCAMEntry Entry) { base.UnLoadCamera(Entry); @@ -107,8 +107,8 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.MinY = (float)FallingYNumericUpDown.Value; Entry.TransitionTime = (int)CamIntNumericUpDown.Value; Entry.TransitionEndTime = (int)CamEndIntNumericUpDown.Value; - Entry.FrontOffset = (float)FrontOffsetNumericUpDown.Value; - Entry.HeightOffset = (float)HeightOffsetNumericUpDown.Value; + Entry.LookOffset = (float)FrontOffsetNumericUpDown.Value; + Entry.LookOffsetVertical = (float)HeightOffsetNumericUpDown.Value; Entry.GroundMoveDelay = (int)GroundDelayNumericUpDown.Value; Entry.AirMoveDelay = (int)AirDelayNumericUpDown.Value; Entry.UpperBorder = (float)UpperBorderNumericUpDown.Value; @@ -120,7 +120,7 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); Entry.DisableReset = false; Entry.EnableFoV = FieldOfViewCheckBox.Checked; - Entry.SharpZoom = !SharpZoomCheckBox.Checked; + Entry.StaticLookOffset = SharpZoomCheckBox.Checked; Entry.DisableAntiBlur = DisableAntiBlurCheckBox.Checked; Entry.DisableCollision = DisableCollisionCheckBox.Checked; Entry.DisableFirstPerson = !DisableFirstPersonCheckBox.Checked; @@ -132,7 +132,7 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.EventUseTransitionEndTime = EventUseEndTimeCheckBox.Checked; Entry.UDown = 120; - Entry.TransitionGroundTime = 120; + Entry.TransitionGroundTime = 160; } private void FieldOfViewCheckBox_CheckedChanged(object sender, EventArgs e) @@ -144,5 +144,7 @@ private void UseVerticalPanAxisCheckBox_CheckedChanged(object sender, EventArgs { VerticalPanAxisVector3NumericUpDown.Enabled = UseVerticalPanAxisCheckBox.Checked; } + + private void AnyValueChanged(object sender, EventArgs e){ } } } diff --git a/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs b/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs index d83eea0..851fc06 100644 --- a/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs +++ b/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs @@ -48,6 +48,8 @@ public ColourNumericUpDown() [Category("Appearance")] [DefaultValue(typeof(Color), "Gray")] public Color BorderColor { get; set; } + public delegate void Valuechanged2(EventArgs e); + public Valuechanged2 ValueChange2 = (EventArgs e) => { }; private decimal _textval; public decimal TextValue @@ -59,13 +61,16 @@ public decimal TextValue set { _textval = Math.Min(Math.Max(Minimum, value), Maximum); + Value = _textval; } } protected override void OnValueChanged(EventArgs e) { _textval = Value; + ValueChange2(e); } + protected override void OnTextChanged(EventArgs e) { if (decimal.TryParse(string.IsNullOrWhiteSpace(Text) ? "0.0" : Text, out decimal result)) @@ -75,3 +80,4 @@ protected override void OnTextChanged(EventArgs e) } } } + diff --git a/LaunchCamPlus/Extra Controls/PresetSelectorPanel.cs b/LaunchCamPlus/Extra Controls/PresetSelectorPanel.cs index 5a73f22..11fe8f3 100644 --- a/LaunchCamPlus/Extra Controls/PresetSelectorPanel.cs +++ b/LaunchCamPlus/Extra Controls/PresetSelectorPanel.cs @@ -1,13 +1,7 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; using System.IO; +using System.Windows.Forms; using Hackio.IO.BCAM; namespace LaunchCamPlus @@ -93,6 +87,13 @@ private void PresetsTreeView_AfterSelect(object sender, TreeViewEventArgs e) private void SelectButton_Click(object sender, EventArgs e) { + if (((CameraEditorForm)ParentForm).Cameras == null) + { + Console.WriteLine(Program.ConsoleHalfSplitter); + Console.WriteLine("Failed to add the preset!\nNo camera file is active"); + Console.WriteLine(Program.ConsoleHalfSplitter); + return; + } try { string full = ((FileInfo)PresetsTreeView.SelectedNode.Tag).FullName; diff --git a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs index 268089e..ec04c29 100644 --- a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs +++ b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs @@ -68,6 +68,12 @@ private void InitializeComponent() this.ZValueNumericUpDown.Name = "ZValueNumericUpDown"; this.ZValueNumericUpDown.Size = new System.Drawing.Size(94, 20); this.ZValueNumericUpDown.TabIndex = 2; + this.ZValueNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + this.ZValueNumericUpDown.ValueChanged += new System.EventHandler(this.NumberValueChanged); // // YValueNumericUpDown // @@ -89,6 +95,12 @@ private void InitializeComponent() this.YValueNumericUpDown.Name = "YValueNumericUpDown"; this.YValueNumericUpDown.Size = new System.Drawing.Size(94, 20); this.YValueNumericUpDown.TabIndex = 1; + this.YValueNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + this.YValueNumericUpDown.ValueChanged += new System.EventHandler(this.NumberValueChanged); // // XValueNumericUpDown // @@ -110,6 +122,12 @@ private void InitializeComponent() this.XValueNumericUpDown.Name = "XValueNumericUpDown"; this.XValueNumericUpDown.Size = new System.Drawing.Size(94, 20); this.XValueNumericUpDown.TabIndex = 0; + this.XValueNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + this.XValueNumericUpDown.ValueChanged += new System.EventHandler(this.NumberValueChanged); // // Vector3NumericUpDown // diff --git a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.cs b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.cs index e7692f3..a0d1726 100644 --- a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.cs +++ b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.cs @@ -51,5 +51,14 @@ public Vector3 GetVector3() { return new Vector3((float)XValueNumericUpDown.Value, (float)YValueNumericUpDown.Value, (float)ZValueNumericUpDown.Value); } + + [Category("Action")] + [Browsable(true)] + public event EventHandler ValueChanged; + + private void NumberValueChanged(object sender, EventArgs e) + { + ValueChanged(sender, e); + } } } diff --git a/LaunchCamPlus/Formats/BCAM.cs b/LaunchCamPlus/Formats/BCAM.cs index a01c704..cafea85 100644 --- a/LaunchCamPlus/Formats/BCAM.cs +++ b/LaunchCamPlus/Formats/BCAM.cs @@ -7,6 +7,7 @@ using System.Collections; using LaunchCamPlus.Properties; using Hackio.IO.Util; +using System.Text.RegularExpressions; namespace Hackio.IO.BCAM { @@ -456,8 +457,8 @@ public static uint FieldNameToHash(string field) "GroundStarMoveDelay", "AirStartMoveDelay", "udown", - "Front Zoom", - "Height Zoom", + "Look Offset", + "Look Offset Vertical", "Upper Border", "Lower Border", "Event Frames", @@ -490,7 +491,7 @@ public static uint FieldNameToHash(string field) //Put all these into 1 int through the power of masking "DisableReset", "Enable Field of View", - "Enable Sharp Zoom", + "Static Look Offset", "Disable Anti-blur", "Disable Collision", "Disable First Person", @@ -1200,7 +1201,7 @@ public int UDown } } - public float FrontOffset + public float LookOffset { get { @@ -1222,7 +1223,7 @@ public float FrontOffset Data.Add(0x145863FF, value); } } - public float HeightOffset + public float LookOffsetVertical { get { @@ -1589,7 +1590,7 @@ public bool EnableFoV Data.Add(0x9F02074F, value ? 1 : 0); } } - public bool SharpZoom + public bool StaticLookOffset { get { @@ -1841,8 +1842,8 @@ public override bool Equals(object obj) GroundMoveDelay == entry.GroundMoveDelay && AirMoveDelay == entry.AirMoveDelay && UDown == entry.UDown && - FrontOffset == entry.FrontOffset && - HeightOffset == entry.HeightOffset && + LookOffset == entry.LookOffset && + LookOffsetVertical == entry.LookOffsetVertical && UpperBorder == entry.UpperBorder && LowerBorder == entry.LowerBorder && EventFrames == entry.EventFrames && @@ -1854,7 +1855,7 @@ public override bool Equals(object obj) EqualityComparer>.Default.Equals(UpAxis, entry.UpAxis) && DisableReset == entry.DisableReset && EnableFoV == entry.EnableFoV && - SharpZoom == entry.SharpZoom && + StaticLookOffset == entry.StaticLookOffset && DisableAntiBlur == entry.DisableAntiBlur && DisableCollision == entry.DisableCollision && DisableFirstPerson == entry.DisableFirstPerson && @@ -1891,8 +1892,8 @@ public override int GetHashCode() hashCode = hashCode * -1521134295 + GroundMoveDelay.GetHashCode(); hashCode = hashCode * -1521134295 + AirMoveDelay.GetHashCode(); hashCode = hashCode * -1521134295 + UDown.GetHashCode(); - hashCode = hashCode * -1521134295 + FrontOffset.GetHashCode(); - hashCode = hashCode * -1521134295 + HeightOffset.GetHashCode(); + hashCode = hashCode * -1521134295 + LookOffset.GetHashCode(); + hashCode = hashCode * -1521134295 + LookOffsetVertical.GetHashCode(); hashCode = hashCode * -1521134295 + UpperBorder.GetHashCode(); hashCode = hashCode * -1521134295 + LowerBorder.GetHashCode(); hashCode = hashCode * -1521134295 + EventFrames.GetHashCode(); @@ -1904,7 +1905,7 @@ public override int GetHashCode() hashCode = hashCode * -1521134295 + EqualityComparer>.Default.GetHashCode(UpAxis); hashCode = hashCode * -1521134295 + DisableReset.GetHashCode(); hashCode = hashCode * -1521134295 + EnableFoV.GetHashCode(); - hashCode = hashCode * -1521134295 + SharpZoom.GetHashCode(); + hashCode = hashCode * -1521134295 + StaticLookOffset.GetHashCode(); hashCode = hashCode * -1521134295 + DisableAntiBlur.GetHashCode(); hashCode = hashCode * -1521134295 + DisableCollision.GetHashCode(); hashCode = hashCode * -1521134295 + DisableFirstPerson.GetHashCode(); @@ -1965,8 +1966,15 @@ public static string GetTranslatedName(this BCAMEntry entry) } else if (Original.StartsWith("e:")) { - string targetkey = string.Concat(Original.Split(':')[1].Where(IsNonDigit)); - Final += Events.ContainsKey(targetkey) ? "Event: "+Original.Substring(2).Replace(targetkey, Events[targetkey]+" ").Replace("番目", "th") : Original; + string val = Original.Replace('[', '<').Replace(']', '>'); //Regex is so dumb + Match m = Regex.Match(val, @"^e:\S+?<\S+?>$", RegexOptions.IgnoreCase); + if (m.Success) + Final += "Demo: "+Original.Replace("e:",""); + else + { + string targetkey = string.Concat(Original.Split(':')[1].Where(IsNonDigit)); + Final += Events.ContainsKey(targetkey) ? "Event: "+Original.Substring(2).Replace(targetkey, Events[targetkey]+" ").Replace("番目", "th") : Original; + } } else if (Original.StartsWith("o:")) { @@ -2083,15 +2091,23 @@ public static List SortBy(this List OriginalList, T[] sortref) public static Dictionary Events = new Dictionary() { { "シナリオスターター", new EventData("Scenario Starter", true, true) }, - { "グリーンスーパースピンドライバー", new EventData("Green Launch Star", true, true)}, { "スーパースピンドライバー固有出現イベント用", new EventData("Launch Star Appearance", true, false) }, { "スーパースピンドライバー", new EventData("Launch Star", true, true) }, { "スピンドライバ固有出現イベント用", new EventData("Sling Star Appearance", true, false) }, { "スピンドライバ", new EventData("Sling Star", true, true) }, - { "パワースター出現ポイント固有", new EventData("Power Star Appear Point", true, false) }, + { "グリーンスーパースピンドライバー固有出現イベント用", new EventData("Green Launch Star Appearance", true, false) }, + { "グリーンスーパースピンドライバー", new EventData("Green Launch Star", true, true)}, + { "ピンクスーパースピンドライバー固有出現イベント用", new EventData("Pink Launch Star Appearance", true, false) }, + { "ピンクスーパースピンドライバー", new EventData("Pink Launch Star", true, true)}, + { "グランドスター固有", new EventData("Grand Star Appearance", true, false) }, { "パワースター固有", new EventData("Power Star Appearance", true, false) }, - { "土管固有出現", new EventData("Warp Pipe", true, false) }, + { "グリーンスター固有", new EventData("Green Star Appearance", true, false) }, + { "パワースター出現ポイント固有", new EventData("Power Star Appear Point", true, false) }, { "簡易デモ実行固有簡易デモ", new EventData("Simple Demo Executor", true, false) }, + { "鍵スイッチ固有", new EventData("Key Switch Appearence", true, false) }, + { "カプセルケージ固有", new EventData("Capsule Cage Opening", true, false) }, + { "ゴロ岩カバー檻固有", new EventData("Capsule Cage (Alt) Opening", true, false) }, + { "土管固有出現", new EventData("Warp Pipe", true, false) }, { "ウォータープレッシャー固有", new EventData("Bubble Shooter", true, false) }, { "ポール固有", new EventData("Pole", true, false) }, { "ポール（鉄骨）固有", new EventData("Square Pole", true, false) }, @@ -2104,25 +2120,47 @@ public static List SortBy(this List OriginalList, T[] sortref) { "つる花固有掴まり", new EventData("Creeper Plant", true, false) }, { "空中ブランコ固有", new EventData("Trapeze Vine", true, false) }, { "音符の妖精固有", new EventData("Note Fairy Appearance", true, false) }, - { "インフェルノジェネレータ固有出現デモカメラ", new EventData("(SMG2) Cosmic Clones Appearance", true, false) }, + { "インフェルノジェネレータ固有出現デモカメラ", new EventData("Cosmic Clones Appearance", true, false) }, + { "バネベーゴマン", new EventData("Spring Topman", true, true) }, + { "隠れバネベーゴマン", new EventData("Hiding Spring Topman", true, true) }, + { "モンテ固有", new EventData("Chuckster Pianta", true, false) }, + { "ハラペココインチコ固有飛行", new EventData("Coin Hungry Luma", true, false) }, + { "チューブスライダー固有滑り", new EventData("Tube Slider", true, false) }, + { "チューブスライダー固有飛び出し", new EventData("Tube Slider Exit", true, false) }, + { "プチポーター固有基点でワープイン", new EventData("Minigame Teleporter (Prepare to Warp)", true, false) }, + { "プチポーター固有ワープ点でワープアウト", new EventData("Minigame Teleporter (Arrive at Destination)", true, false) }, + { "プチポーター固有ワープ点でワープイン", new EventData("Minigame Teleporter (Prepare return warp)", true, false) }, + { "プチポーター固有基点でワープアウト", new EventData("Minigame Teleporter (Arrive from returning)", true, false) }, { "看板固有会話", new EventData("Message: Signboard", true, false) }, { "キノピオ固有会話", new EventData("Message: Toad", true, false) }, + { "郵便屋さんキノピオ固有注目会話", new EventData("Message: Mailtoad", true, false) }, + { "銀行屋さんキノピオ固有注目会話", new EventData("Message: Banktoad", true, false) }, { "ウサギ固有会話", new EventData("Message: Star Bunny", true, false) }, + { "ロゼッタ固有会話", new EventData("Message: Rosalina", true, false) }, + { "マイスター固有会話", new EventData("Message: Lubba", true, false) }, { "チコ固有会話", new EventData("Message: Luma", true, false) }, - { "ハニービー固有会話", new EventData("Message: Honeybee", true, false) }, { "ハニークイーン固有会話", new EventData("Message: Queen Bee", true, false) }, - { "ペンギン固有会話", new EventData("Message: Penguin", true, false) }, - { "ペンギンコーチ固有会話", new EventData("Message: Penguin Coach", true, false) }, + { "ハニービー固有会話", new EventData("Message: Honeybee", true, false) }, { "ペンギン仙人固有会話", new EventData("Message: Penguin Elder", true, false) }, + { "ペンギンコーチ固有会話", new EventData("Message: Penguin Coach", true, false) }, + { "ペンギン固有会話", new EventData("Message: Penguin", true, false) }, + { "パマタリアン固有会話", new EventData("Message: Gearmo", true, false) }, + { "パマタリアンハンター固有会話", new EventData("Message: Gearmo Hunter", true, false) }, { "赤ボム兵固有会話", new EventData("Message: Bob-omb Buddy", true, false) }, + { "モンテ固有会話", new EventData("Message: Pianta", true, false) }, + { "ピーチャン固有会話", new EventData("Message: Jibberjay", true, false) }, + { "モック固有会話", new EventData("Message: Whittle", true, false) }, + { "さすらいの遊び人(通常会話)固有会話", new EventData("Message: The Chimp (NPC)", true, false) }, - { "引き戻し", new EventData("Pull Back", false, false) }, + { "引き戻し", new EventData("Pull Back Area", false, false) }, { "水上フォロー", new EventData("Water Follow", false, false) }, { "水中フォロー", new EventData("Underwater Follow", false, false) }, { "水中プラネット", new EventData("Underwater Planet", false, false) }, - { "フーファイターカメラ", new EventData("Foo Fighter Camera", false, false) } + { "フーファイターカメラ", new EventData("Foo Fighter Camera", false, false) }, + + { "DemoName[CameraPartName]", new EventData("Demo Camera Template", false, false) } }; /// /// o: cameras @@ -2272,7 +2310,7 @@ public class CameraDefaults public static Dictionary Defaults = new Dictionary() { //================================================================================================================================================================== - { "CAM_TYPE_XZ_PARA", new CameraDefaults(196631, 0, 0.2984513f, 0f, 0f, 1200f, 45f, 100, 100, 160, 0, 0, "", 300f, 800f, 120, 120, 120, 0f, 0f, 0.30f, 0.10f, 0, 0, + { "CAM_TYPE_XZ_PARA", new CameraDefaults(196631, 0, 0.2984513f, 0f, 0f, 1200f, 45f, 100, 100, 160, 1, 0, "", 300f, 800f, 120, 120, 120, 0f, 0f, 0.30f, 0.10f, 0, 0, new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,1,0), new Vector3(0,1,0), false, false, false, false, false, false, false, false, 0, true, false, false) }, //================================================================================================================================================================== @@ -2280,12 +2318,16 @@ public class CameraDefaults new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,1,0), false, false, false, false, false, false, false, false, 0, false, false, false) }, //================================================================================================================================================================== + { "CAM_TYPE_WONDER_PLANET", new CameraDefaults(196631, 0, 0.0f, 0f, 0f, 0f, 45f, 100, 100, 160, 1, 0, "", 300f, 800f, 120, 120, 120, 0f, 0f, 0.3f, 0.1f, 0, 0, + new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), new Vector3(0,0,0), + false, false, false, false, false, false, false, false, 0, false, false, false) }, + //================================================================================================================================================================== }; internal CameraDefaults(int version, int number, float XRot, float YRot, float ZRot, float zoom, float fov, int time, int endtime, int gndtime, int num1, int num2, string str, float maxY, float minY, - int gndmovedelay, int airmovedelay, int udown, float frontzoom, float heightzoom, float upperborder, float lowerborder, int evframes, int evpriority, + int gndmovedelay, int airmovedelay, int udown, float lookoffset, float lookoffsety, float upperborder, float lowerborder, int evframes, int evpriority, Vector3 fixpointoffset, Vector3 worldpointoffset, Vector3 playeroffset, Vector3 verticalpanaxis, Vector3 upaxis, - bool disablereset, bool enablefov, bool sharpzoom, bool disableantiblur, bool disablecollision, bool disablefirstperson, bool Gflagenderpframe, bool Gflagthrough, int Gflagendtime, + bool disablereset, bool enablefov, bool staticlookoffset, bool disableantiblur, bool disablecollision, bool disablefirstperson, bool Gflagenderpframe, bool Gflagthrough, int Gflagendtime, bool useverticalpanaxis, bool eventuseendtime, bool eventusetime) => DefaultValues = new Dictionary { { 0x14F51CD8, version }, @@ -2306,8 +2348,8 @@ internal CameraDefaults(int version, int number, float XRot, float YRot, float Z { 0xD26F6AA9, gndmovedelay }, { 0x93AECC0B, airmovedelay }, { 0x069FE297, udown }, - { 0x145863FF, frontzoom }, - { 0x76B41C57, heightzoom }, + { 0x145863FF, lookoffset }, + { 0x76B41C57, lookoffsety }, { 0x06A558A2, upperborder }, { 0x06262B01, lowerborder }, { 0x05C676D0, evframes }, @@ -2331,7 +2373,7 @@ internal CameraDefaults(int version, int number, float XRot, float YRot, float Z { 0x41E363AC, disablereset }, { 0x9F02074F, enablefov }, - { 0x82D5627E, sharpzoom }, + { 0x82D5627E, staticlookoffset }, { 0xE2044E84, disableantiblur }, { 0x521E5C3F, disablecollision }, { 0xBB74D6C1, disablefirstperson }, diff --git a/LaunchCamPlus/Formats/LCPP.cs b/LaunchCamPlus/Formats/LCPP.cs index b95ff61..4cf9e44 100644 --- a/LaunchCamPlus/Formats/LCPP.cs +++ b/LaunchCamPlus/Formats/LCPP.cs @@ -201,10 +201,10 @@ public void LoadLegacyFile(Stream FS) Properties.UDown = Convert.ToInt32(P[1]); break; case "FrontZoom": - Properties.FrontOffset = Convert.ToSingle(P[1]); + Properties.LookOffset = Convert.ToSingle(P[1]); break; case "HeightZoom": - Properties.HeightOffset = Convert.ToSingle(P[1]); + Properties.LookOffsetVertical = Convert.ToSingle(P[1]); break; case "UpperBorder": P[1] = P[1].Replace("f", ""); @@ -272,7 +272,7 @@ public void LoadLegacyFile(Stream FS) Properties.EnableFoV = P[1] == "true" ? true : false; break; case "SharpZoom": - Properties.SharpZoom = P[1] == "true" ? true : false; + Properties.StaticLookOffset = P[1] == "true" ? true : false; break; case "DisableAntiBlur": Properties.DisableAntiBlur = P[1] == "true" ? true : false; @@ -373,8 +373,8 @@ public void LoadCompressedLegacyFile(Stream FS) GroundMoveDelay = (int)FindNumber(FS, Offset), AirMoveDelay = (int)FindNumber(FS, Offset), UDown = (int)FindNumber(FS, Offset), - FrontOffset = FindNumber(FS, Offset), - HeightOffset = FindNumber(FS, Offset), + LookOffset = FindNumber(FS, Offset), + LookOffsetVertical = FindNumber(FS, Offset), UpperBorder = FindNumber(FS, Offset), LowerBorder = FindNumber(FS, Offset), EventFrames = (int)FindNumber(FS, Offset), @@ -385,7 +385,7 @@ public void LoadCompressedLegacyFile(Stream FS) VerticalPanAxis = new Vector3(FindNumber(FS, Offset), FindNumber(FS, Offset), FindNumber(FS, Offset)), UpAxis = new Vector3(FindNumber(FS, Offset), FindNumber(FS, Offset), FindNumber(FS, Offset)), DisableReset = FindBoolean(FS, Offset), - SharpZoom = FindBoolean(FS, Offset), + StaticLookOffset = FindBoolean(FS, Offset), DisableAntiBlur = FindBoolean(FS, Offset), DisableCollision = FindBoolean(FS, Offset), DisableFirstPerson = FindBoolean(FS, Offset), diff --git a/LaunchCamPlus/LaunchCamPlus.csproj b/LaunchCamPlus/LaunchCamPlus.csproj index 995beab..c84e166 100644 --- a/LaunchCamPlus/LaunchCamPlus.csproj +++ b/LaunchCamPlus/LaunchCamPlus.csproj @@ -60,6 +60,7 @@ + @@ -69,6 +70,12 @@ EyeposFixThereCameraPanel.cs + + UserControl + + + WanderPlanetCameraPanel.cs + UserControl @@ -163,6 +170,9 @@ EyeposFixThereCameraPanel.cs + + WanderPlanetCameraPanel.cs + XZParaCameraPanel.cs diff --git a/LaunchCamPlus/Program.cs b/LaunchCamPlus/Program.cs index 9edb4cd..765ee28 100644 --- a/LaunchCamPlus/Program.cs +++ b/LaunchCamPlus/Program.cs @@ -21,6 +21,7 @@ static void Main(string[] args) Application.SetCompatibleTextRenderingDefault(false); Console.Title = Application.ProductName + " " + Application.ProductVersion + " - Console"; + //Console.OutputEncoding = System.Text.Encoding.GetEncoding(932); // This fixes the Japanese not showing properly, but it looks so weird in the console... if (Settings.Default.IsFirstLaunch) { string FullfilePath = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath; diff --git a/LaunchCamPlus/Properties/AssemblyInfo.cs b/LaunchCamPlus/Properties/AssemblyInfo.cs index 961f743..45bcacf 100644 --- a/LaunchCamPlus/Properties/AssemblyInfo.cs +++ b/LaunchCamPlus/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.3.8.7")] -[assembly: AssemblyFileVersion("2.3.8.7")] +[assembly: AssemblyVersion("2.3.8.8")] +[assembly: AssemblyFileVersion("2.3.8.8")] diff --git a/LaunchCamPlus/UpdateAlert.txt b/LaunchCamPlus/UpdateAlert.txt index 046ec61..ebd6242 100644 --- a/LaunchCamPlus/UpdateAlert.txt +++ b/LaunchCamPlus/UpdateAlert.txt @@ -1 +1 @@ -2.3.8.7 \ No newline at end of file +2.3.8.8 \ No newline at end of file