diff --git a/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs index 614e80f..60525ab 100644 --- a/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs +++ b/LaunchCamPlus/CameraPanels/PointFixCameraPanel.Designer.cs @@ -74,6 +74,11 @@ private void InitializeComponent() 0, 0, 0}); + this.PlayerOffsetYNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); this.PlayerOffsetYNumericUpDown.Name = "PlayerOffsetYNumericUpDown"; this.PlayerOffsetYNumericUpDown.Size = new System.Drawing.Size(94, 20); this.PlayerOffsetYNumericUpDown.TabIndex = 133; @@ -102,6 +107,11 @@ private void InitializeComponent() 0, 0, 0}); + this.PlayerOffsetXNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); this.PlayerOffsetXNumericUpDown.Name = "PlayerOffsetXNumericUpDown"; this.PlayerOffsetXNumericUpDown.Size = new System.Drawing.Size(94, 20); this.PlayerOffsetXNumericUpDown.TabIndex = 131; diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs b/LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs new file mode 100644 index 0000000..b75f96e --- /dev/null +++ b/LaunchCamPlus/CameraPanels/TowerCameraPanel.Designer.cs @@ -0,0 +1,684 @@ +namespace LaunchCamPlus.CameraPanels +{ + partial class TowerCameraPanel + { + /// + /// 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.PlayerOffsetVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.UseVerticalPanAxisCheckBox = new System.Windows.Forms.CheckBox(); + this.VerticalPanAxisVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.WorldOffsetVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.FixpointVector3NumericUpDown = new LaunchCamPlus.Vector3NumericUpDown(); + this.FieldOfViewCheckBox = new System.Windows.Forms.CheckBox(); + this.FieldOfViewNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.FieldOfViewLabel = new System.Windows.Forms.Label(); + this.RotationXNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.ZoomNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.RotationXLabel = new System.Windows.Forms.Label(); + this.ZoomLabel = new System.Windows.Forms.Label(); + this.RotationYLabel = new System.Windows.Forms.Label(); + this.RotationZLabel = new System.Windows.Forms.Label(); + this.RotationZNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.RotationYNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.LowerBorderNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.LowerBorderLabel = new System.Windows.Forms.Label(); + this.UpperBorderNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.UpperBorderLabel = new System.Windows.Forms.Label(); + 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.JumpingYNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.MaxYLabel = new System.Windows.Forms.Label(); + this.MinYLabel = new System.Windows.Forms.Label(); + this.FallingYNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.CamEndIntLabel = new System.Windows.Forms.Label(); + this.CamEndIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + this.CamIntLabel = new System.Windows.Forms.Label(); + this.CamIntNumericUpDown = new LaunchCamPlus.ColourNumericUpDown(); + ((System.ComponentModel.ISupportInitialize)(this.FieldOfViewNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationXNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ZoomNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.LowerBorderNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.UpperBorderNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.JumpingYNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.FallingYNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).BeginInit(); + this.SuspendLayout(); + // + // PlayerOffsetVector3NumericUpDown + // + this.PlayerOffsetVector3NumericUpDown.Location = new System.Drawing.Point(152, 250); + this.PlayerOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(50, 45); + this.PlayerOffsetVector3NumericUpDown.Name = "PlayerOffsetVector3NumericUpDown"; + this.PlayerOffsetVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); + this.PlayerOffsetVector3NumericUpDown.TabIndex = 68; + this.PlayerOffsetVector3NumericUpDown.Text = "Up Axis"; + // + // UseVerticalPanAxisCheckBox + // + this.UseVerticalPanAxisCheckBox.AutoSize = true; + this.UseVerticalPanAxisCheckBox.Location = new System.Drawing.Point(243, 349); + this.UseVerticalPanAxisCheckBox.Name = "UseVerticalPanAxisCheckBox"; + this.UseVerticalPanAxisCheckBox.Size = new System.Drawing.Size(15, 14); + this.UseVerticalPanAxisCheckBox.TabIndex = 67; + this.UseVerticalPanAxisCheckBox.UseVisualStyleBackColor = true; + // + // VerticalPanAxisVector3NumericUpDown + // + this.VerticalPanAxisVector3NumericUpDown.Enabled = false; + this.VerticalPanAxisVector3NumericUpDown.Location = new System.Drawing.Point(152, 348); + this.VerticalPanAxisVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); + this.VerticalPanAxisVector3NumericUpDown.Name = "VerticalPanAxisVector3NumericUpDown"; + this.VerticalPanAxisVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); + this.VerticalPanAxisVector3NumericUpDown.TabIndex = 66; + this.VerticalPanAxisVector3NumericUpDown.Text = "Vertical Axis"; + // + // WorldOffsetVector3NumericUpDown + // + this.WorldOffsetVector3NumericUpDown.Location = new System.Drawing.Point(152, 153); + this.WorldOffsetVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); + this.WorldOffsetVector3NumericUpDown.Name = "WorldOffsetVector3NumericUpDown"; + this.WorldOffsetVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); + this.WorldOffsetVector3NumericUpDown.TabIndex = 65; + this.WorldOffsetVector3NumericUpDown.Text = "World Offset"; + // + // FixpointVector3NumericUpDown + // + this.FixpointVector3NumericUpDown.Location = new System.Drawing.Point(152, 56); + this.FixpointVector3NumericUpDown.MinimumSize = new System.Drawing.Size(70, 90); + this.FixpointVector3NumericUpDown.Name = "FixpointVector3NumericUpDown"; + this.FixpointVector3NumericUpDown.Size = new System.Drawing.Size(109, 90); + this.FixpointVector3NumericUpDown.TabIndex = 64; + this.FixpointVector3NumericUpDown.Text = "Fixpoint Offset"; + // + // FieldOfViewCheckBox + // + this.FieldOfViewCheckBox.AutoSize = true; + this.FieldOfViewCheckBox.Location = new System.Drawing.Point(55, 163); + this.FieldOfViewCheckBox.Name = "FieldOfViewCheckBox"; + this.FieldOfViewCheckBox.Size = new System.Drawing.Size(15, 14); + this.FieldOfViewCheckBox.TabIndex = 63; + this.FieldOfViewCheckBox.UseVisualStyleBackColor = true; + // + // FieldOfViewNumericUpDown + // + this.FieldOfViewNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.FieldOfViewNumericUpDown.DecimalPlaces = 3; + this.FieldOfViewNumericUpDown.Enabled = false; + this.FieldOfViewNumericUpDown.Location = new System.Drawing.Point(72, 160); + this.FieldOfViewNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.FieldOfViewNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.FieldOfViewNumericUpDown.Name = "FieldOfViewNumericUpDown"; + this.FieldOfViewNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.FieldOfViewNumericUpDown.TabIndex = 62; + this.FieldOfViewNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // FieldOfViewLabel + // + this.FieldOfViewLabel.AutoSize = true; + this.FieldOfViewLabel.Location = new System.Drawing.Point(9, 162); + this.FieldOfViewLabel.Name = "FieldOfViewLabel"; + this.FieldOfViewLabel.Size = new System.Drawing.Size(29, 13); + this.FieldOfViewLabel.TabIndex = 61; + this.FieldOfViewLabel.Text = "FoV:"; + // + // RotationXNumericUpDown + // + this.RotationXNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.RotationXNumericUpDown.DecimalPlaces = 3; + this.RotationXNumericUpDown.Location = new System.Drawing.Point(72, 56); + this.RotationXNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.RotationXNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.RotationXNumericUpDown.Name = "RotationXNumericUpDown"; + this.RotationXNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.RotationXNumericUpDown.TabIndex = 54; + this.RotationXNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // ZoomNumericUpDown + // + 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(72, 134); + this.ZoomNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.ZoomNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.ZoomNumericUpDown.Name = "ZoomNumericUpDown"; + this.ZoomNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.ZoomNumericUpDown.TabIndex = 60; + this.ZoomNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // RotationXLabel + // + this.RotationXLabel.AutoSize = true; + this.RotationXLabel.Location = new System.Drawing.Point(9, 58); + this.RotationXLabel.Name = "RotationXLabel"; + this.RotationXLabel.Size = new System.Drawing.Size(57, 13); + this.RotationXLabel.TabIndex = 53; + this.RotationXLabel.Text = "X Rotation"; + // + // ZoomLabel + // + this.ZoomLabel.AutoSize = true; + this.ZoomLabel.Location = new System.Drawing.Point(9, 136); + this.ZoomLabel.Name = "ZoomLabel"; + this.ZoomLabel.Size = new System.Drawing.Size(34, 13); + this.ZoomLabel.TabIndex = 59; + this.ZoomLabel.Text = "Zoom"; + // + // RotationYLabel + // + this.RotationYLabel.AutoSize = true; + this.RotationYLabel.Location = new System.Drawing.Point(9, 84); + this.RotationYLabel.Name = "RotationYLabel"; + this.RotationYLabel.Size = new System.Drawing.Size(57, 13); + this.RotationYLabel.TabIndex = 55; + this.RotationYLabel.Text = "Y Rotation"; + // + // RotationZLabel + // + this.RotationZLabel.AutoSize = true; + this.RotationZLabel.Location = new System.Drawing.Point(9, 110); + this.RotationZLabel.Name = "RotationZLabel"; + this.RotationZLabel.Size = new System.Drawing.Size(25, 13); + this.RotationZLabel.TabIndex = 57; + 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(72, 108); + 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(74, 20); + this.RotationZNumericUpDown.TabIndex = 58; + this.RotationZNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // RotationYNumericUpDown + // + this.RotationYNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.RotationYNumericUpDown.DecimalPlaces = 3; + this.RotationYNumericUpDown.Location = new System.Drawing.Point(72, 82); + this.RotationYNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.RotationYNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.RotationYNumericUpDown.Name = "RotationYNumericUpDown"; + this.RotationYNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.RotationYNumericUpDown.TabIndex = 56; + this.RotationYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // LowerBorderNumericUpDown + // + 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(72, 368); + this.LowerBorderNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.LowerBorderNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.LowerBorderNumericUpDown.Name = "LowerBorderNumericUpDown"; + this.LowerBorderNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.LowerBorderNumericUpDown.TabIndex = 84; + this.LowerBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // LowerBorderLabel + // + this.LowerBorderLabel.AutoSize = true; + this.LowerBorderLabel.Location = new System.Drawing.Point(9, 370); + this.LowerBorderLabel.Name = "LowerBorderLabel"; + this.LowerBorderLabel.Size = new System.Drawing.Size(36, 13); + this.LowerBorderLabel.TabIndex = 83; + this.LowerBorderLabel.Text = "Lower"; + // + // UpperBorderNumericUpDown + // + 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(72, 342); + this.UpperBorderNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.UpperBorderNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.UpperBorderNumericUpDown.Name = "UpperBorderNumericUpDown"; + this.UpperBorderNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.UpperBorderNumericUpDown.TabIndex = 82; + this.UpperBorderNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // UpperBorderLabel + // + this.UpperBorderLabel.AutoSize = true; + this.UpperBorderLabel.Location = new System.Drawing.Point(9, 344); + this.UpperBorderLabel.Name = "UpperBorderLabel"; + this.UpperBorderLabel.Size = new System.Drawing.Size(36, 13); + this.UpperBorderLabel.TabIndex = 81; + this.UpperBorderLabel.Text = "Upper"; + // + // 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(72, 212); + 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(74, 20); + this.HeightOffsetNumericUpDown.TabIndex = 80; + this.HeightOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // HeightOffsetLabel + // + this.HeightOffsetLabel.AutoSize = true; + this.HeightOffsetLabel.Location = new System.Drawing.Point(9, 214); + this.HeightOffsetLabel.Name = "HeightOffsetLabel"; + this.HeightOffsetLabel.Size = new System.Drawing.Size(54, 13); + this.HeightOffsetLabel.TabIndex = 79; + this.HeightOffsetLabel.Text = "↪ Vertical"; + // + // FrontOffsetNumericUpDown + // + this.FrontOffsetNumericUpDown.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.FrontOffsetNumericUpDown.DecimalPlaces = 3; + this.FrontOffsetNumericUpDown.Location = new System.Drawing.Point(72, 186); + 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(74, 20); + this.FrontOffsetNumericUpDown.TabIndex = 78; + this.FrontOffsetNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // FrontOffsetLabel + // + this.FrontOffsetLabel.AutoSize = true; + this.FrontOffsetLabel.Location = new System.Drawing.Point(9, 189); + this.FrontOffsetLabel.Name = "FrontOffsetLabel"; + this.FrontOffsetLabel.Size = new System.Drawing.Size(62, 13); + this.FrontOffsetLabel.TabIndex = 77; + this.FrontOffsetLabel.Text = "Look Offset"; + // + // JumpingYNumericUpDown + // + 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(72, 238); + this.JumpingYNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.JumpingYNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.JumpingYNumericUpDown.Name = "JumpingYNumericUpDown"; + this.JumpingYNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.JumpingYNumericUpDown.TabIndex = 74; + this.JumpingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // MaxYLabel + // + this.MaxYLabel.AutoSize = true; + this.MaxYLabel.Location = new System.Drawing.Point(9, 240); + this.MaxYLabel.Name = "MaxYLabel"; + this.MaxYLabel.Size = new System.Drawing.Size(37, 13); + this.MaxYLabel.TabIndex = 73; + this.MaxYLabel.Text = "Max Y"; + // + // MinYLabel + // + this.MinYLabel.AutoSize = true; + this.MinYLabel.Location = new System.Drawing.Point(9, 266); + this.MinYLabel.Name = "MinYLabel"; + this.MinYLabel.Size = new System.Drawing.Size(34, 13); + this.MinYLabel.TabIndex = 75; + this.MinYLabel.Text = "Min Y"; + // + // FallingYNumericUpDown + // + 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(72, 264); + this.FallingYNumericUpDown.Maximum = new decimal(new int[] { + 2147483647, + 0, + 0, + 0}); + this.FallingYNumericUpDown.Minimum = new decimal(new int[] { + -2147483648, + 0, + 0, + -2147483648}); + this.FallingYNumericUpDown.Name = "FallingYNumericUpDown"; + this.FallingYNumericUpDown.Size = new System.Drawing.Size(74, 20); + this.FallingYNumericUpDown.TabIndex = 76; + this.FallingYNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 196608}); + // + // CamEndIntLabel + // + this.CamEndIntLabel.AutoSize = true; + this.CamEndIntLabel.Location = new System.Drawing.Point(9, 422); + this.CamEndIntLabel.Name = "CamEndIntLabel"; + this.CamEndIntLabel.Size = new System.Drawing.Size(50, 13); + this.CamEndIntLabel.TabIndex = 71; + 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(72, 420); + 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(74, 20); + this.CamEndIntNumericUpDown.TabIndex = 72; + this.CamEndIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // CamIntLabel + // + this.CamIntLabel.AutoSize = true; + this.CamIntLabel.Location = new System.Drawing.Point(9, 396); + this.CamIntLabel.Name = "CamIntLabel"; + this.CamIntLabel.Size = new System.Drawing.Size(58, 13); + this.CamIntLabel.TabIndex = 69; + 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(72, 394); + 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(74, 20); + this.CamIntNumericUpDown.TabIndex = 70; + this.CamIntNumericUpDown.TextValue = new decimal(new int[] { + 0, + 0, + 0, + 0}); + // + // TowerCameraPanel + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CameraType = "CAM_TYPE_TOWER"; + this.Controls.Add(this.LowerBorderNumericUpDown); + this.Controls.Add(this.LowerBorderLabel); + this.Controls.Add(this.UpperBorderNumericUpDown); + this.Controls.Add(this.UpperBorderLabel); + this.Controls.Add(this.HeightOffsetNumericUpDown); + this.Controls.Add(this.HeightOffsetLabel); + this.Controls.Add(this.FrontOffsetNumericUpDown); + this.Controls.Add(this.FrontOffsetLabel); + this.Controls.Add(this.JumpingYNumericUpDown); + this.Controls.Add(this.MaxYLabel); + this.Controls.Add(this.MinYLabel); + this.Controls.Add(this.FallingYNumericUpDown); + this.Controls.Add(this.CamEndIntLabel); + this.Controls.Add(this.CamEndIntNumericUpDown); + this.Controls.Add(this.CamIntLabel); + this.Controls.Add(this.CamIntNumericUpDown); + this.Controls.Add(this.PlayerOffsetVector3NumericUpDown); + this.Controls.Add(this.UseVerticalPanAxisCheckBox); + this.Controls.Add(this.VerticalPanAxisVector3NumericUpDown); + this.Controls.Add(this.WorldOffsetVector3NumericUpDown); + this.Controls.Add(this.FixpointVector3NumericUpDown); + this.Controls.Add(this.FieldOfViewCheckBox); + this.Controls.Add(this.FieldOfViewNumericUpDown); + this.Controls.Add(this.FieldOfViewLabel); + this.Controls.Add(this.RotationXNumericUpDown); + this.Controls.Add(this.ZoomNumericUpDown); + this.Controls.Add(this.RotationXLabel); + this.Controls.Add(this.ZoomLabel); + this.Controls.Add(this.RotationYLabel); + this.Controls.Add(this.RotationZLabel); + this.Controls.Add(this.RotationZNumericUpDown); + this.Controls.Add(this.RotationYNumericUpDown); + this.Name = "TowerCameraPanel"; + this.Controls.SetChildIndex(this.RotationYNumericUpDown, 0); + this.Controls.SetChildIndex(this.RotationZNumericUpDown, 0); + this.Controls.SetChildIndex(this.RotationZLabel, 0); + this.Controls.SetChildIndex(this.RotationYLabel, 0); + this.Controls.SetChildIndex(this.ZoomLabel, 0); + this.Controls.SetChildIndex(this.RotationXLabel, 0); + this.Controls.SetChildIndex(this.ZoomNumericUpDown, 0); + this.Controls.SetChildIndex(this.RotationXNumericUpDown, 0); + this.Controls.SetChildIndex(this.FieldOfViewLabel, 0); + this.Controls.SetChildIndex(this.FieldOfViewNumericUpDown, 0); + this.Controls.SetChildIndex(this.FieldOfViewCheckBox, 0); + this.Controls.SetChildIndex(this.FixpointVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.WorldOffsetVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.VerticalPanAxisVector3NumericUpDown, 0); + this.Controls.SetChildIndex(this.UseVerticalPanAxisCheckBox, 0); + this.Controls.SetChildIndex(this.PlayerOffsetVector3NumericUpDown, 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.FallingYNumericUpDown, 0); + this.Controls.SetChildIndex(this.MinYLabel, 0); + this.Controls.SetChildIndex(this.MaxYLabel, 0); + this.Controls.SetChildIndex(this.JumpingYNumericUpDown, 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.UpperBorderLabel, 0); + this.Controls.SetChildIndex(this.UpperBorderNumericUpDown, 0); + this.Controls.SetChildIndex(this.LowerBorderLabel, 0); + this.Controls.SetChildIndex(this.LowerBorderNumericUpDown, 0); + ((System.ComponentModel.ISupportInitialize)(this.FieldOfViewNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationXNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ZoomNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationZNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RotationYNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.LowerBorderNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.UpperBorderNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.HeightOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.FrontOffsetNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.JumpingYNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.FallingYNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamEndIntNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CamIntNumericUpDown)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Vector3NumericUpDown PlayerOffsetVector3NumericUpDown; + private System.Windows.Forms.CheckBox UseVerticalPanAxisCheckBox; + private Vector3NumericUpDown VerticalPanAxisVector3NumericUpDown; + private Vector3NumericUpDown WorldOffsetVector3NumericUpDown; + private Vector3NumericUpDown FixpointVector3NumericUpDown; + private System.Windows.Forms.CheckBox FieldOfViewCheckBox; + private ColourNumericUpDown FieldOfViewNumericUpDown; + private System.Windows.Forms.Label FieldOfViewLabel; + private ColourNumericUpDown RotationXNumericUpDown; + private ColourNumericUpDown ZoomNumericUpDown; + private System.Windows.Forms.Label RotationXLabel; + private System.Windows.Forms.Label ZoomLabel; + private System.Windows.Forms.Label RotationYLabel; + private System.Windows.Forms.Label RotationZLabel; + private ColourNumericUpDown RotationZNumericUpDown; + private ColourNumericUpDown RotationYNumericUpDown; + private ColourNumericUpDown LowerBorderNumericUpDown; + private System.Windows.Forms.Label LowerBorderLabel; + private ColourNumericUpDown UpperBorderNumericUpDown; + private System.Windows.Forms.Label UpperBorderLabel; + private ColourNumericUpDown HeightOffsetNumericUpDown; + private System.Windows.Forms.Label HeightOffsetLabel; + private ColourNumericUpDown FrontOffsetNumericUpDown; + private System.Windows.Forms.Label FrontOffsetLabel; + private ColourNumericUpDown JumpingYNumericUpDown; + private System.Windows.Forms.Label MaxYLabel; + private System.Windows.Forms.Label MinYLabel; + private ColourNumericUpDown FallingYNumericUpDown; + private System.Windows.Forms.Label CamEndIntLabel; + private ColourNumericUpDown CamEndIntNumericUpDown; + private System.Windows.Forms.Label CamIntLabel; + private ColourNumericUpDown CamIntNumericUpDown; + } +} diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.cs b/LaunchCamPlus/CameraPanels/TowerCameraPanel.cs new file mode 100644 index 0000000..06b95c7 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/TowerCameraPanel.cs @@ -0,0 +1,20 @@ +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; + +namespace LaunchCamPlus.CameraPanels +{ + public partial class TowerCameraPanel : CameraPanelBase + { + public TowerCameraPanel() + { + InitializeComponent(); + } + } +} diff --git a/LaunchCamPlus/CameraPanels/TowerCameraPanel.resx b/LaunchCamPlus/CameraPanels/TowerCameraPanel.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/LaunchCamPlus/CameraPanels/TowerCameraPanel.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/Extra Controls/SettingsPanel.cs b/LaunchCamPlus/Extra Controls/SettingsPanel.cs index 056bb79..531a105 100644 --- a/LaunchCamPlus/Extra Controls/SettingsPanel.cs +++ b/LaunchCamPlus/Extra Controls/SettingsPanel.cs @@ -1,14 +1,8 @@ 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 LaunchCamPlus.Properties; -using System.Runtime.InteropServices; namespace LaunchCamPlus { diff --git a/LaunchCamPlus/Formats/BCAM.cs b/LaunchCamPlus/Formats/BCAM.cs index a13ba17..8193806 100644 --- a/LaunchCamPlus/Formats/BCAM.cs +++ b/LaunchCamPlus/Formats/BCAM.cs @@ -1,12 +1,12 @@ -using System; +using Hack.io.Util; +using LaunchCamPlus; +using LaunchCamPlus.Properties; +using System; +using System.Collections; using System.Collections.Generic; -using System.Linq; using System.IO; +using System.Linq; using System.Text; -using LaunchCamPlus; -using System.Collections; -using LaunchCamPlus.Properties; -using Hack.io.Util; using System.Text.RegularExpressions; namespace Hack.io.BCAM @@ -977,6 +977,9 @@ public int TransitionTime Data.Add(0xAE79D1C0, value); } } + /// + /// Event value, only used by e: cameras + /// public int TransitionEndTime { get @@ -1290,6 +1293,9 @@ public float LowerBorder } } + /// + /// Event value, only used by e: cameras + /// public int EventFrames { get @@ -1312,6 +1318,9 @@ public int EventFrames Data.Add(0x05C676D0, value); } } + /// + /// Event value, only used by e: cameras + /// public int EventPriority { get @@ -1678,6 +1687,9 @@ public bool DisableFirstPerson Data.Add(0xBB74D6C1, value ? 1 : 0); } } + /// + /// Game Flag, only used by g: cameras + /// public bool GFlagEndErpFrame { get @@ -1700,6 +1712,9 @@ public bool GFlagEndErpFrame Data.Add(0xDA484167, value ? 1 : 0); } } + /// + /// Game Flag, only used by g: cameras + /// public bool GFlagThrough { get @@ -1722,6 +1737,9 @@ public bool GFlagThrough Data.Add(0xED8DD072, value ? 1 : 0); } } + /// + /// Game Flag, only used by g: cameras + /// public int GFlagEndTime { get @@ -1766,48 +1784,54 @@ public bool EnableVerticalPanAxis Data.Add(0x26C8C3C0, value ? 1 : 0); } } + /// + /// Event Flag, only used by e: cameras + /// public bool EventUseTransitionTime { get { - if (Data.ContainsKey(0x45E50EE5)) - return (int)Data[0x45E50EE5] > 0; + if (Data.ContainsKey(0x1BCD52AA)) + return (int)Data[0x1BCD52AA] > 0; else - return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]; + return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]; } set { - if (Data.ContainsKey(0x45E50EE5)) + if (Data.ContainsKey(0x1BCD52AA)) { - if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]) - Data.Remove(0x45E50EE5); + if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]) + Data.Remove(0x1BCD52AA); else - Data[0x45E50EE5] = value ? 1 : 0; + Data[0x1BCD52AA] = value ? 1 : 0; } - else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]) - Data.Add(0x45E50EE5, value ? 1 : 0); + else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]) + Data.Add(0x1BCD52AA, value ? 1 : 0); } } + /// + /// Event Flag, only used by e: cameras + /// public bool EventUseTransitionEndTime { get { - if (Data.ContainsKey(0x1BCD52AA)) - return (int)Data[0x1BCD52AA] > 0; + if (Data.ContainsKey(0x45E50EE5)) + return (int)Data[0x45E50EE5] > 0; else - return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]; + return (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]; } set { - if (Data.ContainsKey(0x1BCD52AA)) + if (Data.ContainsKey(0x45E50EE5)) { - if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]) - Data.Remove(0x1BCD52AA); + if (value == (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]) + Data.Remove(0x45E50EE5); else - Data[0x1BCD52AA] = value ? 1 : 0; + Data[0x45E50EE5] = value ? 1 : 0; } - else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x1BCD52AA]) - Data.Add(0x1BCD52AA, value ? 1 : 0); + else if (value != (bool)CameraDefaults.Defaults[CameraDefaults.Defaults.ContainsKey(Type) ? Type : "CAM_TYPE_XZ_PARA"].DefaultValues[0x45E50EE5]) + Data.Add(0x45E50EE5, value ? 1 : 0); } } diff --git a/LaunchCamPlus/LaunchCamPlus.csproj b/LaunchCamPlus/LaunchCamPlus.csproj index a967419..d4f4786 100644 --- a/LaunchCamPlus/LaunchCamPlus.csproj +++ b/LaunchCamPlus/LaunchCamPlus.csproj @@ -79,6 +79,12 @@ PointFixCameraPanel.cs + + UserControl + + + TowerCameraPanel.cs + UserControl @@ -182,6 +188,9 @@ PointFixCameraPanel.cs + + TowerCameraPanel.cs + WanderPlanetCameraPanel.cs diff --git a/LaunchCamPlus/Properties/AssemblyInfo.cs b/LaunchCamPlus/Properties/AssemblyInfo.cs index 45bcacf..b91f829 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.8")] -[assembly: AssemblyFileVersion("2.3.8.8")] +[assembly: AssemblyVersion("2.3.8.9")] +[assembly: AssemblyFileVersion("2.3.8.9")] diff --git a/LaunchCamPlus/UpdateAlert.txt b/LaunchCamPlus/UpdateAlert.txt index ebd6242..a46bd65 100644 --- a/LaunchCamPlus/UpdateAlert.txt +++ b/LaunchCamPlus/UpdateAlert.txt @@ -1 +1 @@ -2.3.8.8 \ No newline at end of file +2.3.8.9 \ No newline at end of file