diff --git a/Novetus/NovetusCMD/Novetus.CMD.csproj b/Novetus/NovetusCMD/Novetus.CMD.csproj
index 9ecf639..1a76e97 100644
--- a/Novetus/NovetusCMD/Novetus.CMD.csproj
+++ b/Novetus/NovetusCMD/Novetus.CMD.csproj
@@ -68,6 +68,8 @@
false
x86
TRACE;CMD;NOVETUS_APPS
+ pdbonly
+ true
diff --git a/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs b/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs
deleted file mode 100644
index 3e47579..0000000
--- a/Novetus/NovetusLauncher/Classes/SDK/OBJConverter.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-#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);
-
- MessageBox.Show(result.Vertices.Count.ToString());
- MessageBox.Show(result.Normals.Count.ToString());
-
- string testString = "";
- testString += "version 1.00\n";
- testString += result.Groups.First().Faces.Count + "\n";
- for (int i = 0; i < result.Vertices.Count; ++i)
- {
- Vertex vert = result.Vertices[i];
-
- Normal norm;
- if (i >= result.Normals.Count)
- {
- norm = new Normal(0, 0, 0);
- }
- else
- {
- norm = result.Normals[i];
- }
-
- Texture tex;
- if (i >= result.Textures.Count)
- {
- tex = new Texture(0, 0);
- }
- else
- {
- tex = result.Textures[i];
- }
-
- testString += "[" +
- (vert.X * 0.5) + "," +
- (vert.Y * 0.5) + "," +
- (vert.Z * 0.5) + "]" +
- "[" + norm.X + "," +
- norm.Y + "," +
- norm.Z + "]" +
- "[" + tex.X + "," +
- tex.Y + ",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
deleted file mode 100644
index d68f81f..0000000
Binary files a/Novetus/NovetusLauncher/Dependencies/CjClutter.ObjLoader.LoaderNet4.dll and /dev/null differ
diff --git a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs
index 727422a..1dfba7d 100644
--- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs
+++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.Designer.cs
@@ -53,7 +53,6 @@
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();
//
@@ -121,23 +120,12 @@
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, 399);
- this.Controls.Add(this.TestButton);
+ this.ClientSize = new System.Drawing.Size(438, 352);
this.Controls.Add(this.listView1);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox2);
@@ -161,5 +149,4 @@
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 0481320..e8674b2 100644
--- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs
+++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.cs
@@ -123,12 +123,5 @@ 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 c94778a..d510d54 100644
--- a/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx
+++ b/Novetus/NovetusLauncher/Forms/SDK/NovetusSDK.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAU
- EwAAAk1TRnQBSQFMAgEBCgEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ EwAAAk1TRnQBSQFMAgEBCgEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 281f1ed..d3b6a0d 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -71,11 +71,10 @@
false
x86
+ pdbonly
+ true
-
- Dependencies\CjClutter.ObjLoader.LoaderNet4.dll
-
..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll
@@ -98,12 +97,6 @@
..\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
-
@@ -162,7 +155,6 @@
-
Form
diff --git a/Novetus/NovetusLauncher/packages.config b/Novetus/NovetusLauncher/packages.config
index 3e7ad67..d68baea 100644
--- a/Novetus/NovetusLauncher/packages.config
+++ b/Novetus/NovetusLauncher/packages.config
@@ -6,6 +6,4 @@
-
-
\ No newline at end of file
diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj
index d343cce..92d0a27 100644
--- a/Novetus/NovetusURI/Novetus.URI.csproj
+++ b/Novetus/NovetusURI/Novetus.URI.csproj
@@ -27,7 +27,7 @@
x86
- none
+ pdbonly
true
bin\Release\
TRACE;URI;NOVETUS_APPS
@@ -35,6 +35,7 @@
4
false
4096
+ true
NovetusIcon.ico