From 9a37c2daafe5440726209680d3320d9b02e27149 Mon Sep 17 00:00:00 2001 From: Bitl Date: Thu, 26 Mar 2020 08:15:31 -0700 Subject: [PATCH] fps display and performancde mode. removed uneeded usings. --- NovetusLauncher/NovetusCMD/LocalVars.cs | 9 +- NovetusLauncher/NovetusCMD/Program.cs | 7 +- NovetusLauncher/NovetusFuncs/ClientScript.cs | 2 - NovetusLauncher/NovetusFuncs/GlobalVars.cs | 8 +- NovetusLauncher/NovetusFuncs/IconLoader.cs | 4 - NovetusLauncher/NovetusFuncs/LauncherFuncs.cs | 73 ++++++++-- .../NovetusFuncs/TreeNodeHelper.cs | 1 - NovetusLauncher/NovetusLauncher/LocalVars.cs | 8 +- .../NovetusLauncher/MainForm.Designer.cs | 128 +++++++++++++++--- NovetusLauncher/NovetusLauncher/MainForm.cs | 35 ++++- NovetusLauncher/NovetusLauncher/Program.cs | 1 - .../NovetusLauncher/SDK/AssetLocalizer.cs | 6 - .../SDK/ClientScriptDocumentation.cs | 1 - .../NovetusLauncher/SDK/SplashTester.cs | 8 -- .../NovetusLauncher/URI/LoaderForm.cs | 1 - .../NovetusLauncher/URI/QuickConfigure.cs | 1 - 16 files changed, 210 insertions(+), 83 deletions(-) diff --git a/NovetusLauncher/NovetusCMD/LocalVars.cs b/NovetusLauncher/NovetusCMD/LocalVars.cs index e65ee26..4474711 100644 --- a/NovetusLauncher/NovetusCMD/LocalVars.cs +++ b/NovetusLauncher/NovetusCMD/LocalVars.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NovetusCMD +namespace NovetusCMD { public static class LocalVars { @@ -13,6 +7,7 @@ namespace NovetusCMD public static bool RequestToOutputInfo = false; public static bool DebugMode = false; public static bool NoWebServer = false; + public static string ServerInfoFileName = "serverinfo.txt"; public static int ProcessID = 0; } } diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index 6838f09..ce1fff5 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -11,11 +11,10 @@ using Mono.Nat; using System.Diagnostics; using System.IO; using static NovetusCMD.CommandLineArguments; -using System.Reflection; namespace NovetusCMD { - public static class Program + public static class Program { public static void InitUPnP() { @@ -469,8 +468,8 @@ namespace NovetusCMD GlobalVars.IsWebServerOn == true ? GlobalVars.LocalWebServerURI : "" ); - File.WriteAllText(GlobalVars.BasePath + "\\" + GlobalVars.ServerInfoFileName, GlobalVars.RemoveEmptyLines(text)); - ConsolePrint("Server Information sent to file " + GlobalVars.BasePath + "\\" + GlobalVars.ServerInfoFileName, 4); + File.WriteAllText(GlobalVars.BasePath + "\\" + LocalVars.ServerInfoFileName, GlobalVars.RemoveEmptyLines(text)); + ConsolePrint("Server Information sent to file " + GlobalVars.BasePath + "\\" + LocalVars.ServerInfoFileName, 4); } } diff --git a/NovetusLauncher/NovetusFuncs/ClientScript.cs b/NovetusLauncher/NovetusFuncs/ClientScript.cs index 3684f22..79f1424 100644 --- a/NovetusLauncher/NovetusFuncs/ClientScript.cs +++ b/NovetusLauncher/NovetusFuncs/ClientScript.cs @@ -10,8 +10,6 @@ using System; using System.IO; using System.Reflection; -using System.Linq; -using System.Globalization; public class ClientScript { diff --git a/NovetusLauncher/NovetusFuncs/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs index 5a9d4b2..d77fcd3 100644 --- a/NovetusLauncher/NovetusFuncs/GlobalVars.cs +++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs @@ -34,7 +34,6 @@ public static class GlobalVars public static readonly string MapsDirBase = "maps"; public static string MapPath = ""; public static string MapPathSnip = ""; - public static bool ReShade = true; public static readonly string BaseGameDir = "rbxasset://../../../"; public static readonly string SharedDataGameDir = BaseGameDir + "shareddata/"; public static readonly string DirFonts = "\\fonts"; @@ -230,9 +229,10 @@ public static class GlobalVars public static string WebServer_BodyColors = WebServer_CustomPlayerDir + "bodycolors.rbxm"; //itemmaker public static bool DisabledHelp = false; - //cmd - public static string ServerInfoFileName = "serverinfo.txt"; - + //reshade + public static bool ReShade = true; + public static bool ReShadeFPSDisplay = false; + public static bool ReShadePerformanceMode = false; public static string MultiLine(params string[] args) { diff --git a/NovetusLauncher/NovetusFuncs/IconLoader.cs b/NovetusLauncher/NovetusFuncs/IconLoader.cs index b087995..bab7456 100644 --- a/NovetusLauncher/NovetusFuncs/IconLoader.cs +++ b/NovetusLauncher/NovetusFuncs/IconLoader.cs @@ -1,10 +1,6 @@ using System; using System.IO; using System.Windows.Forms; -using System.IO.Compression; -using System.Linq; -using System.Drawing; -using System.Drawing.Imaging; public class IconLoader { diff --git a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs index 0de339b..b73ade6 100644 --- a/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/LauncherFuncs.cs @@ -7,12 +7,9 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Collections.Generic; using System.Drawing; using System.Drawing.Imaging; using System.IO; -using System.Linq; -using System.Windows.Forms; public class LauncherFuncs { @@ -230,7 +227,7 @@ public class LauncherFuncs } Customization(GlobalVars.ConfigDir + "\\" + GlobalVars.ConfigNameCustomization, write); - ReShade(GlobalVars.ConfigDir + "\\ReShade.ini", write); + ReShade(GlobalVars.ConfigDir, "ReShade.ini", write); } public static void Customization(string cfgpath, bool write) @@ -512,19 +509,42 @@ public class LauncherFuncs string section = "GENERAL"; int NoReloadOnInit = GlobalVars.ReShade ? 0 : 1; - ini.IniWriteValue(section, "NoReloadOnInit", NoReloadOnInit.ToString()); + int FPS = GlobalVars.ReShadeFPSDisplay ? 1 : 0; + ini.IniWriteValue(section, "ShowFPS", FPS.ToString()); + ini.IniWriteValue(section, "ShowFrameTime", FPS.ToString()); + int PerformanceMode = GlobalVars.ReShadePerformanceMode ? 1 : 0; + ini.IniWriteValue(section, "PerformanceMode", PerformanceMode.ToString()); } else { //READ - string Decryptline1; + string Decryptline1, Decryptline2, Decryptline3, Decryptline4; IniFile ini = new IniFile(cfgpath); string section = "GENERAL"; Decryptline1 = ini.IniReadValue(section, "NoReloadOnInit"); + if (string.IsNullOrWhiteSpace(Decryptline1)) + { + int NoReloadOnInit = GlobalVars.ReShade ? 0 : 1; + ini.IniWriteValue(section, "NoReloadOnInit", NoReloadOnInit.ToString()); + } + Decryptline2 = ini.IniReadValue(section, "ShowFPS"); + Decryptline3 = ini.IniReadValue(section, "ShowFrameTime"); + if (string.IsNullOrWhiteSpace(Decryptline2) || string.IsNullOrWhiteSpace(Decryptline3)) + { + int FPS = GlobalVars.ReShadeFPSDisplay ? 1 : 0; + ini.IniWriteValue(section, "ShowFPS", FPS.ToString()); + ini.IniWriteValue(section, "ShowFrameTime", FPS.ToString()); + } + Decryptline4 = ini.IniReadValue(section, "PerformanceMode"); + if (string.IsNullOrWhiteSpace(Decryptline4)) + { + int PerformanceMode = GlobalVars.ReShadePerformanceMode ? 1 : 0; + ini.IniWriteValue(section, "PerformanceMode", PerformanceMode.ToString()); + } if (Convert.ToInt32(Decryptline1) == 0) { @@ -534,24 +554,55 @@ public class LauncherFuncs { GlobalVars.ReShade = false; } + + if (Convert.ToInt32(Decryptline2) == 1 && Convert.ToInt32(Decryptline3) == 1) + { + GlobalVars.ReShadeFPSDisplay = true; + } + else if (Convert.ToInt32(Decryptline2) == 0 && Convert.ToInt32(Decryptline3) == 0) + { + GlobalVars.ReShadeFPSDisplay = false; + } + + if (Convert.ToInt32(Decryptline4) == 1) + { + GlobalVars.ReShadePerformanceMode = true; + } + else if (Convert.ToInt32(Decryptline4) == 0) + { + GlobalVars.ReShadePerformanceMode = false; + } } } - public static void ReShade(string cfgpath, bool write = false) + public static void ReShade(string cfgpath, string cfgname, bool write) { + string fullpath = cfgpath + "\\" + cfgname; + + if (!File.Exists(fullpath)) + { + File.Copy(GlobalVars.ConfigDir + "\\ReShade_default.ini", fullpath, true); + ReShadeValues(fullpath, write); + } + else + { + ReShadeValues(fullpath, write); + } + string clientdir = GlobalVars.ClientDir; DirectoryInfo dinfo = new DirectoryInfo(clientdir); DirectoryInfo[] Dirs = dinfo.GetDirectories(); foreach (DirectoryInfo dir in Dirs) { - if (!File.Exists(dir.FullName + @"\ReShade.ini")) + string fulldirpath = dir.FullName + @"\" + cfgname; + + if (!File.Exists(fulldirpath)) { - ReShadeValues(cfgpath, write); - File.Copy(cfgpath, dir.FullName + @"\ReShade.ini", true); + File.Copy(fullpath, fulldirpath, true); } else { - ReShadeValues(dir.FullName + @"\ReShade.ini", write); + ReShadeValues(fulldirpath, write); } } } diff --git a/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs b/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs index 3fd6144..37a4821 100644 --- a/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs +++ b/NovetusLauncher/NovetusFuncs/TreeNodeHelper.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Windows.Forms; using System.IO; using System.Linq; -using System.Collections; public static class TreeNodeHelper { diff --git a/NovetusLauncher/NovetusLauncher/LocalVars.cs b/NovetusLauncher/NovetusLauncher/LocalVars.cs index 9280cf6..2b7b019 100644 --- a/NovetusLauncher/NovetusLauncher/LocalVars.cs +++ b/NovetusLauncher/NovetusLauncher/LocalVars.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace NovetusLauncher +namespace NovetusLauncher { class LocalVars { diff --git a/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs b/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs index 174e356..b1584c6 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.Designer.cs @@ -70,6 +70,8 @@ namespace NovetusLauncher this.button35 = new System.Windows.Forms.Button(); this.tabControl1 = new TabControlWithoutHeader(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.label24 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.button7 = new System.Windows.Forms.Button(); @@ -122,6 +124,11 @@ namespace NovetusLauncher this.tabPage8 = new System.Windows.Forms.TabPage(); this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.label22 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.checkBox7 = new System.Windows.Forms.CheckBox(); + this.checkBox6 = new System.Windows.Forms.CheckBox(); this.checkBox5 = new System.Windows.Forms.CheckBox(); this.label3 = new System.Windows.Forms.Label(); this.richTextBox3 = new System.Windows.Forms.RichTextBox(); @@ -239,7 +246,7 @@ namespace NovetusLauncher // button8 // this.button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button8.Location = new System.Drawing.Point(3, 3); + this.button8.Location = new System.Drawing.Point(6, 3); this.button8.Name = "button8"; this.button8.Size = new System.Drawing.Size(104, 20); this.button8.TabIndex = 35; @@ -508,6 +515,8 @@ namespace NovetusLauncher // // tabPage1 // + this.tabPage1.Controls.Add(this.label24); + this.tabPage1.Controls.Add(this.label23); this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); this.tabPage1.Controls.Add(this.button7); @@ -528,6 +537,24 @@ namespace NovetusLauncher this.tabPage1.ToolTipText = "Join a server via IP Address"; this.tabPage1.UseVisualStyleBackColor = true; // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(385, 14); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(60, 13); + this.label24.TabIndex = 52; + this.label24.Text = "Server Port"; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(220, 14); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(92, 13); + this.label23.TabIndex = 51; + this.label23.Text = "Server IP Address"; + // // label2 // this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; @@ -546,9 +573,9 @@ namespace NovetusLauncher // // button7 // - this.button7.Location = new System.Drawing.Point(409, 44); + this.button7.Location = new System.Drawing.Point(415, 56); this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(56, 21); + this.button7.Size = new System.Drawing.Size(51, 21); this.button7.TabIndex = 48; this.button7.Text = "RESET"; this.button7.UseVisualStyleBackColor = true; @@ -556,9 +583,9 @@ namespace NovetusLauncher // // button11 // - this.button11.Location = new System.Drawing.Point(357, 44); + this.button11.Location = new System.Drawing.Point(364, 56); this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(46, 21); + this.button11.Size = new System.Drawing.Size(45, 21); this.button11.TabIndex = 46; this.button11.Text = "SAVE"; this.button11.UseVisualStyleBackColor = true; @@ -566,7 +593,7 @@ namespace NovetusLauncher // // numericUpDown1 // - this.numericUpDown1.Location = new System.Drawing.Point(368, 18); + this.numericUpDown1.Location = new System.Drawing.Point(364, 30); this.numericUpDown1.Maximum = new decimal(new int[] { 65535, 0, @@ -578,7 +605,7 @@ namespace NovetusLauncher 0, 0}); this.numericUpDown1.Name = "numericUpDown1"; - this.numericUpDown1.Size = new System.Drawing.Size(90, 20); + this.numericUpDown1.Size = new System.Drawing.Size(102, 20); this.numericUpDown1.TabIndex = 18; this.numericUpDown1.Value = new decimal(new int[] { 53640, @@ -599,7 +626,7 @@ namespace NovetusLauncher // // button10 // - this.button10.Location = new System.Drawing.Point(204, 44); + this.button10.Location = new System.Drawing.Point(203, 56); this.button10.Name = "button10"; this.button10.Size = new System.Drawing.Size(120, 21); this.button10.TabIndex = 15; @@ -630,7 +657,7 @@ namespace NovetusLauncher // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(173, 18); + this.textBox1.Location = new System.Drawing.Point(169, 30); this.textBox1.Name = "textBox1"; this.textBox1.Size = new System.Drawing.Size(189, 20); this.textBox1.TabIndex = 0; @@ -1109,6 +1136,11 @@ namespace NovetusLauncher // // tabPage5 // + this.tabPage5.Controls.Add(this.label22); + this.tabPage5.Controls.Add(this.label20); + this.tabPage5.Controls.Add(this.label9); + this.tabPage5.Controls.Add(this.checkBox7); + this.tabPage5.Controls.Add(this.checkBox6); this.tabPage5.Controls.Add(this.checkBox5); this.tabPage5.Controls.Add(this.label3); this.tabPage5.Controls.Add(this.richTextBox3); @@ -1131,12 +1163,61 @@ namespace NovetusLauncher this.tabPage5.Text = "SETTINGS"; this.tabPage5.UseVisualStyleBackColor = true; // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(498, 3); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(52, 13); + this.label22.TabIndex = 67; + this.label22.Text = "ReShade"; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(97, 3); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(44, 13); + this.label20.TabIndex = 66; + this.label20.Text = "General"; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(327, 3); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(37, 13); + this.label9.TabIndex = 65; + this.label9.Text = "Config"; + // + // checkBox7 + // + this.checkBox7.AutoSize = true; + this.checkBox7.Location = new System.Drawing.Point(412, 47); + this.checkBox7.Name = "checkBox7"; + this.checkBox7.Size = new System.Drawing.Size(116, 17); + this.checkBox7.TabIndex = 64; + this.checkBox7.Text = "Performance Mode"; + this.checkBox7.UseVisualStyleBackColor = true; + this.checkBox7.CheckedChanged += new System.EventHandler(this.checkBox7_CheckedChanged); + // + // checkBox6 + // + this.checkBox6.AutoSize = true; + this.checkBox6.Location = new System.Drawing.Point(534, 47); + this.checkBox6.Name = "checkBox6"; + this.checkBox6.Size = new System.Drawing.Size(83, 17); + this.checkBox6.TabIndex = 63; + this.checkBox6.Text = "FPS Display"; + this.checkBox6.UseVisualStyleBackColor = true; + this.checkBox6.CheckedChanged += new System.EventHandler(this.checkBox6_CheckedChanged); + // // checkBox5 // this.checkBox5.AutoSize = true; this.checkBox5.Checked = true; this.checkBox5.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox5.Location = new System.Drawing.Point(429, 7); + this.checkBox5.Location = new System.Drawing.Point(467, 24); this.checkBox5.Name = "checkBox5"; this.checkBox5.Size = new System.Drawing.Size(107, 17); this.checkBox5.TabIndex = 62; @@ -1168,7 +1249,7 @@ namespace NovetusLauncher this.checkBox2.AutoSize = true; this.checkBox2.Checked = true; this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox2.Location = new System.Drawing.Point(204, 7); + this.checkBox2.Location = new System.Drawing.Point(6, 22); this.checkBox2.Name = "checkBox2"; this.checkBox2.Size = new System.Drawing.Size(135, 17); this.checkBox2.TabIndex = 59; @@ -1187,7 +1268,7 @@ namespace NovetusLauncher // // button26 // - this.button26.Location = new System.Drawing.Point(204, 27); + this.button26.Location = new System.Drawing.Point(6, 42); this.button26.Name = "button26"; this.button26.Size = new System.Drawing.Size(124, 21); this.button26.TabIndex = 57; @@ -1214,18 +1295,18 @@ namespace NovetusLauncher // // label6 // - this.label6.Location = new System.Drawing.Point(266, 57); + this.label6.Location = new System.Drawing.Point(261, 72); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(93, 15); + this.label6.Size = new System.Drawing.Size(106, 15); this.label6.TabIndex = 46; this.label6.Text = "Current Path:"; this.label6.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // label5 // - this.label5.Location = new System.Drawing.Point(5, 72); + this.label5.Location = new System.Drawing.Point(5, 87); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(612, 40); + this.label5.Size = new System.Drawing.Size(612, 25); this.label5.TabIndex = 45; this.label5.Text = "path lol"; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1243,7 +1324,7 @@ namespace NovetusLauncher // button9 // this.button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button9.Location = new System.Drawing.Point(105, 27); + this.button9.Location = new System.Drawing.Point(302, 43); this.button9.Name = "button9"; this.button9.Size = new System.Drawing.Size(93, 21); this.button9.TabIndex = 37; @@ -1253,7 +1334,7 @@ namespace NovetusLauncher // // checkBox3 // - this.checkBox3.Location = new System.Drawing.Point(345, 6); + this.checkBox3.Location = new System.Drawing.Point(147, 21); this.checkBox3.Name = "checkBox3"; this.checkBox3.Size = new System.Drawing.Size(77, 19); this.checkBox3.TabIndex = 22; @@ -1265,7 +1346,7 @@ namespace NovetusLauncher // this.checkBox1.Checked = true; this.checkBox1.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox1.Location = new System.Drawing.Point(345, 31); + this.checkBox1.Location = new System.Drawing.Point(147, 46); this.checkBox1.Name = "checkBox1"; this.checkBox1.Size = new System.Drawing.Size(124, 17); this.checkBox1.TabIndex = 5; @@ -1277,7 +1358,7 @@ namespace NovetusLauncher // button5 // this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button5.Location = new System.Drawing.Point(105, 3); + this.button5.Location = new System.Drawing.Point(302, 19); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(93, 22); this.button5.TabIndex = 10; @@ -1435,5 +1516,12 @@ namespace NovetusLauncher private System.Windows.Forms.Label label3; private System.Windows.Forms.Button button35; private System.Windows.Forms.CheckBox checkBox5; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.CheckBox checkBox7; + private System.Windows.Forms.CheckBox checkBox6; } } diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index aea2f74..7800080 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -16,14 +16,13 @@ using System.ComponentModel; using System.Reflection; using Mono.Nat; using System.Globalization; -using System.Linq; namespace NovetusLauncher { - /// - /// Description of MainForm. - /// - public partial class MainForm : Form + /// + /// Description of MainForm. + /// + public partial class MainForm : Form { DiscordRpc.EventHandlers handlers; @@ -504,6 +503,8 @@ namespace NovetusLauncher checkBox4.Checked = GlobalVars.UPnP; checkBox2.Checked = GlobalVars.DiscordPresence; checkBox5.Checked = GlobalVars.ReShade; + checkBox6.Checked = GlobalVars.ReShadeFPSDisplay; + checkBox7.Checked = GlobalVars.ReShadePerformanceMode; ConsolePrint("Config loaded.", 3); ReadClientValues(GlobalVars.SelectedClient); } @@ -1805,5 +1806,29 @@ namespace NovetusLauncher GlobalVars.ReShade = false; } } + + private void checkBox6_CheckedChanged(object sender, EventArgs e) + { + if (checkBox5.Checked == true) + { + GlobalVars.ReShadeFPSDisplay = true; + } + else if (checkBox5.Checked == false) + { + GlobalVars.ReShadeFPSDisplay = false; + } + } + + private void checkBox7_CheckedChanged(object sender, EventArgs e) + { + if (checkBox5.Checked == true) + { + GlobalVars.ReShadePerformanceMode = true; + } + else if (checkBox5.Checked == false) + { + GlobalVars.ReShadePerformanceMode = false; + } + } } } diff --git a/NovetusLauncher/NovetusLauncher/Program.cs b/NovetusLauncher/NovetusLauncher/Program.cs index bd2a6e5..5539bf1 100644 --- a/NovetusLauncher/NovetusLauncher/Program.cs +++ b/NovetusLauncher/NovetusLauncher/Program.cs @@ -9,7 +9,6 @@ using System; using System.Windows.Forms; - namespace NovetusLauncher { /// diff --git a/NovetusLauncher/NovetusLauncher/SDK/AssetLocalizer.cs b/NovetusLauncher/NovetusLauncher/SDK/AssetLocalizer.cs index 9fa1353..993aa44 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/AssetLocalizer.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/AssetLocalizer.cs @@ -1,12 +1,6 @@ using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Data; -using System.Drawing; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace NovetusLauncher diff --git a/NovetusLauncher/NovetusLauncher/SDK/ClientScriptDocumentation.cs b/NovetusLauncher/NovetusLauncher/SDK/ClientScriptDocumentation.cs index e30d306..a3f61ae 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/ClientScriptDocumentation.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/ClientScriptDocumentation.cs @@ -10,7 +10,6 @@ using System; using System.Windows.Forms; using System.IO; - namespace NovetusLauncher { /// diff --git a/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs b/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs index caee39c..3985e5e 100644 --- a/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs +++ b/NovetusLauncher/NovetusLauncher/SDK/SplashTester.cs @@ -7,15 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; -using System.Collections.Generic; -using System.Drawing; using System.Windows.Forms; -using System.IO; -using System.Diagnostics; -using System.ComponentModel; -using System.Reflection; -using Mono.Nat; -using System.Globalization; namespace NovetusLauncher { diff --git a/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs index 035fbcd..eaa0ed8 100644 --- a/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs +++ b/NovetusLauncher/NovetusLauncher/URI/LoaderForm.cs @@ -13,7 +13,6 @@ using System.Threading; using System.Windows.Forms; using System.Reflection; - namespace NovetusLauncher { /// diff --git a/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs b/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs index e40d7c6..afb9af3 100644 --- a/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs +++ b/NovetusLauncher/NovetusLauncher/URI/QuickConfigure.cs @@ -11,7 +11,6 @@ using System.Windows.Forms; using System.IO; using System.ComponentModel; - namespace NovetusLauncher { ///