diff --git a/LaunchCamPlus/CameraEditorForm.cs b/LaunchCamPlus/CameraEditorForm.cs index 8528246..04804c4 100644 --- a/LaunchCamPlus/CameraEditorForm.cs +++ b/LaunchCamPlus/CameraEditorForm.cs @@ -13,6 +13,7 @@ using LaunchCamPlus.Properties; using System.Media; using System.Diagnostics; +using System.Runtime.InteropServices; namespace LaunchCamPlus { @@ -41,7 +42,8 @@ public CameraEditorForm(string[] args) PreBufferedPanels = new Dictionary { { "DEFAULT", new DefaultCameraPanel() { Dock = DockStyle.Fill } }, - { "CAM_TYPE_XZ_PARA", new XZParaCameraPanel() { Dock = DockStyle.Fill } } + { "CAM_TYPE_XZ_PARA", new XZParaCameraPanel() { Dock = DockStyle.Fill } }, + { "CAM_TYPE_EYEPOS_FIX_THERE", new EyeposFixThereCameraPanel() { Dock = DockStyle.Fill } } }; ReloadTheme(); @@ -139,7 +141,7 @@ private void AddDefaultCameraToolStripMenuItem_Click(object sender, EventArgs e) if (Cameras == null) return; BCAMEntry newcamera = CameraDefaults.Defaults["CAM_TYPE_XZ_PARA"]; - newcamera.Identification = "c:" + BCAMEx.CalculateNextCameraArea(Cameras).ToString("X4"); + newcamera.Identification = "c:" + BCAMEx.CalculateNextCameraArea(Cameras).ToString("x4"); newcamera.Type = "CAM_TYPE_XZ_PARA"; AddCamera(newcamera); Console.WriteLine("Added the Default Camera to the end of the Camera List"); diff --git a/LaunchCamPlus/CameraPanels/CameraPanelBase.cs b/LaunchCamPlus/CameraPanels/CameraPanelBase.cs index fd0ba47..e475446 100644 --- a/LaunchCamPlus/CameraPanels/CameraPanelBase.cs +++ b/LaunchCamPlus/CameraPanels/CameraPanelBase.cs @@ -39,6 +39,7 @@ protected CameraPanelBase() TypeComboBox.SelectionLength = 0; })); }; + TypeComboBox.MouseWheel += TypeComboBox_MouseWheel; Loading = false; } @@ -107,7 +108,13 @@ private void TypeComboBox_SelectedIndexChanged(object sender, EventArgs e) if (Loading || Settings.Default.IsUseDefaultOnly) return; - ((CameraEditorForm)ParentForm).ReloadEditor(true); + ((CameraEditorForm)ParentForm)?.ReloadEditor(true); + } + + void TypeComboBox_MouseWheel(object sender, MouseEventArgs e) + { + if (sender is ComboBox cb && !cb.DroppedDown) + ((HandledMouseEventArgs)e).Handled = true; } } diff --git a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs index 3c32af6..cca1f7e 100644 --- a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.Designer.cs @@ -137,9 +137,8 @@ private void InitializeComponent() // // ZoomLabel // - this.ZoomLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.ZoomLabel.AutoSize = true; - this.ZoomLabel.Location = new System.Drawing.Point(146, 58); + this.ZoomLabel.Location = new System.Drawing.Point(3, 136); this.ZoomLabel.Name = "ZoomLabel"; this.ZoomLabel.Size = new System.Drawing.Size(34, 13); this.ZoomLabel.TabIndex = 16; @@ -147,9 +146,8 @@ private void InitializeComponent() // // Num1Label // - this.Num1Label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Num1Label.AutoSize = true; - this.Num1Label.Location = new System.Drawing.Point(305, 58); + this.Num1Label.Location = new System.Drawing.Point(3, 292); this.Num1Label.Name = "Num1Label"; this.Num1Label.Size = new System.Drawing.Size(38, 13); this.Num1Label.TabIndex = 10; @@ -157,9 +155,8 @@ private void InitializeComponent() // // Num2Label // - this.Num2Label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Num2Label.AutoSize = true; - this.Num2Label.Location = new System.Drawing.Point(305, 84); + this.Num2Label.Location = new System.Drawing.Point(3, 318); this.Num2Label.Name = "Num2Label"; this.Num2Label.Size = new System.Drawing.Size(38, 13); this.Num2Label.TabIndex = 12; @@ -167,28 +164,26 @@ private void InitializeComponent() // // FieldOfViewLabel // - this.FieldOfViewLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.FieldOfViewLabel.AutoSize = true; - this.FieldOfViewLabel.Location = new System.Drawing.Point(146, 84); + this.FieldOfViewLabel.Location = new System.Drawing.Point(3, 162); this.FieldOfViewLabel.Name = "FieldOfViewLabel"; - this.FieldOfViewLabel.Size = new System.Drawing.Size(67, 13); + this.FieldOfViewLabel.Size = new System.Drawing.Size(29, 13); this.FieldOfViewLabel.TabIndex = 18; - this.FieldOfViewLabel.Text = "Field of View"; + this.FieldOfViewLabel.Text = "FoV:"; // // CamIntLabel // this.CamIntLabel.AutoSize = true; - this.CamIntLabel.Location = new System.Drawing.Point(3, 136); + this.CamIntLabel.Location = new System.Drawing.Point(3, 396); this.CamIntLabel.Name = "CamIntLabel"; - this.CamIntLabel.Size = new System.Drawing.Size(79, 13); + this.CamIntLabel.Size = new System.Drawing.Size(58, 13); this.CamIntLabel.TabIndex = 20; - this.CamIntLabel.Text = "Transition Time"; + this.CamIntLabel.Text = "Enter Time"; // // CamEndIntLabel // - this.CamEndIntLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.CamEndIntLabel.AutoSize = true; - this.CamEndIntLabel.Location = new System.Drawing.Point(146, 136); + this.CamEndIntLabel.Location = new System.Drawing.Point(3, 422); this.CamEndIntLabel.Name = "CamEndIntLabel"; this.CamEndIntLabel.Size = new System.Drawing.Size(50, 13); this.CamEndIntLabel.TabIndex = 22; @@ -196,21 +191,18 @@ private void InitializeComponent() // // FieldOfViewCheckBox // - this.FieldOfViewCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.FieldOfViewCheckBox.AutoSize = true; - this.FieldOfViewCheckBox.Location = new System.Drawing.Point(162, 109); + this.FieldOfViewCheckBox.Location = new System.Drawing.Point(49, 163); this.FieldOfViewCheckBox.Name = "FieldOfViewCheckBox"; - this.FieldOfViewCheckBox.Size = new System.Drawing.Size(122, 17); + this.FieldOfViewCheckBox.Size = new System.Drawing.Size(15, 14); this.FieldOfViewCheckBox.TabIndex = 24; - this.FieldOfViewCheckBox.Text = "Enable Field of View"; this.FieldOfViewCheckBox.UseVisualStyleBackColor = true; this.FieldOfViewCheckBox.CheckedChanged += new System.EventHandler(this.FieldOfViewCheckBox_CheckedChanged); // // MaxYLabel // - this.MaxYLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.MaxYLabel.AutoSize = true; - this.MaxYLabel.Location = new System.Drawing.Point(305, 110); + this.MaxYLabel.Location = new System.Drawing.Point(3, 240); this.MaxYLabel.Name = "MaxYLabel"; this.MaxYLabel.Size = new System.Drawing.Size(37, 13); this.MaxYLabel.TabIndex = 25; @@ -218,9 +210,8 @@ private void InitializeComponent() // // MinYLabel // - this.MinYLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.MinYLabel.AutoSize = true; - this.MinYLabel.Location = new System.Drawing.Point(305, 136); + this.MinYLabel.Location = new System.Drawing.Point(3, 266); this.MinYLabel.Name = "MinYLabel"; this.MinYLabel.Size = new System.Drawing.Size(34, 13); this.MinYLabel.TabIndex = 27; @@ -229,39 +220,36 @@ private void InitializeComponent() // FrontOffsetLabel // this.FrontOffsetLabel.AutoSize = true; - this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 164); + this.FrontOffsetLabel.Location = new System.Drawing.Point(3, 189); this.FrontOffsetLabel.Name = "FrontOffsetLabel"; - this.FrontOffsetLabel.Size = new System.Drawing.Size(74, 13); + this.FrontOffsetLabel.Size = new System.Drawing.Size(55, 13); this.FrontOffsetLabel.TabIndex = 29; - this.FrontOffsetLabel.Text = "Front distance"; + this.FrontOffsetLabel.Text = "Front Dist."; // // HeightOffsetLabel // - this.HeightOffsetLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.HeightOffsetLabel.AutoSize = true; - this.HeightOffsetLabel.Location = new System.Drawing.Point(159, 162); + 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(43, 13); this.HeightOffsetLabel.TabIndex = 31; - this.HeightOffsetLabel.Text = "Air distance"; + this.HeightOffsetLabel.Text = "Air Dist."; // // SharpZoomCheckBox // - this.SharpZoomCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.SharpZoomCheckBox.AutoSize = true; - this.SharpZoomCheckBox.Location = new System.Drawing.Point(109, 382); + this.SharpZoomCheckBox.Location = new System.Drawing.Point(261, 279); this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; - this.SharpZoomCheckBox.Size = new System.Drawing.Size(94, 17); + this.SharpZoomCheckBox.Size = new System.Drawing.Size(108, 17); this.SharpZoomCheckBox.TabIndex = 33; - this.SharpZoomCheckBox.Text = "Disable Interp."; + this.SharpZoomCheckBox.Text = "Dist. Interpolation"; this.SharpZoomCheckBox.UseVisualStyleBackColor = true; // // HeightOffsetNumericUpDown // - this.HeightOffsetNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; 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(227, 162); + this.HeightOffsetNumericUpDown.Location = new System.Drawing.Point(66, 212); this.HeightOffsetNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -273,14 +261,19 @@ private void InitializeComponent() 0, -2147483648}); this.HeightOffsetNumericUpDown.Name = "HeightOffsetNumericUpDown"; - this.HeightOffsetNumericUpDown.Size = new System.Drawing.Size(72, 20); + this.HeightOffsetNumericUpDown.Size = new System.Drawing.Size(74, 20); this.HeightOffsetNumericUpDown.TabIndex = 32; + this.HeightOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // 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(83, 162); + this.FrontOffsetNumericUpDown.Location = new System.Drawing.Point(66, 186); this.FrontOffsetNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -292,15 +285,19 @@ private void InitializeComponent() 0, -2147483648}); this.FrontOffsetNumericUpDown.Name = "FrontOffsetNumericUpDown"; - this.FrontOffsetNumericUpDown.Size = new System.Drawing.Size(70, 20); + this.FrontOffsetNumericUpDown.Size = new System.Drawing.Size(74, 20); this.FrontOffsetNumericUpDown.TabIndex = 30; + this.FrontOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // JumpingYNumericUpDown // - this.JumpingYNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.JumpingYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.JumpingYNumericUpDown.DecimalPlaces = 3; - this.JumpingYNumericUpDown.Location = new System.Drawing.Point(349, 108); + this.JumpingYNumericUpDown.Location = new System.Drawing.Point(66, 238); this.JumpingYNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -312,15 +309,19 @@ private void InitializeComponent() 0, -2147483648}); this.JumpingYNumericUpDown.Name = "JumpingYNumericUpDown"; - this.JumpingYNumericUpDown.Size = new System.Drawing.Size(89, 20); + this.JumpingYNumericUpDown.Size = new System.Drawing.Size(74, 20); this.JumpingYNumericUpDown.TabIndex = 26; + this.JumpingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // FallingYNumericUpDown // - this.FallingYNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.FallingYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.FallingYNumericUpDown.DecimalPlaces = 3; - this.FallingYNumericUpDown.Location = new System.Drawing.Point(349, 134); + this.FallingYNumericUpDown.Location = new System.Drawing.Point(66, 264); this.FallingYNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -332,14 +333,18 @@ private void InitializeComponent() 0, -2147483648}); this.FallingYNumericUpDown.Name = "FallingYNumericUpDown"; - this.FallingYNumericUpDown.Size = new System.Drawing.Size(89, 20); + this.FallingYNumericUpDown.Size = new System.Drawing.Size(74, 20); this.FallingYNumericUpDown.TabIndex = 28; + this.FallingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // CamEndIntNumericUpDown // - this.CamEndIntNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.CamEndIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.CamEndIntNumericUpDown.Location = new System.Drawing.Point(202, 134); + this.CamEndIntNumericUpDown.Location = new System.Drawing.Point(66, 420); this.CamEndIntNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -351,13 +356,18 @@ private void InitializeComponent() 0, -2147483648}); this.CamEndIntNumericUpDown.Name = "CamEndIntNumericUpDown"; - this.CamEndIntNumericUpDown.Size = new System.Drawing.Size(97, 20); + this.CamEndIntNumericUpDown.Size = new System.Drawing.Size(74, 20); this.CamEndIntNumericUpDown.TabIndex = 23; + this.CamEndIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // CamIntNumericUpDown // this.CamIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.CamIntNumericUpDown.Location = new System.Drawing.Point(88, 134); + this.CamIntNumericUpDown.Location = new System.Drawing.Point(66, 394); this.CamIntNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -369,16 +379,20 @@ private void InitializeComponent() 0, -2147483648}); this.CamIntNumericUpDown.Name = "CamIntNumericUpDown"; - this.CamIntNumericUpDown.Size = new System.Drawing.Size(52, 20); + this.CamIntNumericUpDown.Size = new System.Drawing.Size(74, 20); this.CamIntNumericUpDown.TabIndex = 21; + this.CamIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // FieldOfViewNumericUpDown // - this.FieldOfViewNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; 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(219, 82); + this.FieldOfViewNumericUpDown.Location = new System.Drawing.Point(66, 160); this.FieldOfViewNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -390,8 +404,13 @@ private void InitializeComponent() 0, -2147483648}); this.FieldOfViewNumericUpDown.Name = "FieldOfViewNumericUpDown"; - this.FieldOfViewNumericUpDown.Size = new System.Drawing.Size(80, 20); + this.FieldOfViewNumericUpDown.Size = new System.Drawing.Size(74, 20); this.FieldOfViewNumericUpDown.TabIndex = 19; + this.FieldOfViewNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // RotationXNumericUpDown // @@ -411,12 +430,16 @@ private void InitializeComponent() this.RotationXNumericUpDown.Name = "RotationXNumericUpDown"; this.RotationXNumericUpDown.Size = new System.Drawing.Size(74, 20); this.RotationXNumericUpDown.TabIndex = 5; + this.RotationXNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // Num2NumericUpDown // - this.Num2NumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Num2NumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.Num2NumericUpDown.Location = new System.Drawing.Point(349, 82); + this.Num2NumericUpDown.Location = new System.Drawing.Point(66, 316); this.Num2NumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -428,15 +451,19 @@ private void InitializeComponent() 0, -2147483648}); this.Num2NumericUpDown.Name = "Num2NumericUpDown"; - this.Num2NumericUpDown.Size = new System.Drawing.Size(89, 20); + this.Num2NumericUpDown.Size = new System.Drawing.Size(74, 20); this.Num2NumericUpDown.TabIndex = 13; + this.Num2NumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // ZoomNumericUpDown // - this.ZoomNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.ZoomNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.ZoomNumericUpDown.DecimalPlaces = 3; - this.ZoomNumericUpDown.Location = new System.Drawing.Point(186, 56); + this.ZoomNumericUpDown.Location = new System.Drawing.Point(66, 134); this.ZoomNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -448,8 +475,13 @@ private void InitializeComponent() 0, -2147483648}); this.ZoomNumericUpDown.Name = "ZoomNumericUpDown"; - this.ZoomNumericUpDown.Size = new System.Drawing.Size(113, 20); + this.ZoomNumericUpDown.Size = new System.Drawing.Size(74, 20); this.ZoomNumericUpDown.TabIndex = 17; + this.ZoomNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // RotationZNumericUpDown // @@ -469,12 +501,16 @@ private void InitializeComponent() this.RotationZNumericUpDown.Name = "RotationZNumericUpDown"; this.RotationZNumericUpDown.Size = new System.Drawing.Size(74, 20); this.RotationZNumericUpDown.TabIndex = 9; + this.RotationZNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // Num1NumericUpDown // - this.Num1NumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Num1NumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.Num1NumericUpDown.Location = new System.Drawing.Point(349, 56); + this.Num1NumericUpDown.Location = new System.Drawing.Point(66, 290); this.Num1NumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -486,8 +522,13 @@ private void InitializeComponent() 0, -2147483648}); this.Num1NumericUpDown.Name = "Num1NumericUpDown"; - this.Num1NumericUpDown.Size = new System.Drawing.Size(89, 20); + this.Num1NumericUpDown.Size = new System.Drawing.Size(74, 20); this.Num1NumericUpDown.TabIndex = 11; + this.Num1NumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // RotationYNumericUpDown // @@ -507,11 +548,16 @@ private void InitializeComponent() this.RotationYNumericUpDown.Name = "RotationYNumericUpDown"; this.RotationYNumericUpDown.Size = new System.Drawing.Size(74, 20); this.RotationYNumericUpDown.TabIndex = 7; + this.RotationYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // GroundDelayLabel // this.GroundDelayLabel.AutoSize = true; - this.GroundDelayLabel.Location = new System.Drawing.Point(3, 189); + this.GroundDelayLabel.Location = new System.Drawing.Point(261, 58); this.GroundDelayLabel.Name = "GroundDelayLabel"; this.GroundDelayLabel.Size = new System.Drawing.Size(72, 13); this.GroundDelayLabel.TabIndex = 34; @@ -520,7 +566,7 @@ private void InitializeComponent() // GroundDelayNumericUpDown // this.GroundDelayNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.GroundDelayNumericUpDown.Location = new System.Drawing.Point(83, 187); + this.GroundDelayNumericUpDown.Location = new System.Drawing.Point(339, 56); this.GroundDelayNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -532,13 +578,18 @@ private void InitializeComponent() 0, -2147483648}); this.GroundDelayNumericUpDown.Name = "GroundDelayNumericUpDown"; - this.GroundDelayNumericUpDown.Size = new System.Drawing.Size(70, 20); + this.GroundDelayNumericUpDown.Size = new System.Drawing.Size(99, 20); this.GroundDelayNumericUpDown.TabIndex = 35; + this.GroundDelayNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // AirDelayLabel // this.AirDelayLabel.AutoSize = true; - this.AirDelayLabel.Location = new System.Drawing.Point(3, 214); + this.AirDelayLabel.Location = new System.Drawing.Point(261, 82); this.AirDelayLabel.Name = "AirDelayLabel"; this.AirDelayLabel.Size = new System.Drawing.Size(49, 13); this.AirDelayLabel.TabIndex = 36; @@ -547,7 +598,7 @@ private void InitializeComponent() // AirDelayNumericUpDown // this.AirDelayNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.AirDelayNumericUpDown.Location = new System.Drawing.Point(83, 212); + this.AirDelayNumericUpDown.Location = new System.Drawing.Point(339, 82); this.AirDelayNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -559,35 +610,37 @@ private void InitializeComponent() 0, -2147483648}); this.AirDelayNumericUpDown.Name = "AirDelayNumericUpDown"; - this.AirDelayNumericUpDown.Size = new System.Drawing.Size(70, 20); + this.AirDelayNumericUpDown.Size = new System.Drawing.Size(99, 20); this.AirDelayNumericUpDown.TabIndex = 37; + this.AirDelayNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // DisableCollisionCheckBox // - this.DisableCollisionCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.DisableCollisionCheckBox.AutoSize = true; - this.DisableCollisionCheckBox.Location = new System.Drawing.Point(109, 407); + this.DisableCollisionCheckBox.Location = new System.Drawing.Point(374, 210); this.DisableCollisionCheckBox.Name = "DisableCollisionCheckBox"; - this.DisableCollisionCheckBox.Size = new System.Drawing.Size(102, 17); + this.DisableCollisionCheckBox.Size = new System.Drawing.Size(64, 17); this.DisableCollisionCheckBox.TabIndex = 38; - this.DisableCollisionCheckBox.Text = "Disable Collision"; + this.DisableCollisionCheckBox.Text = "Collision"; this.DisableCollisionCheckBox.UseVisualStyleBackColor = true; // // EventFrameLabel // - this.EventFrameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventFrameLabel.AutoSize = true; - this.EventFrameLabel.Location = new System.Drawing.Point(305, 189); + this.EventFrameLabel.Location = new System.Drawing.Point(261, 134); this.EventFrameLabel.Name = "EventFrameLabel"; - this.EventFrameLabel.Size = new System.Drawing.Size(61, 13); + this.EventFrameLabel.Size = new System.Drawing.Size(71, 13); this.EventFrameLabel.TabIndex = 39; - this.EventFrameLabel.Text = "Event Time"; + this.EventFrameLabel.Text = "Event Length"; // // EventFrameNumericUpDown // - this.EventFrameNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventFrameNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.EventFrameNumericUpDown.Location = new System.Drawing.Point(380, 187); + this.EventFrameNumericUpDown.Location = new System.Drawing.Point(339, 134); this.EventFrameNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -599,15 +652,19 @@ private void InitializeComponent() 0, -2147483648}); this.EventFrameNumericUpDown.Name = "EventFrameNumericUpDown"; - this.EventFrameNumericUpDown.Size = new System.Drawing.Size(58, 20); + this.EventFrameNumericUpDown.Size = new System.Drawing.Size(99, 20); this.EventFrameNumericUpDown.TabIndex = 40; + this.EventFrameNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // UpperBorderNumericUpDown // - this.UpperBorderNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.UpperBorderNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.UpperBorderNumericUpDown.DecimalPlaces = 3; - this.UpperBorderNumericUpDown.Location = new System.Drawing.Point(235, 187); + this.UpperBorderNumericUpDown.Location = new System.Drawing.Point(66, 342); this.UpperBorderNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -619,25 +676,28 @@ private void InitializeComponent() 0, -2147483648}); this.UpperBorderNumericUpDown.Name = "UpperBorderNumericUpDown"; - this.UpperBorderNumericUpDown.Size = new System.Drawing.Size(64, 20); + this.UpperBorderNumericUpDown.Size = new System.Drawing.Size(74, 20); this.UpperBorderNumericUpDown.TabIndex = 44; + this.UpperBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // UpperBorderLabel // - this.UpperBorderLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.UpperBorderLabel.AutoSize = true; - this.UpperBorderLabel.Location = new System.Drawing.Point(159, 189); + this.UpperBorderLabel.Location = new System.Drawing.Point(3, 344); this.UpperBorderLabel.Name = "UpperBorderLabel"; - this.UpperBorderLabel.Size = new System.Drawing.Size(70, 13); + this.UpperBorderLabel.Size = new System.Drawing.Size(36, 13); this.UpperBorderLabel.TabIndex = 43; - this.UpperBorderLabel.Text = "Upper Border"; + this.UpperBorderLabel.Text = "Upper"; // // LowerBorderNumericUpDown // - this.LowerBorderNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LowerBorderNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.LowerBorderNumericUpDown.DecimalPlaces = 3; - this.LowerBorderNumericUpDown.Location = new System.Drawing.Point(235, 212); + this.LowerBorderNumericUpDown.Location = new System.Drawing.Point(66, 368); this.LowerBorderNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -649,104 +709,103 @@ private void InitializeComponent() 0, -2147483648}); this.LowerBorderNumericUpDown.Name = "LowerBorderNumericUpDown"; - this.LowerBorderNumericUpDown.Size = new System.Drawing.Size(64, 20); + this.LowerBorderNumericUpDown.Size = new System.Drawing.Size(74, 20); this.LowerBorderNumericUpDown.TabIndex = 46; + this.LowerBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // LowerBorderLabel // - this.LowerBorderLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LowerBorderLabel.AutoSize = true; - this.LowerBorderLabel.Location = new System.Drawing.Point(159, 214); + this.LowerBorderLabel.Location = new System.Drawing.Point(3, 370); this.LowerBorderLabel.Name = "LowerBorderLabel"; - this.LowerBorderLabel.Size = new System.Drawing.Size(70, 13); + this.LowerBorderLabel.Size = new System.Drawing.Size(36, 13); this.LowerBorderLabel.TabIndex = 45; - this.LowerBorderLabel.Text = "Lower Border"; + this.LowerBorderLabel.Text = "Lower"; // // FixpointVector3NumericUpDown // - this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(3, 238); - this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(146, 56); + this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); this.FixpointVector3NumericUpDown.Name = "FixpointVector3NumericUpDown"; - this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); this.FixpointVector3NumericUpDown.TabIndex = 47; this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; // // WorldOffsetVector3NumericUpDown // - this.WorldOffsetVector3NumericUpDown.Location = new System.Drawing.Point(113, 238); - this.WorldOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.WorldOffsetVector3NumericUpDown.Location = new System.Drawing.Point(146, 153); + this.WorldOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); this.WorldOffsetVector3NumericUpDown.Name = "WorldOffsetVector3NumericUpDown"; - this.WorldOffsetVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.WorldOffsetVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); this.WorldOffsetVector3NumericUpDown.TabIndex = 48; this.WorldOffsetVector3NumericUpDown.Text = "World Offset"; // // VerticalPanAxisVector3NumericUpDown // - this.VerticalPanAxisVector3NumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.VerticalPanAxisVector3NumericUpDown.Location = new System.Drawing.Point(338, 238); - this.VerticalPanAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.VerticalPanAxisVector3NumericUpDown.Enabled = false; + this.VerticalPanAxisVector3NumericUpDown.Location = new System.Drawing.Point(146, 348); + this.VerticalPanAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); this.VerticalPanAxisVector3NumericUpDown.Name = "VerticalPanAxisVector3NumericUpDown"; - this.VerticalPanAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.VerticalPanAxisVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); this.VerticalPanAxisVector3NumericUpDown.TabIndex = 49; this.VerticalPanAxisVector3NumericUpDown.Text = "Vertical Axis"; // // UpAxisVector3NumericUpDown // - this.UpAxisVector3NumericUpDown.Location = new System.Drawing.Point(3, 331); - this.UpAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.UpAxisVector3NumericUpDown.Location = new System.Drawing.Point(261, 348); + this.UpAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); this.UpAxisVector3NumericUpDown.Name = "UpAxisVector3NumericUpDown"; - this.UpAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.UpAxisVector3NumericUpDown.Size = new System.Drawing.Size(177, 90); this.UpAxisVector3NumericUpDown.TabIndex = 50; this.UpAxisVector3NumericUpDown.Text = "Up Axis"; // // UseVerticalPanAxisCheckBox // - this.UseVerticalPanAxisCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.UseVerticalPanAxisCheckBox.AutoSize = true; - this.UseVerticalPanAxisCheckBox.Location = new System.Drawing.Point(314, 359); + this.UseVerticalPanAxisCheckBox.Location = new System.Drawing.Point(237, 349); this.UseVerticalPanAxisCheckBox.Name = "UseVerticalPanAxisCheckBox"; - this.UseVerticalPanAxisCheckBox.Size = new System.Drawing.Size(119, 17); + this.UseVerticalPanAxisCheckBox.Size = new System.Drawing.Size(15, 14); this.UseVerticalPanAxisCheckBox.TabIndex = 51; - this.UseVerticalPanAxisCheckBox.Text = "Enable Vertical Axis"; this.UseVerticalPanAxisCheckBox.UseVisualStyleBackColor = true; + this.UseVerticalPanAxisCheckBox.CheckedChanged += new System.EventHandler(this.UseVerticalPanAxisCheckBox_CheckedChanged); // // PlayerOffsetVector3NumericUpDown // - this.PlayerOffsetVector3NumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.PlayerOffsetVector3NumericUpDown.Location = new System.Drawing.Point(227, 238); - this.PlayerOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.PlayerOffsetVector3NumericUpDown.Location = new System.Drawing.Point(146, 250); + this.PlayerOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(50, 45); this.PlayerOffsetVector3NumericUpDown.Name = "PlayerOffsetVector3NumericUpDown"; - this.PlayerOffsetVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.PlayerOffsetVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); this.PlayerOffsetVector3NumericUpDown.TabIndex = 52; this.PlayerOffsetVector3NumericUpDown.Text = "Player Offset"; // // DisableAntiBlurCheckBox // - this.DisableAntiBlurCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.DisableAntiBlurCheckBox.AutoSize = true; - this.DisableAntiBlurCheckBox.Location = new System.Drawing.Point(233, 359); + this.DisableAntiBlurCheckBox.Location = new System.Drawing.Point(374, 233); this.DisableAntiBlurCheckBox.Name = "DisableAntiBlurCheckBox"; - this.DisableAntiBlurCheckBox.Size = new System.Drawing.Size(80, 17); + this.DisableAntiBlurCheckBox.Size = new System.Drawing.Size(44, 17); this.DisableAntiBlurCheckBox.TabIndex = 53; - this.DisableAntiBlurCheckBox.Text = "Enable Blur"; + this.DisableAntiBlurCheckBox.Text = "Blur"; this.DisableAntiBlurCheckBox.UseVisualStyleBackColor = true; // // DisableFirstPersonCheckBox // - this.DisableFirstPersonCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.DisableFirstPersonCheckBox.AutoSize = true; - this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(109, 359); + this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(261, 256); this.DisableFirstPersonCheckBox.Name = "DisableFirstPersonCheckBox"; - this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(119, 17); + this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(81, 17); this.DisableFirstPersonCheckBox.TabIndex = 54; - this.DisableFirstPersonCheckBox.Text = "Disable First Person"; + this.DisableFirstPersonCheckBox.Text = "First Person"; this.DisableFirstPersonCheckBox.UseVisualStyleBackColor = true; // // GFlagEndErpFrameCheckBox // - this.GFlagEndErpFrameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GFlagEndErpFrameCheckBox.AutoSize = true; - this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(314, 382); + this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(261, 302); this.GFlagEndErpFrameCheckBox.Name = "GFlagEndErpFrameCheckBox"; this.GFlagEndErpFrameCheckBox.Size = new System.Drawing.Size(118, 17); this.GFlagEndErpFrameCheckBox.TabIndex = 55; @@ -755,9 +814,8 @@ private void InitializeComponent() // // GFlagThroughCheckBox // - this.GFlagThroughCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.GFlagThroughCheckBox.AutoSize = true; - this.GFlagThroughCheckBox.Location = new System.Drawing.Point(217, 382); + this.GFlagThroughCheckBox.Location = new System.Drawing.Point(261, 325); this.GFlagThroughCheckBox.Name = "GFlagThroughCheckBox"; this.GFlagThroughCheckBox.Size = new System.Drawing.Size(94, 17); this.GFlagThroughCheckBox.TabIndex = 56; @@ -767,28 +825,27 @@ private void InitializeComponent() // EventUseTimeCheckBox // this.EventUseTimeCheckBox.AutoSize = true; - this.EventUseTimeCheckBox.Location = new System.Drawing.Point(109, 336); + this.EventUseTimeCheckBox.Location = new System.Drawing.Point(261, 210); this.EventUseTimeCheckBox.Name = "EventUseTimeCheckBox"; - this.EventUseTimeCheckBox.Size = new System.Drawing.Size(159, 17); + this.EventUseTimeCheckBox.Size = new System.Drawing.Size(108, 17); this.EventUseTimeCheckBox.TabIndex = 58; - this.EventUseTimeCheckBox.Text = "Events: Use Transition Time"; + this.EventUseTimeCheckBox.Text = "Event Enter Time"; this.EventUseTimeCheckBox.UseVisualStyleBackColor = true; // // EventUseEndTimeCheckBox // - this.EventUseEndTimeCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventUseEndTimeCheckBox.AutoSize = true; - this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(314, 407); + this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(261, 233); this.EventUseEndTimeCheckBox.Name = "EventUseEndTimeCheckBox"; - this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(130, 17); + this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(100, 17); this.EventUseEndTimeCheckBox.TabIndex = 59; - this.EventUseEndTimeCheckBox.Text = "Events: Use Exit Time"; + this.EventUseEndTimeCheckBox.Text = "Event Exit Time"; this.EventUseEndTimeCheckBox.UseVisualStyleBackColor = true; // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(274, 337); + this.label1.Location = new System.Drawing.Point(261, 186); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(34, 13); this.label1.TabIndex = 60; @@ -796,29 +853,25 @@ private void InitializeComponent() // // StringTextBox // - this.StringTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.StringTextBox.Location = new System.Drawing.Point(314, 334); + this.StringTextBox.Location = new System.Drawing.Point(301, 185); this.StringTextBox.Name = "StringTextBox"; - this.StringTextBox.Size = new System.Drawing.Size(124, 20); + this.StringTextBox.Size = new System.Drawing.Size(137, 20); this.StringTextBox.TabIndex = 61; // // DisableResetCheckBox // - this.DisableResetCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.DisableResetCheckBox.AutoSize = true; - this.DisableResetCheckBox.Location = new System.Drawing.Point(217, 407); + this.DisableResetCheckBox.Location = new System.Drawing.Point(374, 256); this.DisableResetCheckBox.Name = "DisableResetCheckBox"; - this.DisableResetCheckBox.Size = new System.Drawing.Size(92, 17); + this.DisableResetCheckBox.Size = new System.Drawing.Size(54, 17); this.DisableResetCheckBox.TabIndex = 62; - this.DisableResetCheckBox.Text = "Disable Reset"; + this.DisableResetCheckBox.Text = "Reset"; this.DisableResetCheckBox.UseVisualStyleBackColor = true; // // EventPriorityLabel // - this.EventPriorityLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventPriorityLabel.AutoSize = true; - this.EventPriorityLabel.Location = new System.Drawing.Point(305, 214); + this.EventPriorityLabel.Location = new System.Drawing.Point(261, 159); this.EventPriorityLabel.Name = "EventPriorityLabel"; this.EventPriorityLabel.Size = new System.Drawing.Size(69, 13); this.EventPriorityLabel.TabIndex = 41; @@ -826,9 +879,8 @@ private void InitializeComponent() // // EventPriorityNumericUpDown // - this.EventPriorityNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventPriorityNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.EventPriorityNumericUpDown.Location = new System.Drawing.Point(380, 212); + this.EventPriorityNumericUpDown.Location = new System.Drawing.Point(339, 159); this.EventPriorityNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -840,14 +892,18 @@ private void InitializeComponent() 0, -2147483648}); this.EventPriorityNumericUpDown.Name = "EventPriorityNumericUpDown"; - this.EventPriorityNumericUpDown.Size = new System.Drawing.Size(58, 20); + this.EventPriorityNumericUpDown.Size = new System.Drawing.Size(99, 20); this.EventPriorityNumericUpDown.TabIndex = 42; + this.EventPriorityNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // GFlagEndTimeLabel // - this.GFlagEndTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GFlagEndTimeLabel.AutoSize = true; - this.GFlagEndTimeLabel.Location = new System.Drawing.Point(305, 162); + this.GFlagEndTimeLabel.Location = new System.Drawing.Point(261, 108); this.GFlagEndTimeLabel.Name = "GFlagEndTimeLabel"; this.GFlagEndTimeLabel.Size = new System.Drawing.Size(34, 13); this.GFlagEndTimeLabel.TabIndex = 63; @@ -855,9 +911,8 @@ private void InitializeComponent() // // GFlagEndTimeNumericUpDown // - this.GFlagEndTimeNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.GFlagEndTimeNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); - this.GFlagEndTimeNumericUpDown.Location = new System.Drawing.Point(349, 160); + this.GFlagEndTimeNumericUpDown.Location = new System.Drawing.Point(339, 108); this.GFlagEndTimeNumericUpDown.Maximum = new decimal(new int[] { 2147483647, 0, @@ -869,8 +924,13 @@ private void InitializeComponent() 0, -2147483648}); this.GFlagEndTimeNumericUpDown.Name = "GFlagEndTimeNumericUpDown"; - this.GFlagEndTimeNumericUpDown.Size = new System.Drawing.Size(89, 20); + this.GFlagEndTimeNumericUpDown.Size = new System.Drawing.Size(99, 20); this.GFlagEndTimeNumericUpDown.TabIndex = 64; + this.GFlagEndTimeNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // // DefaultCameraPanel // diff --git a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs index 0c055d6..e8e57db 100644 --- a/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs +++ b/LaunchCamPlus/CameraPanels/DefaultCameraPanel.cs @@ -104,12 +104,12 @@ public override void LoadCamera(BCAMEntry Entry) VerticalPanAxisVector3NumericUpDown.LoadVector3(Entry.VerticalPanAxis); UpAxisVector3NumericUpDown.LoadVector3(Entry.UpAxis); - DisableResetCheckBox.Checked = Entry.DisableReset; + DisableResetCheckBox.Checked = !Entry.DisableReset; FieldOfViewCheckBox.Checked = Entry.EnableFoV; - SharpZoomCheckBox.Checked = Entry.SharpZoom; + SharpZoomCheckBox.Checked = !Entry.SharpZoom; DisableAntiBlurCheckBox.Checked = Entry.DisableAntiBlur; - DisableCollisionCheckBox.Checked = Entry.DisableCollision; - DisableFirstPersonCheckBox.Checked = Entry.DisableFirstPerson; + DisableCollisionCheckBox.Checked = !Entry.DisableCollision; + DisableFirstPersonCheckBox.Checked = !Entry.DisableFirstPerson; GFlagEndErpFrameCheckBox.Checked = Entry.GFlagEndErpFrame; GFlagThroughCheckBox.Checked = Entry.GFlagThrough; GFlagEndTimeNumericUpDown.Value = (decimal)Entry.GFlagEndTime; @@ -146,12 +146,12 @@ public override void UnLoadCamera(BCAMEntry Entry) Entry.PlayerOffset = PlayerOffsetVector3NumericUpDown.GetVector3(); Entry.VerticalPanAxis = VerticalPanAxisVector3NumericUpDown.GetVector3(); Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); - Entry.DisableReset = DisableResetCheckBox.Checked; + Entry.DisableReset = !DisableResetCheckBox.Checked; Entry.EnableFoV = FieldOfViewCheckBox.Checked; - Entry.SharpZoom = SharpZoomCheckBox.Checked; + Entry.SharpZoom = !SharpZoomCheckBox.Checked; Entry.DisableAntiBlur = DisableAntiBlurCheckBox.Checked; - Entry.DisableCollision = DisableCollisionCheckBox.Checked; - Entry.DisableFirstPerson = DisableFirstPersonCheckBox.Checked; + Entry.DisableCollision = !DisableCollisionCheckBox.Checked; + Entry.DisableFirstPerson = !DisableFirstPersonCheckBox.Checked; Entry.GFlagEndErpFrame = GFlagEndErpFrameCheckBox.Checked; Entry.GFlagThrough = GFlagThroughCheckBox.Checked; Entry.GFlagEndTime = (int)GFlagEndTimeNumericUpDown.Value; @@ -167,5 +167,10 @@ private void FieldOfViewCheckBox_CheckedChanged(object sender, EventArgs e) { FieldOfViewNumericUpDown.Enabled = FieldOfViewCheckBox.Checked; } + + private void UseVerticalPanAxisCheckBox_CheckedChanged(object sender, EventArgs e) + { + VerticalPanAxisVector3NumericUpDown.Enabled = UseVerticalPanAxisCheckBox.Checked; + } } } diff --git a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs new file mode 100644 index 0000000..e1b5ff0 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.Designer.cs @@ -0,0 +1,497 @@ +namespace LaunchCamPlus.CameraPanels +{ + partial class EyeposFixThereCameraPanel + { + /// + /// 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.RotationZLabel = new System.Windows.Forms.Label(); + this.RotationZNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.Num1CheckBox = new System.Windows.Forms.CheckBox(); + this.DisableFirstPersonCheckBox = new System.Windows.Forms.CheckBox(); + this.CamEndIntLabel = new System.Windows.Forms.Label(); + this.CamEndIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.CamIntLabel = new System.Windows.Forms.Label(); + this.CamIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.EventUseTimeCheckBox = new System.Windows.Forms.CheckBox(); + this.EventUseEndTimeCheckBox = new System.Windows.Forms.CheckBox(); + this.EventFrameLabel = new System.Windows.Forms.Label(); + this.EventFrameNumericUpDown = 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.FixpointVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.UpAxisVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.SharpZoomCheckBox = new System.Windows.Forms.CheckBox(); + this.GFlagEndTimeLabel = new System.Windows.Forms.Label(); + this.GFlagEndTimeNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.GFlagEndErpFrameCheckBox = new System.Windows.Forms.CheckBox(); + this.GFlagThroughCheckBox = new System.Windows.Forms.CheckBox(); + this.StringTextBox = new LaunchCamPlus.ColourTextBox(); + this.label1 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).BeginInit(); + this.SuspendLayout(); + // + // RotationZLabel + // + this.RotationZLabel.AutoSize = true; + this.RotationZLabel.Location = new System.Drawing.Point(3, 58); + this.RotationZLabel.Name = "RotationZLabel"; + this.RotationZLabel.Size = new System.Drawing.Size(25, 13); + this.RotationZLabel.TabIndex = 10; + this.RotationZLabel.Text = "Roll"; + // + // RotationZNumericUpDown + // + this.RotationZNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.RotationZNumericUpDown.DecimalPlaces = 3; + this.RotationZNumericUpDown.Location = new System.Drawing.Point(83, 56); + this.RotationZNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.RotationZNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.RotationZNumericUpDown.Name = "RotationZNumericUpDown"; + this.RotationZNumericUpDown.Size = new System.Drawing.Size(75, 20); + this.RotationZNumericUpDown.TabIndex = 11; + this.RotationZNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // Num1CheckBox + // + this.Num1CheckBox.AutoSize = true; + this.Num1CheckBox.Location = new System.Drawing.Point(270, 54); + this.Num1CheckBox.Name = "Num1CheckBox"; + this.Num1CheckBox.Size = new System.Drawing.Size(120, 17); + this.Num1CheckBox.TabIndex = 76; + this.Num1CheckBox.Text = "Advanced Tracking"; + this.Num1CheckBox.UseVisualStyleBackColor = true; + // + // DisableFirstPersonCheckBox + // + this.DisableFirstPersonCheckBox.AutoSize = true; + this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(270, 75); + this.DisableFirstPersonCheckBox.Name = "DisableFirstPersonCheckBox"; + this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(81, 17); + this.DisableFirstPersonCheckBox.TabIndex = 77; + this.DisableFirstPersonCheckBox.Text = "First Person"; + this.DisableFirstPersonCheckBox.UseVisualStyleBackColor = true; + // + // CamEndIntLabel + // + this.CamEndIntLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.CamEndIntLabel.AutoSize = true; + this.CamEndIntLabel.Location = new System.Drawing.Point(3, 162); + this.CamEndIntLabel.Name = "CamEndIntLabel"; + this.CamEndIntLabel.Size = new System.Drawing.Size(50, 13); + this.CamEndIntLabel.TabIndex = 80; + this.CamEndIntLabel.Text = "Exit Time"; + // + // CamEndIntNumericUpDown + // + this.CamEndIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.CamEndIntNumericUpDown.Location = new System.Drawing.Point(83, 160); + 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(75, 20); + this.CamEndIntNumericUpDown.TabIndex = 81; + this.CamEndIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // CamIntLabel + // + this.CamIntLabel.AutoSize = true; + this.CamIntLabel.Location = new System.Drawing.Point(3, 136); + this.CamIntLabel.Name = "CamIntLabel"; + this.CamIntLabel.Size = new System.Drawing.Size(58, 13); + this.CamIntLabel.TabIndex = 78; + 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(83, 134); + 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(75, 20); + this.CamIntNumericUpDown.TabIndex = 79; + this.CamIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // EventUseTimeCheckBox + // + this.EventUseTimeCheckBox.AutoSize = true; + this.EventUseTimeCheckBox.Location = new System.Drawing.Point(270, 120); + this.EventUseTimeCheckBox.Name = "EventUseTimeCheckBox"; + this.EventUseTimeCheckBox.Size = new System.Drawing.Size(108, 17); + this.EventUseTimeCheckBox.TabIndex = 82; + this.EventUseTimeCheckBox.Text = "Event Enter Time"; + this.EventUseTimeCheckBox.UseVisualStyleBackColor = true; + // + // EventUseEndTimeCheckBox + // + this.EventUseEndTimeCheckBox.AutoSize = true; + this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(270, 143); + this.EventUseEndTimeCheckBox.Name = "EventUseEndTimeCheckBox"; + this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(100, 17); + this.EventUseEndTimeCheckBox.TabIndex = 83; + this.EventUseEndTimeCheckBox.Text = "Event Exit Time"; + this.EventUseEndTimeCheckBox.UseVisualStyleBackColor = true; + // + // EventFrameLabel + // + this.EventFrameLabel.AutoSize = true; + this.EventFrameLabel.Location = new System.Drawing.Point(3, 188); + this.EventFrameLabel.Name = "EventFrameLabel"; + this.EventFrameLabel.Size = new System.Drawing.Size(71, 13); + this.EventFrameLabel.TabIndex = 84; + 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(83, 186); + 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(75, 20); + this.EventFrameNumericUpDown.TabIndex = 85; + this.EventFrameNumericUpDown.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(83, 108); + 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(75, 20); + this.HeightOffsetNumericUpDown.TabIndex = 89; + this.HeightOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // HeightOffsetLabel + // + this.HeightOffsetLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; + 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.TabIndex = 88; + this.HeightOffsetLabel.Text = "Air distance"; + // + // 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(83, 82); + 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(75, 20); + this.FrontOffsetNumericUpDown.TabIndex = 87; + this.FrontOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // FrontOffsetLabel + // + 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.TabIndex = 86; + this.FrontOffsetLabel.Text = "Front distance"; + // + // FixpointVector3NumericUpDown + // + this.FixpointVector3NumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(164, 54); + this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.FixpointVector3NumericUpDown.Name = "FixpointVector3NumericUpDown"; + this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.FixpointVector3NumericUpDown.TabIndex = 90; + this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; + // + // UpAxisVector3NumericUpDown + // + this.UpAxisVector3NumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.UpAxisVector3NumericUpDown.Location = new System.Drawing.Point(164, 144); + this.UpAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.UpAxisVector3NumericUpDown.Name = "UpAxisVector3NumericUpDown"; + this.UpAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.UpAxisVector3NumericUpDown.TabIndex = 91; + this.UpAxisVector3NumericUpDown.Text = "Up Axis"; + // + // SharpZoomCheckBox + // + 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.TabIndex = 92; + this.SharpZoomCheckBox.Text = "Distance Interpolation"; + this.SharpZoomCheckBox.UseVisualStyleBackColor = true; + // + // GFlagEndTimeLabel + // + this.GFlagEndTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GFlagEndTimeLabel.AutoSize = true; + this.GFlagEndTimeLabel.Location = new System.Drawing.Point(3, 214); + this.GFlagEndTimeLabel.Name = "GFlagEndTimeLabel"; + this.GFlagEndTimeLabel.Size = new System.Drawing.Size(57, 13); + this.GFlagEndTimeLabel.TabIndex = 94; + 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(83, 212); + 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(75, 20); + this.GFlagEndTimeNumericUpDown.TabIndex = 96; + this.GFlagEndTimeNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // GFlagEndErpFrameCheckBox + // + this.GFlagEndErpFrameCheckBox.AutoSize = true; + this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(270, 189); + this.GFlagEndErpFrameCheckBox.Name = "GFlagEndErpFrameCheckBox"; + this.GFlagEndErpFrameCheckBox.Size = new System.Drawing.Size(118, 17); + this.GFlagEndErpFrameCheckBox.TabIndex = 93; + this.GFlagEndErpFrameCheckBox.Text = "GFlagEndErpFrame"; + this.GFlagEndErpFrameCheckBox.UseVisualStyleBackColor = true; + // + // GFlagThroughCheckBox + // + this.GFlagThroughCheckBox.AutoSize = true; + this.GFlagThroughCheckBox.Location = new System.Drawing.Point(270, 166); + this.GFlagThroughCheckBox.Name = "GFlagThroughCheckBox"; + this.GFlagThroughCheckBox.Size = new System.Drawing.Size(94, 17); + this.GFlagThroughCheckBox.TabIndex = 95; + this.GFlagThroughCheckBox.Text = "GFlagThrough"; + this.GFlagThroughCheckBox.UseVisualStyleBackColor = true; + // + // StringTextBox + // + this.StringTextBox.Location = new System.Drawing.Point(310, 212); + this.StringTextBox.Name = "StringTextBox"; + this.StringTextBox.Size = new System.Drawing.Size(128, 20); + this.StringTextBox.TabIndex = 98; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(270, 215); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 97; + this.label1.Text = "String"; + // + // EyeposFixThereCameraPanel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CameraType = "CAM_TYPE_EYEPOS_FIX_THERE"; + this.Controls.Add(this.StringTextBox); + this.Controls.Add(this.label1); + this.Controls.Add(this.GFlagEndTimeLabel); + this.Controls.Add(this.GFlagEndTimeNumericUpDown); + this.Controls.Add(this.GFlagEndErpFrameCheckBox); + this.Controls.Add(this.GFlagThroughCheckBox); + this.Controls.Add(this.SharpZoomCheckBox); + this.Controls.Add(this.UpAxisVector3NumericUpDown); + this.Controls.Add(this.FixpointVector3NumericUpDown); + this.Controls.Add(this.HeightOffsetNumericUpDown); + this.Controls.Add(this.HeightOffsetLabel); + this.Controls.Add(this.FrontOffsetNumericUpDown); + this.Controls.Add(this.FrontOffsetLabel); + this.Controls.Add(this.EventFrameLabel); + this.Controls.Add(this.EventFrameNumericUpDown); + this.Controls.Add(this.CamEndIntLabel); + this.Controls.Add(this.CamEndIntNumericUpDown); + this.Controls.Add(this.CamIntLabel); + this.Controls.Add(this.CamIntNumericUpDown); + this.Controls.Add(this.EventUseTimeCheckBox); + this.Controls.Add(this.EventUseEndTimeCheckBox); + this.Controls.Add(this.DisableFirstPersonCheckBox); + this.Controls.Add(this.Num1CheckBox); + this.Controls.Add(this.RotationZLabel); + this.Controls.Add(this.RotationZNumericUpDown); + this.Name = "EyeposFixThereCameraPanel"; + this.Controls.SetChildIndex(this.RotationZNumericUpDown, 0); + this.Controls.SetChildIndex(this.RotationZLabel, 0); + this.Controls.SetChildIndex(this.Num1CheckBox, 0); + this.Controls.SetChildIndex(this.DisableFirstPersonCheckBox, 0); + this.Controls.SetChildIndex(this.EventUseEndTimeCheckBox, 0); + this.Controls.SetChildIndex(this.EventUseTimeCheckBox, 0); + this.Controls.SetChildIndex(this.CamIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamIntLabel, 0); + this.Controls.SetChildIndex(this.CamEndIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamEndIntLabel, 0); + this.Controls.SetChildIndex(this.EventFrameNumericUpDown, 0); + this.Controls.SetChildIndex(this.EventFrameLabel, 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.FixpointVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.UpAxisVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.SharpZoomCheckBox, 0); + this.Controls.SetChildIndex(this.GFlagThroughCheckBox, 0); + this.Controls.SetChildIndex(this.GFlagEndErpFrameCheckBox, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeNumericUpDown, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeLabel, 0); + this.Controls.SetChildIndex(this.label1, 0); + this.Controls.SetChildIndex(this.StringTextBox, 0); + ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label RotationZLabel; + private ColourNumericUpDown RotationZNumericUpDown; + private System.Windows.Forms.CheckBox Num1CheckBox; + private System.Windows.Forms.CheckBox DisableFirstPersonCheckBox; + private System.Windows.Forms.Label CamEndIntLabel; + private ColourNumericUpDown CamEndIntNumericUpDown; + private System.Windows.Forms.Label CamIntLabel; + private ColourNumericUpDown CamIntNumericUpDown; + private System.Windows.Forms.CheckBox EventUseTimeCheckBox; + private System.Windows.Forms.CheckBox EventUseEndTimeCheckBox; + private System.Windows.Forms.Label EventFrameLabel; + private ColourNumericUpDown EventFrameNumericUpDown; + private ColourNumericUpDown HeightOffsetNumericUpDown; + private System.Windows.Forms.Label HeightOffsetLabel; + private ColourNumericUpDown FrontOffsetNumericUpDown; + private System.Windows.Forms.Label FrontOffsetLabel; + private Vector3NumericUpDown FixpointVector3NumericUpDown; + private Vector3NumericUpDown UpAxisVector3NumericUpDown; + private System.Windows.Forms.CheckBox SharpZoomCheckBox; + private System.Windows.Forms.Label GFlagEndTimeLabel; + private ColourNumericUpDown GFlagEndTimeNumericUpDown; + private System.Windows.Forms.CheckBox GFlagEndErpFrameCheckBox; + private System.Windows.Forms.CheckBox GFlagThroughCheckBox; + private ColourTextBox StringTextBox; + private System.Windows.Forms.Label label1; + } +} diff --git a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs new file mode 100644 index 0000000..c068561 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.cs @@ -0,0 +1,122 @@ +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 EyeposFixThereCameraPanel : CameraPanelBase + { + public EyeposFixThereCameraPanel() + { + InitializeComponent(); + } + + + 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); + RotationZNumericUpDown.Value = (decimal)Entry.RotationZ.RadianToDegree(); + Num1CheckBox.Checked = Entry.Num1 > 0; + StringTextBox.Text = Entry.String; + CamIntNumericUpDown.Value = Entry.TransitionTime; + CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; + FrontOffsetNumericUpDown.Value = (decimal)Entry.FrontOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.HeightOffset; + EventFrameNumericUpDown.Value = Entry.EventFrames; + + FixpointVector3NumericUpDown.LoadVector3(Entry.FixPointOffset); + UpAxisVector3NumericUpDown.LoadVector3(Entry.UpAxis); + + SharpZoomCheckBox.Checked = !Entry.SharpZoom; + 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 = 0.0f; + Entry.RotationZ = ((float)RotationZNumericUpDown.Value).DegreeToRadian(); + Entry.Num1 = Num1CheckBox.Checked ? 1 : 0; + //Entry.Num2 = Num2CheckBox.Checked ? 1 : 0; + Entry.String = StringTextBox.Text; + Entry.FieldOfView = 45.0f; + Entry.MaxY = 0; + Entry.MinY = 0; + Entry.TransitionTime = (int)CamIntNumericUpDown.Value; + Entry.TransitionEndTime = (int)CamEndIntNumericUpDown.Value; + Entry.FrontOffset = (float)FrontOffsetNumericUpDown.Value; + Entry.HeightOffset = (float)HeightOffsetNumericUpDown.Value; + Entry.GroundMoveDelay = 0; + Entry.AirMoveDelay = 0; + Entry.UpperBorder = 0.0f; + Entry.LowerBorder = 0.0f; + Entry.EventFrames = (int)EventFrameNumericUpDown.Value; + Entry.EventPriority = Entry.IsOfCategory("e") ? 1 : 0; + Entry.FixPointOffset = FixpointVector3NumericUpDown.GetVector3(); + Entry.VerticalPanAxis = new Vector3(); + Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); + Entry.DisableReset = false; + Entry.EnableFoV = false; + Entry.SharpZoom = !SharpZoomCheckBox.Checked; + Entry.DisableAntiBlur = false; + Entry.DisableCollision = false; + 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; + } + } +} diff --git a/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.resx b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/EyeposFixThereCameraPanel.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 2958f68..393326f 100644 --- a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.Designer.cs @@ -51,19 +51,35 @@ private void InitializeComponent() this.ZoomNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); this.ZoomLabel = new System.Windows.Forms.Label(); this.FlagGroupBox = new System.Windows.Forms.GroupBox(); + this.UseVerticalPanAxisCheckBox = new System.Windows.Forms.CheckBox(); + this.GFlagEndErpFrameCheckBox = new System.Windows.Forms.CheckBox(); + this.GFlagThroughCheckBox = new System.Windows.Forms.CheckBox(); this.Num2CheckBox = new System.Windows.Forms.CheckBox(); + this.DisableAntiBlurCheckBox = new System.Windows.Forms.CheckBox(); this.Num1CheckBox = new System.Windows.Forms.CheckBox(); this.FieldOfViewCheckBox = 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.DisableAntiBlurCheckBox = new System.Windows.Forms.CheckBox(); this.SharpZoomCheckBox = new System.Windows.Forms.CheckBox(); this.DisableFirstPersonCheckBox = new System.Windows.Forms.CheckBox(); - this.GFlagTransitionEndTimeCheckBox = new System.Windows.Forms.CheckBox(); - this.GFlagThroughCheckBox = new System.Windows.Forms.CheckBox(); - this.GFlagEndErpFrameCheckBox = new System.Windows.Forms.CheckBox(); - this.UseVerticalPanAxisCheckBox = new System.Windows.Forms.CheckBox(); - this.DisableCollisionCheckBox = new System.Windows.Forms.CheckBox(); + this.CamEndIntLabel = new System.Windows.Forms.Label(); + this.CamEndIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.CamIntLabel = new System.Windows.Forms.Label(); + this.CamIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.FixpointVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.UpAxisVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.VerticalPanAxisVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.GFlagEndTimeLabel = new System.Windows.Forms.Label(); + this.GFlagEndTimeNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.AirDelayLabel = new System.Windows.Forms.Label(); + this.AirDelayNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.GroundDelayLabel = new System.Windows.Forms.Label(); + this.GroundDelayNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.EventFrameLabel = new System.Windows.Forms.Label(); + this.EventFrameNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.StringTextBox = new LaunchCamPlus.ColourTextBox(); + this.label1 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.RotationXNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).BeginInit(); @@ -76,6 +92,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.FieldOfViewNumericUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.ZoomNumericUpDown)).BeginInit(); this.FlagGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.AirDelayNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GroundDelayNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).BeginInit(); this.SuspendLayout(); // // RotationXNumericUpDown @@ -84,18 +106,23 @@ private void InitializeComponent() this.RotationXNumericUpDown.DecimalPlaces = 3; this.RotationXNumericUpDown.Location = new System.Drawing.Point(83, 56); this.RotationXNumericUpDown.Maximum = new decimal(new int[] { - 180, + 2147483647, 0, 0, 0}); this.RotationXNumericUpDown.Minimum = new decimal(new int[] { - 180, + -2147483648, 0, 0, -2147483648}); this.RotationXNumericUpDown.Name = "RotationXNumericUpDown"; this.RotationXNumericUpDown.Size = new System.Drawing.Size(75, 20); this.RotationXNumericUpDown.TabIndex = 11; + this.RotationXNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // RotationXLabel // @@ -130,18 +157,23 @@ private void InitializeComponent() this.RotationZNumericUpDown.DecimalPlaces = 3; this.RotationZNumericUpDown.Location = new System.Drawing.Point(83, 108); this.RotationZNumericUpDown.Maximum = new decimal(new int[] { - 180, + 2147483647, 0, 0, 0}); this.RotationZNumericUpDown.Minimum = new decimal(new int[] { - 180, + -2147483648, 0, 0, -2147483648}); this.RotationZNumericUpDown.Name = "RotationZNumericUpDown"; this.RotationZNumericUpDown.Size = new System.Drawing.Size(75, 20); this.RotationZNumericUpDown.TabIndex = 15; + this.RotationZNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // RotationYNumericUpDown // @@ -149,22 +181,26 @@ private void InitializeComponent() this.RotationYNumericUpDown.DecimalPlaces = 3; this.RotationYNumericUpDown.Location = new System.Drawing.Point(83, 82); this.RotationYNumericUpDown.Maximum = new decimal(new int[] { - 180, + 2147483647, 0, 0, 0}); this.RotationYNumericUpDown.Minimum = new decimal(new int[] { - 180, + -2147483648, 0, 0, -2147483648}); this.RotationYNumericUpDown.Name = "RotationYNumericUpDown"; this.RotationYNumericUpDown.Size = new System.Drawing.Size(75, 20); this.RotationYNumericUpDown.TabIndex = 13; + this.RotationYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // LowerBorderNumericUpDown // - this.LowerBorderNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.LowerBorderNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.LowerBorderNumericUpDown.DecimalPlaces = 3; this.LowerBorderNumericUpDown.Location = new System.Drawing.Point(83, 316); @@ -181,6 +217,11 @@ private void InitializeComponent() this.LowerBorderNumericUpDown.Name = "LowerBorderNumericUpDown"; this.LowerBorderNumericUpDown.Size = new System.Drawing.Size(75, 20); this.LowerBorderNumericUpDown.TabIndex = 62; + this.LowerBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // LowerBorderLabel // @@ -194,7 +235,6 @@ private void InitializeComponent() // // UpperBorderNumericUpDown // - this.UpperBorderNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.UpperBorderNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.UpperBorderNumericUpDown.DecimalPlaces = 3; this.UpperBorderNumericUpDown.Location = new System.Drawing.Point(83, 290); @@ -211,6 +251,11 @@ private void InitializeComponent() this.UpperBorderNumericUpDown.Name = "UpperBorderNumericUpDown"; this.UpperBorderNumericUpDown.Size = new System.Drawing.Size(75, 20); this.UpperBorderNumericUpDown.TabIndex = 60; + this.UpperBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // UpperBorderLabel // @@ -224,7 +269,6 @@ private void InitializeComponent() // // HeightOffsetNumericUpDown // - this.HeightOffsetNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; 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(83, 212); @@ -241,6 +285,11 @@ private void InitializeComponent() this.HeightOffsetNumericUpDown.Name = "HeightOffsetNumericUpDown"; this.HeightOffsetNumericUpDown.Size = new System.Drawing.Size(75, 20); this.HeightOffsetNumericUpDown.TabIndex = 58; + this.HeightOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // HeightOffsetLabel // @@ -270,6 +319,11 @@ private void InitializeComponent() this.FrontOffsetNumericUpDown.Name = "FrontOffsetNumericUpDown"; this.FrontOffsetNumericUpDown.Size = new System.Drawing.Size(75, 20); this.FrontOffsetNumericUpDown.TabIndex = 56; + this.FrontOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // FrontOffsetLabel // @@ -282,7 +336,6 @@ private void InitializeComponent() // // JumpingYNumericUpDown // - this.JumpingYNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.JumpingYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.JumpingYNumericUpDown.DecimalPlaces = 3; this.JumpingYNumericUpDown.Location = new System.Drawing.Point(83, 238); @@ -299,6 +352,11 @@ private void InitializeComponent() this.JumpingYNumericUpDown.Name = "JumpingYNumericUpDown"; this.JumpingYNumericUpDown.Size = new System.Drawing.Size(75, 20); this.JumpingYNumericUpDown.TabIndex = 52; + this.JumpingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // MaxYLabel // @@ -322,7 +380,6 @@ private void InitializeComponent() // // FallingYNumericUpDown // - this.FallingYNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.FallingYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.FallingYNumericUpDown.DecimalPlaces = 3; this.FallingYNumericUpDown.Location = new System.Drawing.Point(83, 264); @@ -339,12 +396,17 @@ private void InitializeComponent() this.FallingYNumericUpDown.Name = "FallingYNumericUpDown"; this.FallingYNumericUpDown.Size = new System.Drawing.Size(75, 20); this.FallingYNumericUpDown.TabIndex = 54; + this.FallingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // FieldOfViewNumericUpDown // - this.FieldOfViewNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; 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(83, 160); this.FieldOfViewNumericUpDown.Maximum = new decimal(new int[] { 2147483647, @@ -359,6 +421,11 @@ private void InitializeComponent() this.FieldOfViewNumericUpDown.Name = "FieldOfViewNumericUpDown"; this.FieldOfViewNumericUpDown.Size = new System.Drawing.Size(75, 20); this.FieldOfViewNumericUpDown.TabIndex = 50; + this.FieldOfViewNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // FieldOfViewLabel // @@ -372,7 +439,6 @@ private void InitializeComponent() // // ZoomNumericUpDown // - this.ZoomNumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; this.ZoomNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); this.ZoomNumericUpDown.DecimalPlaces = 3; this.ZoomNumericUpDown.Location = new System.Drawing.Point(83, 134); @@ -389,6 +455,11 @@ private void InitializeComponent() this.ZoomNumericUpDown.Name = "ZoomNumericUpDown"; this.ZoomNumericUpDown.Size = new System.Drawing.Size(75, 20); this.ZoomNumericUpDown.TabIndex = 48; + this.ZoomNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); // // ZoomLabel // @@ -402,44 +473,91 @@ private void InitializeComponent() // // FlagGroupBox // + this.FlagGroupBox.Controls.Add(this.UseVerticalPanAxisCheckBox); + this.FlagGroupBox.Controls.Add(this.GFlagEndErpFrameCheckBox); + this.FlagGroupBox.Controls.Add(this.GFlagThroughCheckBox); this.FlagGroupBox.Controls.Add(this.Num2CheckBox); + this.FlagGroupBox.Controls.Add(this.DisableAntiBlurCheckBox); this.FlagGroupBox.Controls.Add(this.Num1CheckBox); - this.FlagGroupBox.Controls.Add(this.GFlagThroughCheckBox); this.FlagGroupBox.Controls.Add(this.FieldOfViewCheckBox); this.FlagGroupBox.Controls.Add(this.EventUseTimeCheckBox); - this.FlagGroupBox.Controls.Add(this.EventUseEndTimeCheckBox); this.FlagGroupBox.Controls.Add(this.DisableCollisionCheckBox); - this.FlagGroupBox.Controls.Add(this.DisableAntiBlurCheckBox); + this.FlagGroupBox.Controls.Add(this.EventUseEndTimeCheckBox); this.FlagGroupBox.Controls.Add(this.SharpZoomCheckBox); this.FlagGroupBox.Controls.Add(this.DisableFirstPersonCheckBox); this.FlagGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom; - this.FlagGroupBox.Location = new System.Drawing.Point(0, 343); + this.FlagGroupBox.Location = new System.Drawing.Point(0, 342); this.FlagGroupBox.Name = "FlagGroupBox"; - this.FlagGroupBox.Size = new System.Drawing.Size(441, 98); + this.FlagGroupBox.Size = new System.Drawing.Size(441, 99); this.FlagGroupBox.TabIndex = 63; this.FlagGroupBox.TabStop = false; this.FlagGroupBox.Text = "Flags"; // + // UseVerticalPanAxisCheckBox + // + this.UseVerticalPanAxisCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.UseVerticalPanAxisCheckBox.AutoSize = true; + this.UseVerticalPanAxisCheckBox.Location = new System.Drawing.Point(203, 47); + this.UseVerticalPanAxisCheckBox.Name = "UseVerticalPanAxisCheckBox"; + this.UseVerticalPanAxisCheckBox.Size = new System.Drawing.Size(105, 17); + this.UseVerticalPanAxisCheckBox.TabIndex = 67; + this.UseVerticalPanAxisCheckBox.Text = "Use Vertical Axis"; + this.UseVerticalPanAxisCheckBox.UseVisualStyleBackColor = true; + this.UseVerticalPanAxisCheckBox.CheckedChanged += new System.EventHandler(this.UseVerticalPanAxisCheckBox_CheckedChanged); + // + // GFlagEndErpFrameCheckBox + // + this.GFlagEndErpFrameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GFlagEndErpFrameCheckBox.AutoSize = true; + this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(312, 75); + this.GFlagEndErpFrameCheckBox.Name = "GFlagEndErpFrameCheckBox"; + this.GFlagEndErpFrameCheckBox.Size = new System.Drawing.Size(118, 17); + this.GFlagEndErpFrameCheckBox.TabIndex = 70; + this.GFlagEndErpFrameCheckBox.Text = "GFlagEndErpFrame"; + this.GFlagEndErpFrameCheckBox.UseVisualStyleBackColor = true; + // + // GFlagThroughCheckBox + // + this.GFlagThroughCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.GFlagThroughCheckBox.AutoSize = true; + this.GFlagThroughCheckBox.Location = new System.Drawing.Point(312, 47); + this.GFlagThroughCheckBox.Name = "GFlagThroughCheckBox"; + this.GFlagThroughCheckBox.Size = new System.Drawing.Size(94, 17); + this.GFlagThroughCheckBox.TabIndex = 71; + this.GFlagThroughCheckBox.Text = "GFlagThrough"; + this.GFlagThroughCheckBox.UseVisualStyleBackColor = true; + // // Num2CheckBox // this.Num2CheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Num2CheckBox.AutoSize = true; - this.Num2CheckBox.Location = new System.Drawing.Point(302, 42); + this.Num2CheckBox.Location = new System.Drawing.Point(203, 75); this.Num2CheckBox.Name = "Num2CheckBox"; - this.Num2CheckBox.Size = new System.Drawing.Size(125, 17); + this.Num2CheckBox.Size = new System.Drawing.Size(87, 17); this.Num2CheckBox.TabIndex = 76; - this.Num2CheckBox.Text = "Disable D-Pad Reset"; + this.Num2CheckBox.Text = "D-Pad Reset"; this.Num2CheckBox.UseVisualStyleBackColor = true; // + // DisableAntiBlurCheckBox + // + this.DisableAntiBlurCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.DisableAntiBlurCheckBox.AutoSize = true; + this.DisableAntiBlurCheckBox.Location = new System.Drawing.Point(98, 47); + this.DisableAntiBlurCheckBox.Name = "DisableAntiBlurCheckBox"; + this.DisableAntiBlurCheckBox.Size = new System.Drawing.Size(97, 17); + this.DisableAntiBlurCheckBox.TabIndex = 68; + this.DisableAntiBlurCheckBox.Text = "Sharp Rotation"; + this.DisableAntiBlurCheckBox.UseVisualStyleBackColor = true; + // // Num1CheckBox // this.Num1CheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.Num1CheckBox.AutoSize = true; - this.Num1CheckBox.Location = new System.Drawing.Point(137, 42); + this.Num1CheckBox.Location = new System.Drawing.Point(98, 75); this.Num1CheckBox.Name = "Num1CheckBox"; - this.Num1CheckBox.Size = new System.Drawing.Size(137, 17); + this.Num1CheckBox.Size = new System.Drawing.Size(99, 17); this.Num1CheckBox.TabIndex = 75; - this.Num1CheckBox.Text = "Disable D-Pad Rotation"; + this.Num1CheckBox.Text = "D-Pad Rotation"; this.Num1CheckBox.UseVisualStyleBackColor = true; // // FieldOfViewCheckBox @@ -448,128 +566,338 @@ private void InitializeComponent() this.FieldOfViewCheckBox.AutoSize = true; this.FieldOfViewCheckBox.Location = new System.Drawing.Point(6, 19); this.FieldOfViewCheckBox.Name = "FieldOfViewCheckBox"; - this.FieldOfViewCheckBox.Size = new System.Drawing.Size(122, 17); + this.FieldOfViewCheckBox.Size = new System.Drawing.Size(86, 17); this.FieldOfViewCheckBox.TabIndex = 64; - this.FieldOfViewCheckBox.Text = "Enable Field of View"; + this.FieldOfViewCheckBox.Text = "Field of View"; this.FieldOfViewCheckBox.UseVisualStyleBackColor = true; + this.FieldOfViewCheckBox.CheckedChanged += new System.EventHandler(this.FieldOfViewCheckBox_CheckedChanged); // // EventUseTimeCheckBox // this.EventUseTimeCheckBox.AutoSize = true; - this.EventUseTimeCheckBox.Location = new System.Drawing.Point(114, 78); + this.EventUseTimeCheckBox.Location = new System.Drawing.Point(203, 19); this.EventUseTimeCheckBox.Name = "EventUseTimeCheckBox"; - this.EventUseTimeCheckBox.Size = new System.Drawing.Size(159, 17); + this.EventUseTimeCheckBox.Size = new System.Drawing.Size(108, 17); this.EventUseTimeCheckBox.TabIndex = 73; - this.EventUseTimeCheckBox.Text = "Events: Use Transition Time"; + this.EventUseTimeCheckBox.Text = "Event Enter Time"; this.EventUseTimeCheckBox.UseVisualStyleBackColor = true; // + // DisableCollisionCheckBox + // + this.DisableCollisionCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.DisableCollisionCheckBox.AutoSize = true; + this.DisableCollisionCheckBox.Location = new System.Drawing.Point(98, 19); + this.DisableCollisionCheckBox.Name = "DisableCollisionCheckBox"; + this.DisableCollisionCheckBox.Size = new System.Drawing.Size(102, 17); + this.DisableCollisionCheckBox.TabIndex = 66; + this.DisableCollisionCheckBox.Text = "Disable Collision"; + this.DisableCollisionCheckBox.UseVisualStyleBackColor = true; + // // EventUseEndTimeCheckBox // this.EventUseEndTimeCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.EventUseEndTimeCheckBox.AutoSize = true; - this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(305, 78); + this.EventUseEndTimeCheckBox.Location = new System.Drawing.Point(312, 19); this.EventUseEndTimeCheckBox.Name = "EventUseEndTimeCheckBox"; - this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(130, 17); + this.EventUseEndTimeCheckBox.Size = new System.Drawing.Size(100, 17); this.EventUseEndTimeCheckBox.TabIndex = 74; - this.EventUseEndTimeCheckBox.Text = "Events: Use Exit Time"; + this.EventUseEndTimeCheckBox.Text = "Event Exit Time"; this.EventUseEndTimeCheckBox.UseVisualStyleBackColor = true; // - // DisableAntiBlurCheckBox - // - this.DisableAntiBlurCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.DisableAntiBlurCheckBox.AutoSize = true; - this.DisableAntiBlurCheckBox.Location = new System.Drawing.Point(265, 19); - this.DisableAntiBlurCheckBox.Name = "DisableAntiBlurCheckBox"; - this.DisableAntiBlurCheckBox.Size = new System.Drawing.Size(80, 17); - this.DisableAntiBlurCheckBox.TabIndex = 68; - this.DisableAntiBlurCheckBox.Text = "Enable Blur"; - this.DisableAntiBlurCheckBox.UseVisualStyleBackColor = true; - // // SharpZoomCheckBox // - this.SharpZoomCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.SharpZoomCheckBox.AutoSize = true; - this.SharpZoomCheckBox.Location = new System.Drawing.Point(140, 19); + this.SharpZoomCheckBox.Location = new System.Drawing.Point(6, 75); this.SharpZoomCheckBox.Name = "SharpZoomCheckBox"; - this.SharpZoomCheckBox.Size = new System.Drawing.Size(122, 17); + this.SharpZoomCheckBox.Size = new System.Drawing.Size(80, 17); this.SharpZoomCheckBox.TabIndex = 65; - this.SharpZoomCheckBox.Text = "Disable Interpolation"; + this.SharpZoomCheckBox.Text = "Dist. Interp."; this.SharpZoomCheckBox.UseVisualStyleBackColor = true; // // DisableFirstPersonCheckBox // this.DisableFirstPersonCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; this.DisableFirstPersonCheckBox.AutoSize = true; - this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(6, 42); + this.DisableFirstPersonCheckBox.Location = new System.Drawing.Point(6, 47); this.DisableFirstPersonCheckBox.Name = "DisableFirstPersonCheckBox"; - this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(119, 17); + this.DisableFirstPersonCheckBox.Size = new System.Drawing.Size(81, 17); this.DisableFirstPersonCheckBox.TabIndex = 69; - this.DisableFirstPersonCheckBox.Text = "Disable First Person"; + this.DisableFirstPersonCheckBox.Text = "First Person"; this.DisableFirstPersonCheckBox.UseVisualStyleBackColor = true; // - // GFlagTransitionEndTimeCheckBox + // CamEndIntLabel // - this.GFlagTransitionEndTimeCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.GFlagTransitionEndTimeCheckBox.AutoSize = true; - this.GFlagTransitionEndTimeCheckBox.Location = new System.Drawing.Point(171, 239); - this.GFlagTransitionEndTimeCheckBox.Name = "GFlagTransitionEndTimeCheckBox"; - this.GFlagTransitionEndTimeCheckBox.Size = new System.Drawing.Size(96, 17); - this.GFlagTransitionEndTimeCheckBox.TabIndex = 72; - this.GFlagTransitionEndTimeCheckBox.Text = "GFlagEndTime"; - this.GFlagTransitionEndTimeCheckBox.UseVisualStyleBackColor = true; + this.CamEndIntLabel.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.CamEndIntLabel.AutoSize = true; + this.CamEndIntLabel.Location = new System.Drawing.Point(270, 84); + this.CamEndIntLabel.Name = "CamEndIntLabel"; + this.CamEndIntLabel.Size = new System.Drawing.Size(50, 13); + this.CamEndIntLabel.TabIndex = 66; + this.CamEndIntLabel.Text = "Exit Time"; // - // GFlagThroughCheckBox + // CamEndIntNumericUpDown // - this.GFlagThroughCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.GFlagThroughCheckBox.AutoSize = true; - this.GFlagThroughCheckBox.Location = new System.Drawing.Point(6, 55); - this.GFlagThroughCheckBox.Name = "GFlagThroughCheckBox"; - this.GFlagThroughCheckBox.Size = new System.Drawing.Size(94, 17); - this.GFlagThroughCheckBox.TabIndex = 71; - this.GFlagThroughCheckBox.Text = "GFlagThrough"; - this.GFlagThroughCheckBox.UseVisualStyleBackColor = true; + this.CamEndIntNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CamEndIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.CamEndIntNumericUpDown.Location = new System.Drawing.Point(355, 82); + 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(83, 20); + this.CamEndIntNumericUpDown.TabIndex = 67; + this.CamEndIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // - // GFlagEndErpFrameCheckBox + // CamIntLabel // - this.GFlagEndErpFrameCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.GFlagEndErpFrameCheckBox.AutoSize = true; - this.GFlagEndErpFrameCheckBox.Location = new System.Drawing.Point(312, 261); - this.GFlagEndErpFrameCheckBox.Name = "GFlagEndErpFrameCheckBox"; - this.GFlagEndErpFrameCheckBox.Size = new System.Drawing.Size(118, 17); - this.GFlagEndErpFrameCheckBox.TabIndex = 70; - this.GFlagEndErpFrameCheckBox.Text = "GFlagEndErpFrame"; - this.GFlagEndErpFrameCheckBox.UseVisualStyleBackColor = true; + this.CamIntLabel.AutoSize = true; + this.CamIntLabel.Location = new System.Drawing.Point(270, 58); + this.CamIntLabel.Name = "CamIntLabel"; + this.CamIntLabel.Size = new System.Drawing.Size(58, 13); + this.CamIntLabel.TabIndex = 64; + this.CamIntLabel.Text = "Enter Time"; // - // UseVerticalPanAxisCheckBox + // CamIntNumericUpDown // - this.UseVerticalPanAxisCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.UseVerticalPanAxisCheckBox.AutoSize = true; - this.UseVerticalPanAxisCheckBox.Location = new System.Drawing.Point(312, 295); - this.UseVerticalPanAxisCheckBox.Name = "UseVerticalPanAxisCheckBox"; - this.UseVerticalPanAxisCheckBox.Size = new System.Drawing.Size(119, 17); - this.UseVerticalPanAxisCheckBox.TabIndex = 67; - this.UseVerticalPanAxisCheckBox.Text = "Enable Vertical Axis"; - this.UseVerticalPanAxisCheckBox.UseVisualStyleBackColor = true; + this.CamIntNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.CamIntNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.CamIntNumericUpDown.Location = new System.Drawing.Point(355, 56); + 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(83, 20); + this.CamIntNumericUpDown.TabIndex = 65; + this.CamIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // - // DisableCollisionCheckBox + // FixpointVector3NumericUpDown + // + this.FixpointVector3NumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(164, 56); + this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.FixpointVector3NumericUpDown.Name = "FixpointVector3NumericUpDown"; + this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.FixpointVector3NumericUpDown.TabIndex = 68; + this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; + // + // UpAxisVector3NumericUpDown + // + this.UpAxisVector3NumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.UpAxisVector3NumericUpDown.Location = new System.Drawing.Point(164, 248); + this.UpAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.UpAxisVector3NumericUpDown.Name = "UpAxisVector3NumericUpDown"; + this.UpAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.UpAxisVector3NumericUpDown.TabIndex = 70; + this.UpAxisVector3NumericUpDown.Text = "Up Axis"; + // + // VerticalPanAxisVector3NumericUpDown + // + this.VerticalPanAxisVector3NumericUpDown.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.VerticalPanAxisVector3NumericUpDown.Enabled = false; + this.VerticalPanAxisVector3NumericUpDown.Location = new System.Drawing.Point(164, 151); + this.VerticalPanAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(100, 90); + this.VerticalPanAxisVector3NumericUpDown.Name = "VerticalPanAxisVector3NumericUpDown"; + this.VerticalPanAxisVector3NumericUpDown.Size = new System.Drawing.Size(100, 92); + this.VerticalPanAxisVector3NumericUpDown.TabIndex = 69; + this.VerticalPanAxisVector3NumericUpDown.Text = "Vertical Axis"; + // + // GFlagEndTimeLabel + // + this.GFlagEndTimeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GFlagEndTimeLabel.AutoSize = true; + this.GFlagEndTimeLabel.Location = new System.Drawing.Point(270, 110); + this.GFlagEndTimeLabel.Name = "GFlagEndTimeLabel"; + this.GFlagEndTimeLabel.Size = new System.Drawing.Size(57, 13); + this.GFlagEndTimeLabel.TabIndex = 71; + this.GFlagEndTimeLabel.Text = "GEndTime"; + // + // GFlagEndTimeNumericUpDown + // + this.GFlagEndTimeNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GFlagEndTimeNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.GFlagEndTimeNumericUpDown.Location = new System.Drawing.Point(355, 108); + 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(83, 20); + this.GFlagEndTimeNumericUpDown.TabIndex = 72; + this.GFlagEndTimeNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); // - this.DisableCollisionCheckBox.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.DisableCollisionCheckBox.AutoSize = true; - this.DisableCollisionCheckBox.Location = new System.Drawing.Point(6, 78); - this.DisableCollisionCheckBox.Name = "DisableCollisionCheckBox"; - this.DisableCollisionCheckBox.Size = new System.Drawing.Size(102, 17); - this.DisableCollisionCheckBox.TabIndex = 66; - this.DisableCollisionCheckBox.Text = "Disable Collision"; - this.DisableCollisionCheckBox.UseVisualStyleBackColor = true; + // AirDelayLabel + // + this.AirDelayLabel.AutoSize = true; + this.AirDelayLabel.Location = new System.Drawing.Point(270, 161); + this.AirDelayLabel.Name = "AirDelayLabel"; + this.AirDelayLabel.Size = new System.Drawing.Size(49, 13); + this.AirDelayLabel.TabIndex = 75; + this.AirDelayLabel.Text = "Air Delay"; + // + // AirDelayNumericUpDown + // + this.AirDelayNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.AirDelayNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.AirDelayNumericUpDown.Location = new System.Drawing.Point(355, 159); + this.AirDelayNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.AirDelayNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.AirDelayNumericUpDown.Name = "AirDelayNumericUpDown"; + this.AirDelayNumericUpDown.Size = new System.Drawing.Size(83, 20); + this.AirDelayNumericUpDown.TabIndex = 76; + this.AirDelayNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // GroundDelayLabel + // + this.GroundDelayLabel.AutoSize = true; + this.GroundDelayLabel.Location = new System.Drawing.Point(270, 136); + this.GroundDelayLabel.Name = "GroundDelayLabel"; + this.GroundDelayLabel.Size = new System.Drawing.Size(72, 13); + this.GroundDelayLabel.TabIndex = 73; + this.GroundDelayLabel.Text = "Ground Delay"; + // + // GroundDelayNumericUpDown + // + this.GroundDelayNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.GroundDelayNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.GroundDelayNumericUpDown.Location = new System.Drawing.Point(355, 134); + this.GroundDelayNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.GroundDelayNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.GroundDelayNumericUpDown.Name = "GroundDelayNumericUpDown"; + this.GroundDelayNumericUpDown.Size = new System.Drawing.Size(83, 20); + this.GroundDelayNumericUpDown.TabIndex = 74; + this.GroundDelayNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // EventFrameLabel + // + this.EventFrameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.EventFrameLabel.AutoSize = true; + this.EventFrameLabel.Location = new System.Drawing.Point(270, 187); + this.EventFrameLabel.Name = "EventFrameLabel"; + this.EventFrameLabel.Size = new System.Drawing.Size(71, 13); + this.EventFrameLabel.TabIndex = 77; + this.EventFrameLabel.Text = "Event Length"; + // + // EventFrameNumericUpDown + // + this.EventFrameNumericUpDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.EventFrameNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.EventFrameNumericUpDown.Location = new System.Drawing.Point(355, 185); + 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(83, 20); + this.EventFrameNumericUpDown.TabIndex = 78; + this.EventFrameNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // StringTextBox + // + this.StringTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.StringTextBox.Location = new System.Drawing.Point(273, 224); + this.StringTextBox.Multiline = true; + this.StringTextBox.Name = "StringTextBox"; + this.StringTextBox.Size = new System.Drawing.Size(165, 112); + this.StringTextBox.TabIndex = 80; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(270, 208); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(34, 13); + this.label1.TabIndex = 79; + this.label1.Text = "String"; // // XZParaCameraPanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CameraType = "CAM_TYPE_XZ_PARA"; - this.Controls.Add(this.GFlagTransitionEndTimeCheckBox); - this.Controls.Add(this.GFlagEndErpFrameCheckBox); - this.Controls.Add(this.UseVerticalPanAxisCheckBox); + this.Controls.Add(this.StringTextBox); + this.Controls.Add(this.label1); + this.Controls.Add(this.EventFrameLabel); + this.Controls.Add(this.EventFrameNumericUpDown); + this.Controls.Add(this.AirDelayLabel); + this.Controls.Add(this.AirDelayNumericUpDown); + this.Controls.Add(this.GroundDelayLabel); + this.Controls.Add(this.GroundDelayNumericUpDown); + this.Controls.Add(this.GFlagEndTimeLabel); + this.Controls.Add(this.GFlagEndTimeNumericUpDown); + this.Controls.Add(this.UpAxisVector3NumericUpDown); + this.Controls.Add(this.VerticalPanAxisVector3NumericUpDown); + this.Controls.Add(this.FixpointVector3NumericUpDown); + this.Controls.Add(this.CamEndIntLabel); + this.Controls.Add(this.CamEndIntNumericUpDown); + this.Controls.Add(this.CamIntLabel); + this.Controls.Add(this.CamIntNumericUpDown); this.Controls.Add(this.FlagGroupBox); this.Controls.Add(this.LowerBorderNumericUpDown); this.Controls.Add(this.LowerBorderLabel); @@ -617,9 +945,23 @@ private void InitializeComponent() this.Controls.SetChildIndex(this.LowerBorderLabel, 0); this.Controls.SetChildIndex(this.LowerBorderNumericUpDown, 0); this.Controls.SetChildIndex(this.FlagGroupBox, 0); - this.Controls.SetChildIndex(this.UseVerticalPanAxisCheckBox, 0); - this.Controls.SetChildIndex(this.GFlagEndErpFrameCheckBox, 0); - this.Controls.SetChildIndex(this.GFlagTransitionEndTimeCheckBox, 0); + this.Controls.SetChildIndex(this.CamIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamIntLabel, 0); + this.Controls.SetChildIndex(this.CamEndIntNumericUpDown, 0); + this.Controls.SetChildIndex(this.CamEndIntLabel, 0); + this.Controls.SetChildIndex(this.FixpointVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.VerticalPanAxisVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.UpAxisVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeNumericUpDown, 0); + this.Controls.SetChildIndex(this.GFlagEndTimeLabel, 0); + this.Controls.SetChildIndex(this.GroundDelayNumericUpDown, 0); + this.Controls.SetChildIndex(this.GroundDelayLabel, 0); + this.Controls.SetChildIndex(this.AirDelayNumericUpDown, 0); + this.Controls.SetChildIndex(this.AirDelayLabel, 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); ((System.ComponentModel.ISupportInitialize)(this.RotationXNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).EndInit(); @@ -633,6 +975,12 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.ZoomNumericUpDown)).EndInit(); this.FlagGroupBox.ResumeLayout(false); this.FlagGroupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GFlagEndTimeNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.AirDelayNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GroundDelayNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.EventFrameNumericUpDown)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -671,10 +1019,26 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox DisableAntiBlurCheckBox; private System.Windows.Forms.CheckBox SharpZoomCheckBox; private System.Windows.Forms.CheckBox DisableFirstPersonCheckBox; - private System.Windows.Forms.CheckBox GFlagTransitionEndTimeCheckBox; private System.Windows.Forms.CheckBox GFlagThroughCheckBox; private System.Windows.Forms.CheckBox GFlagEndErpFrameCheckBox; private System.Windows.Forms.CheckBox UseVerticalPanAxisCheckBox; private System.Windows.Forms.CheckBox DisableCollisionCheckBox; + private System.Windows.Forms.Label CamEndIntLabel; + private ColourNumericUpDown CamEndIntNumericUpDown; + private System.Windows.Forms.Label CamIntLabel; + private ColourNumericUpDown CamIntNumericUpDown; + private Vector3NumericUpDown FixpointVector3NumericUpDown; + private Vector3NumericUpDown UpAxisVector3NumericUpDown; + private Vector3NumericUpDown VerticalPanAxisVector3NumericUpDown; + private System.Windows.Forms.Label GFlagEndTimeLabel; + private ColourNumericUpDown GFlagEndTimeNumericUpDown; + private System.Windows.Forms.Label AirDelayLabel; + private ColourNumericUpDown AirDelayNumericUpDown; + private System.Windows.Forms.Label GroundDelayLabel; + private ColourNumericUpDown GroundDelayNumericUpDown; + private System.Windows.Forms.Label EventFrameLabel; + private ColourNumericUpDown EventFrameNumericUpDown; + private ColourTextBox StringTextBox; + private System.Windows.Forms.Label label1; } } diff --git a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs index bfc04b7..b650c19 100644 --- a/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs +++ b/LaunchCamPlus/CameraPanels/XZParaCameraPanel.cs @@ -7,6 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Hackio.IO.BCAM; namespace LaunchCamPlus.CameraPanels { @@ -16,5 +17,132 @@ public XZParaCameraPanel() { InitializeComponent(); } + + 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); + RotationXNumericUpDown.Value = (decimal)Entry.RotationX.RadianToDegree(); + RotationYNumericUpDown.Value = (decimal)Entry.RotationY.RadianToDegree(); + RotationZNumericUpDown.Value = (decimal)Entry.RotationZ.RadianToDegree(); + ZoomNumericUpDown.Value = (decimal)Entry.Zoom; + Num1CheckBox.Checked = Entry.Num1 > 0; + Num2CheckBox.Checked = Entry.Num2 > 0; + StringTextBox.Text = Entry.String; + FieldOfViewNumericUpDown.Value = (decimal)Entry.FieldOfView; + JumpingYNumericUpDown.Value = (decimal)Entry.MaxY; + FallingYNumericUpDown.Value = (decimal)Entry.MinY; + CamIntNumericUpDown.Value = Entry.TransitionTime; + CamEndIntNumericUpDown.Value = Entry.TransitionEndTime; + FrontOffsetNumericUpDown.Value = (decimal)Entry.FrontOffset; + HeightOffsetNumericUpDown.Value = (decimal)Entry.HeightOffset; + GroundDelayNumericUpDown.Value = Entry.GroundMoveDelay; + AirDelayNumericUpDown.Value = Entry.AirMoveDelay; + UpperBorderNumericUpDown.Value = (decimal)Entry.UpperBorder; + LowerBorderNumericUpDown.Value = (decimal)Entry.LowerBorder; + EventFrameNumericUpDown.Value = Entry.EventFrames; + + FixpointVector3NumericUpDown.LoadVector3(Entry.FixPointOffset); + VerticalPanAxisVector3NumericUpDown.LoadVector3(Entry.VerticalPanAxis); + UpAxisVector3NumericUpDown.LoadVector3(Entry.UpAxis); + + FieldOfViewCheckBox.Checked = Entry.EnableFoV; + SharpZoomCheckBox.Checked = !Entry.SharpZoom; + 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; + UseVerticalPanAxisCheckBox.Checked = Entry.EnableVerticalPanAxis; + EventUseTimeCheckBox.Checked = Entry.EventUseTransitionTime; + EventUseEndTimeCheckBox.Checked = Entry.EventUseTransitionEndTime; + } + + public override void UnLoadCamera(BCAMEntry Entry) + { + base.UnLoadCamera(Entry); + Entry.RotationX = ((float)RotationXNumericUpDown.Value).DegreeToRadian(); + Entry.RotationY = ((float)RotationYNumericUpDown.Value).DegreeToRadian(); + Entry.RotationZ = ((float)RotationZNumericUpDown.Value).DegreeToRadian(); + Entry.Zoom = (float)ZoomNumericUpDown.Value; + Entry.Num1 = Num1CheckBox.Checked ? 1 : 0; + Entry.Num2 = Num2CheckBox.Checked ? 1 : 0; + Entry.String = StringTextBox.Text; + Entry.FieldOfView = (float)FieldOfViewNumericUpDown.Value; + Entry.MaxY = (float)JumpingYNumericUpDown.Value; + 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.GroundMoveDelay = (int)GroundDelayNumericUpDown.Value; + Entry.AirMoveDelay = (int)AirDelayNumericUpDown.Value; + Entry.UpperBorder = (float)UpperBorderNumericUpDown.Value; + Entry.LowerBorder = (float)LowerBorderNumericUpDown.Value; + Entry.EventFrames = (int)EventFrameNumericUpDown.Value; + Entry.EventPriority = Entry.IsOfCategory("e") ? 1 : 0; + Entry.FixPointOffset = FixpointVector3NumericUpDown.GetVector3(); + Entry.VerticalPanAxis = VerticalPanAxisVector3NumericUpDown.GetVector3(); + Entry.UpAxis = UpAxisVector3NumericUpDown.GetVector3(); + Entry.DisableReset = false; + Entry.EnableFoV = FieldOfViewCheckBox.Checked; + Entry.SharpZoom = !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 = UseVerticalPanAxisCheckBox.Checked; + Entry.EventUseTransitionTime = EventUseTimeCheckBox.Checked; + Entry.EventUseTransitionEndTime = EventUseEndTimeCheckBox.Checked; + + Entry.UDown = 120; + Entry.TransitionGroundTime = 120; + } + + private void FieldOfViewCheckBox_CheckedChanged(object sender, EventArgs e) + { + FieldOfViewNumericUpDown.Enabled = FieldOfViewCheckBox.Checked; + } + + private void UseVerticalPanAxisCheckBox_CheckedChanged(object sender, EventArgs e) + { + VerticalPanAxisVector3NumericUpDown.Enabled = UseVerticalPanAxisCheckBox.Checked; + } } } diff --git a/LaunchCamPlus/Extra Controls/ColourComboBox.cs b/LaunchCamPlus/Extra Controls/ColourComboBox.cs index a588cea..4d90c77 100644 --- a/LaunchCamPlus/Extra Controls/ColourComboBox.cs +++ b/LaunchCamPlus/Extra Controls/ColourComboBox.cs @@ -7,6 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using System.Diagnostics; namespace LaunchCamPlus { @@ -14,6 +15,8 @@ public class ColourComboBox : ComboBox { private const int WM_PAINT = 0xF; private readonly int buttonWidth = SystemInformation.HorizontalScrollBarArrowWidth; + + [DebuggerStepThrough] protected override void WndProc(ref Message m) { base.WndProc(ref m); @@ -53,41 +56,4 @@ public ColourComboBox() [DefaultValue(typeof(Color), "Gray")] public Color BorderColor { get; set; } } - - public class ColourNumericUpDown : NumericUpDown - { - private const int WM_PAINT = 0xF; - private readonly int buttonWidth = SystemInformation.HorizontalScrollBarArrowWidth; - protected override void WndProc(ref Message m) - { - base.WndProc(ref m); - if (m.Msg == WM_PAINT) - { - using (var g = Graphics.FromHwnd(Handle)) - { - // Uncomment this if you don't want the "highlight border". - //using (var p = new Pen(this.BorderColor, 1)) - //{ - // g.DrawRectangle(p, 0, 0, Width - buttonWidth - 1, Height - 1); - //} - using (var p = new Pen(this.BorderColor, 1)) - { - g.DrawRectangle(p, 0, 0, Width - buttonWidth - 1, Height - 1); - } - } - } - } - - public ColourNumericUpDown() - { - BorderColor = Color.FromArgb(200, 200, 200); - SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - //Resize += (object sender, EventArgs e) => { Refresh(); }; - } - - [Browsable(true)] - [Category("Appearance")] - [DefaultValue(typeof(Color), "Gray")] - public Color BorderColor { get; set; } - } } diff --git a/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs b/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs new file mode 100644 index 0000000..d83eea0 --- /dev/null +++ b/LaunchCamPlus/Extra Controls/ColourNumericUpDown.cs @@ -0,0 +1,77 @@ +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.Diagnostics; + +namespace LaunchCamPlus +{ + public class ColourNumericUpDown : NumericUpDown + { + private const int WM_PAINT = 0xF; + private readonly int buttonWidth = SystemInformation.HorizontalScrollBarArrowWidth; + + [DebuggerStepThrough] + protected override void WndProc(ref Message m) + { + base.WndProc(ref m); + if (m.Msg == WM_PAINT) + { + using (var g = Graphics.FromHwnd(Handle)) + { + // Uncomment this if you don't want the "highlight border". + //using (var p = new Pen(this.BorderColor, 1)) + //{ + // g.DrawRectangle(p, 0, 0, Width - buttonWidth - 1, Height - 1); + //} + using (var p = new Pen(this.BorderColor, 1)) + { + g.DrawRectangle(p, 0, 0, Width - buttonWidth - 1, Height - 1); + } + } + } + } + + public ColourNumericUpDown() + { + BorderColor = Color.FromArgb(200, 200, 200); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); + //Resize += (object sender, EventArgs e) => { Refresh(); }; + } + + [Browsable(true)] + [Category("Appearance")] + [DefaultValue(typeof(Color), "Gray")] + public Color BorderColor { get; set; } + + private decimal _textval; + public decimal TextValue + { + get + { + return _textval; + } + set + { + _textval = Math.Min(Math.Max(Minimum, value), Maximum); + } + } + + protected override void OnValueChanged(EventArgs e) + { + _textval = Value; + } + protected override void OnTextChanged(EventArgs e) + { + if (decimal.TryParse(string.IsNullOrWhiteSpace(Text) ? "0.0" : Text, out decimal result)) + { + _textval = result; + } + } + } +} diff --git a/LaunchCamPlus/Extra Controls/IdentificationAssistant.cs b/LaunchCamPlus/Extra Controls/IdentificationAssistant.cs index c0716f8..347fc5c 100644 --- a/LaunchCamPlus/Extra Controls/IdentificationAssistant.cs +++ b/LaunchCamPlus/Extra Controls/IdentificationAssistant.cs @@ -113,10 +113,10 @@ private void BuildEvent() switch (CategoryComboBox.SelectedIndex) { case 0: - final += "c:" + ((int)CamIDNumericUpDown.Value).ToString("X4"); + final += "c:" + ((int)CamIDNumericUpDown.Value).ToString("x4"); break; case 1: - final += "s:" + ((int)CamIDNumericUpDown.Value).ToString("X4"); + final += "s:" + ((int)CamIDNumericUpDown.Value).ToString("x4"); break; case 2: final += "e:"+EventComboBox.SelectedValue.ToString(); diff --git a/LaunchCamPlus/Extra Controls/SettingsPanel.Designer.cs b/LaunchCamPlus/Extra Controls/SettingsPanel.Designer.cs index ec3f00d..853414a 100644 --- a/LaunchCamPlus/Extra Controls/SettingsPanel.Designer.cs +++ b/LaunchCamPlus/Extra Controls/SettingsPanel.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsPanel)); this.LogoPictureBox = new System.Windows.Forms.PictureBox(); this.AboutLabel = new System.Windows.Forms.Label(); this.VisualSettingsGroupBox = new System.Windows.Forms.GroupBox(); @@ -91,7 +92,7 @@ private void InitializeComponent() this.VisualSettingsGroupBox.Size = new System.Drawing.Size(435, 118); this.VisualSettingsGroupBox.TabIndex = 2; this.VisualSettingsGroupBox.TabStop = false; - this.VisualSettingsGroupBox.Text = "Visuals"; + this.VisualSettingsGroupBox.Text = "Visuals and Audio"; // // SfxCheckBox // @@ -121,7 +122,6 @@ private void InitializeComponent() // UniqueEditorsCheckbox // this.UniqueEditorsCheckbox.AutoSize = true; - this.UniqueEditorsCheckbox.Enabled = false; this.UniqueEditorsCheckbox.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.UniqueEditorsCheckbox.Location = new System.Drawing.Point(6, 52); this.UniqueEditorsCheckbox.Name = "UniqueEditorsCheckbox"; @@ -263,13 +263,11 @@ private void InitializeComponent() // NoticeLabel // this.NoticeLabel.AutoSize = true; - this.NoticeLabel.Location = new System.Drawing.Point(3, 256); + this.NoticeLabel.Location = new System.Drawing.Point(22, 257); this.NoticeLabel.Name = "NoticeLabel"; - this.NoticeLabel.Size = new System.Drawing.Size(368, 65); + this.NoticeLabel.Size = new System.Drawing.Size(368, 78); this.NoticeLabel.TabIndex = 5; - this.NoticeLabel.Text = "!!NOTICE!!\r\nThis is a Pre-release version of Launch Cam Plus.\r\nIf your cameras ar" + - "e not working as expected, try disabling Advanced Saving.\r\n\r\nUnique Editors are " + - "Disabled atm due to being unfinished"; + this.NoticeLabel.Text = resources.GetString("NoticeLabel.Text"); // // SettingsPanel // diff --git a/LaunchCamPlus/Extra Controls/SettingsPanel.cs b/LaunchCamPlus/Extra Controls/SettingsPanel.cs index 4bdec95..056bb79 100644 --- a/LaunchCamPlus/Extra Controls/SettingsPanel.cs +++ b/LaunchCamPlus/Extra Controls/SettingsPanel.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using LaunchCamPlus.Properties; +using System.Runtime.InteropServices; namespace LaunchCamPlus { diff --git a/LaunchCamPlus/Extra Controls/SettingsPanel.resx b/LaunchCamPlus/Extra Controls/SettingsPanel.resx index 1af7de1..b211355 100644 --- a/LaunchCamPlus/Extra Controls/SettingsPanel.resx +++ b/LaunchCamPlus/Extra Controls/SettingsPanel.resx @@ -117,4 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + !!NOTICE!! +This is a Pre-release version of Launch Cam Plus. +If your cameras are not working as expected, try disabling Advanced Saving. + +Be careful with Unique Editors! Switching from 1 unique editor to another +may erase data useless to the camera you're switching from. + \ No newline at end of file diff --git a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs index bccfe21..268089e 100644 --- a/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs +++ b/LaunchCamPlus/Extra Controls/Vector3NumericUpDown.Designer.cs @@ -119,7 +119,7 @@ private void InitializeComponent() this.Controls.Add(this.ZValueNumericUpDown); this.Controls.Add(this.YValueNumericUpDown); this.Controls.Add(this.XValueNumericUpDown); - this.MinimumSize = new System.Drawing.Size(100, 90); + this.MinimumSize = new System.Drawing.Size(50, 90); this.Name = "Vector3NumericUpDown"; this.Size = new System.Drawing.Size(100, 90); ((System.ComponentModel.ISupportInitialize)(this.ZValueNumericUpDown)).EndInit(); diff --git a/LaunchCamPlus/Formats/BCAM.cs b/LaunchCamPlus/Formats/BCAM.cs index c0baffc..a01c704 100644 --- a/LaunchCamPlus/Formats/BCAM.cs +++ b/LaunchCamPlus/Formats/BCAM.cs @@ -1966,7 +1966,7 @@ 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; + Final += Events.ContainsKey(targetkey) ? "Event: "+Original.Substring(2).Replace(targetkey, Events[targetkey]+" ").Replace("番目", "th") : Original; } else if (Original.StartsWith("o:")) { @@ -2024,7 +2024,8 @@ public static short GetCameraNum(this BCAMEntry entry) return -1; } - static public bool IsNonDigit(char c) => !char.IsNumber(c); + public static bool IsNonDigit(char c) => !(c >= 0x30 && c <= 0x39); + public static string RemoveDigits(this string str) => string.Concat(str.Where(IsNonDigit)); public static float RefineAngle(this float angle) @@ -2095,9 +2096,20 @@ public static List SortBy(this List OriginalList, T[] sortref) { "ポール固有", new EventData("Pole", true, false) }, { "ポール（鉄骨）固有", new EventData("Square Pole", true, false) }, { "移動用砲台固有", new EventData("Player Cannon", true, false) }, - + { "１ＵＰキノコ固有", new EventData("1-UP Appearence", true, false) }, + { "？コイン固有", new EventData("?-Coin Collection", true, false) }, + { "伸び植物固有出現デモ", new EventData("Sproutle Vine Appearance", true, false) }, + { "伸び植物固有掴まり", new EventData("Sproutle Vine", true, false) }, + { "つるスライダー固有滑り", new EventData("Sprauto Vine", true, false) }, + { "つる花固有掴まり", 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("Message: Signboard", true, false) }, { "キノピオ固有会話", new EventData("Message: Toad", true, false) }, { "ウサギ固有会話", new EventData("Message: Star Bunny", 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) }, @@ -2259,10 +2271,15 @@ public class CameraDefaults { public static Dictionary Defaults = new Dictionary() { - { "CAM_TYPE_XZ_PARA", new CameraDefaults(196631, 0, 0.2984513f, 0f, 0f, 1200f, 45f, 100, 0, 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, 0, 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) }, - + //================================================================================================================================================================== + { "CAM_TYPE_EYEPOS_FIX_THERE", new CameraDefaults(196631, 0, 0.0f, 0f, 0f, 0f, 45f, 100, 100, 160, 1, 0, "", 0f, 0f, 0, 0, 120, 0f, 0f, 0.0f, 0.0f, 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,1,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, diff --git a/LaunchCamPlus/LaunchCamPlus.csproj b/LaunchCamPlus/LaunchCamPlus.csproj index 72ea953..995beab 100644 --- a/LaunchCamPlus/LaunchCamPlus.csproj +++ b/LaunchCamPlus/LaunchCamPlus.csproj @@ -60,15 +60,24 @@ - + + + UserControl + + + EyeposFixThereCameraPanel.cs + UserControl XZParaCameraPanel.cs + + Component + UserControl @@ -151,6 +160,9 @@ DefaultCameraPanel.cs + + EyeposFixThereCameraPanel.cs + XZParaCameraPanel.cs diff --git a/LaunchCamPlus/Properties/AssemblyInfo.cs b/LaunchCamPlus/Properties/AssemblyInfo.cs index 577175c..961f743 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.0")] -[assembly: AssemblyFileVersion("2.3.8.0")] +[assembly: AssemblyVersion("2.3.8.7")] +[assembly: AssemblyFileVersion("2.3.8.7")] diff --git a/LaunchCamPlus/UpdateAlert.txt b/LaunchCamPlus/UpdateAlert.txt index 3d44991..046ec61 100644 --- a/LaunchCamPlus/UpdateAlert.txt +++ b/LaunchCamPlus/UpdateAlert.txt @@ -1 +1 @@ -2.3.8.0 \ No newline at end of file +2.3.8.7 \ No newline at end of file