diff -r 1537daccd6f088f66a4628ca9605d33d4f0ab9e4 -r aefb416b2b98c99878350a249cf00fa694beb27d axios_ui_testbed/axios_ui_testbed/Screens/UIScreen1.cs --- a/axios_ui_testbed/axios_ui_testbed/Screens/UIScreen1.cs Sun Jun 24 14:30:57 2012 -0500 +++ b/axios_ui_testbed/axios_ui_testbed/Screens/UIScreen1.cs Wed Nov 21 00:30:47 2012 -0600 @@ -73,10 +73,11 @@ x.MouseDown += new AxiosEvents.AxiosHandler(x_MouseDown); AddGameObject(x); b = new AxiosButton(); - //b.Position = new Vector2(3f, 3f); + b.Position = new Vector2(3f, 3f); b.ClickTexture = _blocktextures[0, 0]; b.NormalTexture = _blocktextures[0, 1]; b.HoverTexture = _blocktextures[0, 2]; + //b.Position = new Vector2(10, 10); b.MouseDown += new AxiosEvents.AxiosHandler(b_MouseDown); b.Origin = new Vector2(b.ClickTexture.Width / 2, b.ClickTexture.Height / 2); AddGameObject(b); @@ -89,7 +90,7 @@ r1 = new Rectangle((int)obj1.X, (int)obj1.Y, b.Width, b.Height); r2 = new Rectangle((int)obj2.X, (int)obj2.Y, b.Width, b.Height); r3 = new Rectangle((int)b.Position.X, (int)(b.Position.Y), (int)Math.Floor(ConvertUnits.ToSimUnits(b.Width)), (int)Math.Ceiling(ConvertUnits.ToSimUnits(b.Height))); - r4 = new AxiosRectangle(b.Position.X, b.Position.Y, ConvertUnits.ToSimUnits(b.Width), (ConvertUnits.ToSimUnits(b.Height))); + r4 = new AxiosRectangle(ConvertUnits.ToSimUnits(b.Position.X), ConvertUnits.ToSimUnits(b.Position.Y), ConvertUnits.ToSimUnits(b.Width), (ConvertUnits.ToSimUnits(b.Height))); } void x_MouseDown(object sender, AxiosGameScreen gameScreen, InputState input) @@ -132,7 +133,7 @@ ScreenManager.SpriteBatch.DrawString(sf, "MP1 - " + mp1.ToString(), new Vector2(-200, -300), Color.Black); ScreenManager.SpriteBatch.DrawString(sf, "MP2 - " + mp2.ToString(), new Vector2(-200, -280), Color.Black); ScreenManager.SpriteBatch.DrawString(sf, "MP3 - " + mp3.ToString(), new Vector2(-200, -260), Color.Black); - ScreenManager.SpriteBatch.DrawString(sf, "r5 - " + r5.ToString(), new Vector2(-200, -240), Color.Black); + ScreenManager.SpriteBatch.DrawString(sf, "MP4 - " + r5.ToString(), new Vector2(-200, -240), Color.Black); ScreenManager.SpriteBatch.DrawString(sf, "obj1 - " + obj1.ToString(), new Vector2(-200, -220), Color.Black); ScreenManager.SpriteBatch.DrawString(sf, "obj2 - " + obj2.ToString(), new Vector2(-200, -200), Color.Black);