diff --git a/Unity Studio/Properties/Resources.Designer.cs b/Unity Studio/Properties/Resources.Designer.cs index f0dc493..d453aed 100644 --- a/Unity Studio/Properties/Resources.Designer.cs +++ b/Unity Studio/Properties/Resources.Designer.cs @@ -60,6 +60,63 @@ namespace Unity_Studio.Properties { } } + /// + /// 查找类似 #version 140 + /// + ///in vec3 normal; + /// + ///out vec4 outputColor; + /// + ///void main() + ///{ + /// vec3 unitNormal = normalize(normal); + /// float nDotProduct = clamp(dot(unitNormal, vec3(0.707, 0, 0.707)), 0, 1); + /// vec2 ContributionWeightsSqrt = vec2(0.5, 0.5f) + vec2(0.5f, -0.5f) * unitNormal.y; + /// vec2 ContributionWeights = ContributionWeightsSqrt * ContributionWeightsSqrt; + /// + /// vec3 color = nDotProduct * vec3(1, 0.957, 0.839) / 3.14159; + /// color += vec3(0.779, 0.716, 0.453) * ContributionWeights.y; + /// color += vec3(0.368, 0.477, 0. [字符串的其余部分被截断]"; 的本地化字符串。 + /// + internal static string fs { + get { + return ResourceManager.GetString("fs", resourceCulture); + } + } + + /// + /// 查找类似 #version 140 + /// + ///out vec4 outputColor; + /// + ///void main() + ///{ + /// outputColor = vec4(0, 0, 0, 1); + ///} 的本地化字符串。 + /// + internal static string fsBlack { + get { + return ResourceManager.GetString("fsBlack", resourceCulture); + } + } + + /// + /// 查找类似 #version 140 + /// + ///out vec4 outputColor; + ///in vec4 color; + /// + ///void main() + ///{ + /// outputColor = color; + ///} 的本地化字符串。 + /// + internal static string fsColor { + get { + return ResourceManager.GetString("fsColor", resourceCulture); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -79,5 +136,30 @@ namespace Unity_Studio.Properties { return ((System.Drawing.Icon)(obj)); } } + + /// + /// 查找类似 #version 140 + /// + ///in vec3 vertexPosition; + ///in vec3 normalDirection; + ///in vec4 vertexColor; + ///uniform mat4 modelMatrix; + ///uniform mat4 viewMatrix; + /// + ///out vec3 normal; + ///out vec4 color; + /// + ///void main() + ///{ + /// gl_Position = viewMatrix * modelMatrix * vec4(vertexPosition, 1.0); + /// normal = normalDirection; + /// color = vertexColor; + ///} 的本地化字符串。 + /// + internal static string vs { + get { + return ResourceManager.GetString("vs", resourceCulture); + } + } } } diff --git a/Unity Studio/Properties/Resources.resx b/Unity Studio/Properties/Resources.resx index 69bc029..43d4d2a 100644 --- a/Unity Studio/Properties/Resources.resx +++ b/Unity Studio/Properties/Resources.resx @@ -117,6 +117,47 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + #version 140 + +in vec3 normal; + +out vec4 outputColor; + +void main() +{ + vec3 unitNormal = normalize(normal); + float nDotProduct = clamp(dot(unitNormal, vec3(0.707, 0, 0.707)), 0, 1); + vec2 ContributionWeightsSqrt = vec2(0.5, 0.5f) + vec2(0.5f, -0.5f) * unitNormal.y; + vec2 ContributionWeights = ContributionWeightsSqrt * ContributionWeightsSqrt; + + vec3 color = nDotProduct * vec3(1, 0.957, 0.839) / 3.14159; + color += vec3(0.779, 0.716, 0.453) * ContributionWeights.y; + color += vec3(0.368, 0.477, 0.735) * ContributionWeights.x; + outputColor = vec4(sqrt(color), 1); +} + + + #version 140 + +out vec4 outputColor; + +void main() +{ + outputColor = vec4(0, 0, 0, 1); +} + + + #version 140 + +out vec4 outputColor; +in vec4 color; + +void main() +{ + outputColor = color; +} + ..\Resources\preview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -124,4 +165,23 @@ ..\Resources\unity.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + #version 140 + +in vec3 vertexPosition; +in vec3 normalDirection; +in vec4 vertexColor; +uniform mat4 modelMatrix; +uniform mat4 viewMatrix; + +out vec3 normal; +out vec4 color; + +void main() +{ + gl_Position = viewMatrix * modelMatrix * vec4(vertexPosition, 1.0); + normal = normalDirection; + color = vertexColor; +} + \ No newline at end of file diff --git a/Unity Studio/Resource1.Designer.cs b/Unity Studio/Resource1.Designer.cs deleted file mode 100644 index 80cab4b..0000000 --- a/Unity Studio/Resource1.Designer.cs +++ /dev/null @@ -1,145 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Unity_Studio { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resource1 { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resource1() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Unity_Studio.Resource1", typeof(Resource1).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to #version 140 - /// - ///in vec3 normal; - /// - ///out vec4 outputColor; - /// - ///void main() - ///{ - /// vec3 unitNormal = normalize(normal); - /// float nDotProduct = clamp(dot(unitNormal, vec3(0.707, 0, 0.707)), 0, 1); - /// vec2 ContributionWeightsSqrt = vec2(0.5, 0.5f) + vec2(0.5f, -0.5f) * unitNormal.y; - /// vec2 ContributionWeights = ContributionWeightsSqrt * ContributionWeightsSqrt; - /// - /// vec3 color = nDotProduct * vec3(1, 0.957, 0.839) / 3.14159; - /// color += vec3(0.779, 0.716, 0.453) * ContributionWeights.y; - /// color += vec3(0.368, 0.477, 0. [rest of string was truncated]";. - /// - internal static string fs { - get { - return ResourceManager.GetString("fs", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to #version 140 - /// - ///out vec4 outputColor; - /// - ///void main() - ///{ - /// outputColor = vec4(0, 0, 0, 1); - ///}. - /// - internal static string fsBlack { - get { - return ResourceManager.GetString("fsBlack", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to #version 140 - /// - ///out vec4 outputColor; - ///in vec4 color; - /// - ///void main() - ///{ - /// outputColor = color; - ///}. - /// - internal static string fsColor { - get { - return ResourceManager.GetString("fsColor", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to #version 140 - /// - ///in vec3 vertexPosition; - ///in vec3 normalDirection; - ///in vec4 vertexColor; - ///uniform mat4 modelMatrix; - ///uniform mat4 viewMatrix; - /// - ///out vec3 normal; - ///out vec4 color; - /// - ///void main() - ///{ - /// gl_Position = viewMatrix * modelMatrix * vec4(vertexPosition, 1.0); - /// normal = normalDirection; - /// color = vertexColor; - ///}. - /// - internal static string vs { - get { - return ResourceManager.GetString("vs", resourceCulture); - } - } - } -} diff --git a/Unity Studio/Resource1.resx b/Unity Studio/Resource1.resx deleted file mode 100644 index 6b139c5..0000000 --- a/Unity Studio/Resource1.resx +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - #version 140 - -in vec3 normal; - -out vec4 outputColor; - -void main() -{ - vec3 unitNormal = normalize(normal); - float nDotProduct = clamp(dot(unitNormal, vec3(0.707, 0, 0.707)), 0, 1); - vec2 ContributionWeightsSqrt = vec2(0.5, 0.5f) + vec2(0.5f, -0.5f) * unitNormal.y; - vec2 ContributionWeights = ContributionWeightsSqrt * ContributionWeightsSqrt; - - vec3 color = nDotProduct * vec3(1, 0.957, 0.839) / 3.14159; - color += vec3(0.779, 0.716, 0.453) * ContributionWeights.y; - color += vec3(0.368, 0.477, 0.735) * ContributionWeights.x; - outputColor = vec4(sqrt(color), 1); -} - - - #version 140 - -out vec4 outputColor; - -void main() -{ - outputColor = vec4(0, 0, 0, 1); -} - - - #version 140 - -out vec4 outputColor; -in vec4 color; - -void main() -{ - outputColor = color; -} - - - #version 140 - -in vec3 vertexPosition; -in vec3 normalDirection; -in vec4 vertexColor; -uniform mat4 modelMatrix; -uniform mat4 viewMatrix; - -out vec3 normal; -out vec4 color; - -void main() -{ - gl_Position = viewMatrix * modelMatrix * vec4(vertexPosition, 1.0); - normal = normalDirection; - color = vertexColor; -} - - \ No newline at end of file diff --git a/Unity Studio/Unity Studio-x86.csproj b/Unity Studio/Unity Studio-x86.csproj index 457d216..4b23aad 100644 --- a/Unity Studio/Unity Studio-x86.csproj +++ b/Unity Studio/Unity Studio-x86.csproj @@ -131,11 +131,6 @@ Code - - Resource1.resx - True - True - ShaderResource.resx True @@ -204,10 +199,6 @@ Resources.resx True - - ResXFileCodeGenerator - Resource1.Designer.cs - ResXFileCodeGenerator ShaderResource.Designer.cs diff --git a/Unity Studio/Unity Studio.csproj b/Unity Studio/Unity Studio.csproj index 992fdef..42abe1a 100644 --- a/Unity Studio/Unity Studio.csproj +++ b/Unity Studio/Unity Studio.csproj @@ -131,11 +131,6 @@ Code - - True - True - Resource1.resx - True True @@ -204,10 +199,6 @@ Resources.resx True - - ResXFileCodeGenerator - Resource1.Designer.cs - ResXFileCodeGenerator ShaderResource.Designer.cs diff --git a/Unity Studio/UnityStudioForm.Designer.cs b/Unity Studio/UnityStudioForm.Designer.cs index f9d5b03..abadf16 100644 --- a/Unity Studio/UnityStudioForm.Designer.cs +++ b/Unity Studio/UnityStudioForm.Designer.cs @@ -52,17 +52,17 @@ this.assetGroupOptions = new System.Windows.Forms.ToolStripComboBox(); this.showExpOpt = new System.Windows.Forms.ToolStripMenuItem(); this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportAll3DMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.all3DObjectssplitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportSelected3DMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportAllAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportSelectedAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportFilteredAssetsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this._3DToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exportAll3DMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.all3DObjectssplitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exportSelected3DMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); - this.sceneTreeView = new GOHierarchy(); + this.sceneTreeView = new Unity_Studio.GOHierarchy(); this.treeSearch = new System.Windows.Forms.TextBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.assetListView = new System.Windows.Forms.ListView(); @@ -112,7 +112,6 @@ this.tabPage1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.progressbarPanel.SuspendLayout(); - this.glControl1.SuspendLayout(); this.previewPanel.SuspendLayout(); this.FMODpanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.FMODprogressBar)).BeginInit(); @@ -133,7 +132,7 @@ this._3DToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(1264, 24); + this.menuStrip1.Size = new System.Drawing.Size(1264, 25); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -146,39 +145,39 @@ this.extractBundleToolStripMenuItem, this.extractFolderToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(39, 21); this.fileToolStripMenuItem.Text = "File"; // // loadFileToolStripMenuItem // this.loadFileToolStripMenuItem.Name = "loadFileToolStripMenuItem"; - this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.loadFileToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.loadFileToolStripMenuItem.Text = "Load file"; this.loadFileToolStripMenuItem.Click += new System.EventHandler(this.loadFile_Click); // // loadFolderToolStripMenuItem // this.loadFolderToolStripMenuItem.Name = "loadFolderToolStripMenuItem"; - this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.loadFolderToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.loadFolderToolStripMenuItem.Text = "Load folder"; this.loadFolderToolStripMenuItem.Click += new System.EventHandler(this.loadFolder_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(155, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(156, 6); // // extractBundleToolStripMenuItem // this.extractBundleToolStripMenuItem.Name = "extractBundleToolStripMenuItem"; - this.extractBundleToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.extractBundleToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.extractBundleToolStripMenuItem.Text = "Extract bundle"; this.extractBundleToolStripMenuItem.Click += new System.EventHandler(this.extractBundleToolStripMenuItem_Click); // // extractFolderToolStripMenuItem // this.extractFolderToolStripMenuItem.Name = "extractFolderToolStripMenuItem"; - this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(158, 22); + this.extractFolderToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.extractFolderToolStripMenuItem.Text = "Extract folder"; this.extractFolderToolStripMenuItem.Click += new System.EventHandler(this.extractFolderToolStripMenuItem_Click); // @@ -191,7 +190,7 @@ this.toolStripSeparator2, this.exportClassStructuresMenuItem}); this.debugMenuItem.Name = "debugMenuItem"; - this.debugMenuItem.Size = new System.Drawing.Size(80, 20); + this.debugMenuItem.Size = new System.Drawing.Size(87, 21); this.debugMenuItem.Text = "Diagnostics"; this.debugMenuItem.Visible = false; // @@ -199,14 +198,14 @@ // this.buildClassStructuresMenuItem.CheckOnClick = true; this.buildClassStructuresMenuItem.Name = "buildClassStructuresMenuItem"; - this.buildClassStructuresMenuItem.Size = new System.Drawing.Size(208, 22); + this.buildClassStructuresMenuItem.Size = new System.Drawing.Size(224, 22); this.buildClassStructuresMenuItem.Text = "Build class structures"; // // dontLoadAssetsMenuItem // this.dontLoadAssetsMenuItem.CheckOnClick = true; this.dontLoadAssetsMenuItem.Name = "dontLoadAssetsMenuItem"; - this.dontLoadAssetsMenuItem.Size = new System.Drawing.Size(208, 22); + this.dontLoadAssetsMenuItem.Size = new System.Drawing.Size(224, 22); this.dontLoadAssetsMenuItem.Text = "Don\'t load assets"; this.dontLoadAssetsMenuItem.CheckedChanged += new System.EventHandler(this.dontLoadAssetsMenuItem_CheckedChanged); // @@ -214,18 +213,18 @@ // this.dontBuildHierarchyMenuItem.CheckOnClick = true; this.dontBuildHierarchyMenuItem.Name = "dontBuildHierarchyMenuItem"; - this.dontBuildHierarchyMenuItem.Size = new System.Drawing.Size(208, 22); + this.dontBuildHierarchyMenuItem.Size = new System.Drawing.Size(224, 22); this.dontBuildHierarchyMenuItem.Text = "Don\'t build hierarchy tree"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(205, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6); // // exportClassStructuresMenuItem // this.exportClassStructuresMenuItem.Name = "exportClassStructuresMenuItem"; - this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(208, 22); + this.exportClassStructuresMenuItem.Size = new System.Drawing.Size(224, 22); this.exportClassStructuresMenuItem.Text = "Export class structures"; this.exportClassStructuresMenuItem.Click += new System.EventHandler(this.exportClassStructuresMenuItem_Click); // @@ -240,18 +239,9 @@ this.assetGroupOptions, this.showExpOpt}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(66, 21); this.optionsToolStripMenuItem.Text = "Options"; // - // displayOriginalName - // - this.displayOriginalName.CheckOnClick = true; - this.displayOriginalName.Name = "displayOriginalName"; - this.displayOriginalName.Size = new System.Drawing.Size(252, 22); - this.displayOriginalName.Text = "Display asset original name"; - this.displayOriginalName.ToolTipText = "Check this option will use asset original name when display and export"; - this.displayOriginalName.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged); - // // displayAll // this.displayAll.CheckOnClick = true; @@ -262,6 +252,15 @@ "t the RAW file."; this.displayAll.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged); // + // displayOriginalName + // + this.displayOriginalName.CheckOnClick = true; + this.displayOriginalName.Name = "displayOriginalName"; + this.displayOriginalName.Size = new System.Drawing.Size(252, 22); + this.displayOriginalName.Text = "Display asset original name"; + this.displayOriginalName.ToolTipText = "Check this option will use asset original name when display and export"; + this.displayOriginalName.CheckedChanged += new System.EventHandler(this.MenuItem_CheckedChanged); + // // enablePreview // this.enablePreview.Checked = true; @@ -303,7 +302,7 @@ "Group exported assets by source file", "Do not group exported assets"}); this.assetGroupOptions.Name = "assetGroupOptions"; - this.assetGroupOptions.Size = new System.Drawing.Size(192, 23); + this.assetGroupOptions.Size = new System.Drawing.Size(192, 25); this.assetGroupOptions.SelectedIndexChanged += new System.EventHandler(this.assetGroupOptions_SelectedIndexChanged); // // showExpOpt @@ -320,28 +319,28 @@ this.exportSelectedAssetsMenuItem, this.exportFilteredAssetsMenuItem}); this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.Size = new System.Drawing.Size(52, 20); + this.exportToolStripMenuItem.Size = new System.Drawing.Size(58, 21); this.exportToolStripMenuItem.Text = "Export"; this.exportToolStripMenuItem.Visible = false; // // exportAllAssetsMenuItem // this.exportAllAssetsMenuItem.Name = "exportAllAssetsMenuItem"; - this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(179, 22); + this.exportAllAssetsMenuItem.Size = new System.Drawing.Size(165, 22); this.exportAllAssetsMenuItem.Text = "All assets"; this.exportAllAssetsMenuItem.Click += new System.EventHandler(this.ExportAssets_Click); // // exportSelectedAssetsMenuItem // this.exportSelectedAssetsMenuItem.Name = "exportSelectedAssetsMenuItem"; - this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(179, 22); + this.exportSelectedAssetsMenuItem.Size = new System.Drawing.Size(165, 22); this.exportSelectedAssetsMenuItem.Text = "Selected assets"; this.exportSelectedAssetsMenuItem.Click += new System.EventHandler(this.ExportAssets_Click); // // exportFilteredAssetsMenuItem // this.exportFilteredAssetsMenuItem.Name = "exportFilteredAssetsMenuItem"; - this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(179, 22); + this.exportFilteredAssetsMenuItem.Size = new System.Drawing.Size(165, 22); this.exportFilteredAssetsMenuItem.Text = "Filtered assets"; this.exportFilteredAssetsMenuItem.Click += new System.EventHandler(this.ExportAssets_Click); // @@ -350,29 +349,29 @@ this._3DToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.exportAll3DMenuItem, this.all3DObjectssplitToolStripMenuItem, - this.exportSelected3DMenuItem,}); - this._3DToolStripMenuItem.Name = "helpToolStripMenuItem"; - this._3DToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.exportSelected3DMenuItem}); + this._3DToolStripMenuItem.Name = "_3DToolStripMenuItem"; + this._3DToolStripMenuItem.Size = new System.Drawing.Size(78, 21); this._3DToolStripMenuItem.Text = "3D Model"; // // exportAll3DMenuItem // this.exportAll3DMenuItem.Name = "exportAll3DMenuItem"; - this.exportAll3DMenuItem.Size = new System.Drawing.Size(179, 22); + this.exportAll3DMenuItem.Size = new System.Drawing.Size(234, 22); this.exportAll3DMenuItem.Text = "Export All 3D objects"; this.exportAll3DMenuItem.Click += new System.EventHandler(this.Export3DObjects_Click); // // all3DObjectssplitToolStripMenuItem // this.all3DObjectssplitToolStripMenuItem.Name = "all3DObjectssplitToolStripMenuItem"; - this.all3DObjectssplitToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.all3DObjectssplitToolStripMenuItem.Size = new System.Drawing.Size(234, 22); this.all3DObjectssplitToolStripMenuItem.Text = "Export All 3D objects (split)"; this.all3DObjectssplitToolStripMenuItem.Click += new System.EventHandler(this.all3DObjectssplitToolStripMenuItem_Click); // // exportSelected3DMenuItem // this.exportSelected3DMenuItem.Name = "exportSelected3DMenuItem"; - this.exportSelected3DMenuItem.Size = new System.Drawing.Size(179, 22); + this.exportSelected3DMenuItem.Size = new System.Drawing.Size(234, 22); this.exportSelected3DMenuItem.Text = "Export Selected 3D objects"; this.exportSelected3DMenuItem.Click += new System.EventHandler(this.Export3DObjects_Click); // @@ -380,7 +379,7 @@ // this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(0, 24); + this.splitContainer1.Location = new System.Drawing.Point(0, 25); this.splitContainer1.Name = "splitContainer1"; // // splitContainer1.Panel1 @@ -395,7 +394,7 @@ this.splitContainer1.Panel2.Controls.Add(this.classPreviewPanel); this.splitContainer1.Panel2.Controls.Add(this.statusStrip1); this.splitContainer1.Panel2MinSize = 400; - this.splitContainer1.Size = new System.Drawing.Size(1264, 659); + this.splitContainer1.Size = new System.Drawing.Size(1264, 656); this.splitContainer1.SplitterDistance = 420; this.splitContainer1.TabIndex = 2; this.splitContainer1.TabStop = false; @@ -409,7 +408,7 @@ this.tabControl1.Name = "tabControl1"; this.tabControl1.Padding = new System.Drawing.Point(17, 3); this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(418, 635); + this.tabControl1.Size = new System.Drawing.Size(418, 634); this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed; this.tabControl1.TabIndex = 0; this.tabControl1.Selected += new System.Windows.Forms.TabControlEventHandler(this.tabPageSelected); @@ -420,7 +419,7 @@ this.tabPage1.Controls.Add(this.treeSearch); this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; - this.tabPage1.Size = new System.Drawing.Size(410, 557); + this.tabPage1.Size = new System.Drawing.Size(410, 608); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Scene Hierarchy"; this.tabPage1.UseVisualStyleBackColor = true; @@ -432,7 +431,7 @@ this.sceneTreeView.HideSelection = false; this.sceneTreeView.Location = new System.Drawing.Point(0, 21); this.sceneTreeView.Name = "sceneTreeView"; - this.sceneTreeView.Size = new System.Drawing.Size(410, 536); + this.sceneTreeView.Size = new System.Drawing.Size(410, 587); this.sceneTreeView.TabIndex = 1; this.sceneTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.sceneTreeView_AfterCheck); // @@ -442,7 +441,7 @@ this.treeSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.treeSearch.Location = new System.Drawing.Point(0, 0); this.treeSearch.Name = "treeSearch"; - this.treeSearch.Size = new System.Drawing.Size(410, 20); + this.treeSearch.Size = new System.Drawing.Size(410, 21); this.treeSearch.TabIndex = 0; this.treeSearch.Text = " Search "; this.treeSearch.TextChanged += new System.EventHandler(this.treeSearch_TextChanged); @@ -457,7 +456,7 @@ this.tabPage2.Controls.Add(this.listSearch); this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; - this.tabPage2.Size = new System.Drawing.Size(410, 609); + this.tabPage2.Size = new System.Drawing.Size(410, 608); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Asset List"; this.tabPage2.UseVisualStyleBackColor = true; @@ -474,9 +473,9 @@ this.assetListView.GridLines = true; this.assetListView.HideSelection = false; this.assetListView.LabelEdit = true; - this.assetListView.Location = new System.Drawing.Point(0, 20); + this.assetListView.Location = new System.Drawing.Point(0, 21); this.assetListView.Name = "assetListView"; - this.assetListView.Size = new System.Drawing.Size(410, 589); + this.assetListView.Size = new System.Drawing.Size(410, 587); this.assetListView.TabIndex = 1; this.assetListView.UseCompatibleStateImageBehavior = false; this.assetListView.View = System.Windows.Forms.View.Details; @@ -507,7 +506,7 @@ this.listSearch.ForeColor = System.Drawing.SystemColors.GrayText; this.listSearch.Location = new System.Drawing.Point(0, 0); this.listSearch.Name = "listSearch"; - this.listSearch.Size = new System.Drawing.Size(410, 20); + this.listSearch.Size = new System.Drawing.Size(410, 21); this.listSearch.TabIndex = 0; this.listSearch.Text = " Filter "; this.listSearch.TextChanged += new System.EventHandler(this.ListSearchTextChanged); @@ -518,18 +517,18 @@ // this.progressbarPanel.Controls.Add(this.progressBar1); this.progressbarPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressbarPanel.Location = new System.Drawing.Point(0, 635); + this.progressbarPanel.Location = new System.Drawing.Point(0, 634); this.progressbarPanel.Name = "progressbarPanel"; this.progressbarPanel.Padding = new System.Windows.Forms.Padding(1, 3, 1, 1); - this.progressbarPanel.Size = new System.Drawing.Size(418, 22); + this.progressbarPanel.Size = new System.Drawing.Size(418, 20); this.progressbarPanel.TabIndex = 2; // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; - this.progressBar1.Location = new System.Drawing.Point(1, 3); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.progressBar1.Location = new System.Drawing.Point(1, 2); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(416, 18); + this.progressBar1.Size = new System.Drawing.Size(416, 17); this.progressBar1.Step = 1; this.progressBar1.TabIndex = 1; // @@ -546,7 +545,7 @@ this.previewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.previewPanel.Location = new System.Drawing.Point(0, 0); this.previewPanel.Name = "previewPanel"; - this.previewPanel.Size = new System.Drawing.Size(838, 635); + this.previewPanel.Size = new System.Drawing.Size(838, 632); this.previewPanel.TabIndex = 1; // // assetInfoLabel @@ -554,14 +553,13 @@ this.assetInfoLabel.AutoSize = true; this.assetInfoLabel.BackColor = System.Drawing.Color.Transparent; this.assetInfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.assetInfoLabel.Location = new System.Drawing.Point(4, 8); + this.assetInfoLabel.Location = new System.Drawing.Point(4, 7); this.assetInfoLabel.Name = "assetInfoLabel"; - this.assetInfoLabel.Size = new System.Drawing.Size(0, 13); + this.assetInfoLabel.Size = new System.Drawing.Size(0, 12); this.assetInfoLabel.TabIndex = 0; // // FMODpanel // - this.FMODpanel.Anchor = System.Windows.Forms.AnchorStyles.None; this.FMODpanel.BackColor = System.Drawing.SystemColors.ControlDark; this.FMODpanel.Controls.Add(this.FMODcopyright); this.FMODpanel.Controls.Add(this.FMODinfoLabel); @@ -573,9 +571,10 @@ this.FMODpanel.Controls.Add(this.FMODstopButton); this.FMODpanel.Controls.Add(this.FMODpauseButton); this.FMODpanel.Controls.Add(this.FMODplayButton); + this.FMODpanel.Dock = System.Windows.Forms.DockStyle.Fill; this.FMODpanel.Location = new System.Drawing.Point(0, 0); this.FMODpanel.Name = "FMODpanel"; - this.FMODpanel.Size = new System.Drawing.Size(838, 635); + this.FMODpanel.Size = new System.Drawing.Size(838, 632); this.FMODpanel.TabIndex = 2; this.FMODpanel.Visible = false; // @@ -583,9 +582,9 @@ // this.FMODcopyright.AutoSize = true; this.FMODcopyright.ForeColor = System.Drawing.SystemColors.ControlLight; - this.FMODcopyright.Location = new System.Drawing.Point(249, 380); + this.FMODcopyright.Location = new System.Drawing.Point(249, 351); this.FMODcopyright.Name = "FMODcopyright"; - this.FMODcopyright.Size = new System.Drawing.Size(283, 13); + this.FMODcopyright.Size = new System.Drawing.Size(341, 12); this.FMODcopyright.TabIndex = 9; this.FMODcopyright.Text = "Audio Engine supplied by FMOD by Firelight Technologies."; // @@ -593,17 +592,17 @@ // this.FMODinfoLabel.AutoSize = true; this.FMODinfoLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODinfoLabel.Location = new System.Drawing.Point(305, 271); + this.FMODinfoLabel.Location = new System.Drawing.Point(305, 250); this.FMODinfoLabel.Name = "FMODinfoLabel"; - this.FMODinfoLabel.Size = new System.Drawing.Size(176, 13); + this.FMODinfoLabel.Size = new System.Drawing.Size(0, 12); this.FMODinfoLabel.TabIndex = 8; // // FMODtimerLabel // this.FMODtimerLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODtimerLabel.Location = new System.Drawing.Point(440, 271); + this.FMODtimerLabel.Location = new System.Drawing.Point(440, 250); this.FMODtimerLabel.Name = "FMODtimerLabel"; - this.FMODtimerLabel.Size = new System.Drawing.Size(155, 13); + this.FMODtimerLabel.Size = new System.Drawing.Size(155, 12); this.FMODtimerLabel.TabIndex = 7; this.FMODtimerLabel.Text = "0:00.0 / 0:00.0"; this.FMODtimerLabel.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -611,19 +610,19 @@ // FMODstatusLabel // this.FMODstatusLabel.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.FMODstatusLabel.Location = new System.Drawing.Point(249, 271); + this.FMODstatusLabel.Location = new System.Drawing.Point(249, 250); this.FMODstatusLabel.Name = "FMODstatusLabel"; - this.FMODstatusLabel.Size = new System.Drawing.Size(50, 13); + this.FMODstatusLabel.Size = new System.Drawing.Size(50, 12); this.FMODstatusLabel.TabIndex = 6; this.FMODstatusLabel.Text = "Stopped"; // // FMODprogressBar // this.FMODprogressBar.AutoSize = false; - this.FMODprogressBar.Location = new System.Drawing.Point(249, 290); + this.FMODprogressBar.Location = new System.Drawing.Point(249, 268); this.FMODprogressBar.Maximum = 1000; this.FMODprogressBar.Name = "FMODprogressBar"; - this.FMODprogressBar.Size = new System.Drawing.Size(350, 24); + this.FMODprogressBar.Size = new System.Drawing.Size(350, 22); this.FMODprogressBar.TabIndex = 5; this.FMODprogressBar.TickStyle = System.Windows.Forms.TickStyle.None; this.FMODprogressBar.Scroll += new System.EventHandler(this.FMODprogressBar_Scroll); @@ -633,7 +632,7 @@ // FMODvolumeBar // this.FMODvolumeBar.LargeChange = 2; - this.FMODvolumeBar.Location = new System.Drawing.Point(496, 320); + this.FMODvolumeBar.Location = new System.Drawing.Point(496, 295); this.FMODvolumeBar.Name = "FMODvolumeBar"; this.FMODvolumeBar.Size = new System.Drawing.Size(104, 45); this.FMODvolumeBar.TabIndex = 4; @@ -644,9 +643,9 @@ // FMODloopButton // this.FMODloopButton.Appearance = System.Windows.Forms.Appearance.Button; - this.FMODloopButton.Location = new System.Drawing.Point(435, 320); + this.FMODloopButton.Location = new System.Drawing.Point(435, 295); this.FMODloopButton.Name = "FMODloopButton"; - this.FMODloopButton.Size = new System.Drawing.Size(55, 46); + this.FMODloopButton.Size = new System.Drawing.Size(55, 42); this.FMODloopButton.TabIndex = 3; this.FMODloopButton.Text = "Loop"; this.FMODloopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -655,9 +654,9 @@ // // FMODstopButton // - this.FMODstopButton.Location = new System.Drawing.Point(374, 320); + this.FMODstopButton.Location = new System.Drawing.Point(374, 295); this.FMODstopButton.Name = "FMODstopButton"; - this.FMODstopButton.Size = new System.Drawing.Size(55, 46); + this.FMODstopButton.Size = new System.Drawing.Size(55, 42); this.FMODstopButton.TabIndex = 2; this.FMODstopButton.Text = "Stop"; this.FMODstopButton.UseVisualStyleBackColor = true; @@ -665,9 +664,9 @@ // // FMODpauseButton // - this.FMODpauseButton.Location = new System.Drawing.Point(313, 320); + this.FMODpauseButton.Location = new System.Drawing.Point(313, 295); this.FMODpauseButton.Name = "FMODpauseButton"; - this.FMODpauseButton.Size = new System.Drawing.Size(55, 46); + this.FMODpauseButton.Size = new System.Drawing.Size(55, 42); this.FMODpauseButton.TabIndex = 1; this.FMODpauseButton.Text = "Pause"; this.FMODpauseButton.UseVisualStyleBackColor = true; @@ -675,9 +674,9 @@ // // FMODplayButton // - this.FMODplayButton.Location = new System.Drawing.Point(252, 320); + this.FMODplayButton.Location = new System.Drawing.Point(252, 295); this.FMODplayButton.Name = "FMODplayButton"; - this.FMODplayButton.Size = new System.Drawing.Size(55, 46); + this.FMODplayButton.Size = new System.Drawing.Size(55, 42); this.FMODplayButton.TabIndex = 0; this.FMODplayButton.Text = "Play"; this.FMODplayButton.UseVisualStyleBackColor = true; @@ -691,7 +690,7 @@ this.fontPreviewBox.Name = "fontPreviewBox"; this.fontPreviewBox.ReadOnly = true; this.fontPreviewBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical; - this.fontPreviewBox.Size = new System.Drawing.Size(838, 635); + this.fontPreviewBox.Size = new System.Drawing.Size(838, 632); this.fontPreviewBox.TabIndex = 0; this.fontPreviewBox.Text = resources.GetString("fontPreviewBox.Text"); this.fontPreviewBox.Visible = false; @@ -706,7 +705,7 @@ this.textPreviewBox.Name = "textPreviewBox"; this.textPreviewBox.ReadOnly = true; this.textPreviewBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.textPreviewBox.Size = new System.Drawing.Size(838, 635); + this.textPreviewBox.Size = new System.Drawing.Size(838, 632); this.textPreviewBox.TabIndex = 2; this.textPreviewBox.Visible = false; this.textPreviewBox.WordWrap = false; @@ -717,11 +716,11 @@ this.glControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.glControl1.Location = new System.Drawing.Point(0, 0); this.glControl1.Name = "glControl1"; - this.glControl1.Size = new System.Drawing.Size(838, 635); + this.glControl1.Size = new System.Drawing.Size(838, 632); this.glControl1.TabIndex = 4; this.glControl1.VSync = false; this.glControl1.Paint += new System.Windows.Forms.PaintEventHandler(this.glControl1_Paint); - this.glControl1.MouseWheel += new System.Windows.Forms.MouseEventHandler(glControl1_MouseWheel); + this.glControl1.MouseWheel += new System.Windows.Forms.MouseEventHandler(this.glControl1_MouseWheel); // // classPreviewPanel // @@ -729,7 +728,7 @@ this.classPreviewPanel.Dock = System.Windows.Forms.DockStyle.Fill; this.classPreviewPanel.Location = new System.Drawing.Point(0, 0); this.classPreviewPanel.Name = "classPreviewPanel"; - this.classPreviewPanel.Size = new System.Drawing.Size(838, 635); + this.classPreviewPanel.Size = new System.Drawing.Size(838, 632); this.classPreviewPanel.TabIndex = 3; this.classPreviewPanel.Visible = false; // @@ -741,7 +740,7 @@ this.classTextBox.Name = "classTextBox"; this.classTextBox.ReadOnly = true; this.classTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.classTextBox.Size = new System.Drawing.Size(838, 635); + this.classTextBox.Size = new System.Drawing.Size(838, 632); this.classTextBox.TabIndex = 3; this.classTextBox.WordWrap = false; // @@ -749,7 +748,7 @@ // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel1}); - this.statusStrip1.Location = new System.Drawing.Point(0, 635); + this.statusStrip1.Location = new System.Drawing.Point(0, 632); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Size = new System.Drawing.Size(838, 22); this.statusStrip1.TabIndex = 2; @@ -805,9 +804,9 @@ // this.timer.Interval = 10; this.timer.Tick += new System.EventHandler(this.timer_Tick); - // + // // timerOpenTK - // + // this.timerOpenTK.Interval = 166; this.timerOpenTK.Tick += new System.EventHandler(this.timerOpenTK_Tick); // @@ -827,28 +826,28 @@ // this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.showOriginalFileToolStripMenuItem}); + this.showOriginalFileToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(202, 56); + this.contextMenuStrip1.Size = new System.Drawing.Size(176, 26); // // showOriginalFileToolStripMenuItem // this.showOriginalFileToolStripMenuItem.Name = "showOriginalFileToolStripMenuItem"; - this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(201, 24); + this.showOriginalFileToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.showOriginalFileToolStripMenuItem.Text = "show original file"; this.showOriginalFileToolStripMenuItem.Click += new System.EventHandler(this.showOriginalFileToolStripMenuItem_Click); // // UnityStudioForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1264, 683); + this.ClientSize = new System.Drawing.Size(1264, 681); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.menuStrip1); this.Icon = global::Unity_Studio.Properties.Resources.unity; this.KeyPreview = true; this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(620, 400); + this.MinimumSize = new System.Drawing.Size(620, 372); this.Name = "UnityStudioForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Unity Studio"; @@ -866,7 +865,6 @@ this.tabPage2.ResumeLayout(false); this.tabPage2.PerformLayout(); this.progressbarPanel.ResumeLayout(false); - this.glControl1.ResumeLayout(false); this.previewPanel.ResumeLayout(false); this.previewPanel.PerformLayout(); this.FMODpanel.ResumeLayout(false); diff --git a/Unity Studio/UnityStudioForm.cs b/Unity Studio/UnityStudioForm.cs index bdab4d2..b19c11e 100644 --- a/Unity Studio/UnityStudioForm.cs +++ b/Unity Studio/UnityStudioForm.cs @@ -1726,7 +1726,7 @@ namespace Unity_Studio private void loadShader(string filename, ShaderType type, int program, out int address) { address = GL.CreateShader(type); - var str = (string)Resource1.ResourceManager.GetObject(filename); + var str = (string)Properties.Resources.ResourceManager.GetObject(filename); GL.ShaderSource(address, str); GL.CompileShader(address); GL.AttachShader(program, address);