Fix Alpha value for Fonts and fix buildCache invalidation.

Kerning for the Font in the SampleContent project is deactivated for as
this is not supported by our FontProcessor yet.
This commit is contained in:
Konstantin Koch 2015-09-05 14:48:26 +02:00
parent 41861a0f3d
commit c22baa8417
4 changed files with 9 additions and 9 deletions
ANX.Framework.Content.Pipeline/Processors
Samples
AlphaTestEffectSample
SampleContent/Fonts
Visual Studio/ANXVisualStudioPackage

@ -249,7 +249,6 @@ namespace ANX.Framework.Content.Pipeline.Processors
private Texture2DContent ConvertBitmap(Bitmap bitmap) private Texture2DContent ConvertBitmap(Bitmap bitmap)
{ {
var bitmapContent = new PixelBitmapContent<Color>(bitmap.Width, bitmap.Height); var bitmapContent = new PixelBitmapContent<Color>(bitmap.Width, bitmap.Height);
var destColor = new Color();
for (int x = 0; x < bitmap.Width; x++) for (int x = 0; x < bitmap.Width; x++)
{ {
@ -257,12 +256,7 @@ namespace ANX.Framework.Content.Pipeline.Processors
{ {
System.Drawing.Color sourceColor = bitmap.GetPixel(x, y); System.Drawing.Color sourceColor = bitmap.GetPixel(x, y);
destColor.R = sourceColor.R; bitmapContent.SetPixel(x, y, Color.FromNonPremultiplied(sourceColor.R, sourceColor.G, sourceColor.B, sourceColor.A));
destColor.G = sourceColor.G;
destColor.B = sourceColor.B;
destColor.A = sourceColor.A;
bitmapContent.SetPixel(x, y, destColor);
} }
} }

@ -39,6 +39,9 @@
<Reference Include="ANX.Framework"> <Reference Include="ANX.Framework">
<HintPath>..\..\bin\Debug\ANX.Framework.dll</HintPath> <HintPath>..\..\bin\Debug\ANX.Framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="ANX.InputDevices.Windows.XInput">
<HintPath>..\..\bin\Debug\ANX.InputDevices.Windows.XInput.dll</HintPath>
</Reference>
<Reference Include="ANX.InputSystem.Standard"> <Reference Include="ANX.InputSystem.Standard">
<HintPath>..\..\bin\Debug\ANX.InputSystem.Standard.dll</HintPath> <HintPath>..\..\bin\Debug\ANX.InputSystem.Standard.dll</HintPath>
</Reference> </Reference>
@ -48,6 +51,9 @@
<Reference Include="ANX.RenderSystem.Windows.DX10"> <Reference Include="ANX.RenderSystem.Windows.DX10">
<HintPath>..\..\bin\Debug\ANX.RenderSystem.Windows.DX10.dll</HintPath> <HintPath>..\..\bin\Debug\ANX.RenderSystem.Windows.DX10.dll</HintPath>
</Reference> </Reference>
<Reference Include="ANX.SoundSystem.Windows.XAudio">
<HintPath>..\..\bin\Debug\ANX.SoundSystem.Windows.XAudio.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />

@ -29,7 +29,7 @@ sind.
UseKerning steuert das Layout der Schriftart. Wenn dieser Wert wahr ist, werden Kerning-Informationen UseKerning steuert das Layout der Schriftart. Wenn dieser Wert wahr ist, werden Kerning-Informationen
bei der Platzierung von Zeichen verwendet. bei der Platzierung von Zeichen verwendet.
--> -->
<UseKerning>true</UseKerning> <UseKerning>false</UseKerning>
<!-- <!--
Style steuert den Stil der Schriftart. Gültige Einträge sind "Normal", "Fett", "Kursiv" Style steuert den Stil der Schriftart. Gültige Einträge sind "Normal", "Fett", "Kursiv"

@ -516,7 +516,7 @@ namespace ANX.Framework.Build
foreach (var buildItem in buildItems) foreach (var buildItem in buildItems)
{ {
if (buildCache.IsValid(buildItem, new Uri(BuildHelper.GetOutputFileName(activeConfiguration.OutputDirectory, buildItem), UriKind.Relative))) if (!buildCache.IsValid(buildItem, new Uri(BuildHelper.GetOutputFileName(activeConfiguration.OutputDirectory, buildItem), UriKind.Relative)))
return false; return false;
} }