diff --git a/References/RecrownedAthenaeum.dll b/References/RecrownedAthenaeum.dll
index 4463e0c..ceb0517 100644
Binary files a/References/RecrownedAthenaeum.dll and b/References/RecrownedAthenaeum.dll differ
diff --git a/References/RecrownedAthenaeum.xml b/References/RecrownedAthenaeum.xml
index c762a54..71e4236 100644
--- a/References/RecrownedAthenaeum.xml
+++ b/References/RecrownedAthenaeum.xml
@@ -4,6 +4,167 @@
RecrownedAthenaeum
+
+
+ The settings the sprite batch should use.
+
+
+
+
+ Defines sprites sort mode.
+
+
+
+
+ The blend state to use.
+
+
+
+
+ Sampler state to use.
+
+
+
+
+ The depth stencil state to use.
+
+
+
+
+ The rasterizer state to use.
+
+
+
+
+ The effect to use.
+
+
+
+
+ The transformation matrix to use.
+
+
+
+
+ Begins the given sprite batch with the current set of settings.
+
+ Begins the spritebatch with the given settings.
+
+
+
+ Renders rectangles using the .
+
+
+
+
+ The used. Needs to be disposed.
+
+
+
+
+ Creates a rectangle renderer with the given .
+
+ Camera to use for . Default will use .
+ Graphics device to use. Default will use .
+
+
+
+ Disposes the rectangle renderer.
+
+
+
+
+ Overridable for dispose.
+
+ True when its a player calling the dispose.
+
+
+
+ Begins a batch for rectangles.
+
+ Whether or not this batch should be filled rectangles.
+
+
+
+ Ends the batch.
+
+
+
+
+ Draws a basic rectangle given bottom left and top right.
+
+ X coordinate of bottom left.
+ Y coordinate of bottom left.
+ Width of rectangle.
+ Height of rectangle.
+ Color of all vertices of this rectangle.
+ Rotation of rectangle. Default is 0 radians.
+
+
+
+ Draws the given rectangle.
+
+ Uses the x, y and dimensions to draw a rectangle.
+ The color of the rectangle.
+
+
+
+ A batch used to draw primitive shapes by batching together vertices.
+
+
+
+
+ Amount of primitives.
+
+
+
+
+ Creates a batch used to draw primitives.
+
+ The current camera being used. Will use default set in if left null.
+ The graphics device used to draw the primitives. Will be using 's graphics device from graphics device manager if null. Default is null.
+ The amount of vertices every batch can hold before flushing. Default is 450. Should be changed to be the most optimal number if possible to prevent unnecessary resizing. Especially if using strip primitive types.
+
+
+
+ Starts the batch. Batch cannot be started twice.
+
+ The type of primitive this batch would be drawing.
+
+
+
+ Ends the batch. Begin needs to be called before end.
+
+
+
+
+ Adds a vertex position for the primitive being drawn. The batch needs to have beens started before this.
+
+ The vector that represents the vertex.
+ The color of that vertex.
+
+
+
+ Flushes the batch. Automatically called if required if using or . Otherwise, manual flushing is required.
+ is used if not zero. Is reset to zero every flush.
+
+
+
+
+ Disposes this.
+
+
+
+
+ Overridable dispose.
+
+ True for when user called for this to be disposed. False otherwise.
+
+
+
+ Destructor.
+
+
A generic 3D camera.
@@ -71,6 +232,11 @@
A virtual 2D camera that wraps the normal . Default projection is orthographic.
+
+
+ The zoom of the camera.
+
+
The 2D position.
@@ -216,7 +382,7 @@
2D camera to be used by default.
-
+
The begin sprite batch to use for custom begins and consistency.
@@ -257,17 +423,19 @@
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.
+ The sprite batch settings to use to begin the batch in after drawing the ninepatch.
Draw with more options.
+ Uses the default for the spritebatch settings.
Spritebatch to use.
The destination to draw the patch.
@@ -752,121 +920,6 @@
The texture containing the atlas.
An array of regions.
-
-
- Renders rectangles using the .
-
-
-
-
- The used. Needs to be disposed.
-
-
-
-
- Creates a rectangle renderer with the given .
-
- Camera to use for . Default will use .
- Graphics device to use. Default will use .
-
-
-
- Disposes the rectangle renderer.
-
-
-
-
- Overridable for dispose.
-
- True when its a player calling the dispose.
-
-
-
- Begins a batch for rectangles.
-
- Whether or not this batch should be filled rectangles.
-
-
-
- Ends the batch.
-
-
-
-
- Draws a basic rectangle given bottom left and top right.
-
- X coordinate of bottom left.
- Y coordinate of bottom left.
- Width of rectangle.
- Height of rectangle.
- Color of all vertices of this rectangle.
- Rotation of rectangle. Default is 0 radians.
-
-
-
- Draws the given rectangle.
-
- Uses the x, y and dimensions to draw a rectangle.
- The color of the rectangle.
-
-
-
- A batch used to draw primitive shapes by batching together vertices.
-
-
-
-
- Amount of primitives.
-
-
-
-
- Creates a batch used to draw primitives.
-
- The current camera being used. Will use default set in if left null.
- The graphics device used to draw the primitives. Will be using 's graphics device from graphics device manager if null. Default is null.
- The amount of vertices every batch can hold before flushing. Default is 450. Should be changed to be the most optimal number if possible to prevent unnecessary resizing. Especially if using strip primitive types.
-
-
-
- Starts the batch. Batch cannot be started twice.
-
- The type of primitive this batch would be drawing.
-
-
-
- Ends the batch. Begin needs to be called before end.
-
-
-
-
- Adds a vertex position for the primitive being drawn. The batch needs to have beens started before this.
-
- The vector that represents the vertex.
- The color of that vertex.
-
-
-
- Flushes the batch. Automatically called if required if using or . Otherwise, manual flushing is required.
- is used if not zero. Is reset to zero every flush.
-
-
-
-
- Disposes this.
-
-
-
-
- Overridable dispose.
-
- True for when user called for this to be disposed. False otherwise.
-
-
-
- Destructor.
-
-
Contracts a transition that the can use.
@@ -1084,12 +1137,6 @@
The screen to show after the loading screen.
-
-
- Custom spritebatch begin call.
-
-
-
A manager for screens. Helps with transitions and updating screens as well as resizes.
@@ -1100,9 +1147,9 @@
Called when the first loading screen is done, and needs to show the landing screen.
-
+
- The function to call that begins the batch.
+ The settings this manager will use to begin a sprite batch.
@@ -1110,13 +1157,13 @@
Currently displayed screen.
-
+
Creates a screen manager that helps manage multiple screens and their transitions.
The camera to be used to perform the correct translations and transformations. Will use default set in if left null.
The graphics device manager to be used. Will use default set in if left null.
- The function to call to begin a batch to be used generally. Will use the built-in one in screen manager if not provided.
+ The settings to begin spritebatch with. Will use the built-in one in screen manager if not provided.
@@ -1549,12 +1596,12 @@
Origin of this module.
-
+
The parent of this module. May be null.
-
+
Name of this module. For organizational/referencial purposes mostly.
@@ -1607,18 +1654,16 @@
Sets the origin to be the center of the bounds.
-
+
- Centers this module's origin on the horizontal axis relative to the given rectangle.
+ Centers this module's origin on the horizontal axis relative to the parent .
- 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.
+ Centers this module's origin on the vertical axis relative to the parent .
- The rectangle to center in.
True if possible.
@@ -1631,13 +1676,13 @@
Camera used by the module for cropping.
-
+
Creates a module group.
Whether or not to crop out of bounds. Default is false.
What camera to use for cropping. Default is null and will use 's camera if crop is enabled.
- The function to be called that begins the batch.
+ The settings to be used that begins the batch.
diff --git a/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs b/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs
index cdd7f03..b2c7cfc 100644
--- a/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs
+++ b/RhythmBullet/Audio/Visualizer/ReflectedHorizontalVisualizer.cs
@@ -33,7 +33,7 @@ namespace RhythmBullet.Audio.Visualizer
public override void Update(GameTime gameTime)
{
- if (disposed) throw new ObjectDisposedException(this.Name);
+ if (disposed) throw new ObjectDisposedException(GetType().Name);
UpdateBars((float)gameTime.ElapsedGameTime.TotalSeconds);
AverageBars();
base.Update(gameTime);
@@ -41,7 +41,7 @@ namespace RhythmBullet.Audio.Visualizer
public override void Draw(SpriteBatch batch)
{
- if (disposed) throw new ObjectDisposedException(this.Name);
+ if (disposed) throw new ObjectDisposedException(GetType().Name);
rectangleRenderer.Begin(true);
for (int i = 0; i < BAR_COUNT; i++)
{
@@ -103,7 +103,7 @@ namespace RhythmBullet.Audio.Visualizer
public void Dispose()
{
- if (disposed) throw new ObjectDisposedException(this.Name);
+ if (disposed) throw new ObjectDisposedException(GetType().Name);
Dispose(true);
}
diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs
index 1134732..7e14e41 100644
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -101,7 +101,7 @@ namespace RhythmBullet
Camera = RecrownedAthenaeum.Configuration.Camera2D;
screenManager = new ScreenManager();
- RecrownedAthenaeum.Configuration.BeginBatchFunction = screenManager.beginBatchFunc;
+ RecrownedAthenaeum.Configuration.spriteBatchSettings = screenManager.batchSettings;
screenManager.ShowFirstScreenEvent += ShowFirstScreen;
QueueContent();
screenManager.Screen = new LoadingScreen(this, Content.Load("RhythmBullet"), 0.7f);
diff --git a/RhythmBullet/Screens/MainMenu/MainPage.cs b/RhythmBullet/Screens/MainMenu/MainPage.cs
index 118b31d..afee31f 100644
--- a/RhythmBullet/Screens/MainMenu/MainPage.cs
+++ b/RhythmBullet/Screens/MainMenu/MainPage.cs
@@ -40,20 +40,20 @@ namespace RhythmBullet.Screens.MainMenu
base.ApplySize(width, height);
title.Scale = (width - 40) / title.texture.Width;
title.CenterOrigin();
- title.CenterHorizontally(Boundaries);
- title.CenterVertically(Boundaries);
+ title.CenterHorizontally();
+ title.CenterVertically();
playButton.situation.Width = (int)(0.3f * title.Boundaries.Width);
playButton.situation.Height = (int)(0.05f * title.Boundaries.Width);
playButton.CenterOrigin();
- playButton.CenterHorizontally(Boundaries);
+ playButton.CenterHorizontally();
playButton.situation.Y = (int)playButton.origin.Y + title.Boundaries.Y + title.Boundaries.Height + 60;
quitButton.situation.Width = (int)(0.3f * title.Boundaries.Width);
quitButton.situation.Height = (int)(0.05f * title.Boundaries.Width);
quitButton.CenterOrigin();
- quitButton.CenterHorizontally(Boundaries);
+ quitButton.CenterHorizontally();
quitButton.situation.Y = (int)quitButton.origin.Y + playButton.Boundaries.Y + playButton.Boundaries.Height + 15;
}