mirror of
https://github.com/Novetus/Novetus_src.git
synced 2025-01-31 17:53:01 +02:00
1.1 additions
This commit is contained in:
parent
115a78409c
commit
a684f08e20
@ -380,16 +380,16 @@ namespace NovetusCMD
|
|||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
//when we add upnp, change this
|
|
||||||
ConsolePrint("Server Loaded.", 4);
|
ConsolePrint("Server Loaded.", 4);
|
||||||
Process client = new Process();
|
Process client = new Process();
|
||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.EnableRaisingEvents = true;
|
client.EnableRaisingEvents = true;
|
||||||
ReadClientValues(GlobalVars.SelectedClient);
|
ReadClientValues(GlobalVars.SelectedClient);
|
||||||
client.Exited += new EventHandler(ServerExited);
|
client.Exited += new EventHandler(ServerExited);
|
||||||
client.Start();
|
client.Start();
|
||||||
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Server);
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Server);
|
||||||
LocalVars.ProcessID = client.Id;
|
LocalVars.ProcessID = client.Id;
|
||||||
CreateTXT();
|
CreateTXT();
|
||||||
}
|
}
|
||||||
|
@ -1077,8 +1077,9 @@ namespace NovetusLauncher
|
|||||||
Process client = new Process();
|
Process client = new Process();
|
||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.Start();
|
client.Start();
|
||||||
}
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
}
|
||||||
catch (Exception ex) when (!Env.Debugging)
|
catch (Exception ex) when (!Env.Debugging)
|
||||||
{
|
{
|
||||||
MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")","Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("Failed to launch Novetus. (Error: " + ex.Message + ")","Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
|
@ -877,10 +877,11 @@ namespace NovetusLauncher
|
|||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.EnableRaisingEvents = true;
|
client.EnableRaisingEvents = true;
|
||||||
ReadClientValues(GlobalVars.SelectedClient);
|
ReadClientValues(GlobalVars.SelectedClient);
|
||||||
client.Exited += new EventHandler(ClientExited);
|
client.Exited += new EventHandler(ClientExited);
|
||||||
client.Start();
|
client.Start();
|
||||||
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Client);
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Client);
|
||||||
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InMPGame);
|
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InMPGame);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -923,10 +924,11 @@ namespace NovetusLauncher
|
|||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.EnableRaisingEvents = true;
|
client.EnableRaisingEvents = true;
|
||||||
ReadClientValues(GlobalVars.SelectedClient);
|
ReadClientValues(GlobalVars.SelectedClient);
|
||||||
client.Exited += new EventHandler(StudioExited);
|
client.Exited += new EventHandler(StudioExited);
|
||||||
client.Start();
|
client.Start();
|
||||||
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Solo);
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Solo);
|
||||||
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InSoloGame);
|
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InSoloGame);
|
||||||
}
|
}
|
||||||
catch (Exception ex) when (!Env.Debugging)
|
catch (Exception ex) when (!Env.Debugging)
|
||||||
@ -974,10 +976,11 @@ namespace NovetusLauncher
|
|||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.EnableRaisingEvents = true;
|
client.EnableRaisingEvents = true;
|
||||||
ReadClientValues(GlobalVars.SelectedClient);
|
ReadClientValues(GlobalVars.SelectedClient);
|
||||||
client.Exited += new EventHandler(ServerExited);
|
client.Exited += new EventHandler(ServerExited);
|
||||||
client.Start();
|
client.Start();
|
||||||
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Server);
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Server);
|
||||||
}
|
}
|
||||||
catch (Exception ex) when (!Env.Debugging)
|
catch (Exception ex) when (!Env.Debugging)
|
||||||
{
|
{
|
||||||
@ -1024,10 +1027,11 @@ namespace NovetusLauncher
|
|||||||
client.StartInfo.FileName = rbxexe;
|
client.StartInfo.FileName = rbxexe;
|
||||||
client.StartInfo.Arguments = args;
|
client.StartInfo.Arguments = args;
|
||||||
client.EnableRaisingEvents = true;
|
client.EnableRaisingEvents = true;
|
||||||
ReadClientValues(GlobalVars.SelectedClient);
|
ReadClientValues(GlobalVars.SelectedClient);
|
||||||
client.Exited += new EventHandler(StudioExited);
|
client.Exited += new EventHandler(StudioExited);
|
||||||
client.Start();
|
client.Start();
|
||||||
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Studio);
|
client.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(client, ScriptGenerator.ScriptType.Studio);
|
||||||
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InStudio);
|
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InStudio);
|
||||||
}
|
}
|
||||||
catch (Exception ex) when (!Env.Debugging)
|
catch (Exception ex) when (!Env.Debugging)
|
||||||
@ -1156,6 +1160,14 @@ namespace NovetusLauncher
|
|||||||
{
|
{
|
||||||
LoadSplashTester();
|
LoadSplashTester();
|
||||||
}
|
}
|
||||||
|
else if (string.Compare(command, "obj2meshv1gui", true, CultureInfo.InvariantCulture) == 0)
|
||||||
|
{
|
||||||
|
LoadOBJ2MeshV1GUI();
|
||||||
|
}
|
||||||
|
else if (string.Compare(command, "sdk obj2meshv1gui", true, CultureInfo.InvariantCulture) == 0)
|
||||||
|
{
|
||||||
|
LoadOBJ2MeshV1GUI();
|
||||||
|
}
|
||||||
else if (string.Compare(command,"charcustom",true, CultureInfo.InvariantCulture) == 0)
|
else if (string.Compare(command,"charcustom",true, CultureInfo.InvariantCulture) == 0)
|
||||||
{
|
{
|
||||||
CharacterCustomization cc = new CharacterCustomization();
|
CharacterCustomization cc = new CharacterCustomization();
|
||||||
@ -1276,6 +1288,13 @@ namespace NovetusLauncher
|
|||||||
ConsolePrint("Splash Tester Loaded.", 4);
|
ConsolePrint("Splash Tester Loaded.", 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LoadOBJ2MeshV1GUI()
|
||||||
|
{
|
||||||
|
Obj2MeshV1GUI obj = new Obj2MeshV1GUI();
|
||||||
|
obj.Show();
|
||||||
|
ConsolePrint("OBJ2MeshV1 GUI Loaded.", 4);
|
||||||
|
}
|
||||||
|
|
||||||
void LoadLauncher()
|
void LoadLauncher()
|
||||||
{
|
{
|
||||||
NovetusSDK im = new NovetusSDK();
|
NovetusSDK im = new NovetusSDK();
|
||||||
@ -1302,6 +1321,7 @@ namespace NovetusLauncher
|
|||||||
ConsolePrint("= itemmaker | Launches the Novetus Item SDK", 4);
|
ConsolePrint("= itemmaker | Launches the Novetus Item SDK", 4);
|
||||||
ConsolePrint("= assetlocalizer | Launches the Novetus Asset Localizer", 4);
|
ConsolePrint("= assetlocalizer | Launches the Novetus Asset Localizer", 4);
|
||||||
ConsolePrint("= splashtester | Launches the Splash Tester", 4);
|
ConsolePrint("= splashtester | Launches the Splash Tester", 4);
|
||||||
|
ConsolePrint("= obj2meshv1gui | Launches the OBJ2MeshV1 GUI", 4);
|
||||||
}
|
}
|
||||||
else if (page == 3)
|
else if (page == 3)
|
||||||
{
|
{
|
||||||
|
@ -102,6 +102,12 @@
|
|||||||
<Compile Include="SDK\ItemMaker.Designer.cs">
|
<Compile Include="SDK\ItemMaker.Designer.cs">
|
||||||
<DependentUpon>ItemMaker.cs</DependentUpon>
|
<DependentUpon>ItemMaker.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="SDK\Obj2MeshV1GUI.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="SDK\Obj2MeshV1GUI.Designer.cs">
|
||||||
|
<DependentUpon>Obj2MeshV1GUI.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="URI\LoaderForm.cs">
|
<Compile Include="URI\LoaderForm.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
@ -165,6 +171,9 @@
|
|||||||
<EmbeddedResource Include="SDK\ItemMaker.resx">
|
<EmbeddedResource Include="SDK\ItemMaker.resx">
|
||||||
<DependentUpon>ItemMaker.cs</DependentUpon>
|
<DependentUpon>ItemMaker.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="SDK\Obj2MeshV1GUI.resx">
|
||||||
|
<DependentUpon>Obj2MeshV1GUI.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="URI\LoaderForm.resx">
|
<EmbeddedResource Include="URI\LoaderForm.resx">
|
||||||
<DependentUpon>LoaderForm.cs</DependentUpon>
|
<DependentUpon>LoaderForm.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
@ -62,7 +62,8 @@
|
|||||||
"Client SDK",
|
"Client SDK",
|
||||||
"ClientScript Documentation",
|
"ClientScript Documentation",
|
||||||
"Asset Localizer",
|
"Asset Localizer",
|
||||||
"Splash Tester"});
|
"Splash Tester",
|
||||||
|
"OBJ2MeshV1 GUI"});
|
||||||
this.listBox1.Location = new System.Drawing.Point(12, 70);
|
this.listBox1.Location = new System.Drawing.Point(12, 70);
|
||||||
this.listBox1.Name = "listBox1";
|
this.listBox1.Name = "listBox1";
|
||||||
this.listBox1.Size = new System.Drawing.Size(260, 95);
|
this.listBox1.Size = new System.Drawing.Size(260, 95);
|
||||||
|
@ -65,6 +65,11 @@ namespace NovetusLauncher
|
|||||||
SplashTester st = new SplashTester();
|
SplashTester st = new SplashTester();
|
||||||
st.Show();
|
st.Show();
|
||||||
}
|
}
|
||||||
|
else if (listBox1.SelectedIndex == 5)
|
||||||
|
{
|
||||||
|
Obj2MeshV1GUI obj = new Obj2MeshV1GUI();
|
||||||
|
obj.Show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
77
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.Designer.cs
generated
Normal file
77
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.Designer.cs
generated
Normal file
@ -0,0 +1,77 @@
|
|||||||
|
namespace NovetusLauncher
|
||||||
|
{
|
||||||
|
partial class Obj2MeshV1GUI
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Obj2MeshV1GUI));
|
||||||
|
this.button1 = new System.Windows.Forms.Button();
|
||||||
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
|
this.SuspendLayout();
|
||||||
|
//
|
||||||
|
// button1
|
||||||
|
//
|
||||||
|
this.button1.Location = new System.Drawing.Point(12, 12);
|
||||||
|
this.button1.Name = "button1";
|
||||||
|
this.button1.Size = new System.Drawing.Size(204, 23);
|
||||||
|
this.button1.TabIndex = 0;
|
||||||
|
this.button1.Text = "Browse for mesh and convert...";
|
||||||
|
this.button1.UseVisualStyleBackColor = true;
|
||||||
|
this.button1.Click += new System.EventHandler(this.button1_Click);
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
this.label1.AutoSize = true;
|
||||||
|
this.label1.Location = new System.Drawing.Point(45, 38);
|
||||||
|
this.label1.Name = "label1";
|
||||||
|
this.label1.Size = new System.Drawing.Size(138, 13);
|
||||||
|
this.label1.TabIndex = 1;
|
||||||
|
this.label1.Text = "OBJ2MeshV1 built by coke.";
|
||||||
|
//
|
||||||
|
// Obj2MeshV1GUI
|
||||||
|
//
|
||||||
|
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||||
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
|
this.ClientSize = new System.Drawing.Size(228, 58);
|
||||||
|
this.Controls.Add(this.label1);
|
||||||
|
this.Controls.Add(this.button1);
|
||||||
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||||
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
|
this.MaximizeBox = false;
|
||||||
|
this.Name = "Obj2MeshV1GUI";
|
||||||
|
this.Text = "OBJ2MeshV1 GUI";
|
||||||
|
this.ResumeLayout(false);
|
||||||
|
this.PerformLayout();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.Button button1;
|
||||||
|
private System.Windows.Forms.Label label1;
|
||||||
|
}
|
||||||
|
}
|
50
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.cs
Normal file
50
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.cs
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
using System.IO;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
namespace NovetusLauncher
|
||||||
|
{
|
||||||
|
public partial class Obj2MeshV1GUI : Form
|
||||||
|
{
|
||||||
|
private OpenFileDialog openFileDialog1;
|
||||||
|
|
||||||
|
public Obj2MeshV1GUI()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
|
||||||
|
openFileDialog1 = new OpenFileDialog()
|
||||||
|
{
|
||||||
|
FileName = "Select a .OBJ file",
|
||||||
|
Filter = "Wavefront .obj file (*.obj)|*.obj",
|
||||||
|
Title = "Open model .obj"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private void button1_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if (openFileDialog1.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
ProcessOBJ(GlobalVars.ConfigDir + "\\obj2meshv1.exe", openFileDialog1.FileName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ProcessOBJ(string EXEName, string FileName)
|
||||||
|
{
|
||||||
|
Process proc = new Process();
|
||||||
|
proc.StartInfo.FileName = EXEName;
|
||||||
|
proc.StartInfo.Arguments = FileName;
|
||||||
|
proc.StartInfo.CreateNoWindow = true;
|
||||||
|
proc.StartInfo.UseShellExecute = false;
|
||||||
|
proc.EnableRaisingEvents = true;
|
||||||
|
proc.Exited += new EventHandler(OBJ2MeshV1Exited);
|
||||||
|
proc.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
void OBJ2MeshV1Exited(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
string properName = Path.GetFileName(openFileDialog1.FileName) + ".mesh";
|
||||||
|
MessageBox.Show("File " + properName + " created!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
2346
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.resx
Normal file
2346
NovetusLauncher/NovetusLauncher/SDK/Obj2MeshV1GUI.resx
Normal file
File diff suppressed because it is too large
Load Diff
@ -178,9 +178,10 @@ namespace NovetusLauncher
|
|||||||
clientproc.StartInfo.FileName = rbxexe;
|
clientproc.StartInfo.FileName = rbxexe;
|
||||||
clientproc.StartInfo.Arguments = args;
|
clientproc.StartInfo.Arguments = args;
|
||||||
clientproc.EnableRaisingEvents = true;
|
clientproc.EnableRaisingEvents = true;
|
||||||
clientproc.Exited += new EventHandler(ClientExited);
|
clientproc.Exited += new EventHandler(ClientExited);
|
||||||
clientproc.Start();
|
clientproc.Start();
|
||||||
SecurityFuncs.RenameWindow(clientproc, ScriptGenerator.ScriptType.Client);
|
clientproc.PriorityClass = ProcessPriorityClass.RealTime;
|
||||||
|
SecurityFuncs.RenameWindow(clientproc, ScriptGenerator.ScriptType.Client);
|
||||||
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InMPGame);
|
LauncherFuncs.UpdateRichPresence(LauncherFuncs.LauncherState.InMPGame);
|
||||||
this.Visible = false;
|
this.Visible = false;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user