diff --git a/References/RecrownedAthenaeum.dll b/References/RecrownedAthenaeum.dll index bb58b5e..0f45663 100644 Binary files a/References/RecrownedAthenaeum.dll and b/References/RecrownedAthenaeum.dll differ diff --git a/References/RecrownedAthenaeum.xml b/References/RecrownedAthenaeum.xml index 2841d95..9246ba9 100644 --- a/References/RecrownedAthenaeum.xml +++ b/References/RecrownedAthenaeum.xml @@ -39,11 +39,6 @@ The projection matrix. - - - The final transformation matrix. - - The graphics device used @@ -241,11 +236,6 @@ An object that represents a ninepatch. - - - color of 9patch. - - Dimensions in ninepatch. May also represent position in texture atlas. @@ -262,12 +252,13 @@ Top side. The dimensions and potentially the coordinates of the rectangle on an atlas. If left to default of null, will only be set to texture bounds. - + Draws the ninepatch. Batch to use. Where to the patch. + The color of the patch. @@ -1427,6 +1418,11 @@ Represents text for the UI. + + + Centers the text int bounds. + + Whether or not to try and wrap text automatically. Meaning will check and attempt to wrap every update. @@ -1502,17 +1498,12 @@ Module for UI layout. - - - Draws rectangle using the bounds of this module. - - - + The bounds before factoring in the origin. - + Bounds of this module (after factoring in the origin). @@ -1580,6 +1571,20 @@ Sets the origin to be the center of the bounds. + + + Centers this module's origin on the horizontal axis relative to the given rectangle. + + The rectangle to center it in. + True if possible and false if not. + + + + Center's this module's origin on the vertical axis relative to the given rectangle. + + The rectangle to center in. + True if possible. + Contains a group of modules and has its own relative coordinate system. @@ -1728,12 +1733,13 @@ Name of defined color. The defined color based on the name given. - + Returns a with given name of region. Name of region. - The region corresponding to the name. + Whether or not the region is required. If true, it will throw an error if the region does not exist while if false, will return null if the region does not exist. + The region corresponding to the name and may return null depending on if the region exists, and is required. @@ -1765,11 +1771,12 @@ The texture atlas to use for this skin. The texture the cursor will be. - + Returns a with given name of region. Null values acceptable. Will return null if parameter is null. Name of region. + Whether or not this texture is mandatory for the module to work. If true, will throw error on failing to retrieve. The region corresponding to the name or null if the requested region doesn't exist. diff --git a/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs b/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs index 01e77dd..cdd7f03 100644 --- a/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs +++ b/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs @@ -45,8 +45,8 @@ namespace RhythmBullet.Audio.Visualizer rectangleRenderer.Begin(true); for (int i = 0; i < BAR_COUNT; i++) { - bar.X = (i * (bar.Width + spaceBetweenBars)) + bounds.X; - bar.Y = bounds.Y; + bar.X = (i * (bar.Width + spaceBetweenBars)) + Boundaries.X; + bar.Y = Boundaries.Y; bar.Height = barValue[i]; rectangleRenderer.Draw(bar.X, bar.Y, bar.Width, bar.Height, color); diff --git a/RhythmBullet/Screens/MainMenu/MainPage.cs b/RhythmBullet/Screens/MainMenu/MainPage.cs index b537645..762bc82 100644 --- a/RhythmBullet/Screens/MainMenu/MainPage.cs +++ b/RhythmBullet/Screens/MainMenu/MainPage.cs @@ -37,24 +37,25 @@ namespace RhythmBullet.Screens.MainMenu public override void ApplySize(int width, int height) { + base.ApplySize(width, height); title.Scale = (width - 40) / title.texture.Width; title.CenterOrigin(); - title.bounds.X = width / 2; - title.bounds.Y = height / 2; + title.CenterHorizontally(Boundaries); + title.CenterVertically(Boundaries); + playButton.situation.Width = (int)(0.3f * title.Boundaries.Width); + playButton.situation.Height = (int)(0.05f * title.Boundaries.Width); playButton.CenterOrigin(); - playButton.bounds.Width = (int) (0.3f * title.TrueBounds.Width); - playButton.CenterHorizontally(new Rectangle(0, 0, width, height)); - playButton.bounds.Y = title.bounds.X + title.TrueBounds.Height + 30; + playButton.CenterHorizontally(Boundaries); + playButton.situation.Y = (int)playButton.origin.Y + title.Boundaries.Y + title.Boundaries.Height + 30; + quitButton.situation.Width = (int)(0.3f * title.Boundaries.Width); + quitButton.situation.Height = (int)(0.05f * title.Boundaries.Width); quitButton.CenterOrigin(); - quitButton.bounds.Width = (int) (0.3f * title.bounds.Width); - quitButton.bounds.Height = (int) (0.15f * playButton.bounds.Width); - playButton.CenterHorizontally(new Rectangle(0, 0, width, height)); - quitButton.bounds.Y = playButton.bounds.X + playButton.bounds.Height + 15; + quitButton.CenterHorizontally(Boundaries); + quitButton.situation.Y = (int)quitButton.origin.Y + playButton.Boundaries.Y + playButton.Boundaries.Height + 15; - base.ApplySize(width, height); } public override void Draw(SpriteBatch batch)