diff --git a/RecrownedAthenaeum/ContentSystem/ContentData.cs b/RecrownedAthenaeum/ContentSystem/ContentData.cs deleted file mode 100644 index 2d32c20..0000000 --- a/RecrownedAthenaeum/ContentSystem/ContentData.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace RecrownedAthenaeum.ContentSystem -{ - struct ContentData - { - internal Type type; - internal string assetName; - internal bool usePathModifier; - - public ContentData(string assetName, Type type, bool usePathModifier) - { - this.type = type; - this.assetName = assetName; - this.usePathModifier = usePathModifier; - } - } -} diff --git a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs b/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs deleted file mode 100644 index 1cc2836..0000000 --- a/RecrownedAthenaeum/ContentSystem/ContentManagerController.cs +++ /dev/null @@ -1,197 +0,0 @@ -using Microsoft.Xna.Framework.Content; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Threading; - -namespace RecrownedAthenaeum.ContentSystem -{ - /// - /// Wrapper for the content manager that helps with controlling it by adding automated multithreaded content loading. - /// - public class AssetManager - { - Thread thread; - readonly ContentManager contentManager; - readonly Queue queue; - Dictionary assets; - /// - /// Path modifiers to change the path in which the content manager looks to load a file. Used for better organizing things while not needing to type entire path. - /// - private readonly Dictionary contentPathModifier; - /// - /// Used when no path modifier is defined for that specific type. - /// - public IContentPathResolver normalPathModifier = new NormalContentResolver(); - volatile float progress; - volatile bool running; - - /// - /// Whether or not the queue is empty and all content is loaded. - /// - public bool Done { get { return !running && queue.Count == 0; } } - - /// - /// The progress of the loading. 1 is complete while 0 is incomplete. - /// - public float Progress { get { return progress; } } - - /// - /// Wraps the . - /// - /// The manager to wrap. - public AssetManager() - { - this.contentManager = contentManager; - assets = new Dictionary(); - queue = new Queue(); - contentPathModifier = new Dictionary(); - } - /// - /// Adds a to this handler. - /// - /// - /// - public void AddContentPathResolver(Type assetType, IContentPathResolver contentResolver) { - contentPathModifier.Add(assetType, contentResolver); - } - /// - /// Removes the for the key. - /// - /// - public void RemoveContentResolver(Type assetType) { - contentPathModifier.Remove(assetType); - } - private void Load(string assetName, Type type, bool usePathModifier) - { - Debug.WriteLine("Loading asset: " + assetName); - string path = assetName; - if (usePathModifier) - { - IContentPathResolver handler; - if (contentPathModifier.ContainsKey(type)) - { - handler = contentPathModifier[type]; - } - else - { - handler = normalPathModifier; - } - path = handler.Modify(assetName); - } - assets.Add(assetName, contentManager.Load(path)); - - } - - /// - /// Gets the requested asset. - /// - /// The type of the asset for an alternative way to cast. - /// The name of the asset. - /// The asset casted to the type given with T. - public T Get(string assetName) - { - lock (queue) - { - return (T)assets[assetName]; - } - } - - /// - /// Queues an asset to be loaded. - /// - /// The type of the asset to be queued. - /// Name of asset to look for. - /// Whether or not to use the path modifiers. - public void Queue(string assetName, bool usePathModifier = true) - { - lock (queue) - { - if (!assets.ContainsKey(assetName)) - { - queue.Enqueue(new ContentData(assetName, typeof(T), usePathModifier)); - Debug.WriteLine("Queued asset: " + assetName); - } - else - { - throw new InvalidOperationException("Did not queue asset due to asset with same name being loaded: " + assetName); - } - } - } - - /// - /// Called whenever a batch of assets should be loaded from the queue. Safe to call once every frame. - /// - public void Update() - { - if (queue.Count > 0 && (thread == null || !thread.IsAlive)) - { - thread = new Thread(LoadBatch); - thread.Start(); - } - } - - private void LoadBatch() - { - running = true; - int totalTasks = queue.Count; - int tasksCompleted = 0; - while (queue.Count != 0) - { - lock (queue) - { - ContentData content = queue.Dequeue(); - Load(content.assetName, content.type, content.usePathModifier); - tasksCompleted++; - progress = (float)tasksCompleted / totalTasks; - } - } - running = false; - } - /// - /// Removes the asset from the list of assets in the system. - /// Cannot remove from queue. - /// - /// the string name used to load the asset - public void Remove(string name) - { - lock (queue) - { - if (assets.ContainsKey(name)) - { - if (assets[name] is IDisposable) - { - ((IDisposable)assets[name]).Dispose(); - } - assets.Remove(name); - } - } - } - - /// - /// Clears the queue. - /// - public void ClearQueue() - { - lock (queue) - { - queue.Clear(); - } - } - - /// - /// Unloads everything from both queue and loaded list while properly disposing of the assets loaded. - /// - public void UnloadAll() - { - lock (queue) - { - contentManager.Unload(); - assets.Clear(); - ClearQueue(); - Debug.WriteLine("Unloaded all assets."); - } - } - - } -} diff --git a/RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs b/RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs deleted file mode 100644 index 8276912..0000000 --- a/RecrownedAthenaeum/ContentSystem/IContentPathResolver.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace RecrownedAthenaeum.ContentSystem -{ - /// - /// Modifies the given path based on a name. Used to simplify long paths for the - /// - public interface IContentPathResolver - { - /// - /// Returns the complete path with the content folder as root. - /// - /// Is the asset's name - /// - string Modify(string contentPath); - } -} diff --git a/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs b/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs deleted file mode 100644 index c0d1968..0000000 --- a/RecrownedAthenaeum/ContentSystem/NormalContentResolver.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace RecrownedAthenaeum.ContentSystem -{ - /// - /// A resolver that does nothing. Used for looking in the root by default. - /// - public class NormalContentResolver : IContentPathResolver - { - /// - /// Passes the path through without modification as this is the normal content resolver and is meant to just pass things on. - /// - /// The path to modify. - /// - public string Modify(string contentPath) - { - return contentPath; - } - } -} diff --git a/RecrownedAthenaeum/Data/SkinData.cs b/RecrownedAthenaeum/Data/SkinData.cs index 17d1210..701df1c 100644 --- a/RecrownedAthenaeum/Data/SkinData.cs +++ b/RecrownedAthenaeum/Data/SkinData.cs @@ -1,5 +1,4 @@ -using Microsoft.Xna.Framework; -using RecrownedAthenaeum.UI.SkinSystem.Definitions; +using RecrownedAthenaeum.UI.SkinSystem.Definitions; namespace RecrownedAthenaeum.Data { diff --git a/RecrownedAthenaeum/Data/TextureAtlasData.cs b/RecrownedAthenaeum/Data/TextureAtlasData.cs index 9922e91..fdc8109 100644 --- a/RecrownedAthenaeum/Data/TextureAtlasData.cs +++ b/RecrownedAthenaeum/Data/TextureAtlasData.cs @@ -1,5 +1,4 @@ -using Microsoft.Xna.Framework; - +using RecrownedAthenaeum.Types; namespace RecrownedAthenaeum.Data { /// diff --git a/RecrownedAthenaeum/Input/IInputListener.cs b/RecrownedAthenaeum/Input/IInputListener.cs index 3120599..9350245 100644 --- a/RecrownedAthenaeum/Input/IInputListener.cs +++ b/RecrownedAthenaeum/Input/IInputListener.cs @@ -1,5 +1,4 @@ -using Microsoft.Xna.Framework.Input; - + namespace RecrownedAthenaeum.Input { /// diff --git a/RecrownedAthenaeum/SpecialTypes/ISpecialDrawable.cs b/RecrownedAthenaeum/SpecialTypes/ISpecialDrawable.cs deleted file mode 100644 index 13d0bfa..0000000 --- a/RecrownedAthenaeum/SpecialTypes/ISpecialDrawable.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.Xna.Framework; -using RecrownedAthenaeum.Render; - -namespace RecrownedAthenaeum.SpecialTypes -{ - /// - /// A wrapper that makes sure anything implementing can be drawn with options. - /// - public interface ISpecialDrawable - { - /// - /// Should draw whatever implements this. - /// - /// The batch to be used. - /// The location and dimensions to draw to. - /// The color tint to draw with. - /// The rotation to be used. - /// The origin for the rotation. - void Draw(ConsistentSpriteBatch spriteBatch, Rectangle destination, Color color, float rotation = 0f, Vector2 origin = default(Vector2)); - } -} diff --git a/RecrownedAthenaeum/SpecialTypes/NinePatch.cs b/RecrownedAthenaeum/SpecialTypes/NinePatch.cs deleted file mode 100644 index 69aa8c1..0000000 --- a/RecrownedAthenaeum/SpecialTypes/NinePatch.cs +++ /dev/null @@ -1,130 +0,0 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; -using System; - -namespace RecrownedAthenaeum.SpecialTypes -{ - /// - /// An object that represents a ninepatch. - /// - public class NinePatch : ISpecialDrawable - { - /// - /// Dimensions in ninepatch. May also represent position in texture atlas. - /// - public Rectangle textureRegion; - readonly Texture2D texture; - readonly int left, right, bottom, top; - - Rectangle[] sourcePatches; - - /// - /// A nine patch object. - /// - /// Texture used for the nine patch. Dimensions must be greater than their sum border counter parts. If used as part of texture atlas, the texture should be the texture of the entire atlas. - /// Left side. - /// Right side. - /// Bottom side. - /// 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. - public NinePatch(Texture2D texture, int left, int right, int bottom, int top, Rectangle? textureBounds = null) - { - this.texture = texture; - if (textureBounds.HasValue) textureRegion = textureBounds.Value; else textureRegion = texture.Bounds; - if (left + right >= textureRegion.Width) throw new ArgumentOutOfRangeException("left and right values cannot be greater than or equal to the width of region. Left value is " + left + " and right value is " + right + ". Bounds of texture are: " + textureRegion); - if (bottom + top >= textureRegion.Height) throw new ArgumentOutOfRangeException("Bottom and top values cannot be greater than or equal to the width of region. Bottom value is " + bottom + " and top value is " + top + "."); - this.left = left; - this.right = right; - this.bottom = bottom; - this.top = top; - - Rectangle[] patches = -{ - new Rectangle(0, 0, left, bottom), - new Rectangle(left, 0, textureRegion.Width - left - right, bottom), - new Rectangle(textureRegion.Width - right, 0, right, bottom), - new Rectangle(0, bottom, left, textureRegion.Height - top - bottom), - new Rectangle(left, bottom, textureRegion.Width - left - right, textureRegion.Height - bottom - top), - new Rectangle(textureRegion.Width - right, bottom, right, textureRegion.Height - top - bottom), - new Rectangle(0, textureRegion.Height - top, left, top), - new Rectangle(left, textureRegion.Height - top, textureRegion.Width - left - right, top), - new Rectangle(textureRegion.Width - right, textureRegion.Height - top, right, top), - }; - - for (int i = 0; i < patches.Length; i++) - { - patches[i].X += textureRegion.X; - patches[i].Y += textureRegion.Y; - } - - sourcePatches = patches; - - } - - private Rectangle[] GenenerateDestinationRectangles(int width, int height) - { - Rectangle[] patches = - { - new Rectangle(0, 0, left, bottom), - new Rectangle(left, 0, width - left - right, bottom), - new Rectangle(width -right, 0, right, bottom), - new Rectangle(0, bottom, left, height - bottom - top), - new Rectangle(left, bottom, width - left - right, height - top - bottom), - new Rectangle(width - right, bottom, right, height - top - bottom), - new Rectangle(0, height - top, left, top), - new Rectangle(left, height - top, width - left - right, top), - new Rectangle(width - right, height - top, right, top), - }; - return patches; - } - - /// - /// Draws the ninepatch. - /// - /// Batch to use. - /// The color of the patch. - /// Where to the patch. - public void Draw(ConsistentSpriteBatch spriteBatch, Color color, Rectangle destination) - { - try - { - spriteBatch.End(); - } catch (InvalidOperationException) - { - throw new InvalidOperationException("Begin must be called to draw a nine patch!"); - } - - spriteBatch.BeginWithoutSaving(samplerState: SamplerState.PointClamp); - - Rectangle[] destinations = GenenerateDestinationRectangles(destination.Width, destination.Height); - for (int i = 0; i < destinations.Length; i++) - { - destinations[i].X += destination.X; - destinations[i].Y += destination.Y; - spriteBatch.Draw(texture, destinations[i], sourcePatches[i], color); - } - spriteBatch.End(); - - spriteBatch.Begin(); - } - - /// - /// - /// Spritebatch to use. - /// The destination to draw the patch. - /// The tint for each patch. - /// Not considered for 9patches. - /// Not considered for 9patches. - public void Draw(ConsistentSpriteBatch spriteBatch, Rectangle destination, Color color, float rotation = 0, Vector2 origin = default(Vector2)) - { - if (rotation != 0) throw new NotImplementedException("Ninepatches can't be rotated."); - if (origin != default(Vector2)) - { - destination.X -= (int)origin.X; - destination.Y -= (int)origin.Y; - } - Draw(spriteBatch, color, destination); - } - } -} diff --git a/RecrownedAthenaeum/SpecialTypes/Resolution.cs b/RecrownedAthenaeum/SpecialTypes/Resolution.cs deleted file mode 100644 index ecd0c1e..0000000 --- a/RecrownedAthenaeum/SpecialTypes/Resolution.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; - -namespace RecrownedAthenaeum.SpecialTypes -{ - /// - /// Holds a width and height while allowing for easier comparison between other s. - /// - public struct Resolution : IComparable - { - /// - /// Dimensions of resolution. - /// - public int Width, Height; - - /// - /// Constructs resolution given the dimensions. - /// - /// Width of resolution. - /// Height of resolution. - public Resolution(int width, int height) - { - Width = width; - Height = height; - } - - /// - /// Compares area of this resolution to another. - /// - /// The other resolution to compare to. - /// A value less than 0 for this being the smaller resolution, 0 for the two being the same in area, and larger for this being the larger in area. - public int CompareTo(Resolution other) - { - return Area() - other.Area(); - } - - /// - /// Gets a string representation of this resolution. - /// - /// "WidthxHeight" - public override string ToString() - { - return Width + "x" + Height; - } - - /// - /// Calculates area of resolution. - /// - /// Area of resolution. - public int Area() - { - return Width * Height; - } - } -} diff --git a/RecrownedAthenaeum/SpecialTypes/TextureAtlas.cs b/RecrownedAthenaeum/SpecialTypes/TextureAtlas.cs deleted file mode 100644 index fcc5893..0000000 --- a/RecrownedAthenaeum/SpecialTypes/TextureAtlas.cs +++ /dev/null @@ -1,236 +0,0 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace RecrownedAthenaeum.SpecialTypes -{ - /// - /// Holds information about an image file that contains various textures in various regions in the file. - /// - public class TextureAtlas : IDisposable - { - private Texture2D texture; - private bool disposed; - private Dictionary dictionaryOfRegions = new Dictionary(); - - /// - /// Given a name, can return a . - /// - /// Name of to obtain. - /// based off name. - public Region this[string name] { get { if (name != null && dictionaryOfRegions.ContainsKey(name)) return dictionaryOfRegions[name]; else throw new KeyNotFoundException("Given key \"" + name + "\" does not exist."); } } - - /// - /// Creates a texture atlas with given main texture as well as an array of to represent locations of which textures reside within the atlas. Region names will be used to refer to the regions within the dictionary. - /// - /// The texture representing the overall atlas. - /// The sub regions that represent the individual textures. - public TextureAtlas(Texture2D texture, Region[] regions) - { - this.texture = texture; - foreach (Region region in regions) - { - dictionaryOfRegions.Add(region.name, region); - } - } - - /// - /// Creates a texture region given a dictionary of regions keyed to strings that can be used to refer to them. - /// - /// The texture representing the overall atlas. - /// - public TextureAtlas(Texture2D texture, Dictionary dictionaryOfRegions) - { - this.texture = texture; - this.dictionaryOfRegions = dictionaryOfRegions; - } - - /// - /// Draw the region given by a string in the atlas onto a destination rectangle. - /// - /// Name of region to draw. - /// SpriteBatch to be used. - /// The location to draw this region. - /// Color to use. - /// Rotation of texture drawn. - /// Origin used by rotation. - public void Draw(string name, ConsistentSpriteBatch batch, Rectangle destination, Color color = default(Color), float rotation = 0, Vector2 origin = new Vector2()) - { - dictionaryOfRegions[name].Draw(batch, destination, color, rotation, origin); - } - - /// - /// Creates or obtains a previously created texture of a region. - /// - /// Name of region. - /// graphics device to be used to generate the texture. - /// The texture from the region. - public Texture2D ObtainRegionAsTexture(string name, GraphicsDevice graphicsDevice) - { - return dictionaryOfRegions[name].AsTexture2D(graphicsDevice); - } - - /// - /// Whether or not this atlas contains the given region name. - /// - /// The name of the region to check for. - /// True if this atlas does contain the region given by name. - public bool ContainsRegion(string regionName) - { - return dictionaryOfRegions.ContainsKey(regionName); - } - - /// - /// Disposes unmanaged resources for the texture atlas. - /// - public void Dispose() - { - Dispose(true); - } - - /// - /// Overridable disposal method. - /// - /// Only true if user calls - public virtual void Dispose(bool disposing) - { - disposed = true; - if (!disposed && disposing) - { - texture.Dispose(); - for (int i = 0; i < dictionaryOfRegions.Count; i++) - { - Region region = dictionaryOfRegions.ElementAt(i).Value; - - if (!region.Disposed) - { - dictionaryOfRegions.ElementAt(i).Value.Dispose(); - } - } - dictionaryOfRegions.Clear(); - } - } - - /// - /// Destructor. - /// - ~TextureAtlas() - { - Dispose(false); - } - - /// - /// A region of a . - /// - public class Region : ISpecialDrawable, IDisposable - { - /// - /// The name of the region. Mostly used to be refered to within the context of a . - /// - public readonly string name; - - /// - /// The location and dimensions of where the original texture resides on the texture representing the atlas. - /// - public readonly Rectangle sourceRectangle; - readonly NinePatch ninepatch; - Texture2D atlasTexture; - Texture2D regionTexture; - - /// - /// If region has already been disposed. - /// - public bool Disposed { get; private set; } - - /// - /// A specified region in a texture atlas. - /// - /// Name of region. - /// The location of the region on the atlas. - /// A definition for the region. - /// The texture that holds the image data for the atlas. - public Region(string name, Rectangle sourceRegion, NinePatch ninePatch, Texture2D atlasTexture) - { - this.atlasTexture = atlasTexture ?? throw new ArgumentNullException("Name parameters can be null."); - this.name = name ?? throw new ArgumentNullException("Name parameters can be null."); - sourceRectangle = sourceRegion; - ninepatch = ninePatch; - } - - /// - /// Draws the region. If ninepatch, rotation and origin are ignored. - /// - /// The batch to use. Should be began. - /// The destination rectangle to draw to. - /// The color to use. - /// Rotation of the final drawing. Ignored if is a 9patch. - /// The origin of the drawing. Ignored if is a 9patch. - public void Draw(ConsistentSpriteBatch batch, Rectangle destination, Color color, float rotation = 0, Vector2 origin = default(Vector2)) - { - if (Disposed) throw new ObjectDisposedException(GetType().Name); - - if (ninepatch != null) - { - ninepatch.Draw(batch, color, destination); - } - else - { - batch.Draw(atlasTexture, destination, sourceRectangle, color, rotation, origin, SpriteEffects.None, 0f); - } - } - - /// - /// Create or obtains a previously created texture of this region. - /// - /// The graphics device to use to create the texture. - /// The texture of the region. - public Texture2D AsTexture2D(GraphicsDevice graphicsDevice) - { - if (Disposed) throw new ObjectDisposedException(GetType().Name); - - if (regionTexture == null) - { - Color[] data = new Color[sourceRectangle.Width * sourceRectangle.Height]; - regionTexture = new Texture2D(graphicsDevice, sourceRectangle.Width, sourceRectangle.Height); - atlasTexture.GetData(0, sourceRectangle, data, 0, sourceRectangle.Width * sourceRectangle.Height); - regionTexture.SetData(data); - } - return regionTexture; - } - - /// - /// Call this to dispose. - /// - public void Dispose() - { - if (Disposed) throw new ObjectDisposedException(GetType().Name); - Dispose(true); - GC.SuppressFinalize(this); - } - - /// - /// Overridable dispose. - /// - /// Whether or not this was a user made call. - public virtual void Dispose(bool disposing) - { - if (disposing && !Disposed) - { - regionTexture?.Dispose(); - } - Disposed = true; - } - - /// - /// Destructor. - /// - ~Region() - { - Dispose(false); - } - } - } -} diff --git a/RecrownedAthenaeum/UI/BookSystem/Book.cs b/RecrownedAthenaeum/UI/BookSystem/Book.cs index a61f02d..7cfe4f4 100644 --- a/RecrownedAthenaeum/UI/BookSystem/Book.cs +++ b/RecrownedAthenaeum/UI/BookSystem/Book.cs @@ -1,12 +1,11 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Input; -using RecrownedAthenaeum.ContentSystem; -using RecrownedAthenaeum.Input; +using RecrownedAthenaeum.Input; +using RecrownedAthenaeum.Assets; using RecrownedAthenaeum.Render; using RecrownedAthenaeum.UI.SkinSystem; using System; using System.Collections.Generic; using System.Linq; +using RecrownedAthenaeum.Types; namespace RecrownedAthenaeum.UI.BookSystem { diff --git a/RecrownedAthenaeum/UI/BookSystem/Page.cs b/RecrownedAthenaeum/UI/BookSystem/Page.cs index 41c82d6..a388b5f 100644 --- a/RecrownedAthenaeum/UI/BookSystem/Page.cs +++ b/RecrownedAthenaeum/UI/BookSystem/Page.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.ContentSystem; +using RecrownedAthenaeum.Assets; using RecrownedAthenaeum.Render; using RecrownedAthenaeum.UI.Modular; using RecrownedAthenaeum.UI.SkinSystem; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Image.cs b/RecrownedAthenaeum/UI/Modular/Modules/Image.cs index 8287695..8eff65b 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Image.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Image.cs @@ -1,7 +1,5 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Types; using System; namespace RecrownedAthenaeum.UI.Modular.Modules diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs index 2d1cdc9..f926229 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs @@ -1,5 +1,4 @@ -using Microsoft.Xna.Framework.Input; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.Input; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using RecrownedAthenaeum.UI.SkinSystem; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs index d7de55e..1e8f2a3 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs @@ -1,7 +1,5 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs b/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs index 0d03bef..f9ed0e4 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs @@ -1,15 +1,9 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Input; -using RecrownedAthenaeum.Input; +using RecrownedAthenaeum.Input; using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace RecrownedAthenaeum.UI.Modular.Modules { diff --git a/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs index e76768c..029f789 100644 --- a/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs +++ b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs @@ -19,7 +19,7 @@ namespace RecrownedAthenaeum.UI.ScreenSystem /// Called every frame if the state of the screen this transition is placed upon is in the enter transition phase. /// /// The time passed in seconds since the last frame. - /// Whether or not this transition is waiting on something. Usually the . + /// Whether or not this transition is waiting on something. Usually the . /// If this returns true, then it is considered that this transition is complete. bool UpdateEnteringTransition(double delta, bool waiting); @@ -27,7 +27,7 @@ namespace RecrownedAthenaeum.UI.ScreenSystem /// Called every frame if the state of the screen this transition is placed upon is in the exit phase. /// /// The time passed in seconds since the last frame. - /// Whether or not this transition is waiting on something. Usually the . + /// Whether or not this transition is waiting on something. Usually the . /// If this returns true, then it is considered that this transition is complete. bool UpdateExitingTransition(double delta, bool waiting); diff --git a/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs index 6697bb3..225bf0d 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs @@ -1,7 +1,5 @@ -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; namespace RecrownedAthenaeum.UI.SkinSystem diff --git a/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs index 7040272..15bdf8a 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; namespace RecrownedAthenaeum.UI.SkinSystem diff --git a/RecrownedAthenaeum/UI/SkinSystem/Skin.cs b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs index 6749cfa..ddf15cf 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/Skin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using RecrownedAthenaeum.Render; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using System; using System.Collections.Generic; diff --git a/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs b/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs index 653e58d..c9a4aea 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs @@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics; using Newtonsoft.Json; using RecrownedAthenaeum.ContentReaders; using RecrownedAthenaeum.Data; -using RecrownedAthenaeum.SpecialTypes; +using RecrownedAthenaeum.Types; using System; using System.Collections.Generic; using System.IO;