From e27b073ceb4de9035a1c39cc9b9092a30b592260 Mon Sep 17 00:00:00 2001 From: Bitl Date: Fri, 10 Sep 2021 18:09:05 -0700 Subject: [PATCH] testing built in obj to mesh conversion --- .../Classes/SDK/OBJConverter.cs | 84 ++++++++++++++++++ .../CjClutter.ObjLoader.LoaderNet4.dll | Bin 0 -> 20992 bytes .../Forms/SDK/NovetusSDK.Designer.cs | 15 +++- .../NovetusLauncher/Forms/SDK/NovetusSDK.cs | 7 ++ .../NovetusLauncher/Forms/SDK/NovetusSDK.resx | 2 +- .../NovetusLauncher/Novetus.Launcher.csproj | 10 +++ Novetus/NovetusLauncher/packages.config | 2 + 7 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs create mode 100644 Novetus/NovetusLauncher/Dependencies/CjClutter.ObjLoader.LoaderNet4.dll diff --git a/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs b/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs new file mode 100644 index 0000000..0a103da --- /dev/null +++ b/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs @@ -0,0 +1,84 @@ +#region Usings +using ObjLoader.Loader.Data.VertexData; +using ObjLoader.Loader.Loaders; +using System; +using System.IO; +using System.Linq; +using System.Windows.Forms; +#endregion + +#region Icon Loader + +public class OBJConverter +{ + private OpenFileDialog openFileDialog1; + private string installOutcome = ""; + + public OBJConverter() + { + openFileDialog1 = new OpenFileDialog() + { + FileName = "Select an .obj file", + Filter = "Wavefront OBJ file (*.obj)|*.obj", + Title = "Open .obj" + }; + } + + public void setInstallOutcome(string text) + { + installOutcome = text; + } + + public string getInstallOutcome() + { + return installOutcome; + } + + public void ConvertOBJ() + { + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + using (Stream str = openFileDialog1.OpenFile()) + { + Directory.SetCurrentDirectory(Path.GetDirectoryName(openFileDialog1.FileName)); + var materialStreamProvider = new MaterialStreamProvider(); + var objLoaderFactory = new ObjLoaderFactory(); + var objLoader = objLoaderFactory.Create(materialStreamProvider); + var fileStream = materialStreamProvider.Open(openFileDialog1.FileName); + var result = objLoader.Load(fileStream); + + string testString = ""; + testString += "version 1.00\n"; + testString += result.Groups.First().Faces.Count + "\n"; + foreach (Vertex vert in result.Vertices) + { + testString += "[" + (vert.X * 0.5) + "," + (vert.Y * 0.5) + "," + (vert.Z * 0.5) + "]"; + foreach (Normal norm in result.Normals) + { + testString += "[" + norm.X + "," + norm.Y + "," + norm.Z + "]"; + + //this is dumb + if (result.Textures.Count > 0) + { + foreach (Texture tex in result.Textures) + { + testString += "[" + tex.X + "," + tex.Y + ",0]"; + } + } + else + { + testString += "[0,0,0]"; + } + } + } + + MessageBox.Show(testString); + Clipboard.SetText(testString); + + Directory.SetCurrentDirectory(GlobalPaths.RootPath); + str.Close(); + } + } + } +} +#endregion \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Dependencies/CjClutter.ObjLoader.LoaderNet4.dll b/Novetus/NovetusLauncher/Dependencies/CjClutter.ObjLoader.LoaderNet4.dll new file mode 100644 index 0000000000000000000000000000000000000000..d68f81f93ca36660547868e5694f28b27e3317b9 GIT binary patch literal 20992 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 literal 0 HcmV?d00001 diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs index 398ad54..727422a 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs @@ -53,6 +53,7 @@ this.listView1 = new System.Windows.Forms.ListView(); this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.imageList1 = new System.Windows.Forms.ImageList(this.components); + this.TestButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // @@ -120,12 +121,23 @@ this.imageList1.Images.SetKeyName(8, "splash.png"); this.imageList1.Images.SetKeyName(9, "XMLContentEditor.png"); // + // TestButton + // + this.TestButton.Location = new System.Drawing.Point(15, 364); + this.TestButton.Name = "TestButton"; + this.TestButton.Size = new System.Drawing.Size(75, 23); + this.TestButton.TabIndex = 16; + this.TestButton.Text = "OBJStats"; + this.TestButton.UseVisualStyleBackColor = true; + this.TestButton.Click += new System.EventHandler(this.TestButton_Click); + // // NovetusSDK // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.ClientSize = new System.Drawing.Size(438, 354); + this.ClientSize = new System.Drawing.Size(438, 399); + this.Controls.Add(this.TestButton); this.Controls.Add(this.listView1); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox2); @@ -149,4 +161,5 @@ private System.Windows.Forms.ListView listView1; private System.Windows.Forms.ColumnHeader columnHeader1; private System.Windows.Forms.ImageList imageList1; + private System.Windows.Forms.Button TestButton; } \ No newline at end of file diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs index e8674b2..0481320 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs @@ -123,5 +123,12 @@ public partial class NovetusSDK : Form } } #endregion + + //remove upon test finish + private void TestButton_Click(object sender, EventArgs e) + { + OBJConverter objconv = new OBJConverter(); + objconv.ConvertOBJ(); + } } #endregion diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx index c02f628..c94778a 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx +++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU - EwAAAk1TRnQBSQFMAgEBCgEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EwAAAk1TRnQBSQFMAgEBCgEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj index 21103f5..281f1ed 100644 --- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj +++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj @@ -73,6 +73,9 @@ x86 + + Dependencies\CjClutter.ObjLoader.LoaderNet4.dll + ..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll @@ -95,6 +98,12 @@ ..\packages\NLog.4.7.2\lib\net40-client\NLog.dll + + ..\packages\SharpGL.3.1.1\lib\net40\SharpGL.dll + + + ..\packages\SharpGL.SceneGraph.3.1.1\lib\net40\SharpGL.SceneGraph.dll + @@ -153,6 +162,7 @@ + Form diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config index d68baea..3e7ad67 100644 --- a/Novetus/NovetusLauncher/packages.config +++ b/Novetus/NovetusLauncher/packages.config @@ -6,4 +6,6 @@ + + \ No newline at end of file