diff --git a/SettingsForm.Designer.cs b/SettingsForm.Designer.cs index 2d5ff1a..3191d62 100644 --- a/SettingsForm.Designer.cs +++ b/SettingsForm.Designer.cs @@ -46,40 +46,40 @@ this.KeyBindButton = new System.Windows.Forms.Button(); this.label1 = new System.Windows.Forms.Label(); this.AdvancedTabPage = new System.Windows.Forms.TabPage(); - this.DoneButton = new System.Windows.Forms.Button(); - this.SaveButton = new System.Windows.Forms.Button(); - this.ResetButton = new System.Windows.Forms.Button(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.FolderBrowseButton = new System.Windows.Forms.Button(); - this.FolderTextBox = new System.Windows.Forms.TextBox(); - this.FolderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); - this.label7 = new System.Windows.Forms.Label(); - this.ShadowCascadesUpDown = new System.Windows.Forms.NumericUpDown(); - this.label8 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.CacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label10 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.CacheTimeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label12 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.ExcludeFoldersTextBox = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.GPUCacheTimeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label15 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.GPUFlushTimeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.GeometryCacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label19 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); - this.TextureCacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); - this.label21 = new System.Windows.Forms.Label(); this.label22 = new System.Windows.Forms.Label(); this.CollisionCacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); this.label23 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.TextureCacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label21 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.GeometryCacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label19 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.GPUFlushTimeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.GPUCacheTimeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.ExcludeFoldersTextBox = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); + this.CacheTimeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label12 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.CacheSizeUpDown = new System.Windows.Forms.NumericUpDown(); + this.label10 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.ShadowCascadesUpDown = new System.Windows.Forms.NumericUpDown(); + this.label7 = new System.Windows.Forms.Label(); + this.label6 = new System.Windows.Forms.Label(); + this.FolderBrowseButton = new System.Windows.Forms.Button(); + this.FolderTextBox = new System.Windows.Forms.TextBox(); + this.label5 = new System.Windows.Forms.Label(); + this.DoneButton = new System.Windows.Forms.Button(); + this.SaveButton = new System.Windows.Forms.Button(); + this.ResetButton = new System.Windows.Forms.Button(); + this.FolderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); this.MainTabControl.SuspendLayout(); this.ControlsTabPage.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -87,14 +87,14 @@ ((System.ComponentModel.ISupportInitialize)(this.CameraSensitivityUpDown)).BeginInit(); this.groupBox1.SuspendLayout(); this.AdvancedTabPage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ShadowCascadesUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.CacheSizeUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.CacheTimeUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.GPUCacheTimeUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.GPUFlushTimeUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.GeometryCacheSizeUpDown)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.TextureCacheSizeUpDown)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.CollisionCacheSizeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.TextureCacheSizeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GeometryCacheSizeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GPUFlushTimeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.GPUCacheTimeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CacheTimeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.CacheSizeUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.ShadowCascadesUpDown)).BeginInit(); this.SuspendLayout(); // // MainTabControl @@ -107,7 +107,7 @@ this.MainTabControl.Location = new System.Drawing.Point(12, 12); this.MainTabControl.Name = "MainTabControl"; this.MainTabControl.SelectedIndex = 0; - this.MainTabControl.Size = new System.Drawing.Size(460, 430); + this.MainTabControl.Size = new System.Drawing.Size(460, 451); this.MainTabControl.TabIndex = 0; // // ControlsTabPage @@ -117,7 +117,7 @@ this.ControlsTabPage.Location = new System.Drawing.Point(4, 22); this.ControlsTabPage.Name = "ControlsTabPage"; this.ControlsTabPage.Padding = new System.Windows.Forms.Padding(3); - this.ControlsTabPage.Size = new System.Drawing.Size(452, 397); + this.ControlsTabPage.Size = new System.Drawing.Size(452, 425); this.ControlsTabPage.TabIndex = 0; this.ControlsTabPage.Text = "Controls"; this.ControlsTabPage.UseVisualStyleBackColor = true; @@ -131,7 +131,7 @@ this.groupBox2.Controls.Add(this.label2); this.groupBox2.Controls.Add(this.CameraSmoothingUpDown); this.groupBox2.Controls.Add(this.CameraSensitivityUpDown); - this.groupBox2.Location = new System.Drawing.Point(6, 301); + this.groupBox2.Location = new System.Drawing.Point(6, 322); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(440, 90); this.groupBox2.TabIndex = 10; @@ -205,7 +205,7 @@ this.groupBox1.Controls.Add(this.label1); this.groupBox1.Location = new System.Drawing.Point(6, 6); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(440, 288); + this.groupBox1.Size = new System.Drawing.Size(440, 309); this.groupBox1.TabIndex = 5; this.groupBox1.TabStop = false; this.groupBox1.Text = "Key bindings"; @@ -233,7 +233,7 @@ this.KeyBindingsListView.HideSelection = false; this.KeyBindingsListView.Location = new System.Drawing.Point(6, 19); this.KeyBindingsListView.Name = "KeyBindingsListView"; - this.KeyBindingsListView.Size = new System.Drawing.Size(237, 263); + this.KeyBindingsListView.Size = new System.Drawing.Size(237, 284); this.KeyBindingsListView.TabIndex = 3; this.KeyBindingsListView.UseCompatibleStateImageBehavior = false; this.KeyBindingsListView.View = System.Windows.Forms.View.Details; @@ -322,372 +322,52 @@ this.AdvancedTabPage.Text = "Advanced"; this.AdvancedTabPage.UseVisualStyleBackColor = true; // - // DoneButton + // label22 // - this.DoneButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.DoneButton.Location = new System.Drawing.Point(397, 448); - this.DoneButton.Name = "DoneButton"; - this.DoneButton.Size = new System.Drawing.Size(75, 23); - this.DoneButton.TabIndex = 3; - this.DoneButton.Text = "Done"; - this.DoneButton.UseVisualStyleBackColor = true; - this.DoneButton.Click += new System.EventHandler(this.DoneButton_Click); + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(184, 337); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(246, 13); + this.label22.TabIndex = 76; + this.label22.Text = "Maximum collisions graphics memory usage, in MB."; // - // SaveButton + // CollisionCacheSizeUpDown // - this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.SaveButton.Location = new System.Drawing.Point(284, 448); - this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(107, 23); - this.SaveButton.TabIndex = 2; - this.SaveButton.Text = "Save settings"; - this.SaveButton.UseVisualStyleBackColor = true; - this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); - // - // ResetButton - // - this.ResetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.ResetButton.Location = new System.Drawing.Point(158, 448); - this.ResetButton.Name = "ResetButton"; - this.ResetButton.Size = new System.Drawing.Size(107, 23); - this.ResetButton.TabIndex = 1; - this.ResetButton.Text = "Reset all settings"; - this.ResetButton.UseVisualStyleBackColor = true; - this.ResetButton.Click += new System.EventHandler(this.ResetButton_Click); - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(6, 3); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(349, 13); - this.label5.TabIndex = 0; - this.label5.Text = "NOTE: These settings require CodeWalker to be restarted to take effect."; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(6, 31); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(71, 13); - this.label6.TabIndex = 50; - this.label6.Text = "GTA V folder:"; - // - // FolderBrowseButton - // - this.FolderBrowseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.FolderBrowseButton.Location = new System.Drawing.Point(419, 27); - this.FolderBrowseButton.Name = "FolderBrowseButton"; - this.FolderBrowseButton.Size = new System.Drawing.Size(27, 23); - this.FolderBrowseButton.TabIndex = 49; - this.FolderBrowseButton.Text = "..."; - this.FolderBrowseButton.UseVisualStyleBackColor = true; - this.FolderBrowseButton.Click += new System.EventHandler(this.FolderBrowseButton_Click); - // - // FolderTextBox - // - this.FolderTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.FolderTextBox.Location = new System.Drawing.Point(110, 28); - this.FolderTextBox.Name = "FolderTextBox"; - this.FolderTextBox.Size = new System.Drawing.Size(303, 20); - this.FolderTextBox.TabIndex = 48; - this.FolderTextBox.TextChanged += new System.EventHandler(this.FolderTextBox_TextChanged); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(6, 100); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(98, 13); - this.label7.TabIndex = 51; - this.label7.Text = "Shadow cascades:"; - // - // ShadowCascadesUpDown - // - this.ShadowCascadesUpDown.Location = new System.Drawing.Point(110, 98); - this.ShadowCascadesUpDown.Maximum = new decimal(new int[] { - 6, + this.CollisionCacheSizeUpDown.Increment = new decimal(new int[] { + 32, 0, 0, 0}); - this.ShadowCascadesUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.ShadowCascadesUpDown.Name = "ShadowCascadesUpDown"; - this.ShadowCascadesUpDown.Size = new System.Drawing.Size(48, 20); - this.ShadowCascadesUpDown.TabIndex = 52; - this.ShadowCascadesUpDown.Value = new decimal(new int[] { - 6, - 0, - 0, - 0}); - this.ShadowCascadesUpDown.ValueChanged += new System.EventHandler(this.ShadowCascadesUpDown_ValueChanged); - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(174, 95); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(236, 26); - this.label8.TabIndex = 53; - this.label8.Text = "The total number of shadow cascades to render.\r\nLess cascades = better performanc" + - "e"; - // - // label9 - // - this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(192, 169); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(226, 13); - this.label9.TabIndex = 56; - this.label9.Text = "Maximum cache system memory usage, in MB."; - // - // CacheSizeUpDown - // - this.CacheSizeUpDown.Increment = new decimal(new int[] { - 128, - 0, - 0, - 0}); - this.CacheSizeUpDown.Location = new System.Drawing.Point(110, 167); - this.CacheSizeUpDown.Maximum = new decimal(new int[] { - 16384, - 0, - 0, - 0}); - this.CacheSizeUpDown.Minimum = new decimal(new int[] { - 1024, - 0, - 0, - 0}); - this.CacheSizeUpDown.Name = "CacheSizeUpDown"; - this.CacheSizeUpDown.Size = new System.Drawing.Size(64, 20); - this.CacheSizeUpDown.TabIndex = 60; - this.CacheSizeUpDown.ThousandsSeparator = true; - this.CacheSizeUpDown.Value = new decimal(new int[] { - 2048, - 0, - 0, - 0}); - this.CacheSizeUpDown.ValueChanged += new System.EventHandler(this.CacheSizeUpDown_ValueChanged); - // - // label10 - // - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(6, 169); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(87, 13); - this.label10.TabIndex = 54; - this.label10.Text = "Main cache size:"; - // - // label11 - // - this.label11.Location = new System.Drawing.Point(175, 132); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(269, 34); - this.label11.TabIndex = 59; - this.label11.Text = "The minimum duration, in seconds, that resources will remain loaded in memory."; - // - // CacheTimeUpDown - // - this.CacheTimeUpDown.DecimalPlaces = 1; - this.CacheTimeUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.CacheTimeUpDown.Location = new System.Drawing.Point(110, 135); - this.CacheTimeUpDown.Maximum = new decimal(new int[] { - 60, - 0, - 0, - 0}); - this.CacheTimeUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.CacheTimeUpDown.Name = "CacheTimeUpDown"; - this.CacheTimeUpDown.Size = new System.Drawing.Size(48, 20); - this.CacheTimeUpDown.TabIndex = 58; - this.CacheTimeUpDown.Value = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.CacheTimeUpDown.ValueChanged += new System.EventHandler(this.CacheTimeUpDown_ValueChanged); - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(6, 137); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(88, 13); - this.label12.TabIndex = 57; - this.label12.Text = "Main cache time:"; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(6, 64); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(82, 13); - this.label13.TabIndex = 62; - this.label13.Text = "Exclude folders:"; - // - // ExcludeFoldersTextBox - // - this.ExcludeFoldersTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.ExcludeFoldersTextBox.Location = new System.Drawing.Point(110, 61); - this.ExcludeFoldersTextBox.Name = "ExcludeFoldersTextBox"; - this.ExcludeFoldersTextBox.Size = new System.Drawing.Size(303, 20); - this.ExcludeFoldersTextBox.TabIndex = 50; - this.ExcludeFoldersTextBox.TextChanged += new System.EventHandler(this.ExcludeFoldersTextBox_TextChanged); - // - // label14 - // - this.label14.Location = new System.Drawing.Point(175, 204); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(269, 34); - this.label14.TabIndex = 65; - this.label14.Text = "The minimum duration, in seconds, that resources will remain loaded in graphics m" + - "emory."; - // - // GPUCacheTimeUpDown - // - this.GPUCacheTimeUpDown.DecimalPlaces = 1; - this.GPUCacheTimeUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.GPUCacheTimeUpDown.Location = new System.Drawing.Point(110, 207); - this.GPUCacheTimeUpDown.Maximum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.GPUCacheTimeUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.GPUCacheTimeUpDown.Name = "GPUCacheTimeUpDown"; - this.GPUCacheTimeUpDown.Size = new System.Drawing.Size(48, 20); - this.GPUCacheTimeUpDown.TabIndex = 64; - this.GPUCacheTimeUpDown.Value = new decimal(new int[] { - 5, - 0, - 0, - 65536}); - this.GPUCacheTimeUpDown.ValueChanged += new System.EventHandler(this.GPUCacheTimeUpDown_ValueChanged); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(6, 209); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(88, 13); - this.label15.TabIndex = 63; - this.label15.Text = "GPU cache time:"; - // - // label16 - // - this.label16.Location = new System.Drawing.Point(175, 236); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(269, 34); - this.label16.TabIndex = 68; - this.label16.Text = "The minimum duration, in seconds, between unloading batches of resources from gra" + - "phics memory."; - // - // GPUFlushTimeUpDown - // - this.GPUFlushTimeUpDown.DecimalPlaces = 2; - this.GPUFlushTimeUpDown.Increment = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.GPUFlushTimeUpDown.Location = new System.Drawing.Point(110, 239); - this.GPUFlushTimeUpDown.Maximum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.GPUFlushTimeUpDown.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 131072}); - this.GPUFlushTimeUpDown.Name = "GPUFlushTimeUpDown"; - this.GPUFlushTimeUpDown.Size = new System.Drawing.Size(48, 20); - this.GPUFlushTimeUpDown.TabIndex = 67; - this.GPUFlushTimeUpDown.Value = new decimal(new int[] { - 1, - 0, - 0, - 65536}); - this.GPUFlushTimeUpDown.ValueChanged += new System.EventHandler(this.GPUFlushTimeUpDown_ValueChanged); - // - // label17 - // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(6, 241); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(80, 13); - this.label17.TabIndex = 66; - this.label17.Text = "GPU flush time:"; - // - // label18 - // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(184, 273); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(247, 13); - this.label18.TabIndex = 70; - this.label18.Text = "Maximum geometry graphics memory usage, in MB."; - // - // GeometryCacheSizeUpDown - // - this.GeometryCacheSizeUpDown.Increment = new decimal(new int[] { - 128, - 0, - 0, - 0}); - this.GeometryCacheSizeUpDown.Location = new System.Drawing.Point(110, 271); - this.GeometryCacheSizeUpDown.Maximum = new decimal(new int[] { - 4096, - 0, - 0, - 0}); - this.GeometryCacheSizeUpDown.Minimum = new decimal(new int[] { - 256, - 0, - 0, - 0}); - this.GeometryCacheSizeUpDown.Name = "GeometryCacheSizeUpDown"; - this.GeometryCacheSizeUpDown.Size = new System.Drawing.Size(58, 20); - this.GeometryCacheSizeUpDown.TabIndex = 71; - this.GeometryCacheSizeUpDown.ThousandsSeparator = true; - this.GeometryCacheSizeUpDown.Value = new decimal(new int[] { + this.CollisionCacheSizeUpDown.Location = new System.Drawing.Point(110, 335); + this.CollisionCacheSizeUpDown.Maximum = new decimal(new int[] { 512, 0, 0, 0}); - this.GeometryCacheSizeUpDown.ValueChanged += new System.EventHandler(this.GeometryCacheSizeUpDown_ValueChanged); + this.CollisionCacheSizeUpDown.Minimum = new decimal(new int[] { + 64, + 0, + 0, + 0}); + this.CollisionCacheSizeUpDown.Name = "CollisionCacheSizeUpDown"; + this.CollisionCacheSizeUpDown.Size = new System.Drawing.Size(58, 20); + this.CollisionCacheSizeUpDown.TabIndex = 77; + this.CollisionCacheSizeUpDown.ThousandsSeparator = true; + this.CollisionCacheSizeUpDown.Value = new decimal(new int[] { + 128, + 0, + 0, + 0}); + this.CollisionCacheSizeUpDown.ValueChanged += new System.EventHandler(this.CollisionCacheSizeUpDown_ValueChanged); // - // label19 + // label23 // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(6, 273); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(88, 13); - this.label19.TabIndex = 69; - this.label19.Text = "Geometry cache:"; + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(6, 337); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(81, 13); + this.label23.TabIndex = 75; + this.label23.Text = "Collision cache:"; // // label20 // @@ -736,58 +416,378 @@ this.label21.TabIndex = 72; this.label21.Text = "Texture cache:"; // - // label22 + // label18 // - this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(184, 337); - this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(246, 13); - this.label22.TabIndex = 76; - this.label22.Text = "Maximum collisions graphics memory usage, in MB."; + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(184, 273); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(247, 13); + this.label18.TabIndex = 70; + this.label18.Text = "Maximum geometry graphics memory usage, in MB."; // - // CollisionCacheSizeUpDown + // GeometryCacheSizeUpDown // - this.CollisionCacheSizeUpDown.Increment = new decimal(new int[] { - 32, - 0, - 0, - 0}); - this.CollisionCacheSizeUpDown.Location = new System.Drawing.Point(110, 335); - this.CollisionCacheSizeUpDown.Maximum = new decimal(new int[] { - 512, - 0, - 0, - 0}); - this.CollisionCacheSizeUpDown.Minimum = new decimal(new int[] { - 64, - 0, - 0, - 0}); - this.CollisionCacheSizeUpDown.Name = "CollisionCacheSizeUpDown"; - this.CollisionCacheSizeUpDown.Size = new System.Drawing.Size(58, 20); - this.CollisionCacheSizeUpDown.TabIndex = 77; - this.CollisionCacheSizeUpDown.ThousandsSeparator = true; - this.CollisionCacheSizeUpDown.Value = new decimal(new int[] { + this.GeometryCacheSizeUpDown.Increment = new decimal(new int[] { 128, 0, 0, 0}); - this.CollisionCacheSizeUpDown.ValueChanged += new System.EventHandler(this.CollisionCacheSizeUpDown_ValueChanged); + this.GeometryCacheSizeUpDown.Location = new System.Drawing.Point(110, 271); + this.GeometryCacheSizeUpDown.Maximum = new decimal(new int[] { + 4096, + 0, + 0, + 0}); + this.GeometryCacheSizeUpDown.Minimum = new decimal(new int[] { + 256, + 0, + 0, + 0}); + this.GeometryCacheSizeUpDown.Name = "GeometryCacheSizeUpDown"; + this.GeometryCacheSizeUpDown.Size = new System.Drawing.Size(58, 20); + this.GeometryCacheSizeUpDown.TabIndex = 71; + this.GeometryCacheSizeUpDown.ThousandsSeparator = true; + this.GeometryCacheSizeUpDown.Value = new decimal(new int[] { + 512, + 0, + 0, + 0}); + this.GeometryCacheSizeUpDown.ValueChanged += new System.EventHandler(this.GeometryCacheSizeUpDown_ValueChanged); // - // label23 + // label19 // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(6, 337); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(81, 13); - this.label23.TabIndex = 75; - this.label23.Text = "Collision cache:"; + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(6, 273); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(88, 13); + this.label19.TabIndex = 69; + this.label19.Text = "Geometry cache:"; + // + // label16 + // + this.label16.Location = new System.Drawing.Point(175, 236); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(269, 34); + this.label16.TabIndex = 68; + this.label16.Text = "The minimum duration, in seconds, between unloading batches of resources from gra" + + "phics memory."; + // + // GPUFlushTimeUpDown + // + this.GPUFlushTimeUpDown.DecimalPlaces = 2; + this.GPUFlushTimeUpDown.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.GPUFlushTimeUpDown.Location = new System.Drawing.Point(110, 239); + this.GPUFlushTimeUpDown.Maximum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.GPUFlushTimeUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 131072}); + this.GPUFlushTimeUpDown.Name = "GPUFlushTimeUpDown"; + this.GPUFlushTimeUpDown.Size = new System.Drawing.Size(48, 20); + this.GPUFlushTimeUpDown.TabIndex = 67; + this.GPUFlushTimeUpDown.Value = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.GPUFlushTimeUpDown.ValueChanged += new System.EventHandler(this.GPUFlushTimeUpDown_ValueChanged); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(6, 241); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(80, 13); + this.label17.TabIndex = 66; + this.label17.Text = "GPU flush time:"; + // + // label14 + // + this.label14.Location = new System.Drawing.Point(175, 204); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(269, 34); + this.label14.TabIndex = 65; + this.label14.Text = "The minimum duration, in seconds, that resources will remain loaded in graphics m" + + "emory."; + // + // GPUCacheTimeUpDown + // + this.GPUCacheTimeUpDown.DecimalPlaces = 1; + this.GPUCacheTimeUpDown.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.GPUCacheTimeUpDown.Location = new System.Drawing.Point(110, 207); + this.GPUCacheTimeUpDown.Maximum = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.GPUCacheTimeUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.GPUCacheTimeUpDown.Name = "GPUCacheTimeUpDown"; + this.GPUCacheTimeUpDown.Size = new System.Drawing.Size(48, 20); + this.GPUCacheTimeUpDown.TabIndex = 64; + this.GPUCacheTimeUpDown.Value = new decimal(new int[] { + 5, + 0, + 0, + 65536}); + this.GPUCacheTimeUpDown.ValueChanged += new System.EventHandler(this.GPUCacheTimeUpDown_ValueChanged); + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(6, 209); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(88, 13); + this.label15.TabIndex = 63; + this.label15.Text = "GPU cache time:"; + // + // label13 + // + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(6, 64); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(82, 13); + this.label13.TabIndex = 62; + this.label13.Text = "Exclude folders:"; + // + // ExcludeFoldersTextBox + // + this.ExcludeFoldersTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ExcludeFoldersTextBox.Location = new System.Drawing.Point(110, 61); + this.ExcludeFoldersTextBox.Name = "ExcludeFoldersTextBox"; + this.ExcludeFoldersTextBox.Size = new System.Drawing.Size(303, 20); + this.ExcludeFoldersTextBox.TabIndex = 50; + this.ExcludeFoldersTextBox.TextChanged += new System.EventHandler(this.ExcludeFoldersTextBox_TextChanged); + // + // label11 + // + this.label11.Location = new System.Drawing.Point(175, 132); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(269, 34); + this.label11.TabIndex = 59; + this.label11.Text = "The minimum duration, in seconds, that resources will remain loaded in memory."; + // + // CacheTimeUpDown + // + this.CacheTimeUpDown.DecimalPlaces = 1; + this.CacheTimeUpDown.Increment = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.CacheTimeUpDown.Location = new System.Drawing.Point(110, 135); + this.CacheTimeUpDown.Maximum = new decimal(new int[] { + 60, + 0, + 0, + 0}); + this.CacheTimeUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 65536}); + this.CacheTimeUpDown.Name = "CacheTimeUpDown"; + this.CacheTimeUpDown.Size = new System.Drawing.Size(48, 20); + this.CacheTimeUpDown.TabIndex = 58; + this.CacheTimeUpDown.Value = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.CacheTimeUpDown.ValueChanged += new System.EventHandler(this.CacheTimeUpDown_ValueChanged); + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(6, 137); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(88, 13); + this.label12.TabIndex = 57; + this.label12.Text = "Main cache time:"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(192, 169); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(226, 13); + this.label9.TabIndex = 56; + this.label9.Text = "Maximum cache system memory usage, in MB."; + // + // CacheSizeUpDown + // + this.CacheSizeUpDown.Increment = new decimal(new int[] { + 128, + 0, + 0, + 0}); + this.CacheSizeUpDown.Location = new System.Drawing.Point(110, 167); + this.CacheSizeUpDown.Maximum = new decimal(new int[] { + 16384, + 0, + 0, + 0}); + this.CacheSizeUpDown.Minimum = new decimal(new int[] { + 1024, + 0, + 0, + 0}); + this.CacheSizeUpDown.Name = "CacheSizeUpDown"; + this.CacheSizeUpDown.Size = new System.Drawing.Size(64, 20); + this.CacheSizeUpDown.TabIndex = 60; + this.CacheSizeUpDown.ThousandsSeparator = true; + this.CacheSizeUpDown.Value = new decimal(new int[] { + 2048, + 0, + 0, + 0}); + this.CacheSizeUpDown.ValueChanged += new System.EventHandler(this.CacheSizeUpDown_ValueChanged); + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(6, 169); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(87, 13); + this.label10.TabIndex = 54; + this.label10.Text = "Main cache size:"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(174, 95); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(236, 26); + this.label8.TabIndex = 53; + this.label8.Text = "The total number of shadow cascades to render.\r\nLess cascades = better performanc" + + "e"; + // + // ShadowCascadesUpDown + // + this.ShadowCascadesUpDown.Location = new System.Drawing.Point(110, 98); + this.ShadowCascadesUpDown.Maximum = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.ShadowCascadesUpDown.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.ShadowCascadesUpDown.Name = "ShadowCascadesUpDown"; + this.ShadowCascadesUpDown.Size = new System.Drawing.Size(48, 20); + this.ShadowCascadesUpDown.TabIndex = 52; + this.ShadowCascadesUpDown.Value = new decimal(new int[] { + 6, + 0, + 0, + 0}); + this.ShadowCascadesUpDown.ValueChanged += new System.EventHandler(this.ShadowCascadesUpDown_ValueChanged); + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(6, 100); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(98, 13); + this.label7.TabIndex = 51; + this.label7.Text = "Shadow cascades:"; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(6, 31); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(71, 13); + this.label6.TabIndex = 50; + this.label6.Text = "GTA V folder:"; + // + // FolderBrowseButton + // + this.FolderBrowseButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.FolderBrowseButton.Location = new System.Drawing.Point(419, 27); + this.FolderBrowseButton.Name = "FolderBrowseButton"; + this.FolderBrowseButton.Size = new System.Drawing.Size(27, 23); + this.FolderBrowseButton.TabIndex = 49; + this.FolderBrowseButton.Text = "..."; + this.FolderBrowseButton.UseVisualStyleBackColor = true; + this.FolderBrowseButton.Click += new System.EventHandler(this.FolderBrowseButton_Click); + // + // FolderTextBox + // + this.FolderTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.FolderTextBox.Location = new System.Drawing.Point(110, 28); + this.FolderTextBox.Name = "FolderTextBox"; + this.FolderTextBox.Size = new System.Drawing.Size(303, 20); + this.FolderTextBox.TabIndex = 48; + this.FolderTextBox.TextChanged += new System.EventHandler(this.FolderTextBox_TextChanged); + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(6, 3); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(349, 13); + this.label5.TabIndex = 0; + this.label5.Text = "NOTE: These settings require CodeWalker to be restarted to take effect."; + // + // DoneButton + // + this.DoneButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.DoneButton.Location = new System.Drawing.Point(397, 469); + this.DoneButton.Name = "DoneButton"; + this.DoneButton.Size = new System.Drawing.Size(75, 23); + this.DoneButton.TabIndex = 3; + this.DoneButton.Text = "Done"; + this.DoneButton.UseVisualStyleBackColor = true; + this.DoneButton.Click += new System.EventHandler(this.DoneButton_Click); + // + // SaveButton + // + this.SaveButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.SaveButton.Location = new System.Drawing.Point(284, 469); + this.SaveButton.Name = "SaveButton"; + this.SaveButton.Size = new System.Drawing.Size(107, 23); + this.SaveButton.TabIndex = 2; + this.SaveButton.Text = "Save settings"; + this.SaveButton.UseVisualStyleBackColor = true; + this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); + // + // ResetButton + // + this.ResetButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.ResetButton.Location = new System.Drawing.Point(158, 469); + this.ResetButton.Name = "ResetButton"; + this.ResetButton.Size = new System.Drawing.Size(107, 23); + this.ResetButton.TabIndex = 1; + this.ResetButton.Text = "Reset all settings"; + this.ResetButton.UseVisualStyleBackColor = true; + this.ResetButton.Click += new System.EventHandler(this.ResetButton_Click); // // SettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(484, 483); + this.ClientSize = new System.Drawing.Size(484, 504); this.Controls.Add(this.ResetButton); this.Controls.Add(this.SaveButton); this.Controls.Add(this.DoneButton); @@ -806,14 +806,14 @@ this.groupBox1.PerformLayout(); this.AdvancedTabPage.ResumeLayout(false); this.AdvancedTabPage.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ShadowCascadesUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.CacheSizeUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.CacheTimeUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.GPUCacheTimeUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.GPUFlushTimeUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.GeometryCacheSizeUpDown)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.TextureCacheSizeUpDown)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.CollisionCacheSizeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.TextureCacheSizeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GeometryCacheSizeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GPUFlushTimeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.GPUCacheTimeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CacheTimeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.CacheSizeUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.ShadowCascadesUpDown)).EndInit(); this.ResumeLayout(false); } diff --git a/SettingsForm.cs b/SettingsForm.cs index 8ed3f18..1095ef9 100644 --- a/SettingsForm.cs +++ b/SettingsForm.cs @@ -60,6 +60,7 @@ namespace CodeWalker AddKeyBinding("Edit Position", keyBindings.EditPosition); AddKeyBinding("Edit Rotation", keyBindings.EditRotation); AddKeyBinding("Edit Scale", keyBindings.EditScale); + AddKeyBinding("First Person Mode", keyBindings.FirstPerson); } private void LoadMouseSettings() diff --git a/Todo.txt b/Todo.txt index 7ba8ab5..304e7db 100644 --- a/Todo.txt +++ b/Todo.txt @@ -23,7 +23,7 @@ RPF explorer - bulk export metadata files as XML ---[UI stuff]--- -show areas/zones with their names? popzone etc +show area/zone names? popzone etc world view grid option? @@ -32,7 +32,7 @@ world view grid option? delete key - delete item! add entities with preview... asset browser -undo add/delete entities, cargens, path nodes +undo add/delete entities, cargens, path nodes, scenario points... copy entity extensions when copying entities! Path editor: fix: linking to another .ynd in the project @@ -112,6 +112,8 @@ Metadata>XML - YMT, YMAP, YTYP, CUT etc files (Meta/PSO/RBF) Collision detection / physics - shoot eggs First-person mode (press P / Start) XBOX controller support +Display Population Zones +Generate _manifest.ymf XML for ymaps in project diff --git a/WorldForm.cs b/WorldForm.cs index 995c85a..8534fec 100644 --- a/WorldForm.cs +++ b/WorldForm.cs @@ -7672,9 +7672,8 @@ namespace CodeWalker { ToggleToolbar(); } - if (k == Keys.P) + if (k == keyBindings.FirstPerson) { - //TEMPORARY! SetControlMode((ControlMode == WorldControlMode.Free) ? WorldControlMode.Ped : WorldControlMode.Free); } } @@ -7709,7 +7708,7 @@ namespace CodeWalker break; } } - if (k == Keys.Escape) //temporary? panic get cursor back + if (k == Keys.Escape) //temporary? panic get cursor back when in first person mode { if (ControlMode != WorldControlMode.Free) SetControlMode(WorldControlMode.Free); } @@ -9400,6 +9399,7 @@ namespace CodeWalker public Keys EditRotation = Keys.E; public Keys EditScale = Keys.R; public Keys Jump = Keys.Space; //for control mode + public Keys FirstPerson = Keys.P; public KeyBindings(StringCollection sc) { @@ -9433,6 +9433,7 @@ namespace CodeWalker case "Edit Position": EditPosition = k; break; case "Edit Rotation": EditRotation = k; break; case "Edit Scale": EditScale = k; break; + case "First Person Mode": FirstPerson = k; break; } } @@ -9453,6 +9454,7 @@ namespace CodeWalker sc.Add(GetSettingItem("Edit Position", EditPosition)); sc.Add(GetSettingItem("Edit Rotation", EditRotation)); sc.Add(GetSettingItem("Edit Scale", EditScale)); + sc.Add(GetSettingItem("First Person Mode", FirstPerson)); return sc; }