From edd2e94a6a27a7b8a55f672071780b6788b5f817 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Sat, 12 Jan 2019 23:40:52 -0600 Subject: [PATCH] minor change for the dispose exception for disposables. --- RecrownedAthenaeum/Render/PrimitiveBatch.cs | 10 +++++----- RecrownedAthenaeum/Render/RectangleRenderer.cs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RecrownedAthenaeum/Render/PrimitiveBatch.cs b/RecrownedAthenaeum/Render/PrimitiveBatch.cs index 6b4914b..ac4b806 100644 --- a/RecrownedAthenaeum/Render/PrimitiveBatch.cs +++ b/RecrownedAthenaeum/Render/PrimitiveBatch.cs @@ -44,7 +44,7 @@ namespace RecrownedAthenaeum.Render public void Begin(PrimitiveType primitiveType) { if (began) throw new InvalidOperationException("Begin is being called twice before being ended."); - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(this.GetType().Name); this.primitiveType = primitiveType; verticesPerPrimitive = 0; switch (primitiveType) @@ -63,7 +63,7 @@ namespace RecrownedAthenaeum.Render /// public void End() { - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(this.GetType().Name); if (!began) throw new InvalidOperationException("Begin must be called before ending."); Flush(); @@ -77,7 +77,7 @@ namespace RecrownedAthenaeum.Render public void AddVertex(Vector2 vertex, Color color) { if (!began) throw new InvalidOperationException("Begin needs to be called before adding vertex."); - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(this.GetType().Name); if (bufferPosition + verticesPerPrimitive >= MaxVertices && (bufferPosition % MaxVertices == 0)) { if (primitiveType != PrimitiveType.LineStrip && primitiveType != PrimitiveType.TriangleStrip) @@ -99,7 +99,7 @@ namespace RecrownedAthenaeum.Render public void Flush() { if (!began) throw new InvalidOperationException("Begin needs to be called before flushing."); - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(this.GetType().Name); if (bufferPosition == 0) return; graphicsDevice.DrawUserPrimitives(primitiveType, vertices.ToArray(), 0, bufferPosition / verticesPerPrimitive); @@ -121,7 +121,7 @@ namespace RecrownedAthenaeum.Render } else { - throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(this.GetType().Name); } } } diff --git a/RecrownedAthenaeum/Render/RectangleRenderer.cs b/RecrownedAthenaeum/Render/RectangleRenderer.cs index 43f23a8..9227381 100644 --- a/RecrownedAthenaeum/Render/RectangleRenderer.cs +++ b/RecrownedAthenaeum/Render/RectangleRenderer.cs @@ -29,7 +29,7 @@ namespace RecrownedAthenaeum.Render public void Begin(bool filled) { filling = filled; - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(GetType().Name); if (began) throw new InvalidOperationException("Cannot begin twice."); primitiveBatch.Begin(filled ? PrimitiveType.TriangleStrip : PrimitiveType.LineStrip); began = true; @@ -37,7 +37,7 @@ namespace RecrownedAthenaeum.Render public void End() { - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(GetType().Name); if (!began) throw new InvalidOperationException("Cannot end before beginning."); primitiveBatch.End(); began = false; @@ -55,7 +55,7 @@ namespace RecrownedAthenaeum.Render /// Rotation of rectangle. Default is 0 radians. public void Rectangle(int x, int y, int width, int height, Color color, double rotation = 0) { - if (disposed) throw new ObjectDisposedException(typeof(PrimitiveBatch).Name); + if (disposed) throw new ObjectDisposedException(GetType().Name); if (!began) throw new InvalidOperationException("Renderer must be started by calling Begin."); Vector2[] corners = new Vector2[4];