- added ContentBuilder and XNB inspector to build files

- some minor tweaking on sample browser
This commit is contained in:
Glatzemann 2012-08-22 11:29:03 +00:00
parent c74b3c5767
commit 2af6bf45b5
7 changed files with 125 additions and 6 deletions

View File

@ -33,6 +33,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>anx.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -87,6 +90,7 @@
</ItemGroup>
<ItemGroup>
<None Include="Resources\sample1.png" />
<Content Include="anx.ico" />
<Content Include="Resources\button.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.1.0.0")]

View File

@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AnxSampleBrowser));
this._pSamples = new System.Windows.Forms.Panel();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
@ -72,7 +73,7 @@
//
this.panel2.BackColor = System.Drawing.Color.White;
this.panel2.BackgroundImage = global::AnxSampleBrowser.Properties.Resources.ANX_Framework;
this.panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.panel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.panel2.Location = new System.Drawing.Point(13, 4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(119, 43);
@ -180,8 +181,10 @@
this.Controls.Add(this._pSamples);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel3);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "AnxSampleBrowser";
this.Text = "Form1";
this.Text = "ANX.Framework Sample Browser";
this.Load += new System.EventHandler(this.AnxSampleBrowser_Load);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.panel3.ResumeLayout(false);

View File

@ -238,8 +238,10 @@ namespace AnxSampleBrowser
this.BeginInvoke((MethodInvoker)delegate { filter(); });
}
private void AnxSampleBrowser_Load(object sender, EventArgs e)
{
this.Text += " v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
}
}
static class StringExtender

View File

@ -117,4 +117,81 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAA
AAoHK0S5BytEuQAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wAAAAAKBy1EwhWS5P8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8AAAAACgctRMIVkuT/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AAAAAAoHLUTCFZLk/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wAAAAAKBy1EwhWS5P8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA
AAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed
9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AAAAAAoHLUTCFZLk/xed9f8XnfX/F531/xed9f8XnfX/F531/xed
9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wAAAAAKBy1EwhWS5P8XnfX/F531/xed9f8XnfX/F531/xed
9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xed9f8XnfX/F531/xed
9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAoHLUTCDFOb/wcvjP8HL4z/By+M/wg3
iP8Vjt3/EXe6/xJ7wP8VkeL/EG6r/xN/x/8Tf8f/E3/H/xSH0v8XnfX/F531/xed9f8VkuT/By1EwgAA
AAr///8A////AP///wD///8A////AP///wD///8A////AP///wAAAAAKBy1EwhWS5P8OYaz/AACA/wAA
gP8AAID/AAF7/xJ7yf8Se7//F531/xJ8wv8Rd7r/F531/xed9f8XnfX/E3/G/xed9f8XnfX/F531/xed
9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xWR
4/8CCnT/AACA/wAAgP8AAID/DFKj/xJ6vv8XnfX/Enq+/xF3uf8XnfX/F531/xed9f8SfsT/F531/xed
9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AAAAAAoHLUTCFZLk/xed
9f8XnfX/F531/wYogf8AAID/AACA/wAAgP8GLYj/FY7e/xN/x/8UhtH/FpPm/xJ7wf8Se8H/EnvB/xJ9
w/8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wAAAAAKBy1EwhWS
5P8XnfX/F531/xed9f8XnfX/C0ma/wAAgP8AAID/AACA/wIMc/8Wluv/F531/xed9f8Wk+b/AxFi/wIL
cf8CC3H/Agtx/xBstv8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8AAAAACgct
RMIVkuT/F531/xed9f8XnfX/F531/xed9f8Qbrj/AAB9/wAAgP8AAID/AAB//w5ksP8XnfX/F531/xed
9f8FJH3/AACA/wAAgP8AAID/C0mb/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA
AAoHK0S5FZLk/xed9f8XnfX/F531/xed9f8XnfX/F531/xaZ7/8CEXT/AACA/wAAgP8AAID/BSd//wpE
l/8KQ5b/CUKV/wUeev8AAID/AACA/wAAgP8GKoP/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed
9f8VkuT/BytEuQcrRLkVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/wcxif8AAID/AACA/wAA
gP8AAID/AACA/wAAgP8AAID/AACA/wAAgP8AAID/AACA/wILdP8Wkub/F531/xed9f8XnfX/F531/xed
9f8XnfX/F531/xWS5P8HK0S5AAAACgcrRMIVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/DFKi/wAA
gP8AAID/AACA/wAAf/8DF3f/BB18/wUhf/8GJID/AQZ6/wAAgP8AAID/AACA/w9lr/8XnfX/F531/xed
9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8AAAAACgcrRMIVkuT/F531/xed9f8XnfX/F531/xed
9f8Se8j/AAF5/wAAgP8AAID/AACA/w5dp/8XnfX/F531/xed9f8FI37/AACA/wAAgP8AAID/CkSW/xed
9f8XnfX/F531/xed9f8XnfX/FZLk/wctRMIAAAAK////AP///wD///8AAAAACgcrQ8MVkuT/F531/xed
9f8XnfX/F531/xed9f8EGHf/AACA/wAAgP8AAID/Bid9/xeb8v8XnfX/F531/wlAlf8AAID/AACA/wAA
gP8FJH7/F531/xed9f8XnfX/F531/xWS5P8HLUTCAAAACv///wD///8A////AP///wD///8AAAAACgcr
Q8MVkuT/F531/xed9f8XnfX/F531/wtJmf8AAID/AACA/wAAgP8AAH7/BSOA/wk9lf8JP5f/BimA/wAA
gP8AAID/AACA/wEHdv8VjNv/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP//
/wD///8AAAAACgcrQ8MVkuT/F531/xed9f8XnfX/FpLm/wITd/8AAID/AACA/wAAgP8AAID/AACA/wAA
gP8AAID/AACA/wAAgP8AAID/AACA/w5eqf8XnfX/FZLk/wctRMIAAAAK////AP///wD///8A////AP//
/wD///8A////AP///wD///8AAAAACgcrQ8MVkuT/F531/xed9f8XnfX/DFOh/wEHdv8AAID/AACA/wAA
gP8AAID/AACA/wAAgP8AAID/AACA/wAAgP8AAID/CT6S/xWS5P8HLUTCAAAACv///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8AAAAACwcrQ8MVkuT/F531/xed9f8XnfX/FY/h/w5f
q/8JQZT/CTuQ/wk6kP8JOY7/CDeN/wg2jP8IN43/CTmP/wk7kP8KRo7/By1EwgAAAAr///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAACwcrQ8MVkuT/F531/xed
9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/FZLk/wctRMIAAAAK////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAACwcr
QsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xWS5P8HLUTCAAAACv//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8AAAAACwcrQsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA
AAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8AAAAACwcrQsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/FZLk/wct
RMIAAAAK////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8AAAAACwcqQcQVkuT/F531/xed9f8XnfX/F531/xWS
5P8HLUTCAAAACv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAADAcqQcQVkuT/F531/xed
9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAADAYp
QcUVkuT/FZLk/wctRMIAAAAK////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8AAAAADAcpQLsHK0S5AAAACv///wD///8A////AP///wD///8A////AP///wD///8A////AP//
/wD///8A////AP///wD///8A//5////8P///+B////AP///gB///wAP//4AB//8AAP/+AAB//AAAP/gA
AB/wAAAP4AAAB8AAAAOAAAABAAAAAAAAAACAAAABwAAAA+AAAAfwAAAP+AAAH/wAAD/+AAB//wAA//+A
Af//wAP//+AH///wD///+B////w////+f/8=
</value>
</data>
</root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -59,6 +59,10 @@
<property name="project.anx.tools.name.StockShaderCodeGenerator" value="StockShaderCodeGenerator" />
<property name="project.anx.tools.path.ProjectConverter" value="../Tools/ProjectConverter" />
<property name="project.anx.tools.name.ProjectConverter" value="ProjectConverter" />
<property name="project.anx.tools.path.ContentBuilder" value="../Tools/ContentBuilder" />
<property name="project.anx.tools.name.ContentBuilder" value="ContentBuilder" />
<property name="project.anx.tools.path.XNBInspector" value="../Tools/XNBInspector" />
<property name="project.anx.tools.name.XNBInspector" value="XNBInspector" />
<target name="clean" description="Cleans all targets.">
<delete>
@ -450,6 +454,35 @@
<arg value="${project.anx.tools.path.StockShaderCodeGenerator}/${project.anx.tools.name.StockShaderCodeGenerator}.csproj" />
</exec>
<echo message="===================================================" />
<echo message="Now building: ContentBuilder tool" />
<echo message="===================================================" />
<exec program="msbuild.exe" >
<arg value="/t:Build"/>
<arg value="/p:Configuration=Release"/>
<arg value='/p:Platform="Any CPU"'/>
<arg value="/p:OutputPath=${build.dir}" />
<arg value="/p:SolutionDir=${build.solution_dir}" />
<arg value="/p:AllowUnsafeBlocks=true" />
<arg value="/clp:ErrorsOnly" />
<arg value="${project.anx.tools.path.ContentBuilder}/${project.anx.tools.name.ContentBuilder}.csproj" />
</exec>
<echo message="===================================================" />
<echo message="Now building: XNB Inspector" />
<echo message="===================================================" />
<exec program="msbuild.exe" >
<arg value="/t:Build"/>
<arg value="/p:Configuration=Release"/>
<arg value='/p:Platform="Any CPU"'/>
<arg value="/p:OutputPath=${build.dir}" />
<arg value="/p:SolutionDir=${build.solution_dir}" />
<arg value="/p:AllowUnsafeBlocks=true" />
<arg value="/clp:ErrorsOnly" />
<arg value="${project.anx.tools.path.XNBInspector}/${project.anx.tools.name.XNBInspector}.csproj" />
</exec>
</target>
<target name="build_stock_shaders" description="Build the stock shaders for the render systems.">