diff --git a/Recrowned-Athenaeum/Camera/Camera2D.cs b/Recrowned-Athenaeum/Camera/Camera2D.cs index 904bc05..ce37908 100644 --- a/Recrowned-Athenaeum/Camera/Camera2D.cs +++ b/Recrowned-Athenaeum/Camera/Camera2D.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.Camera +namespace RecrownedAthenaeum.Camera { public class Camera2D { diff --git a/Recrowned-Athenaeum/ContentSystem/ContentLoad.cs b/Recrowned-Athenaeum/ContentSystem/ContentLoad.cs index 52e1318..a5a2a6e 100644 --- a/Recrowned-Athenaeum/ContentSystem/ContentLoad.cs +++ b/Recrowned-Athenaeum/ContentSystem/ContentLoad.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ContentSystem +namespace RecrownedAthenaeum.ContentSystem { struct LoadableContent { diff --git a/Recrowned-Athenaeum/ContentSystem/ContentManagerController.cs b/Recrowned-Athenaeum/ContentSystem/ContentManagerController.cs index 06babc2..1efb48e 100644 --- a/Recrowned-Athenaeum/ContentSystem/ContentManagerController.cs +++ b/Recrowned-Athenaeum/ContentSystem/ContentManagerController.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ContentSystem +namespace RecrownedAthenaeum.ContentSystem { public class ContentManagerController { diff --git a/Recrowned-Athenaeum/ContentSystem/IContentPathModifier.cs b/Recrowned-Athenaeum/ContentSystem/IContentPathModifier.cs index 7ef1219..01771bf 100644 --- a/Recrowned-Athenaeum/ContentSystem/IContentPathModifier.cs +++ b/Recrowned-Athenaeum/ContentSystem/IContentPathModifier.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ContentSystem +namespace RecrownedAthenaeum.ContentSystem { public interface IContentPathModifier { diff --git a/Recrowned-Athenaeum/ContentSystem/NormalContentResolver.cs b/Recrowned-Athenaeum/ContentSystem/NormalContentResolver.cs index b470c50..3b99332 100644 --- a/Recrowned-Athenaeum/ContentSystem/NormalContentResolver.cs +++ b/Recrowned-Athenaeum/ContentSystem/NormalContentResolver.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ContentSystem +namespace RecrownedAthenaeum.ContentSystem { class NormalContentResolver : IContentPathModifier { diff --git a/Recrowned-Athenaeum/DataTypes/NinePatch.cs b/Recrowned-Athenaeum/DataTypes/NinePatch.cs index 75a4bbf..6331aee 100644 --- a/Recrowned-Athenaeum/DataTypes/NinePatch.cs +++ b/Recrowned-Athenaeum/DataTypes/NinePatch.cs @@ -6,15 +6,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.DataTypes +namespace RecrownedAthenaeum.DataTypes { public class NinePatch { public Color color; readonly Texture2D texture; readonly int a, b, c, d; - private Rectangle sourceRectangle; - private Rectangle drawnRectangle; /// /// A nine patch object. @@ -39,6 +37,9 @@ namespace RhythmBullet.Utilities.DataTypes public void Draw(SpriteBatch batch, Rectangle destination) { + Rectangle sourceRectangle; + Rectangle drawnRectangle; + //1x1 drawnRectangle.X = destination.X; drawnRectangle.Y = destination.Y; diff --git a/Recrowned-Athenaeum/DataTypes/Resolution.cs b/Recrowned-Athenaeum/DataTypes/Resolution.cs index 230e732..6c30837 100644 --- a/Recrowned-Athenaeum/DataTypes/Resolution.cs +++ b/Recrowned-Athenaeum/DataTypes/Resolution.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.DataTypes +namespace RecrownedAthenaeum.DataTypes { public class Resolution : IComparable { diff --git a/Recrowned-Athenaeum/DataTypes/TextureAtlas.cs b/Recrowned-Athenaeum/DataTypes/TextureAtlas.cs new file mode 100644 index 0000000..367337d --- /dev/null +++ b/Recrowned-Athenaeum/DataTypes/TextureAtlas.cs @@ -0,0 +1,22 @@ +using Recrowned_Athenaeum.DataTypes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks;23 + +namespace RecrownedAthenaeum.DataTypes +{ + public class TextureAtlas + { + private TextureAtlasRegion[] textureRegions; + + public TextureAtlas(TextureAtlasRegion[] textureRegions) + { + this.textureRegions = textureRegions; + } + + + + } +} diff --git a/Recrowned-Athenaeum/DataTypes/TextureAtlasRegion.cs b/Recrowned-Athenaeum/DataTypes/TextureAtlasRegion.cs new file mode 100644 index 0000000..521c5b1 --- /dev/null +++ b/Recrowned-Athenaeum/DataTypes/TextureAtlasRegion.cs @@ -0,0 +1,19 @@ +using Microsoft.Xna.Framework; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Recrowned_Athenaeum.DataTypes +{ + public struct TextureAtlasRegion + { + string name; + Rectangle bounds; + Vector2 origin; + bool ninePatch; + int a, b, c, d; + + } +} diff --git a/Recrowned-Athenaeum/Input/IInputListener.cs b/Recrowned-Athenaeum/Input/IInputListener.cs index bfe33a4..9bff789 100644 --- a/Recrowned-Athenaeum/Input/IInputListener.cs +++ b/Recrowned-Athenaeum/Input/IInputListener.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.Input +namespace RecrownedAthenaeum.Input { public interface IInputListener { diff --git a/Recrowned-Athenaeum/Input/InputListener.cs b/Recrowned-Athenaeum/Input/InputListener.cs index 95280f1..800a5a8 100644 --- a/Recrowned-Athenaeum/Input/InputListener.cs +++ b/Recrowned-Athenaeum/Input/InputListener.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.Xna.Framework.Input; -namespace RhythmBullet.Utilities.Input +namespace RecrownedAthenaeum.Input { class InputListener : IInputListener { diff --git a/Recrowned-Athenaeum/Input/InputUtilities.cs b/Recrowned-Athenaeum/Input/InputUtilities.cs index d36788e..3be53be 100644 --- a/Recrowned-Athenaeum/Input/InputUtilities.cs +++ b/Recrowned-Athenaeum/Input/InputUtilities.cs @@ -1,13 +1,13 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Input; -using RhythmBullet.Utilities.Input; +using RecrownedAthenaeum.Input; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.Input +namespace RecrownedAthenaeum.Input { public static class InputUtilities { diff --git a/Recrowned-Athenaeum/ParticleSystem/Particle.cs b/Recrowned-Athenaeum/ParticleSystem/Particle.cs index e61266a..520d78e 100644 --- a/Recrowned-Athenaeum/ParticleSystem/Particle.cs +++ b/Recrowned-Athenaeum/ParticleSystem/Particle.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ParticleSystem +namespace RecrownedAthenaeum.ParticleSystem { class Particle { diff --git a/Recrowned-Athenaeum/Persistence/Preferences.cs b/Recrowned-Athenaeum/Persistence/Preferences.cs index 85dbe2c..4248bd1 100644 --- a/Recrowned-Athenaeum/Persistence/Preferences.cs +++ b/Recrowned-Athenaeum/Persistence/Preferences.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Xml.Serialization; -namespace RhythmBullet.Utilities.Persistence +namespace RecrownedAthenaeum.Persistence { public class Preferences { diff --git a/Recrowned-Athenaeum/Persistence/PreferencesManager.cs b/Recrowned-Athenaeum/Persistence/PreferencesManager.cs index 397afc1..4e105df 100644 --- a/Recrowned-Athenaeum/Persistence/PreferencesManager.cs +++ b/Recrowned-Athenaeum/Persistence/PreferencesManager.cs @@ -1,11 +1,10 @@ -using RhythmBullet.Preferences; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Xml.Serialization; -namespace RhythmBullet.Utilities.Persistence +namespace RecrownedAthenaeum.Persistence { public class PreferencesManager { diff --git a/Recrowned-Athenaeum/Recrowned-Athenaeum.csproj b/Recrowned-Athenaeum/Recrowned-Athenaeum.csproj index a33ad7c..7a7ad2e 100644 --- a/Recrowned-Athenaeum/Recrowned-Athenaeum.csproj +++ b/Recrowned-Athenaeum/Recrowned-Athenaeum.csproj @@ -49,6 +49,8 @@ + + diff --git a/Recrowned-Athenaeum/ScreenSystem/ITransition.cs b/Recrowned-Athenaeum/ScreenSystem/ITransition.cs index a2a58fb..d39c42d 100644 --- a/Recrowned-Athenaeum/ScreenSystem/ITransition.cs +++ b/Recrowned-Athenaeum/ScreenSystem/ITransition.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ScreenSystem +namespace RecrownedAthenaeum.ScreenSystem { public interface ITransition { diff --git a/Recrowned-Athenaeum/ScreenSystem/LoadingScreen.cs b/Recrowned-Athenaeum/ScreenSystem/LoadingScreen.cs index 3d79dae..e076a26 100644 --- a/Recrowned-Athenaeum/ScreenSystem/LoadingScreen.cs +++ b/Recrowned-Athenaeum/ScreenSystem/LoadingScreen.cs @@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Graphics; using System; using System.Diagnostics; -namespace RhythmBullet.Utilities.ScreenSystem +namespace RecrownedAthenaeum.ScreenSystem { public class LoadingScreen : Screen, ITransition { diff --git a/Recrowned-Athenaeum/ScreenSystem/Screen.cs b/Recrowned-Athenaeum/ScreenSystem/Screen.cs index 4c0ae13..6f4852b 100644 --- a/Recrowned-Athenaeum/ScreenSystem/Screen.cs +++ b/Recrowned-Athenaeum/ScreenSystem/Screen.cs @@ -1,13 +1,13 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.Utilities.Camera; +using RecrownedAthenaeum.Camera; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ScreenSystem +namespace RecrownedAthenaeum.ScreenSystem { public enum ScreenState { EnterTransition, ExitTransition, Normal } diff --git a/Recrowned-Athenaeum/ScreenSystem/ScreenManager.cs b/Recrowned-Athenaeum/ScreenSystem/ScreenManager.cs index 18db349..6275d52 100644 --- a/Recrowned-Athenaeum/ScreenSystem/ScreenManager.cs +++ b/Recrowned-Athenaeum/ScreenSystem/ScreenManager.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.Utilities.Camera; +using RecrownedAthenaeum.Camera; using System; using System.Collections.Generic; using System.Diagnostics; @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.ScreenSystem +namespace RecrownedAthenaeum.ScreenSystem { public delegate void FirstScreenChange(Screen screen); diff --git a/Recrowned-Athenaeum/UI/Book/Book.cs b/Recrowned-Athenaeum/UI/Book/Book.cs index 34fba0a..4e460c7 100644 --- a/Recrowned-Athenaeum/UI/Book/Book.cs +++ b/Recrowned-Athenaeum/UI/Book/Book.cs @@ -1,15 +1,15 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.Utilities.Camera; +using RecrownedAthenaeum.Camera; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.UI.Book +namespace RecrownedAthenaeum.UI.Book { - class Book + public class Book { Camera2D camera; Page targetPage; diff --git a/Recrowned-Athenaeum/UI/Book/Page.cs b/Recrowned-Athenaeum/UI/Book/Page.cs index 0fe333c..1b2a00b 100644 --- a/Recrowned-Athenaeum/UI/Book/Page.cs +++ b/Recrowned-Athenaeum/UI/Book/Page.cs @@ -1,16 +1,16 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.UI.Modular; -using RhythmBullet.Utilities.Camera; +using RecrownedAthenaeum.UI.Modular; +using RecrownedAthenaeum.Camera; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.UI.Book +namespace RecrownedAthenaeum.UI.Book { - class Page : UIModuleGroup + public class Page : UIModuleGroup { private readonly int pageX, pageY; public bool NeedsSizeUpdate; diff --git a/Recrowned-Athenaeum/UI/Modular/Modules/Image.cs b/Recrowned-Athenaeum/UI/Modular/Modules/Image.cs index c306b23..751c68d 100644 --- a/Recrowned-Athenaeum/UI/Modular/Modules/Image.cs +++ b/Recrowned-Athenaeum/UI/Modular/Modules/Image.cs @@ -1,15 +1,15 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.UI.Modular; +using RecrownedAthenaeum.UI.Modular; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.UI.Modular.Modules +namespace RecrownedAthenaeum.UI.Modular.Modules { - class Image : UIModule + public class Image : UIModule { public float rotation = 0f; public Texture2D Texture { get; set; } diff --git a/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/Button.cs b/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/Button.cs index 2acafbe..ab7cd53 100644 --- a/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/Button.cs +++ b/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/Button.cs @@ -1,15 +1,15 @@ using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; -using RhythmBullet.UI.Modular; -using RhythmBullet.Utilities.DataTypes; -using RhythmBullet.Utilities.Input; +using RecrownedAthenaeum.UI.Modular; +using RecrownedAthenaeum.DataTypes; +using RecrownedAthenaeum.Input; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.UI.Modular.Modules.Interactive +namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive { public delegate bool Clicked(); diff --git a/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/TextButton.cs b/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/TextButton.cs index e33bbf9..32317c3 100644 --- a/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/TextButton.cs +++ b/Recrowned-Athenaeum/UI/Modular/Modules/Interactive/TextButton.cs @@ -1,21 +1,21 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.UI.Modular.Modules; -using RhythmBullet.Utilities.DataTypes; -using RhythmBullet.Utilities.UI.Modular.Modules.Interactive; +using RecrownedAthenaeum.UI.Modular.Modules; +using RecrownedAthenaeum.DataTypes; +using RecrownedAthenaeum.UI.Modular.Modules.Interactive; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.Utilities.UI.Modular.Modules.Interactive +namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive { - internal class TextButton : Button + public class TextButton : Button { private TextLabel label; - internal TextButton(string text, SpriteFont font, NinePatch background) : base(background) + public TextButton(string text, SpriteFont font, NinePatch background) : base(background) { label = new TextLabel(font, text); label.autoScale = true; diff --git a/Recrowned-Athenaeum/UI/Modular/Modules/TextLabel.cs b/Recrowned-Athenaeum/UI/Modular/Modules/TextLabel.cs index 4fdf286..2cab11f 100644 --- a/Recrowned-Athenaeum/UI/Modular/Modules/TextLabel.cs +++ b/Recrowned-Athenaeum/UI/Modular/Modules/TextLabel.cs @@ -1,13 +1,13 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RhythmBullet.Utilities.Camera; +using RecrownedAthenaeum.Camera; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.UI.Modular.Modules +namespace RecrownedAthenaeum.UI.Modular.Modules { public class TextLabel : UIModule { diff --git a/Recrowned-Athenaeum/UI/Modular/UIModule.cs b/Recrowned-Athenaeum/UI/Modular/UIModule.cs index c7db325..883e562 100644 --- a/Recrowned-Athenaeum/UI/Modular/UIModule.cs +++ b/Recrowned-Athenaeum/UI/Modular/UIModule.cs @@ -1,15 +1,15 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; -using RhythmBullet.Utilities.Camera; -using RhythmBullet.Utilities.Input; +using RecrownedAthenaeum.Camera; +using RecrownedAthenaeum.Input; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace RhythmBullet.UI.Modular +namespace RecrownedAthenaeum.UI.Modular { public class UIModule : IInputListener { diff --git a/Recrowned-Athenaeum/UI/Modular/UIModuleGroup.cs b/Recrowned-Athenaeum/UI/Modular/UIModuleGroup.cs index b561f49..eb9c043 100644 --- a/Recrowned-Athenaeum/UI/Modular/UIModuleGroup.cs +++ b/Recrowned-Athenaeum/UI/Modular/UIModuleGroup.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; -using RhythmBullet.Utilities.Camera; -using RhythmBullet.Utilities.Input; +using RecrownedAthenaeum.Camera; +using RecrownedAthenaeum.Input; -namespace RhythmBullet.UI.Modular +namespace RecrownedAthenaeum.UI.Modular { public class UIModuleGroup : UIModule {