diff --git a/ANX.Framework/CurveKey.cs b/ANX.Framework/CurveKey.cs index 0adc785a..582260e6 100644 --- a/ANX.Framework/CurveKey.cs +++ b/ANX.Framework/CurveKey.cs @@ -116,7 +116,7 @@ namespace ANX.Framework #region Equals public bool Equals(CurveKey other) { - try + if (other != null) { return other.Position == Position && other.Value == Value && @@ -124,18 +124,18 @@ namespace ANX.Framework other.TangentOut == TangentOut && other.Continuity == Continuity; } - catch (NullReferenceException e) - { - return ((object)this)==null; - } + + return false; } public override bool Equals(object obj) { - if (obj is CurveKey) + CurveKey ck = obj as CurveKey; + if (ck != null) { - return Equals(obj as CurveKey); + return Equals(ck); } + return false; } #endregion diff --git a/Samples/TextRendering/Game1.cs b/Samples/TextRendering/Game1.cs index baf18de1..f9eacfe9 100644 --- a/Samples/TextRendering/Game1.cs +++ b/Samples/TextRendering/Game1.cs @@ -103,10 +103,13 @@ namespace TextRendering spriteBatch.DrawString(this.debugFont, "This screen is powered by the ANX.Framework!\r\nsecond line", new Vector2(100, 100 + this.debugFont.LineSpacing), Color.Black, 0.0f, new Vector2(1, -1), Vector2.One, SpriteEffects.None, 0.0f); spriteBatch.DrawString(this.debugFont, "This screen is powered by the ANX.Framework!\r\nsecond line", new Vector2(100, 100 + this.debugFont.LineSpacing), Color.Red, 0.0f, Vector2.Zero, Vector2.One, SpriteEffects.None, 1.0f); - spriteBatch.DrawString(this.debugFont, "Mouse X: "+Mouse.GetState().X, new Vector2(100, 400 ), Color.DarkOrange); - spriteBatch.DrawString(this.debugFont, "Mouse Y:" + Mouse.GetState().Y, new Vector2(100, 500), Color.DarkOrange); + spriteBatch.DrawString(this.debugFont, "Mouse X: " + Mouse.GetState().X, new Vector2(100, 100 + this.debugFont.LineSpacing * 3), Color.DarkOrange); + spriteBatch.DrawString(this.debugFont, "Mouse Y:" + Mouse.GetState().Y, new Vector2(100, 100 + this.debugFont.LineSpacing * 4), Color.DarkOrange); spriteBatch.DrawString(this.debugFont, "rotated Text", new Vector2(100, 150), Color.Green, MathHelper.ToRadians(90), Vector2.Zero, 1.0f, SpriteEffects.None, 1.0f); + GamePadState state = GamePad.GetState(PlayerIndex.One); + spriteBatch.DrawString(this.debugFont, String.Format("GamePad Left: {0} Right: {1}", state.ThumbSticks.Left, state.ThumbSticks.Right) , new Vector2(100, 100 + this.debugFont.LineSpacing * 5), Color.Red, 0.0f, Vector2.Zero, Vector2.One, SpriteEffects.None, 1.0f); + spriteBatch.End(); base.Draw(gameTime); diff --git a/Samples/WindowsGame/AddInSelector.Designer.cs b/Samples/WindowsGame/AddInSelector.Designer.cs index 7bea4345..fab242fe 100644 --- a/Samples/WindowsGame/AddInSelector.Designer.cs +++ b/Samples/WindowsGame/AddInSelector.Designer.cs @@ -108,6 +108,7 @@ // pictureBox1 // this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox1.Image = global::WindowsGame1.Resource1.Logo; this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(507, 169); diff --git a/Samples/WindowsGame/Resource1.resx b/Samples/WindowsGame/Resource1.resx index be3f81fb..25ebd17b 100644 --- a/Samples/WindowsGame/Resource1.resx +++ b/Samples/WindowsGame/Resource1.resx @@ -119,6 +119,6 @@ - Resources\ANX.Framework_Logo01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\ANX.Framework.Logo_459x121.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Samples/WindowsGame/Resources/ANX.Framework.Logo_459x121.png b/Samples/WindowsGame/Resources/ANX.Framework.Logo_459x121.png new file mode 100644 index 00000000..e4373ff9 Binary files /dev/null and b/Samples/WindowsGame/Resources/ANX.Framework.Logo_459x121.png differ diff --git a/Samples/WindowsGame/Resources/ANX.Framework_Logo01.png b/Samples/WindowsGame/Resources/ANX.Framework_Logo01.png deleted file mode 100644 index 53bb7c75..00000000 Binary files a/Samples/WindowsGame/Resources/ANX.Framework_Logo01.png and /dev/null differ diff --git a/Samples/WindowsGame/WindowsGame.csproj b/Samples/WindowsGame/WindowsGame.csproj index 9f348e3c..d7b3a6a4 100644 --- a/Samples/WindowsGame/WindowsGame.csproj +++ b/Samples/WindowsGame/WindowsGame.csproj @@ -92,7 +92,7 @@ true - + diff --git a/Tools/bin/ANX.Framework.Windows.DX10.dll b/Tools/bin/ANX.Framework.Windows.DX10.dll index dc373b6d..8054d571 100644 Binary files a/Tools/bin/ANX.Framework.Windows.DX10.dll and b/Tools/bin/ANX.Framework.Windows.DX10.dll differ diff --git a/Tools/bin/ANX.Framework.Windows.GL3.dll b/Tools/bin/ANX.Framework.Windows.GL3.dll index a914c157..694b6395 100644 Binary files a/Tools/bin/ANX.Framework.Windows.GL3.dll and b/Tools/bin/ANX.Framework.Windows.GL3.dll differ diff --git a/Tools/bin/ANX.Framework.dll b/Tools/bin/ANX.Framework.dll index 9b7ab610..b08c37b8 100644 Binary files a/Tools/bin/ANX.Framework.dll and b/Tools/bin/ANX.Framework.dll differ diff --git a/Tools/bin/asc.exe b/Tools/bin/asc.exe index ece50a08..bea264df 100644 Binary files a/Tools/bin/asc.exe and b/Tools/bin/asc.exe differ diff --git a/Tools/bin/sscg.exe b/Tools/bin/sscg.exe index 6e5fa59d..67705c3d 100644 Binary files a/Tools/bin/sscg.exe and b/Tools/bin/sscg.exe differ