From 1e22e84ce25d3b85fb450ba434c90a99f0a15c99 Mon Sep 17 00:00:00 2001 From: Harrison Date: Sat, 28 Dec 2019 14:35:01 -0600 Subject: [PATCH] Moved Render items under new Graphics namespace. --- .../{ => Graphics}/Render/BasicCamera.cs | 2 +- .../{ => Graphics}/Render/BasicScissor.cs | 2 +- .../{ => Graphics}/Render/Camera2D.cs | 2 +- .../Render/ConsistentSpriteBatch.cs | 2 +- .../{ => Graphics}/Render/PrimitiveBatch.cs | 2 +- .../Render/RectangleRenderer.cs | 2 +- .../{ => Graphics}/Render/Shader/default.frag | 0 .../{ => Graphics}/Render/Shader/default.vert | 0 RecrownedAthenaeum/Render/Shader/Shader.cs | 76 ------------------- RecrownedAthenaeum/Render/SpriteBatch.cs | 13 ---- .../Types/IRectangleDrawable.cs | 2 +- RecrownedAthenaeum/Types/NinePatch.cs | 2 +- RecrownedAthenaeum/Types/TextureAtlas.cs | 2 +- RecrownedAthenaeum/UI/BookSystem/Book.cs | 2 +- RecrownedAthenaeum/UI/BookSystem/Page.cs | 2 +- .../UI/Modular/Modules/Image.cs | 2 +- .../UI/Modular/Modules/Interactive/Button.cs | 2 +- .../Modular/Modules/Interactive/TextButton.cs | 2 +- RecrownedAthenaeum/UI/Modular/Modules/Text.cs | 2 +- .../UI/Modular/Modules/UIScrollable.cs | 2 +- RecrownedAthenaeum/UI/Modular/UIModule.cs | 2 +- .../UI/Modular/UIModuleGroup.cs | 2 +- .../UI/ScreenSystem/ITransition.cs | 2 +- .../UI/ScreenSystem/LoadingScreen.cs | 2 +- RecrownedAthenaeum/UI/ScreenSystem/Screen.cs | 2 +- .../UI/ScreenSystem/ScreenManager.cs | 2 +- RecrownedAthenaeum/UI/SkinSystem/ISkin.cs | 2 +- .../UI/SkinSystem/MergedSkin.cs | 2 +- RecrownedAthenaeum/UI/SkinSystem/Skin.cs | 2 +- 29 files changed, 25 insertions(+), 114 deletions(-) rename RecrownedAthenaeum/{ => Graphics}/Render/BasicCamera.cs (98%) rename RecrownedAthenaeum/{ => Graphics}/Render/BasicScissor.cs (97%) rename RecrownedAthenaeum/{ => Graphics}/Render/Camera2D.cs (98%) rename RecrownedAthenaeum/{ => Graphics}/Render/ConsistentSpriteBatch.cs (99%) rename RecrownedAthenaeum/{ => Graphics}/Render/PrimitiveBatch.cs (99%) rename RecrownedAthenaeum/{ => Graphics}/Render/RectangleRenderer.cs (98%) rename RecrownedAthenaeum/{ => Graphics}/Render/Shader/default.frag (100%) rename RecrownedAthenaeum/{ => Graphics}/Render/Shader/default.vert (100%) delete mode 100644 RecrownedAthenaeum/Render/Shader/Shader.cs delete mode 100644 RecrownedAthenaeum/Render/SpriteBatch.cs diff --git a/RecrownedAthenaeum/Render/BasicCamera.cs b/RecrownedAthenaeum/Graphics/Render/BasicCamera.cs similarity index 98% rename from RecrownedAthenaeum/Render/BasicCamera.cs rename to RecrownedAthenaeum/Graphics/Render/BasicCamera.cs index 37ef2c1..32aa6ca 100644 --- a/RecrownedAthenaeum/Render/BasicCamera.cs +++ b/RecrownedAthenaeum/Graphics/Render/BasicCamera.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// A generic camera. Functions in 3D. diff --git a/RecrownedAthenaeum/Render/BasicScissor.cs b/RecrownedAthenaeum/Graphics/Render/BasicScissor.cs similarity index 97% rename from RecrownedAthenaeum/Render/BasicScissor.cs rename to RecrownedAthenaeum/Graphics/Render/BasicScissor.cs index 2f06b9a..407750e 100644 --- a/RecrownedAthenaeum/Render/BasicScissor.cs +++ b/RecrownedAthenaeum/Graphics/Render/BasicScissor.cs @@ -1,6 +1,6 @@ using RecrownedAthenaeum.Types; -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// A simple utility object that will start and end a scissor setup given a to work with. diff --git a/RecrownedAthenaeum/Render/Camera2D.cs b/RecrownedAthenaeum/Graphics/Render/Camera2D.cs similarity index 98% rename from RecrownedAthenaeum/Render/Camera2D.cs rename to RecrownedAthenaeum/Graphics/Render/Camera2D.cs index af377fc..4a7108c 100644 --- a/RecrownedAthenaeum/Render/Camera2D.cs +++ b/RecrownedAthenaeum/Graphics/Render/Camera2D.cs @@ -2,7 +2,7 @@ using Microsoft.Xna.Framework.Graphics; using System; -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// A virtual 2D camera that wraps the normal . Default projection is orthographic. diff --git a/RecrownedAthenaeum/Render/ConsistentSpriteBatch.cs b/RecrownedAthenaeum/Graphics/Render/ConsistentSpriteBatch.cs similarity index 99% rename from RecrownedAthenaeum/Render/ConsistentSpriteBatch.cs rename to RecrownedAthenaeum/Graphics/Render/ConsistentSpriteBatch.cs index 49197ba..fc0cf26 100644 --- a/RecrownedAthenaeum/Render/ConsistentSpriteBatch.cs +++ b/RecrownedAthenaeum/Graphics/Render/ConsistentSpriteBatch.cs @@ -1,4 +1,4 @@ -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// A that keeps it's settings through begin and end unless manually changed either by the or through changing the fields. Note that changing the fields while the batch has begun will not take effect until the next time the batch is started. diff --git a/RecrownedAthenaeum/Render/PrimitiveBatch.cs b/RecrownedAthenaeum/Graphics/Render/PrimitiveBatch.cs similarity index 99% rename from RecrownedAthenaeum/Render/PrimitiveBatch.cs rename to RecrownedAthenaeum/Graphics/Render/PrimitiveBatch.cs index 87004a5..36abbe0 100644 --- a/RecrownedAthenaeum/Render/PrimitiveBatch.cs +++ b/RecrownedAthenaeum/Graphics/Render/PrimitiveBatch.cs @@ -2,7 +2,7 @@ using Microsoft.Xna.Framework.Graphics; using System; -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// A batch used to draw primitive shapes by batching together vertices. diff --git a/RecrownedAthenaeum/Render/RectangleRenderer.cs b/RecrownedAthenaeum/Graphics/Render/RectangleRenderer.cs similarity index 98% rename from RecrownedAthenaeum/Render/RectangleRenderer.cs rename to RecrownedAthenaeum/Graphics/Render/RectangleRenderer.cs index 224b1ec..5999b30 100644 --- a/RecrownedAthenaeum/Render/RectangleRenderer.cs +++ b/RecrownedAthenaeum/Graphics/Render/RectangleRenderer.cs @@ -2,7 +2,7 @@ using Microsoft.Xna.Framework.Graphics; using System; -namespace RecrownedAthenaeum.Render +namespace RecrownedAthenaeum.Graphics.Render { /// /// Renders rectangles using the . diff --git a/RecrownedAthenaeum/Render/Shader/default.frag b/RecrownedAthenaeum/Graphics/Render/Shader/default.frag similarity index 100% rename from RecrownedAthenaeum/Render/Shader/default.frag rename to RecrownedAthenaeum/Graphics/Render/Shader/default.frag diff --git a/RecrownedAthenaeum/Render/Shader/default.vert b/RecrownedAthenaeum/Graphics/Render/Shader/default.vert similarity index 100% rename from RecrownedAthenaeum/Render/Shader/default.vert rename to RecrownedAthenaeum/Graphics/Render/Shader/default.vert diff --git a/RecrownedAthenaeum/Render/Shader/Shader.cs b/RecrownedAthenaeum/Render/Shader/Shader.cs deleted file mode 100644 index 79d5750..0000000 --- a/RecrownedAthenaeum/Render/Shader/Shader.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.IO; -using System.Text; -using OpenTK.Graphics.OpenGL; -namespace RecrownedAthenaeum.Render.Shader { - public class Shader : IDisposable { - int handle; - public bool IsDisposed { - get; - private set; - } - public Shader(string vertexPath, string fragmentPath) { - IsDisposed = false; - - int vertShader = 0; - int fragShader = 0; - - string vertShaderSource; - string fragShaderSource; - - using (StreamReader stream = new StreamReader(vertexPath, Encoding.UTF8)) { - vertShaderSource = stream.ReadToEnd(); - } - using (StreamReader stream = new StreamReader(fragmentPath, Encoding.UTF8)) { - fragShaderSource = stream.ReadToEnd(); - } - - vertShader = GL.CreateShader(ShaderType.VertexShader); - GL.ShaderSource(vertShader, vertShaderSource); - fragShader = GL.CreateShader(ShaderType.FragmentShader); - GL.ShaderSource(fragShader, fragShaderSource); - - string log; - GL.CompileShader(vertShader); - if ((log = GL.GetShaderInfoLog(vertShader)) == "") { - throw new ArgumentException("Error while compiling vertex shader: " + log, "vertexPath"); - } - GL.CompileShader(fragShader); - if ((log = GL.GetShaderInfoLog(fragShader)) == "") { - throw new ArgumentException("Error while compiling fragment shader: " + log, "fragmentPath"); - } - handle = GL.CreateProgram(); - GL.AttachShader(handle, vertShader); - GL.AttachShader(handle, fragShader); - GL.LinkProgram(handle); - GL.DetachShader(handle, vertShader); - GL.DetachShader(handle, fragShader); - GL.DeleteShader(vertShader); - GL.DeleteShader(fragShader); - } - - public void Use() { - GL.UseProgram(handle); - } - - protected virtual void Dispose(bool disposing) { - if (IsDisposed) { - return; - } - - if (disposing) { - } - GL.DeleteProgram(handle); - IsDisposed = true; - } - - public void Dispose() { - Dispose(true); - GC.SuppressFinalize(this); - } - - ~Shader() { - Dispose(false); - } - } -} \ No newline at end of file diff --git a/RecrownedAthenaeum/Render/SpriteBatch.cs b/RecrownedAthenaeum/Render/SpriteBatch.cs deleted file mode 100644 index 4f64bce..0000000 --- a/RecrownedAthenaeum/Render/SpriteBatch.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace RecrownedAthenaeum.Render { - public class SpriteBatch { - public SpriteBatch() { - } - public void Begin() { - - } - - public void End() { - - } - } -} \ No newline at end of file diff --git a/RecrownedAthenaeum/Types/IRectangleDrawable.cs b/RecrownedAthenaeum/Types/IRectangleDrawable.cs index 3a42ea7..e1bb6da 100644 --- a/RecrownedAthenaeum/Types/IRectangleDrawable.cs +++ b/RecrownedAthenaeum/Types/IRectangleDrawable.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; namespace RecrownedAthenaeum.Types { diff --git a/RecrownedAthenaeum/Types/NinePatch.cs b/RecrownedAthenaeum/Types/NinePatch.cs index db37e2f..540ec7d 100644 --- a/RecrownedAthenaeum/Types/NinePatch.cs +++ b/RecrownedAthenaeum/Types/NinePatch.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; namespace RecrownedAthenaeum.Types diff --git a/RecrownedAthenaeum/Types/TextureAtlas.cs b/RecrownedAthenaeum/Types/TextureAtlas.cs index 3a85e29..9c421cb 100644 --- a/RecrownedAthenaeum/Types/TextureAtlas.cs +++ b/RecrownedAthenaeum/Types/TextureAtlas.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; using System.Collections.Generic; using System.Linq; diff --git a/RecrownedAthenaeum/UI/BookSystem/Book.cs b/RecrownedAthenaeum/UI/BookSystem/Book.cs index 7cfe4f4..e531f40 100644 --- a/RecrownedAthenaeum/UI/BookSystem/Book.cs +++ b/RecrownedAthenaeum/UI/BookSystem/Book.cs @@ -1,6 +1,6 @@ using RecrownedAthenaeum.Input; using RecrownedAthenaeum.Assets; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.UI.SkinSystem; using System; using System.Collections.Generic; diff --git a/RecrownedAthenaeum/UI/BookSystem/Page.cs b/RecrownedAthenaeum/UI/BookSystem/Page.cs index a388b5f..1dc24be 100644 --- a/RecrownedAthenaeum/UI/BookSystem/Page.cs +++ b/RecrownedAthenaeum/UI/BookSystem/Page.cs @@ -1,5 +1,5 @@ using RecrownedAthenaeum.Assets; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.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 8eff65b..32f3af4 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Image.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Image.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using System; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs index f926229..dac3791 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs @@ -2,7 +2,7 @@ using RecrownedAthenaeum.Input; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using RecrownedAthenaeum.UI.SkinSystem; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive { diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs index 1e8f2a3..cebb586 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs index 3c9e8ec..317057e 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; using System.Text; diff --git a/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs b/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs index f9ed0e4..2fc9214 100644 --- a/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs +++ b/RecrownedAthenaeum/UI/Modular/Modules/UIScrollable.cs @@ -1,5 +1,5 @@ using RecrownedAthenaeum.Input; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem; using RecrownedAthenaeum.UI.SkinSystem.Definitions; diff --git a/RecrownedAthenaeum/UI/Modular/UIModule.cs b/RecrownedAthenaeum/UI/Modular/UIModule.cs index 44ba01d..55e4361 100644 --- a/RecrownedAthenaeum/UI/Modular/UIModule.cs +++ b/RecrownedAthenaeum/UI/Modular/UIModule.cs @@ -1,7 +1,7 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Input; using RecrownedAthenaeum.Input; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; namespace RecrownedAthenaeum.UI.Modular diff --git a/RecrownedAthenaeum/UI/Modular/UIModuleGroup.cs b/RecrownedAthenaeum/UI/Modular/UIModuleGroup.cs index b0a0a46..80c1304 100644 --- a/RecrownedAthenaeum/UI/Modular/UIModuleGroup.cs +++ b/RecrownedAthenaeum/UI/Modular/UIModuleGroup.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Input; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; namespace RecrownedAthenaeum.UI.Modular { diff --git a/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs index 029f789..2527847 100644 --- a/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs +++ b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; namespace RecrownedAthenaeum.UI.ScreenSystem { diff --git a/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs b/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs index 8f3597f..1c2e18f 100644 --- a/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs +++ b/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs @@ -1,7 +1,7 @@  using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; namespace RecrownedAthenaeum.UI.ScreenSystem diff --git a/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs b/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs index 0e941b2..73dc4e0 100644 --- a/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs +++ b/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System.Collections.Generic; namespace RecrownedAthenaeum.UI.ScreenSystem diff --git a/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs b/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs index 7204e89..4ccc3b9 100644 --- a/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs +++ b/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using System; using System.Diagnostics; diff --git a/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs index 225bf0d..ca52006 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs @@ -1,4 +1,4 @@ -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; diff --git a/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs index 15bdf8a..ee31200 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; diff --git a/RecrownedAthenaeum/UI/SkinSystem/Skin.cs b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs index ddf15cf..2865b36 100644 --- a/RecrownedAthenaeum/UI/SkinSystem/Skin.cs +++ b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs @@ -1,6 +1,6 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; -using RecrownedAthenaeum.Render; +using RecrownedAthenaeum.Graphics.Render; using RecrownedAthenaeum.Types; using RecrownedAthenaeum.UI.SkinSystem.Definitions; using System;