Implement documentation + A special case check on DrawArc.

Preparing for Release-1, J2D lighting is all that's left and then I can work on J3D.

Added helper functions to get rid of the constant need to dereference things.

Wrote a few functions that were defined but never implemented.

.gitea/workflows/buildtest.yml

@@ -17,6 +17,6 @@ jobs:
       - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
       - run: echo "The workflow is now ready to run your tests on the runner."
       - run: echo "Install toolchain and run ReCI build test"
-      - run: apt-get update && apt-get install -y lua5.3 git && git clone $RECI_GIT $RECI
+      - run: apt-get update && apt-get install -y lua5.3 git libxrandr-dev && git clone $RECI_GIT $RECI
       - run: lua $RECI/reci.lua -f $RECI/scripts/buildtools.reci -f reci/scripts/builddeps.reci -f $RECI/scripts/buildtest.reci
       - run: echo "This job's status is ${{ job.status }}."

CMakeLists.txt

@@ -22,32 +22,27 @@ CPMAddPackage(
 
 CPMAddPackage(
         NAME J3ML
-        URL https://git.redacted.cc/josh/j3ml/archive/Release-3.1.zip
+        URL https://git.redacted.cc/josh/j3ml/archive/Release-3.2.zip
 )
 
 CPMAddPackage(
         NAME ReWindow
-        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-15.zip
+        URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-21.zip
 )
 
 CPMAddPackage(
         NAME GLAD
-        URL https://git.redacted.cc/Redacted/glad/archive/v2.1ext_fbo.zip
+        URL https://git.redacted.cc/Redacted/glad/archive/v2.1ext_fboV2.zip
 )
 
 CPMAddPackage(
         NAME jlog
-        URL https://git.redacted.cc/josh/jlog/Prerelease-12.zip
+        URL https://git.redacted.cc/josh/jlog/Prerelease-16.zip
 )
 
 CPMAddPackage(
-        NAME Event
-        URL https://git.redacted.cc/josh/Event/archive/Release-6.zip
-)
-
-CPMAddPackage(
-        NAME ReTexture
-        URL https://git.redacted.cc/Redacted/ReTexture/archive/Release-1.2.zip
+        NAME ReImage
+        URL https://git.redacted.cc/Redacted/ReImage/archive/Release-2.0.zip
 )
 
 if (WIN32)
@@ -62,6 +57,8 @@ if (WIN32)
     )
 endif()
 
+#set(CMAKE_CXX_FLAGS "-O3 -Wall -Wextra")
+
 file(COPY "assets" DESTINATION "${PROJECT_BINARY_DIR}")
 file(GLOB_RECURSE ASSETS  "assets/*")
 file(GLOB_RECURSE HEADERS "include/*.h" "include/*.hpp")
@@ -81,15 +78,17 @@ endif()
 set_target_properties(JGL PROPERTIES LINKER_LANGUAGE CXX)
 
 #Don't expose these ones.
-include_directories(${ReWindow_SOURCE_DIR}/include)
+include_directories(
+        ${ReWindow_SOURCE_DIR}/include
+        ${Event_SOURCE_DIR}/include
+)
 
 target_include_directories(JGL PUBLIC
         ${PROJECT_SOURCE_DIR}/include
         ${OPENGL_INCLUDE_DIRS}
-        ${ReTexture_SOURCE_DIR}/include
+        ${ReImage_SOURCE_DIR}/include
         ${mcolor_SOURCE_DIR}/include
         ${J3ML_SOURCE_DIR}/include
-        ${Event_SOURCE_DIR}/include
         ${glad_SOURCE_DIR}/include
         ${jlog_SOURCE_DIR}/include
 )
@@ -100,13 +99,13 @@ add_executable(JGL_Demo main.cpp)
 if (UNIX AND NOT APPLE)
     target_include_directories(JGL PRIVATE ${FREETYPE_INCLUDE_DIRS})
     target_link_libraries(JGL PRIVATE ${FREETYPE_LIBRARIES})
-    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML glad jlog Event ReTexture)
+    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML glad jlog ReImage)
 endif()
 
 if (WIN32)
     target_include_directories(JGL PRIVATE ${freetype_SOURCE_DIR}/include)
     target_link_libraries(JGL PRIVATE freetype)
-    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML glad jlog Event ReTexture)
+    target_link_libraries(JGL PUBLIC ${OPENGL_LIBRARIES} mcolor J3ML glad jlog ReImage)
 endif()
 
-target_link_libraries(JGL_Demo PUBLIC JGL ReWindowLibrary)
+target_link_libraries(JGL_Demo PUBLIC JGL ReWindowLibrary Event)

include/JGL/JGL.h

@@ -19,6 +19,7 @@
 #include <JGL/types/FontCache.h>
 #include <JGL/types/Font.h>
 #include <JGL/types/RenderTarget.h>
+#include <JGL/types/Light.h>
 #include <J3ML/LinearAlgebra.hpp>
 #include <J3ML/LinearAlgebra/Vector2.hpp>
 #include <J3ML/LinearAlgebra/Vector3.hpp>
@@ -31,27 +32,44 @@ namespace JGL {
     using namespace J3ML::LinearAlgebra;
     using namespace J3ML::Geometry;
 
-    void Update(const Vector2& window_size);
-    inline void PurgeFontCache() { fontCache.purgeCache(); }
-    std::vector<GLfloat> OpenGLPerspectiveProjectionRH(float fovY, float aspect, float z_near, float z_far);
 
+    /// @param window_size
+    void Update(const Vector2& window_size);
+    inline void PurgeFontCache() { JGL::fontCache.purgeCache(); }
+    std::array<GLfloat, 16> OpenGLPerspectiveProjectionRH(float fovY, float aspect, float z_near, float z_far);
+    /// Returns true if the graphics driver meets the requirements (GL Version & Extensions).
+    bool MeetsRequirements();
     /// Drawing functions for primitive 2D Shapes.
     namespace J2D {
         /// Open a 2-D rendering context with the underlying graphics system (In this case&  by default OpenGL).
         /// @note This call may not strictly be necessary on some setups, but is provided to keep the API constant.
         /// It is recommended to always open a JGL 2D context to render your content, then close when completed.
         /// This keeps our code from, say, clobbering the OpenGL rendering context driving 3D content in between our calls.
+        /// @param render_target
+        /// @param clear_buffers
         void Begin(RenderTarget* render_target = nullptr, bool clear_buffers = false);
         /// Closes a 2-D rendering context with the underlying graphics system (In this case&  by default OpenGL).
         /// @see Begin().
         void End();
+        /// Provide a list of lights to be used in 2D space. Typically directly after J2D::Begin();
+        /// 8 lights maximum for now. Some kind of light sorting will eventually be needed per j2d element.
+        void LightArray(Light*, size_t size);
+        void LightArray(std::vector<Light> lights);
 
         /// Plots a single pixel on the screen.
         /// @param color  A 3-or-4 channel color value. @see class Color3, class Color4
         /// @param coordinates The pixel-point on-screen at which to plot the pixel.
+        /// @param radius The size of the point to plot. By default, a single pixel.
         void DrawPoint(const Color4& color, const Vector2& coordinates, float radius = 1.f);
         void DrawPoint(const Color4& color, float x, float y, float radius = 1.f);
 
+        /// Plots a series of pixel-points on the screen, in a batch.
+        /// @note This is more performant for multiple points than plotting them individually.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param points A set of x,y points to render.
+        /// @param radius The size of the point to plot. By default, a single pixel.
+        void DrawPoints(const Color4& color, const Vector2* points, int num_points, float radius = 1.f);
+
         /// Plots a line (segment) on the screen.
         /// @param color A 3-or-4 channel color value. @see classes Color3, Color4.
         /// @param A The starting point of the line segment.
@@ -60,101 +78,229 @@ namespace JGL {
         void DrawLine(const Color4& color, const Vector2& A, const Vector2& B, float thickness = 1);
         void DrawLine(const Color4& color, float x1, float y1, float x2, float y2, float thickness = 1);
 
-        ///Draws a line with a gradient that transitions across it.
+        /// Draws a line with a color gradient that transitions across it.
+        /// @param color_a A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param color_b A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param A The starting point of the line segment.
+        /// @param B The end point of the line segment.
+        /// @param thickness The width at which to render the line.
         void DrawGradientLine(const Color4& color_a, const Color4& color_b, const Vector2& A, const Vector2& B, float thickness = 1);
         void DrawGradientLine(const Color4& color_a, const Color4& color_b, float x, float y, float w, float h, float thickness = 1);
 
         /// Draws an outline of a rectangle on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @param thickness The width at which to render the lines.
         void OutlineRect(const Color4& color, const Vector2& pos, const Vector2& size, float thickness = 1);
 
+        /// Draws an outline of a rectangle with rounded corners onto the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @param radius The corner-rounding radius (in radians).
+        /// @param thickness The width at which to render the lines.
+        void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
+
+        /// Draws an outline of a rectangle with chamfered corners onto the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @param radius The corner-rounding radius (in radians).
+        /// @param thickness The width at which to render the lines.
+        void OutlineChamferRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
+
         /// Draws a filled rectangle on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @see FillRoundedRect, FillGradientRect, FillChamferRect.
         void FillRect(const Color4& color, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle where the color transitions across it.
+        /// @param color1 A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param color2 A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param gradient See enum Direction
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
         void FillGradientRect(const Color4& color1, const Color4& color2, const Direction& gradient, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle with rounded corners on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @param radius The corner-rounding radius (in radians).
+        /// @param subdivisions The amount of sub-divisions (and calculations) to be performed per-arc rounding corner.
         void FillRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, unsigned int subdivisions = 8);
 
-        void DrawRenderTargetAsSprite(const RenderTarget& render_target, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0 , 0),
+        /// Draws a filled rectangle with chamfered (beveled) corners on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param pos The top-left corner of the rectangle.
+        /// @param size The width and height of the rectangle.
+        /// @param radius The corner-rounding radius (in radians).
+        void FillChamferRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5);
+
+
+
+        /// Draws a render-target (runtime-modifiable texture) to the screen.
+        /// @param render_target A RenderTarget instance to be displayed.
+        /// @param position The position at which to render this object from it's center-point, defined by the origin parameter.
+        /// @param rad_rotation The amount of radians to rotate this render-target about it's center-point.
+        /// @param origin The center-point in the image to use for rendering, rotation, and scaling. Top-left is {0,0} and bottom right is {1, 1}.
+        /// @param scale The amount (in both x, and y axis) to scale the image, with {1,1} being default scaling.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param inversion @see Direction
+        void DrawRenderTarget(const RenderTarget& render_target, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0 , 0),
+                              const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawRenderTarget(const RenderTarget* render_target, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0 , 0),
+                              const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+
+
+        /// Draws a sprite (technically, actually a render target) to the screen.
+        /// @note This similar overload exists because we expect someone will be an idiot and turn all of their sprites into RenderTargets. ~william
+        /// @param render_target A RenderTarget instance to be displayed.
+        /// @param position The position at which to render this object from it's center-point, defined by the origin parameter.
+        /// @param rad_rotation The amount of radians to rotate this render-target about it's center-point.
+        /// @param origin The center-point in the image to use for rendering, rotation, and scaling. Top-left is {0,0} and bottom right is {1, 1}.
+        /// @param scale The amount (in both x, and y axis) to scale the image, with {1,1} being default scaling.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param inversion @see Direction
+        /// @see DrawSprite
+        void DrawSprite(const RenderTarget& render_target, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0 , 0),
                 const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawSprite(const RenderTarget* render_target, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0 , 0),
+                        const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+
         /// Draws a sprite to the screen by passing a G̶L̶u̶i̶n̶t̶ JGL Texture that represents a handle to a loaded texture.
-        /// @param texture
-        /// @param position
+        /// @param texture A texture instance to be displayed.
+        /// @param position The point at which to draw the sprite (from the top-left down).
         /// @param origin The center point around which the image should have all transformations applied to it.
         /// @param scale The scale transformation for the image. X and Y axis are independently-scalable.
         /// @param rad_rotation A float representing the rotation of the sprite where 0 is no rotation and 1 is the maximum rotation (would look the same as 0).
-        /// @param color A 32-bit RGBA value represented as four unsigned 8-bit integers.
-        /// @param inversion inverts the texture only.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param inversion @see Direction
         /// @see class Texture
         void DrawSprite(const Texture& texture, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0,0),
                         const Vector2& scale = Vector2(1,1), const Color4& color = Colors::White, Direction inversion = Direction::None);
-        void DrawSprite(const Texture& texture,
-                        float positionX, float positionY,
-                        float rad_rotation = 0,
-                        float originX = 0, float originY = 0,
-                        float scaleX = 1, float scaleY = 1,
-                        const Color4& color = Colors::White,
-                        Direction inversion = Direction::None);
+        void DrawSprite(const Texture* texture, const Vector2& position, float rad_rotation = 0, const Vector2& origin = Vector2(0,0),
+                        const Vector2& scale = Vector2(1,1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawSprite(const Texture& texture, float positionX, float positionY, float rad_rotation = 0, float originX = 0, float originY = 0,
+                        float scaleX = 1, float scaleY = 1, const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawSprite(const Texture* texture, float positionX, float positionY, float rad_rotation = 0,
+                        float originX = 0, float originY = 0,float scaleX = 1, float scaleY = 1,
+                        const Color4& color = Colors::White, Direction inversion = Direction::None);
 
         /// Draws a piece of a sprite to the screen, similar to DrawSprite.
-        /// @param texture
-        /// @param position
+        /// @param texture A texture instance to be displayed.
+        /// @param position The point at which to draw the sprite (from the top-left down).
         /// @param sub_texture_position The top left corner of the sub-texture to be drawn.
         /// @param sub_texture_size The size of the sub-texture in px.
-        /// @param origin
-        /// @param scale
-        /// @param color
-        /// @param inversion
+        /// @param origin The center point around which the image should have all transformations applied to it.
+        /// @param scale The scale transformation for the image. X and Y axis are independently-scalable.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param inversion @see Direction
         void DrawPartialSprite(const Texture& texture, const Vector2& position, const Vector2& sub_texture_position, const Vector2& sub_texture_size, float rad_rotation = 0,
                                const Vector2& origin = Vector2(0,0), const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawPartialSprite(const Texture* texture, const Vector2& position, const Vector2& sub_texture_position, const Vector2& sub_texture_size, float rad_rotation = 0,
+                               const Vector2& origin = Vector2(0,0), const Vector2& scale = Vector2(1, 1), const Color4& color = Colors::White, Direction inversion = Direction::None);
         void DrawPartialSprite(const Texture& texture, float positionX, float positionY, float sub_texture_positionX, float sub_texture_positionY, unsigned int sub_texture_sizeX, unsigned int sub_texture_sizeY,
                                float rad_rotation = 0, float originX = 0, float originY = 0, float scaleX = 1, float scaleY = 1, const Color4& color = Colors::White, Direction inversion = Direction::None);
+        void DrawPartialSprite(const Texture* texture, float positionX, float positionY, float sub_texture_positionX, float sub_texture_positionY, unsigned int sub_texture_sizeX, unsigned int sub_texture_sizeY,
+                               float rad_rotation = 0, float originX = 0, float originY = 0, float scaleX = 1, float scaleY = 1, const Color4& color = Colors::White, Direction inversion = Direction::None);
 
         /// To save v-ram, Use if a sprite would be identical if mirrored horizontally, vertically, or both. For example, a circle.
         /// Assumes the input texture is the top left quadrant. You can use "SoftwareTexture" to invert it correctly so that's the case.
-        /// @param texture
-        /// @param position
+        /// @param texture A texture instance to be displayed.
+        /// @param position The point at which to draw the sprite (from the top-left down).
         /// @param mirror_axis The axes to mirror across, Vertical and Horizontal or both only.
         /// @param rad_rotation The rotation of the final result.
         /// @param origin The point at which transformations are done about.
-        /// @param scale
-        /// @param color
+        /// @param scale The scale transformation for the image. X and Y axis are independently-scalable.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
         void DrawMirrorSprite(const Texture& texture, const Vector2& position, Direction mirror_axis = Direction::Horizontal | Direction::Vertical, float rad_rotation = 0, const Vector2& origin = Vector2(0,0), const Vector2& scale = Vector2(1,1), const Color4& color = Colors::White);
+        void DrawMirrorSprite(const Texture* texture, const Vector2& position, Direction mirror_axis = Direction::Horizontal | Direction::Vertical, float rad_rotation = 0, const Vector2& origin = Vector2(0,0), const Vector2& scale = Vector2(1,1), const Color4& color = Colors::White);
 
         /// Draws an outline of a circle on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param center The point in cartesian space at which to draw the circle. This will by-definition be the centroid of this circle.
+        /// @param radius The radius of the circle to be drawn. AKA Half the diameter.
+        /// @param subdivisions The accuracy of the approximation of the circle, measured in iteration steps taken.
+        /// @param thickness The line-width of the circle to be rendered at.
         void OutlineCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions = 16, float thickness = 1);
 
         /// Draws a filled circle on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param center The point in cartesian space at which to draw the circle. This will by-definition be the centroid of this circle.
+        /// @param radius The radius of the circle to be drawn. AKA Half the diameter.
+        /// @param subdivisions The accuracy of the approximation of the circle, measured in iteration steps taken.
         void FillCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions = 8);
 
         /// Draws an outline of a triangle on the screen.
-        /// @param color
-        /// @param tri
-        /// @param thickness
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param tri The triangle structure / set of 3 points in cartesian space used to draw the triangle.
+        /// @param thickness The line-width of the triangle to be rendered at.
         void OutlineTriangle(const Color4& color, const Triangle2D& tri, float thickness = 1);
         void OutlineTriangle(const Color4& color, const Vector2& triA, const Vector2& triB, const Vector2& triC, float thickness = 1);
 
         /// Draws a filled triangle on the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param tri The triangle structure / set of 3 points in cartesian space used to draw the triangle.
         void FillTriangle(const Color4& color, const Triangle2D& tri);
         void FIllTriangle(const Color4& color, const Vector2& triA, const Vector2& triB, const Vector2& triC);
 
         /// Draws a triangle where each corner is defined by a given color, Smoothly transitioning between them.
+        /// @param a_color
+        /// @param b_color
+        /// @param c_color
+        /// @param tri
         void FillGradientTriangle(const Color4& a_color, const Color4& b_color, const Color4& c_color, const Triangle2D& tri);
 
+        /// Draws a smooth, curved line segment between two control points, with the curve controlled by the two inner points.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param controlA The first control point, which can be considered the start of the line.
+        /// @param pointA The first inner point, which controls the contour of the curve.
+        /// @param pointB The second inner point, which controls the contour of the curve.
+        /// @param controlB The second control point, which can be considered the end of the line.
+        /// @see J3ML::Algorithm::Bezier
         void DrawCubicBezierCurve(const Color4& color, const Vector2& controlA, const Vector2& pointA, const Vector2& pointB, const Vector2& controlB,
                                   int subdivisions = 10, float thickness = 1);
 
+
+        // TODO: Implement OutlinePolygon overload which takes a std::vector of points as well.
+
         /// Draws a series of points where the last point always connects to the first point.
-        void OutlinePolygon(const Color4& color, const std::vector<Vector2>& points, float thickness = 1);
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param points The array of vector2's to draw as a polygon.
+        /// @param points_size The length of the array of vector2's.
+        /// @param thickness The line-width of the polygon
+        void OutlinePolygon(const Color4& color, const Vector2* points, int points_size, float thickness = 1);
 
         /// Draws a text string on the screen with a given point-size and font.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param text The text to be rendered.
+        /// @param x The position on the screen at which to draw the text, from the top-left.
+        /// @param y The position on the screen at which to draw the text, from the top-left.
+        /// @param scale The value (in both axes) to scale the text by. Defaults to {1,1}.
+        /// @param size The point-size at which to render the font out. Re-using the same point-size allows efficient glyph caching.
+        /// @param font The font to use for rendering. @see Font.
         void DrawString(const Color4& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font);
 
+
+        /// Draws an Arc (section of a circle) to the screen.
+        /// @param color A 3-or-4 channel color value. @see class Color3, class Color4
+        /// @param center The point in cartesian space at which to draw the arc. This will by-definition be the centroid of this partial circle.
+        /// @param radius The radius of the partial circle to be drawn. AKA Half the diameter.
+        /// @param arc_begin The point (0 - 2pi) around a unit-circle of which to start the arc.
+        /// @param arc_end The point (0 - 2pi) around a unit-circle of which to start the arc.
+        /// @param subdivisions The accuracy of the approximation of the circle, measured in iteration steps taken.
+        /// @param thickness The line-width to draw the arc with.
+        void DrawArc(const Color4& color, const Vector2& center, float radius, float arc_begin, float arc_end,
+                     unsigned int subdivisions, float thickness);
+
+
         /// TODO Implement the following. These ones are going to be extremely annoying.
         void FillPolygon(const Color4& color, const std::vector<Vector2>& points);
         void FillTexturedPolygon();
-        void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
         void FillTexturedTriangle();
     }
 
@@ -175,7 +321,24 @@ namespace JGL {
         void WireframeCapsule(const Color3& color, const Capsule& cap, float thickness = 1);
         void FillTriangleMesh(const Color3& color, const TriangleMesh& mesh);
         void WireframeTriangleMesh(const Color3& color, const TriangleMesh& mesh, float thickness = 1);
+
+        /// Draws a string of text in 3D space, with an arbitrary rotation.
+        /// @param color
+        /// @param text
+        /// @param pos
+        /// @param scale
+        /// @param size
+        /// @param font
+        /// @param angle
+        /// @param draw_back_face
         void DrawString(const Color4& color, const std::string& text, const Vector3& pos, float scale, u32 size, const Font& font, const EulerAngle& angle = {0, 0, 0}, bool draw_back_face = false);
+
+        /// Draws a string of text in 3D space that is always facing the exact direction of the camera projection.
+        void DrawBillboardString();
+
+        /// Draws a texture sprite in 3D space that is always facing the exact direction of the camera projection.
+        void DrawBillboardSprite();
+
         void DrawSprite();
         void DrawMatrixGizmo     (const Matrix3x3&, const Vector3&);
         void DrawMatrixGizmo     (const Matrix4x4&);

include/JGL/types/Enums.h

@@ -17,7 +17,7 @@ namespace JGL {
         return (u8)a & (u8)b;
     }
 
-    static std::string to_string(JGL::Direction direction) {
+    static std::string to_string(const JGL::Direction& direction) {
         switch (direction) {
             case JGL::Direction::None:
                 return "None";
@@ -33,4 +33,40 @@ namespace JGL {
                 return "Unknown";
         }
     }
+
+    enum class MSAA_SAMPLE_RATE : u8 {
+        MSAA_NONE = 0,
+        MSAA_2X = 1,
+        MSAA_4X = 2,
+        MSAA_8X = 3
+    };
+
+    static std::string to_string(const JGL::MSAA_SAMPLE_RATE& sample_rate) {
+        switch (sample_rate) {
+            case MSAA_SAMPLE_RATE::MSAA_NONE:
+                return "No MSAA";
+            case MSAA_SAMPLE_RATE::MSAA_2X:
+                return "MSAA 2x";
+            case MSAA_SAMPLE_RATE::MSAA_4X:
+                return "MSAA 4x";
+            case MSAA_SAMPLE_RATE::MSAA_8X:
+                return "MSAA 8x";
+            default:
+                return "Unknown";
+        }
+    }
+    static int to_int(const JGL::MSAA_SAMPLE_RATE& sample_rate) {
+        switch (sample_rate) {
+            case MSAA_SAMPLE_RATE::MSAA_NONE:
+                return 0;
+            case MSAA_SAMPLE_RATE::MSAA_2X:
+                return 2;
+            case MSAA_SAMPLE_RATE::MSAA_4X:
+                return 4;
+            case MSAA_SAMPLE_RATE::MSAA_8X:
+                return 8;
+            default:
+                return 0;
+        }
+    }
 }

include/JGL/types/FontCache.h

@@ -26,7 +26,7 @@ public:
 
     //CachedGlyph(GLuint texture_id, char c);
     CachedGlyph(char c, std::array<GLfloat, 12> texcoords, float x2o, float y2o, float w, float h, float advX, float advY);
-    char getCharacter();
+    char getCharacter() const;
     [[nodiscard]] std::array<GLfloat, 12> getTexCoords() const;
 };
 
@@ -38,16 +38,19 @@ private:
     GLsizei texture_width = 0, texture_height = 0;
     unsigned int font_size = 0;
     unsigned int font_index = 0;
+    void Erase();
 public:
     void appendGlyph(CachedGlyph* glyph);
-    unsigned int getFontSize();
-    unsigned int getFontIndex();
+    unsigned int getFontSize() const;
+    unsigned int getFontIndex() const;
     CachedGlyph* getGlyph(char c);
     std::unordered_map<char, CachedGlyph*> getGlyphs();
-    const GLuint* getTexture();
+    const GLuint* getTextureHandle();
     [[nodiscard]] GLsizei getTextureWidth() const;
     [[nodiscard]] GLsizei getTextureHeight() const;
+public:
     CachedFont(GLuint texture_id, GLsizei texture_width, GLsizei texture_height, unsigned int font_size, unsigned int font_index);
+    ~CachedFont();
 };
 
 class JGL::FontCache {

include/JGL/types/Light.h

@@ -0,0 +1,30 @@
+#pragma once
+#include <J3ML/LinearAlgebra/Vector4.hpp>
+#include <J3ML/LinearAlgebra/Vector3.hpp>
+#include <Color4.hpp>
+
+namespace JGL {
+    class Light;
+    class OmnidirectionalLight2D;
+    class PointLight2D;
+}
+
+class JGL::Light {
+private:
+    /// W in position seems to determine whether or not the light is omni-directional. 1 = omni 0 = point.
+    /// Position is un-normalized screen space. For ex 500, 500, 1 for a light coming from where you're sitting.
+    Vector4 position = {0, 0, 0, 1};
+    Color4 ambient = {0, 0, 0, 0};
+    Color4 diffuse = {0, 0, 0, 0};
+    Color4 specular = {0, 0, 0, 0};
+public:
+    Light(const Vector3& position, const Color4& ambient, const Color4& diffuse, const Color4& specular);
+    Vector3 GetNormalizedSceenSpaceCoordinates() const;
+};
+
+class JGL::OmnidirectionalLight2D {
+private:
+public:
+    OmnidirectionalLight2D(const Vector3& position, const Color4& ambient, const Color4& diffuse, const Color4& specular);
+
+};

include/JGL/types/Material.h

@@ -0,0 +1,4 @@
+/// A simple wrapper for OpenGL materials. Lets you set things such as the "shininess" of your elements.
+class Material {
+
+};

include/JGL/types/RenderTarget.h

@@ -1,11 +1,13 @@
 #pragma once
 #include <glad/glad.h>
-#include <JGL/types/Texture.h>
 #include <Color4.hpp>
 #include <Colors.hpp>
+#include <JGL/types/Enums.h>
+#include <J3ML/LinearAlgebra/Vector2.hpp>
 
 namespace JGL {
     class RenderTarget;
+    class Texture; // Forward declare.
 }
 
 class JGL::RenderTarget {
@@ -14,24 +16,51 @@ private:
     /// "Size" in this sense is the "Renderable Area" because OpenGL textures behave strangely if they're not square.
     Vector2 size{0, 0};
     bool using_depth = false;
+    bool texture_created_by_us = false;
     GLuint framebuffer_object = 0;
     GLuint depth_buffer = 0;
-    Texture* texture = nullptr;
+    const Texture* texture = nullptr;
+    MSAA_SAMPLE_RATE msaa_sample_rate = MSAA_SAMPLE_RATE::MSAA_NONE;
+    GLuint msaa_framebuffer_object = 0;
+    GLuint msaa_depth_buffer = 0;
+    GLuint msaa_render_buffer = 0;
+    void Erase();
 public:
     static GLuint GetActiveGLFramebufferHandle();
     static void SetActiveGLRenderTarget(const RenderTarget& render_target);
+
+    /** Change the size of the renderable area of the Render Target. **/
+    /// @param new_size new size in px.
+    void Resize(const Vector2& new_size);
+    void SetMSAAEnabled(MSAA_SAMPLE_RATE sample_rate);
+    /// If you're using raw OpenGL commands to draw to this outside of J2D or J3D don't forget to do this.
+    /// Blits the MSAA FBO onto the regular FBO if MSAA is enabled and or If you're rendering to a texture which uses mipmaps,
+    /// It regenerates them so what you drew doesn't disappear at a distance. Otherwise it does nothing.
+    void Blit() const;
+
+    /// Blit a render target onto another. Will break if they're not the same size.
+    static void Blit(const RenderTarget& source, RenderTarget* destination);
+    [[nodiscard]] bool TextureCreatedByRenderTarget() const;
 public:
     [[nodiscard]] Vector2 GetDimensions() const;
-    [[nodiscard]] Texture* GetJGLTexture() const;
+    [[nodiscard]] MSAA_SAMPLE_RATE GetMSAASampleRate() const;
+    /// Returns whether or not MSAA is enabled, If it is and you're not using J2D || J3D Begin / End,
+    /// You need to run "Blit()" after rendering to your FBO before you show it.
+    /// @note Also, If the texture wasn't made by the RenderTarget you don't want this. It would destroy the texture.
+    [[nodiscard]] bool MSAAEnabled() const;
+    [[nodiscard]] const Texture* GetJGLTexture() const;
     [[nodiscard]] GLuint GetGLTextureHandle() const;
     [[nodiscard]] GLuint GetGLFramebufferObjectHandle() const;
     [[nodiscard]] GLuint GetGLDepthBufferHandle() const;
     [[nodiscard]] Color4 GetClearColor() const;
+    /// Get the data back from the FBO. This is *not* async friendly.
+    [[nodiscard]] std::vector<GLfloat> GetData() const;
 public:
-    /// Create a render target for a texture that already exists. For decals.
-    explicit RenderTarget(const Texture& texture, const Color4& clear_color = Colors::Black, bool use_depth = false);
+    /// Copy constructor. Will always set "texture_created_by_us" to true and use our own texture to avoid memleaks.
+    RenderTarget(const RenderTarget& rhs);
+    /// Create a render target for a texture that already exists. For adding to an existing texture.
+    explicit RenderTarget(const Texture* texture, const Color4& clear_color = Colors::Black);
     /// Create a Render Target with a brand new texture. Want to render JGL elements onto a texture and display it as a sprite?
-    explicit RenderTarget(const Vector2& size,  const Color4& clear_color = Colors::Black, bool use_depth = false);
-
-    void Erase();
+    explicit RenderTarget(const Vector2& size, const Color4& clear_color = Colors::Black, bool use_depth = false, MSAA_SAMPLE_RATE sample_rate = MSAA_SAMPLE_RATE::MSAA_NONE);
+    ~RenderTarget();
 };

include/JGL/types/Texture.h

@@ -1,12 +1,12 @@
 #pragma once
-#include <ReTexture/Texture.h>
+#include <ReImage/Image.h>
 #include <J3ML/LinearAlgebra.hpp>
 #include <Color3.hpp>
 #include <Color4.hpp>
 #include <glad/glad.h>
 
 namespace JGL {
-    using namespace ReTexture;
+    using namespace ReImage;
     enum class TextureFilteringMode : u8 {
         NEAREST = 0, //Fastest for 2D, Sometimes causes graphical issues.
         BILINEAR = 1, //Fast and pretty, The best for 2D.
@@ -25,22 +25,25 @@ namespace JGL {
 
     /// Represents texture data loaded on the GPU. Contains a handle that can be passed to OpenGL draw calls.
     class Texture {
+    private:
+        void Erase();
     protected:
         GLuint texture_handle = 0;
         Vector2 texture_size = {0, 0};
-        ReTexture::TextureFlag texture_flags;
-        ReTexture::TextureFormat texture_format;
+        ReImage::TextureFlag texture_flags;
+        ReImage::TextureFormat texture_format;
         TextureFilteringMode texture_filtering_mode;
         TextureWrappingMode texture_wrapping_mode;
-        void load(SoftwareTexture* software_texture, const Vector2& size, const TextureFormat& format, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode);
+        void load(Image* software_texture, const Vector2& size, const TextureFormat& format, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode);
     public:
-        ///Load a texture from a file,
-        explicit Texture(const std::string& file, TextureFilteringMode filtering_mode = TextureFilteringMode::BILINEAR, TextureWrappingMode wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE);
-        Texture(const std::string& file, const TextureFlag& flags, TextureFilteringMode filtering_mode = TextureFilteringMode::BILINEAR, TextureWrappingMode wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE);
+        /// Load a texture from a file,
+        explicit Texture(const std::string& file, TextureFilteringMode filtering_mode = TextureFilteringMode::BILINEAR, TextureWrappingMode wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE, const TextureFlag& flags = TextureFlag::INVERT_Y);
+        Texture(Image* software_texture, const Vector2& size, const TextureFormat& format, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode);
         /* Initialize a texture filled with trash data
         this is primarily for the RenderTarget */
         explicit Texture(const Vector2& size);
-        Texture() = default;
+        Texture(const Texture& rhs);
+        ~Texture();
     public:
         [[nodiscard]] GLuint GetGLTextureHandle() const;
         [[nodiscard]] Vector2 GetDimensions() const;
@@ -49,9 +52,6 @@ namespace JGL {
         [[nodiscard]] TextureFlag GetFlags() const;
         [[nodiscard]] TextureFormat GetFormat() const;
         [[nodiscard]] std::vector<Color4> GetPixelData() const;
-
-        void SetTextureHandle(GLuint handle);
-        void Erase();
     };
 
 }

include/JGL/types/VRamList.h

@@ -1,68 +1,68 @@
 #pragma once
+#include <vector>
 #include <glad/glad.h>
 #include <J3ML/LinearAlgebra/Vector2.hpp>
+#include <J3ML/LinearAlgebra/Vector2i.hpp>
 #include <J3ML/LinearAlgebra/Vector3.hpp>
 #include <J3ML/LinearAlgebra/Vector4.hpp>
-#include <JGL/logger/logger.h>
-#include <type_traits>
-#include <vector>
-#include <cstring>
-#include <string>
 
 namespace JGL {
     class VRamList;
 }
 
-/// A wrapper for VBO, Storing texture coordinates or vertices or indices in vram.
+/// A wrapped for "Vertex Buffer Object" In OpenGL, Store things in VRam.
 class JGL::VRamList {
 private:
     GLuint list_handle = 0;
-    long size = 0;
+    long num_elements = 0;
     bool element_array_buffer = false;
-
     void load(const GLfloat* data, const long& size);
     void load(const GLuint* data, const long& size);
+    void SetData(void* data, const long& length);
+    void UpdateData(void* data, const long& offset, const long& length);
+    void Erase();
 public:
-    VRamList() = default;
-    VRamList(const GLfloat* data, const long& size);
-    VRamList(Vector2* data, const long& size);
-    VRamList(Vector3* data, const long& size);
-    VRamList(Vector4* data, const long& size);
-    VRamList(const GLuint* data, const long& size);
+    VRamList(const GLuint* data, const long& length);
+    VRamList(const GLfloat* data, const long& length);
+    VRamList(Vector2* data, const long& length);
+    VRamList(Vector3* data, const long& length);
+    VRamList(Vector4* data, const long& length);
+
+    ~VRamList();
+    /** Copying around the VBO data to a new VBO like this is slow.
+     * Pass to function by const reference or pointer always. */
+    VRamList(const VRamList& rhs);
+
 public:
     [[nodiscard]] GLuint GetHandle() const;
-    /// Returns the number of GLfloat or GLuint in the list.
-    [[nodiscard]] long GetSize() const;
+    /// Returns the number of elements in the list.
+    [[nodiscard]] long GetLength() const;
     /// Returns the size of the data in bytes.
-    [[nodiscard]] long GetDataSize() const;
-    [[nodiscard]] bool IsIntegerArray() const;
+    [[nodiscard]] size_t GetSize() const;
+    /** Get VBO data back from the GPU. This is *bad* because the CPU is going to wait
+    * for the transfer to finish. Has limited use other than testing. */
+    [[nodiscard]] std::vector<GLfloat> GetDataF() const;
+    [[nodiscard]] std::vector<GLuint> GetDataUI() const;
     [[nodiscard]] bool IsFloatArray() const;
-    void Erase();
+    /** Replace the data of an existing VBO in it's entirety. Must be same type.
+      * "length" refers to the number of elements in data. Not the number of bytes. */
+    void SetData(const GLfloat* data, const long& length);
+    void SetData(const Vector2* data, const long& length);
+    void SetData(const Vector3* data, const long& length);
+    void SetData(const Vector4* data, const long& length);
 
-    /// Get list data back from the GPU. This is *very* slow.
-    /// It's not recommended you use this in your normal rendering routines.
-    template <typename T>
-    [[nodiscard]] std::vector<T> GetListData() const {
-        GLenum buffer_type;
-        GLint current_buffer = 0;
+    void SetData(const GLuint* data, const long& length);
+    void SetData(const Vector2i* data, const long& length);
 
-        if constexpr (std::is_same<T, GLfloat>::value)
-            buffer_type = GL_ARRAY_BUFFER,
-            glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &current_buffer);
-        else if constexpr (std::is_same<T, GLuint>::value)
-            buffer_type = GL_ELEMENT_ARRAY_BUFFER,
-            glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &current_buffer);
-        else {
-            Logger::Fatal("Typename T must be either GLfloat or GLuint.");
-            exit(-1);
-        }
+    /** Update only a portion of the data in a VBO. Must be same type.
+     * "length" refers to the number of elements in data. Not the number of bytes.
+     * "offset" refers the number of Typename T into the buffer the data you want to change is.
+     * For ex, offset 0 and length of 1 overwrites the first value. Offset 1 the second etc */
+     void UpdateData(const GLfloat* data, const long& offset, const long& length);
+     void UpdateData(const Vector2* data, const long& offset, const long& length);
+     void UpdateData(const Vector3* data, const long& offset, const long& length);
+     void UpdateData(const Vector4* data, const long& offset, const long& length);
 
-        glBindBuffer(buffer_type, list_handle);
-        std::vector<T> data(size);
-        memcpy(data.data(), (T*) glMapBuffer(buffer_type, GL_READ_ONLY), size * sizeof(T));
-        glUnmapBuffer(buffer_type);
-        glBindBuffer(buffer_type, current_buffer);
-
-        return data;
-    }
+     void UpdateData(const GLuint* data, const long& offset, const long& length);
+     void UpdateData(const Vector2i* data, const long& offset, const long& length);
 };

main.cpp

@@ -1,15 +1,16 @@
-
 #include <JGL/JGL.h>
 #include <rewindow/types/window.h>
 #include <Colors.hpp>
 #include <chrono>
 #include <J3ML/LinearAlgebra/Vector2.hpp>
+#include <JGL/logger/logger.h>
 
 using J3ML::LinearAlgebra::Vector2;
 using namespace JGL;
 
 JGL::Font FreeSans;
 JGL::Font Jupiteroid;
+float fps = 0.0f;
 
 class Gizmo
 {
@@ -37,6 +38,8 @@ public:
     }
 
     void Draw() {
+
+
         if (dragging)
             J2D::DrawPoint(Colors::White, position, 4.f);
         else if (hovered)
@@ -45,6 +48,8 @@ public:
             J2D::DrawPoint(Colors::Reds::Salmon, position, 3.f);
 
         J2D::DrawString(Colors::White, std::format("{:.1f},{:.1f}", position.x, position.y), position.x, position.y, 1.f, 10, FreeSans);
+
+
     }
 };
 
@@ -92,15 +97,19 @@ Gizmo c({350, 300});
 Gizmo d({450, 250});
 
 Texture* image;
+Texture* image2;
 RenderTarget* j2d_render_target;
+RenderTarget* image2_render_target;
 
 class JGLDemoWindow : public ReWindow::RWindow
 {
 public:
     void initGL() {
         camera = new Camera;
-
         gladLoadGL();
+        if (!JGL::MeetsRequirements())
+            Logger::Warning("The graphics driver does not meet the minimum requirements to run this program.");
+
         JGL::InitTextEngine();
         JGL::Update(getSize());
         J3D::Init(getSize(), 90, 100);
@@ -112,19 +121,22 @@ public:
         glDepthFunc(GL_LESS);
         glDepthMask(GL_TRUE);
         image = new Texture("assets/sprites/Re3D.png", TextureFilteringMode::BILINEAR);
-        j2d_render_target = new RenderTarget({500, 500}, {255,0,0,0});
+        j2d_render_target = new RenderTarget({540, 540}, {0,0,0,0}, false, MSAA_SAMPLE_RATE::MSAA_NONE);
+        image2 = image;
+        image2_render_target = new RenderTarget(image2);
+
+        J2D::Begin(image2_render_target);
+            J2D::DrawString(Colors::Red, "TEST", 0, 16, 1, 16, FreeSans);
+            J2D::FillRect(Colors::Blue, {0,0}, {4,4});
+        J2D::End();
     }
 
     Vector3 textAngle = {0,0,0};
     float fov = 90;
     float sprite_radians = 0;
     bool fov_increasing = true;
-    std::chrono::high_resolution_clock::time_point start;
-    float fps = 0.0f;
 
     void display() {
-        start = std::chrono::high_resolution_clock::now();
-
         JGL::Update(getSize());
         if (fov_increasing)
             fov += 0.25;
@@ -153,20 +165,21 @@ public:
             J3D::DrawString(Colors::Red, "JGL Sample Text", {-0.33, -0.1, 1.0f}, 1.f, 32, FreeSans, textAngle, true);
         J3D::End();
 
-
-        J2D::Begin();
+        J2D::Begin(j2d_render_target, true);
             J2D::FillRect(Colors::Blue, {0,52}, {100,100});
-            J2D::DrawSprite(*image, {300, 300}, 0, {0,0}, {1, 1}, Colors::White, Direction::Vertical | Direction::Horizontal);
-            J2D::DrawMirrorSprite(*image, {400, 300}, Direction::Horizontal | Direction::Vertical, sprite_radians, {0.5,0.5}, {1, 1}, Colors::White);
-            J2D::DrawPartialSprite(*image, {225, 300}, image->GetDimensions() * 0.25, image->GetDimensions() * 0.75, sprite_radians, {0.5, 0.5});
+            J2D::DrawSprite(image2, {300, 400}, sprite_radians * 0.10f, {0.5,0.5}, {1, 1}, Colors::White);
+            J2D::DrawMirrorSprite(image, {400, 300}, Direction::Horizontal | Direction::Vertical, sprite_radians, {0.5,0.5}, {1, 1}, Colors::White);
+            J2D::DrawPartialSprite(image, {225, 300}, image->GetDimensions() * 0.25, image->GetDimensions() * 0.75, sprite_radians, {0.5, 0.5}, {1,1}, Colors::White);
             J2D::FillRect(Colors::Pinks::HotPink, {68, 120}, {32, 32});
             J2D::FillGradientRect(Colors::Red, Colors::Blue, Direction::Diagonal_SWNE, {100,52}, {100,100});
             J2D::FillRoundedRect(Colors::Red, {200, 52}, {100, 100}, 8, 8);
             J2D::FillRoundedRect(Colors::Purples::BlueViolet, {300, 52}, {100, 100}, 8, 4);
-
             J2D::FillCircle(Colors::White, {52, 204}, 50, 24);
             J2D::OutlineCircle(Colors::White, {153, 204}, 50, 24);
 
+            J2D::FillChamferRect(Colors::Reds::LightSalmon, {150, 400}, {64, 64}, 5);
+            J2D::OutlineRoundedRect(Colors::Reds::LightCoral, {250, 350}, {128, 128}, 10, 2);
+            std::vector<Vector2> points = {{1,1}, {4,4}, {8,8}, {16,16}, {32,32}};
             J2D::FillGradientTriangle(Color4(Colors::Red), Color4(Colors::Green), Color4(Colors::Blue), {{0, 275}, {0, 375}, {100, 375}});
             J2D::OutlineTriangle(Colors::Blue, {{100, 275}, {0, 275}, {100, 375}});
             J2D::DrawGradientLine(Colors::Red, Colors::Blue, {105, 375}, {200, 275}, 2);
@@ -177,7 +190,8 @@ public:
             J2D::DrawString(Colors::White, "Position: " + std::to_string(camera->position.x) + " " + std::to_string(camera->position.y) + " " + std::to_string(camera->position.z), 0, 16, 1,16, Jupiteroid);
             J2D::DrawString(Colors::White, "ViewAngle: " + std::to_string(camera->angle.x) + " " + std::to_string(camera->angle.y) + " " + std::to_string(camera->angle.z), 0, 33, 1,16, Jupiteroid);
             J2D::DrawString(Colors::White, "Framerate: " + std::to_string((int) fps), 0, 48, 1, 16, Jupiteroid);
-            J2D::OutlinePolygon(Colors::White, {{200, 400}, {220, 420}, {220, 430}, {230, 410}, {200, 400}});
+            std::array<Vector2, 5> polygon = {Vector2(200, 400), {220, 420}, {220, 430}, {230, 410}, {200, 400}};
+            J2D::OutlinePolygon(Colors::White, polygon.data(), polygon.size());
             //J2D::FillPolygon(Colors::White, {{200, 400}, {220, 420}, {220, 430}, {230, 410}, {200, 400}});
             J2D::DrawCubicBezierCurve(Colors::Blues::CornflowerBlue,
                                       a.position,
@@ -193,15 +207,12 @@ public:
         J2D::End();
 
         //Draw the Render Target that we just drew all that stuff onto.
-        /*
-        J2D::Begin();
-            J2D::DrawRenderTargetAsSprite(*j2d_render_target, {0, 0}, 0, {0.5, 0.5}, {1,1}, Colors::White);
-        J2D::End();
-         */
 
-        std::chrono::high_resolution_clock::time_point stop = std::chrono::high_resolution_clock::now();
-        std::chrono::duration<float> frame_time = stop - start;
-        fps = 1.0f / frame_time.count();
+        J2D::Begin();
+            J2D::DrawSprite(j2d_render_target, {0, 0}, 0, {0.5, 0.5}, {1,1}, Colors::White);
+            J2D::DrawSprite(image2_render_target, {300, 500}, 0, {0.5, 0.5}, {1,1}, Colors::White);
+        J2D::End();
+
     }
 
     void OnRefresh(float elapsed) override {
@@ -247,11 +258,15 @@ int main(int argc, char** argv) {
     window->Open();
     window->initGL();
     window->setResizable(true);
-    window->setVsyncEnabled(true);
+    window->setVsyncEnabled(false);
 
     while (window->isAlive()) {
+        std::chrono::high_resolution_clock::time_point start = std::chrono::high_resolution_clock::now();
         window->pollEvents();
         window->refresh();
+        std::chrono::high_resolution_clock::time_point stop = std::chrono::high_resolution_clock::now();
+        std::chrono::duration<float> frame_time = stop - start;
+        fps = 1.0f / frame_time.count();
     }
     return 0;
 }

src/JGL.cpp

@@ -18,6 +18,7 @@ bool inJ2D = false;
 bool inJ3D = false;
 bool wasTexture2DEnabled = false;
 bool wasTextureCoordArrayEnabled = false;
+
 bool wasDepthTestEnabled = false;
 bool wasVertexArraysEnabled = false;
 bool wasCullFaceEnabled = false;
@@ -34,6 +35,14 @@ namespace JGL {
         glViewport(0, 0, (int) wS.x, (int) wS.y);
     }
 
+    bool MeetsRequirements() {
+        if (!GLAD_GL_VERSION_2_1)
+            return false;
+        if (!GLAD_GL_ARB_framebuffer_object)
+            return false;
+        return true;
+    }
+
 #pragma region J2D
     void J2D::Begin(RenderTarget* rt, bool clear_buffers) {
         GLfloat old_clear_color[4];
@@ -43,6 +52,9 @@ namespace JGL {
             glGetIntegerv(GL_VIEWPORT, viewport);
             current_fbo = JGL::RenderTarget::GetActiveGLFramebufferHandle();
             JGL::RenderTarget::SetActiveGLRenderTarget(*rt);
+
+            if (!(rt->GetJGLTexture()->GetFlags() & INVERT_Y))
+                Logger::Warning("You're rendering onto a texture that is upside-down. Your draw commands won't work how you'd expect.");
         }
         glMatrixMode(GL_PROJECTION);
         glPushMatrix();
@@ -94,17 +106,13 @@ namespace JGL {
         else
             wasBlendEnabled = true;
 
-        if (!glIsEnabled(GL_TEXTURE_2D))
-            wasTexture2DEnabled = false,
-            glEnable(GL_TEXTURE_2D);
-        else
-            wasTexture2DEnabled = true;
+        if (glIsEnabled(GL_TEXTURE_2D))
+            wasTexture2DEnabled = true,
+            glDisable(GL_TEXTURE_2D);
 
-        if (!glIsEnabled(GL_TEXTURE_COORD_ARRAY))
-            wasTextureCoordArrayEnabled = false,
-            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        else
+        if (glIsEnabled(GL_TEXTURE_COORD_ARRAY))
             wasTextureCoordArrayEnabled = true;
+            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
         if (glIsEnabled(GL_COLOR_ARRAY))
             wasColorArrayEnabled = true,
@@ -114,7 +122,7 @@ namespace JGL {
 
         if (!inJ3D)
             inJ2D = true;
-        else { Logger::Error("Attempt to Begin J2D inside of J3D context."); }
+        else { Logger::Error("Beginning J2D context inside of J3D context?"); }
 
         if (rt != nullptr && clear_buffers) {
             glClearColor(rt->GetClearColor().R(), rt->GetClearColor().G(), rt->GetClearColor().B(), rt->GetClearColor().A());
@@ -141,11 +149,11 @@ namespace JGL {
         if (!wasBlendEnabled)
             glDisable(GL_BLEND);
 
-        if (!wasTexture2DEnabled)
-            glDisable(GL_TEXTURE_2D);
+        if (wasTexture2DEnabled)
+            glEnable(GL_TEXTURE_2D);
 
-        if (!wasTextureCoordArrayEnabled)
-            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        if (wasTextureCoordArrayEnabled)
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
         if (wasColorArrayEnabled)
             glEnableClientState(GL_COLOR_ARRAY);
@@ -157,6 +165,7 @@ namespace JGL {
         glColor4fv(oldColor);
 
         if (render_target != nullptr) {
+            render_target->Blit();
             render_target = nullptr;
             glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
             glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
@@ -168,11 +177,9 @@ namespace JGL {
         if (!inJ2D)
             Logger::Error("Drawing J2D element before J2D begin.");
 
-        Vector2 vertices[] = {coordinates};
-
         glPointSize(radius);
         glColor4ubv(color.ptr());
-        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), coordinates.ptr());
         glDrawArrays(GL_POINTS, 0, 1);
         glColor4fv(baseColor);
     }
@@ -288,24 +295,78 @@ namespace JGL {
         J2D::FillCircle(color, {pos.x + size.x - radius, pos.y + size.y - radius}, radius, subdivisions);
     }
 
-    void
-    J2D::DrawRenderTargetAsSprite(const JGL::RenderTarget& rt, const Vector2& position, float rad_rotation, const Vector2& origin,
+    void J2D::DrawSprite(const Texture* texture, float positionX, float positionY, float rad_rotation,
+                         float originX, float originY,float scaleX, float scaleY,
+                         const Color4& color, Direction inversion) {
+        DrawSprite(*texture, {positionX, positionY}, rad_rotation, {originX, originY}, {scaleX, scaleY}, color, inversion);
+    }
+    void J2D::DrawSprite(const Texture* texture, const Vector2& position, float rad_rotation, const Vector2& origin,
+                         const Vector2& scale, const Color4& color, Direction inversion) {
+
+        DrawSprite(*texture, position, rad_rotation, origin, scale, color, inversion);
+    }
+
+    void J2D::DrawPartialSprite(const Texture* texture, const Vector2& position, const Vector2& sub_texture_position,
+                                const Vector2& sub_texture_size, float rad_rotation, const Vector2& origin,
+                                const Vector2& scale, const Color4& color, Direction inversion) {
+        DrawPartialSprite(*texture, position, sub_texture_position, sub_texture_size, rad_rotation, origin, scale, color, inversion);
+
+    }
+
+    void J2D::DrawPartialSprite(const Texture* texture, float positionX, float positionY, float sub_texture_positionX,
+                                float sub_texture_positionY, unsigned int sub_texture_sizeX,
+                                unsigned int sub_texture_sizeY, float rad_rotation, float originX, float originY,
+                                float scaleX, float scaleY, const Color4& color, Direction inversion) {
+        DrawPartialSprite(*texture, {positionX, positionY}, {sub_texture_positionX, sub_texture_positionY}, {(float) sub_texture_sizeX, (float) sub_texture_sizeY},
+                          rad_rotation, {originX, originY}, {scaleX, scaleY}, color, inversion);
+    }
+
+    void J2D::DrawMirrorSprite(const Texture* texture, const Vector2& position, Direction mirror_axis, float rad_rotation,
+                               const Vector2& origin, const Vector2& scale, const Color4& color) {
+        DrawMirrorSprite(*texture, position, mirror_axis, rad_rotation, origin, scale, color);
+    }
+
+    void J2D::DrawSprite(const RenderTarget* render_target, const Vector2& position, float rad_rotation,
+                         const Vector2& origin, const Vector2& scale, const Color4& color, Direction inversion) {
+        DrawSprite(*render_target, position, rad_rotation, origin, scale, color, inversion);
+    }
+
+    void J2D::DrawRenderTarget(const RenderTarget* render_target, const Vector2& position, float rad_rotation,
+                               const Vector2& origin, const Vector2& scale, const Color4& color, Direction inversion) {
+        DrawSprite(*render_target, position, rad_rotation, origin, scale, color, inversion);
+    }
+
+    void J2D::DrawRenderTarget(const RenderTarget& render_target, const Vector2& position, float rad_rotation,
+                               const Vector2& origin, const Vector2& scale, const Color4& color, Direction inversion) {
+        DrawSprite(render_target, position, rad_rotation, origin, scale, color, inversion);
+    }
+
+    void J2D::DrawSprite(const JGL::RenderTarget& rt, const Vector2& position, float rad_rotation, const Vector2& origin,
                                   const Vector2& scale, const Color4& color, Direction inversion) {
 
         //Correct for the render-target being upside-down.
         Direction d{};
-        if (inversion == Direction::None)
+        if (inversion == Direction::None && !(rt.GetJGLTexture()->GetFlags() & INVERT_Y))
             d = Direction::Vertical;
-        else if (inversion == Direction::Horizontal)
-            d = Direction::Horizontal | Direction::Vertical;
-        else if (inversion& Direction::Horizontal && inversion& Direction::Vertical)
+        else if (inversion == Direction::Horizontal) {
             d = Direction::Horizontal;
+            if (!(rt.GetJGLTexture()->GetFlags() & INVERT_Y))
+                d = Direction::Horizontal | Direction::Vertical;
+        }
+        else if (inversion& Direction::Horizontal && inversion& Direction::Vertical) {
+            d = Direction::Horizontal;
+            if (!(rt.GetJGLTexture()->GetFlags() & INVERT_Y))
+                d = Direction::Horizontal | Direction::Vertical;
+        }
 
         //Change the blending mode such that the alpha doesn't get multiplied again.
-        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        //J2D::DrawSprite(*rt.GetJGLTexture(), position, rad_rotation, origin, scale, color, d);
+        if (rt.TextureCreatedByRenderTarget())
+            glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
         J2D::DrawPartialSprite(*rt.GetJGLTexture(), position, {0, 0}, rt.GetDimensions(), rad_rotation, origin, scale, color, d);
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+        if (rt.TextureCreatedByRenderTarget())
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
     void J2D::DrawSprite(const Texture& texture, const Vector2& pos, float rad_rotation, const Vector2& origin,
                          const Vector2& scale, const Color4& color, Direction inversion) {
@@ -315,7 +376,11 @@ namespace JGL {
 
         const Vector2 size = texture.GetDimensions();
 
-        std::array<Vector2, 4> textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(1, 0)};
+        std::array<Vector2, 4> textureCoordinates{};
+        if (texture.GetFlags() & INVERT_Y)
+            textureCoordinates = {Vector2(0, 1), Vector2(0, 0), Vector2(1, 0), Vector2(1, 1)};
+        else
+            textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(1, 0)};
 
         // TODO: Kind of a mess, refactor to be more sensible later.
         // Factors in scaling and origin correctly.
@@ -344,21 +409,24 @@ namespace JGL {
                      pos2.y + offset.y * scale.y
                     };
 
+        if (inversion == Direction::Vertical)
+            std::swap(textureCoordinates[0], textureCoordinates[1]),
+            std::swap(textureCoordinates[3], textureCoordinates[2]);
+        if (inversion == Direction::Horizontal)
+            std::swap(textureCoordinates[0], textureCoordinates[3]),
+            std::swap(textureCoordinates[1], textureCoordinates[2]);
 
-        if (inversion& Direction::Vertical)
-            textureCoordinates = {Vector2(0, 1), Vector2(0, 0), Vector2(1, 0), Vector2(1, 1)};
-        if (inversion& Direction::Horizontal)
-            textureCoordinates = {Vector2(1, 0), Vector2(1, 1), Vector2(0, 1), Vector2(0, 0)};
-        if ((inversion& Direction::Horizontal) && (inversion& Direction::Vertical))
-            textureCoordinates = {Vector2(1, 1), Vector2(1, 0), Vector2(0, 0), Vector2(0, 1)};
-
-        glColor4ubv(color.ptr());
-        glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
-        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
-        glTexCoordPointer(2, GL_FLOAT, sizeof(Vector2), textureCoordinates.data());
-        glDrawArrays(GL_QUADS, 0, 4);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glColor4fv(baseColor);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnable(GL_TEXTURE_2D);
+            glColor4ubv(color.ptr());
+            glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
+            glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
+            glTexCoordPointer(2, GL_FLOAT, sizeof(Vector2), textureCoordinates.data());
+            glDrawArrays(GL_QUADS, 0, 4);
+            glBindTexture(GL_TEXTURE_2D, 0);
+            glColor4fv(baseColor);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisable(GL_TEXTURE_2D);
     }
 
 
@@ -379,18 +447,32 @@ namespace JGL {
             Logger::Error("Drawing J2D element before J2D begin.");
 
         const Vector2 textureSize = texture.GetDimensions();
-
+        std::array<GLfloat, 8> textureCoordinates{};
         // Calculate texture coordinates (relative to the whole texture)
-        std::array<GLfloat, 8> textureCoordinates = {
-                sub_texture_position.x / textureSize.x,
-                sub_texture_position.y / textureSize.y,
-                sub_texture_position.x / textureSize.x,
-                (sub_texture_position.y + sub_texture_size.y) / textureSize.y,
-                (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
-                (sub_texture_position.y + sub_texture_size.y) / textureSize.y,
-                (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
-                sub_texture_position.y / textureSize.y
-        };
+        if (!(texture.GetFlags() & INVERT_Y))
+            textureCoordinates = {
+                    sub_texture_position.x / textureSize.x,
+                    sub_texture_position.y / textureSize.y,
+                    sub_texture_position.x / textureSize.x,
+                    (sub_texture_position.y + sub_texture_size.y) / textureSize.y,
+                    (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
+                    (sub_texture_position.y + sub_texture_size.y) / textureSize.y,
+                    (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
+                    sub_texture_position.y / textureSize.y
+            };
+
+        else {
+            textureCoordinates = {
+                    sub_texture_position.x / textureSize.x,
+                    (textureSize.y - sub_texture_position.y) / textureSize.y,
+                    sub_texture_position.x / textureSize.x,
+                    (textureSize.y - (sub_texture_position.y + sub_texture_size.y)) / textureSize.y,
+                    (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
+                    (textureSize.y - (sub_texture_position.y + sub_texture_size.y)) / textureSize.y,
+                    (sub_texture_position.x + sub_texture_size.x) / textureSize.x,
+                    (textureSize.y - sub_texture_position.y) / textureSize.y
+            };
+        }
 
         if (inversion& Direction::Vertical)
             std::swap(textureCoordinates[1], textureCoordinates[3]),
@@ -423,17 +505,20 @@ namespace JGL {
                      (v.x - pos2.x - offset.x * scale.x) * sin_theta + (v.y - pos2.y - offset.y * scale.y) * cos_theta +
                      pos2.y + offset.y * scale.y};
 
-        glColor4ubv(color.ptr());
-        glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
-        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
-        glTexCoordPointer(2, GL_FLOAT, 0, textureCoordinates.data());
-        glDrawArrays(GL_QUADS, 0, 4);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glColor4fv(baseColor);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnable(GL_TEXTURE_2D);
+            glColor4ubv(color.ptr());
+            glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
+            glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
+            glTexCoordPointer(2, GL_FLOAT, 0, textureCoordinates.data());
+            glDrawArrays(GL_QUADS, 0, 4);
+            glBindTexture(GL_TEXTURE_2D, 0);
+            glColor4fv(baseColor);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisable(GL_TEXTURE_2D);
     }
 
-    void
-    J2D::DrawPartialSprite(const JGL::Texture& texture, float positionX, float positionY, float sub_texture_positionX,
+    void J2D::DrawPartialSprite(const JGL::Texture& texture, float positionX, float positionY, float sub_texture_positionX,
                            float sub_texture_positionY, unsigned int sub_texture_sizeX,
                            unsigned int sub_texture_sizeY, float originX, float originY, float rad_rotation,
                            float scaleX, float scaleY, const Color4& color, JGL::Direction inversion) {
@@ -452,20 +537,35 @@ namespace JGL {
 
         glBindTexture(GL_TEXTURE_2D, texture.GetGLTextureHandle());
         Vector2 size = texture.GetDimensions();
+
         std::array<Vector2, 4> textureCoordinates  = {Vector2(0, 0), Vector2(0, 1), Vector2(1, 1), Vector2(1, 0)};
+        if (mirror_axis == Direction::Horizontal) {
+            size.x *= 2;
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
+            if (texture.GetFlags() & INVERT_Y)
+                textureCoordinates = {Vector2(0, 1), Vector2(0, 0), Vector2(2, 0), Vector2(2, 1)};
+            else
+                textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(2, 1), Vector2(2, 0)};
+        }
 
-        if (mirror_axis& Direction::Horizontal)
-            size.x *= 2,
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT),
-            textureCoordinates = {Vector2(0, 0), Vector2(0, 1), Vector2(2, 1), Vector2(2, 0)};
+        else if (mirror_axis == Direction::Vertical) {
+            size.y *= 2;
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
+            if (texture.GetFlags() & INVERT_Y)
+                textureCoordinates = {Vector2(0, 2), Vector2(0, 0), Vector2(1, 0), Vector2(1, 2)};
+            else
+                textureCoordinates = {Vector2(0, 0), Vector2(0, 2), Vector2(1, 2), Vector2(1, 0)};
+        }
 
-        if (mirror_axis& Direction::Vertical)
-            size.y *= 2,
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT),
-            textureCoordinates = {Vector2(0, 0), Vector2(0, 2), Vector2(1, 2), Vector2(1, 0)};
-
-        if ((mirror_axis& Direction::Horizontal) && (mirror_axis& Direction::Vertical))
-            textureCoordinates = {Vector2(0, 0), Vector2(0, 2), Vector2(2, 2), Vector2(2, 0)};
+        else if ((mirror_axis& Direction::Horizontal) && (mirror_axis& Direction::Vertical)) {
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
+            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
+            size *= 2;
+            if (texture.GetFlags() & INVERT_Y)
+                textureCoordinates = {Vector2(0, 2), Vector2(0, 0), Vector2(2, 0), Vector2(2, 2)};
+            else
+                textureCoordinates = {Vector2(0, 0), Vector2(0, 2), Vector2(2, 2), Vector2(2, 0)};
+        }
 
         const Vector2 offset = origin * size;
         Vector2 pos2 = position;
@@ -488,24 +588,27 @@ namespace JGL {
                         (v.x - pos2.x - offset.x * scale.x) * sin_theta + (v.y - pos2.y - offset.y * scale.y) * cos_theta + pos2.y + offset.y * scale.y
                 };
 
-        glColor4ubv(color.ptr());
-        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
-        glTexCoordPointer(2, GL_FLOAT, sizeof(Vector2), textureCoordinates.data());
-        glDrawArrays(GL_QUADS, 0, 4);
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnable(GL_TEXTURE_2D);
+            glColor4ubv(color.ptr());
+            glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
+            glTexCoordPointer(2, GL_FLOAT, sizeof(Vector2), textureCoordinates.data());
+            glDrawArrays(GL_QUADS, 0, 4);
 
-        //Reset the wrapping mode.
-        if (texture.GetWrappingMode() == TextureWrappingMode::CLAMP_TO_EDGE)
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE),
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-        else if (texture.GetWrappingMode() == TextureWrappingMode::REPEAT)
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT),
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-        else if (texture.GetWrappingMode() == TextureWrappingMode::CLAMP_TO_BORDER)
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER),
-            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
-
-        glBindTexture(GL_TEXTURE_2D, 0);
-        glColor4fv(baseColor);
+            //Reset the wrapping mode.
+            if (texture.GetWrappingMode() == TextureWrappingMode::CLAMP_TO_EDGE)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE),
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+            else if (texture.GetWrappingMode() == TextureWrappingMode::REPEAT)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT),
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+            else if (texture.GetWrappingMode() == TextureWrappingMode::CLAMP_TO_BORDER)
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER),
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+            glBindTexture(GL_TEXTURE_2D, 0);
+            glColor4fv(baseColor);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisable(GL_TEXTURE_2D);
     }
 
     void J2D::OutlineCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions, float thickness) {
@@ -513,13 +616,18 @@ namespace JGL {
             Logger::Error("Drawing J2D element before J2D begin.");
 
         float step = (2.f * Math::Pi) / (float) subdivisions;
-        std::vector<Vector2> vertices{};
+        std::vector<Vector2> vertices(subdivisions);
         GLfloat angle, x, y;
 
+        int i = 0;
         for (angle = 0.0f; angle < (2.f * Math::Pi); angle += step) {
             x = radius * std::sin(angle) + center.x;
             y = radius * std::cos(angle) + center.y;
-            vertices.emplace_back(x,y);
+            if (i < subdivisions)
+                vertices[i] = {x, y};
+            else
+                vertices.emplace_back(x, y);
+            i++;
         }
 
         glLineWidth(thickness);
@@ -535,11 +643,22 @@ namespace JGL {
 
         GLfloat angle, x, y;
         float step =  (2.f * Math::Pi) / (float) subdivisions;
-        std::vector<Vector2> vertices{};
-        for (angle = 0.0f; angle < (2.f * Math::Pi); angle += step)
-                x = radius * std::sin(angle) + center.x,
-                y = radius * std::cos(angle) + center.y,
+        std::vector<Vector2> vertices(subdivisions);
+
+        /* Most of the time the vector "vertices" is either the same size or size + 1 of the number of subdivisions.
+         * Because a float is a decimal, It'd take too long to get rid of the emplace-back making us
+         * wait around for the container to resize. This gets rid of it for what we can guarantee. */
+        int i = 0;
+        for (angle = 0.0f; angle < (2.f * Math::Pi); angle += step) {
+            x = radius * std::sin(angle) + center.x;
+            y = radius * std::cos(angle) + center.y;
+            if (i < subdivisions)
+                vertices[i] = {x, y};
+            else
                 vertices.emplace_back(x, y);
+            i++;
+        }
+
         glColor4ubv(color.ptr());
         glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
         glDrawArrays(GL_TRIANGLE_FAN, 0, (int) vertices.size());
@@ -588,6 +707,7 @@ namespace JGL {
         glColor4fv(baseColor);
     }
 
+    //TODO render all in once pass with GL_LINE_LOOP instead of separate lines.
     void J2D::DrawCubicBezierCurve(const Color4 &color, const Vector2& controlA, const Vector2& pointA, const Vector2& pointB, const Vector2& controlB,
                                    int subdivisions, float thickness) {
 
@@ -606,25 +726,162 @@ namespace JGL {
         DrawLine(color, last, first, thickness);
     }
 
-    void J2D::OutlinePolygon(const Color4 &color, const std::vector<Vector2>& points, float thickness) {
+    void J2D::OutlinePolygon(const Color4& color, const Vector2* points, int points_size, float thickness) {
         if (!inJ2D)
             Logger::Error("Drawing J2D element before J2D begin.");
 
-        if (points.front() != points.back())
+        if (points[0] != points[points_size -1])
             throw std::runtime_error("J2D::OutlinePolygon: The first point and the last point must connect.");
 
         glLineWidth(thickness);
         glColor4ubv(color.ptr());
-        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), points.data());
-        glDrawArrays(GL_LINE_LOOP, 0, (int) points.size());
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), points);
+        glDrawArrays(GL_LINE_LOOP, 0, points_size);
         glColor4fv(baseColor);
     }
 
+    void J2D::DrawGradientLine(const Color4 &color_a, const Color4 &color_b, float x, float y, float w, float h,
+                               float thickness) {
+        DrawGradientLine(color_a, color_b, {x, y}, {w, h}, thickness);
+    }
+
+    void J2D::DrawArc(const Color4& color, const Vector2& center, float radius, float arc_begin, float arc_end, unsigned int subdivisions, float thickness)
+    {
+        if (!inJ2D)
+            Logger::Error("Drawing J2D element before J2D begin.");
+
+        if (arc_begin == arc_end)
+            Logger::Error("WTF are you even drawing???");
+
+        if ( J3ML::Math::Mod(J3ML::Math::Abs(arc_begin-arc_end), J3ML::Math::Pi*2.f) == 0)
+            Logger::Error("Use OutlineCircle instead!!");
+
+        float step = Math::Abs(arc_end-arc_begin) / (float) subdivisions;
+        std::vector<Vector2> vertices(subdivisions);
+        GLfloat angle, x, y;
+
+        int i = 0;
+        for (angle = arc_begin; angle <= arc_end; angle += step) {
+            x = center.x + (radius * std::cos(angle));
+            y = center.y + (radius * std::sin(angle));
+            if (i < subdivisions)
+                vertices[i] = {x, y};
+            else
+                vertices.emplace_back(x, y);
+            i++;
+        }
+
+        glLineWidth(thickness);
+        glColor4ubv(color.ptr());
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices.data());
+        glDrawArrays(GL_LINE_STRIP, 0, (int) vertices.size());
+        glColor4fv(baseColor);
+    }
+
+    void J2D::OutlineRoundedRect(const Color4 &color, const Vector2 &pos, const Vector2 &size, float radius, float thickness)
+    {
+        // A rounded rectangle of size 2a x 2b with rounding radius r is given by
+        // f(x; a, r) + f(y; b, r) = 1
+        // where
+        // f(x; a, r) = {
+        // if |x| >= a - r: (|x| - (a-r) / r )^2
+        // otherwise: 0
+        // }
+
+        //std::vector<Vector2> vertices;
+
+
+        // TODO: Calculate vertices for top-left     quarter-circle.
+
+        Vector2 tl = pos;
+        Vector2 tr = pos + Vector2(size.x, 0);
+        Vector2 br = pos + size;
+        Vector2 bl = pos + Vector2(0, size.y);
+
+        // Center-point around which to calculate each 'quarter-circle'.
+        Vector2 anchor_tl = pos + Vector2(radius, radius);
+        Vector2 anchor_tr = pos + Vector2(size.x-radius, radius);
+        Vector2 anchor_br = pos + size - Vector2(radius, radius);
+        Vector2 anchor_bl = pos + Vector2(radius, size.y - radius);
+
+        //J2D::Begin();
+        //J2D::DrawPoints(Colors::Red, {tl, tr, br, bl}, 2);
+        //J2D::DrawPoints(Colors::Blue, {anchor_tl, anchor_tr, anchor_br, anchor_bl}, 2);
+        //J2D::End();
+
+        Vector2 anchor_topleft_top = pos + Vector2(radius, 0);
+        Vector2 anchor_topright_top = pos + Vector2(size.x - radius, 0);
+        // TODO: Calculate vertices for top-right    quarter-circle.
+        Vector2 anchor_topright_right = pos + Vector2(size.x, radius);
+        Vector2 anchor_bottomright_right = pos + Vector2(size.x, size.y - radius);
+        // TODO: Calculate vertices for bottom-right quarter-circle.
+        Vector2 anchor_bottomright_bottom = pos + Vector2(size.x - radius, size.y);
+        Vector2 anchor_bottomleft_bottom = pos + Vector2(radius, size.y);
+        // TODO: Calculate vertices for bottom-left  quarter-circle.
+        Vector2 anchor_bottomleft_left = pos + Vector2(0, size.y - radius);
+        Vector2 anchor_topleft_left = pos + Vector2(0, radius);
+
+        //J2D::Begin();
+
+        // The 3.01f, etc is a tiny-bit of overshoot to compensate for the fact that
+        // this is not being plotted as a continuous line-loop.
+        // Once i'm done working this out I expect bill will want to make it such.
+
+        unsigned int subdivisions = 9;
+
+        J2D::DrawArc(color, anchor_tl, radius, Math::Pi, 3.01f*Math::Pi/2.f, subdivisions, thickness);
+        J2D::DrawLine(color, anchor_topleft_top, anchor_topright_top, thickness);
+        J2D::DrawArc(color, anchor_tr, radius, 3.f*Math::Pi/2.f, 2.02*Math::Pi, subdivisions, thickness);
+        J2D::DrawLine(color, anchor_topright_right, anchor_bottomright_right, thickness);
+        J2D::DrawArc(color, anchor_br, radius, 0.0f, 1.01f*Math::Pi/2, subdivisions, thickness);
+        J2D::DrawLine(color, anchor_bottomright_bottom, anchor_bottomleft_bottom, thickness);
+        J2D::DrawArc(color, anchor_bl, radius, Math::Pi/2, Math::Pi*1.01f, subdivisions, thickness);
+        J2D::DrawLine(color, anchor_bottomleft_left, anchor_topleft_left, thickness);
+        //J2D::End();
+
+
+    }
+
+    void J2D::FillChamferRect(const Color4 &color, const Vector2 &pos, const Vector2 &size, float radius) {
+        FillRoundedRect(color, pos, size, radius, 4);
+    }
+
+    void J2D::OutlineChamferRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius,
+                                 float thickness) {
+        Vector2 anchor_topleft_top = pos + Vector2(radius, 0);
+        Vector2 anchor_topright_top = pos + Vector2(size.x - radius, 0);
+        Vector2 anchor_topright_right = pos + Vector2(size.x, radius);
+        Vector2 anchor_bottomright_right = pos + Vector2(size.x, size.y - radius);
+        Vector2 anchor_bottomright_bottom = pos + Vector2(size.x - radius, size.y);
+        Vector2 anchor_bottomleft_bottom = pos + Vector2(radius, size.y);
+        Vector2 anchor_bottomleft_left = pos + Vector2(0, size.y - radius);
+        Vector2 anchor_topleft_left = pos + Vector2(0, radius);
+
+        Vector2 vertices[] = {anchor_topleft_top, anchor_topright_top, anchor_topright_right, anchor_bottomright_right, anchor_bottomright_bottom, anchor_bottomleft_bottom, anchor_bottomleft_left, anchor_topleft_left};
+        glLineWidth(thickness);
+        glColor4ubv(color.ptr());
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), vertices);
+        glDrawArrays(GL_LINE_LOOP, 0, 8);
+        glColor4fv(baseColor);
+    }
+
+    void J2D::DrawPoints(const Color4& color, const Vector2* points, int num_points, float radius) {
+        glPointSize(radius);
+        glColor4ubv(color.ptr());
+        glVertexPointer(2, GL_FLOAT, sizeof(Vector2), points);
+        glDrawArrays(GL_POINTS, 0, num_points);
+        glColor4fv(baseColor);
+    }
+
+    void J2D::FIllTriangle(const Color4& color, const Vector2& triA, const Vector2& triB, const Vector2& triC) {
+        FillTriangle(color, {triA, triB, triC});
+    }
+
 #pragma endregion
 
 #pragma region J3D
-    std::vector<GLfloat> OpenGLPerspectiveProjectionRH(float fovY, float aspect, float z_near, float z_far) {
-        std::vector<GLfloat> result(16);
+    std::array<GLfloat, 16> OpenGLPerspectiveProjectionRH(float fovY, float aspect, float z_near, float z_far) {
+        std::array<GLfloat, 16> result{};
         GLfloat f = 1.0f / std::tan(fovY * 0.5f * Math::Pi / 180.0f);
         result[0] = f / aspect;
         result[5] = f;
@@ -677,17 +934,13 @@ namespace JGL {
             wasVertexArraysEnabled = false,
             glEnableClientState(GL_VERTEX_ARRAY);
 
-        if (!glIsEnabled(GL_TEXTURE_COORD_ARRAY))
-            wasTextureCoordArrayEnabled = false,
-            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-        else
-            wasTextureCoordArrayEnabled = true;
+        if (glIsEnabled(GL_TEXTURE_COORD_ARRAY))
+            wasTextureCoordArrayEnabled = true,
+            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
-
-        wasTexture2DEnabled = true;
-        if (!glIsEnabled(GL_TEXTURE_2D))
-            wasTexture2DEnabled = false,
-            glEnable(GL_TEXTURE_2D);
+        if (glIsEnabled(GL_TEXTURE_2D))
+            wasTexture2DEnabled = true,
+            glDisable(GL_TEXTURE_2D);
 
         wasCullFaceEnabled = false;
         if (glIsEnabled(GL_CULL_FACE))
@@ -704,7 +957,7 @@ namespace JGL {
         if (!inJ2D)
             inJ3D = true;
         else
-            Logger::Error("Can't begin J3D context inside J2D context.");
+            Logger::Error("Beginning J3D context inside of J2D context?");
     }
 
     void J3D::End() {
@@ -715,7 +968,7 @@ namespace JGL {
             glDisableClientState(GL_VERTEX_ARRAY);
 
         if (wasTexture2DEnabled)
-            glDisable(GL_TEXTURE_2D);
+            glEnable(GL_TEXTURE_2D);
 
         if (!wasBlendEnabled)
             glDisable(GL_BLEND);
@@ -723,8 +976,8 @@ namespace JGL {
         if (wasCullFaceEnabled)
             glEnable(GL_CULL_FACE);
 
-        if (!wasTextureCoordArrayEnabled)
-            glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        if (wasTextureCoordArrayEnabled)
+            glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 
         //Put the draw color back how it was before.
         glColor4fv(oldColor);
@@ -733,7 +986,7 @@ namespace JGL {
 
     void J3D::DrawLine(const Color4& color, const Vector3& A, const Vector3& B, float thickness) {
         if (!inJ3D)
-            Logger::Error("Attempt to Render J3D element before J3D begin.");
+            Logger::Error("Drawing J3D element before J3D begin.");
 
         Vector3 vertices[] = {A, B};
 

src/TextRendering.cpp

@@ -15,13 +15,15 @@
 
 #include <JGL/types/Font.h>
 #include <JGL/types/FontCache.h>
-#include "JGL/logger/logger.h"
+#include <JGL/logger/logger.h>
 
 namespace JGL {
     CachedFont* CacheFont(const Font& font, u32 size) {
+
+        glEnable(GL_TEXTURE_2D);
         CachedFont* cachedFont;
         FT_Set_Pixel_Sizes(font.face, 0, size);
-        jlog::Debug("Caching font data...");
+        Logger::Debug("Caching font data...");
         GLuint texture_id;
         glGenTextures(1, &texture_id);
         glBindTexture(GL_TEXTURE_2D, texture_id);
@@ -88,6 +90,7 @@ namespace JGL {
             xoffset += g->bitmap.width;
             charcode = FT_Get_Next_Char(font.face, charcode, &gindex);
         }
+        glDisable(GL_TEXTURE_2D);
         return cachedFont;
     }
 
@@ -95,18 +98,30 @@ namespace JGL {
         // Offset by height to render at "correct" location.
         y += size;
 
+        bool round_text_coords_for_crisp_rendering = true;
+
+        // TODO: This currently does not account for non-integer scale factors.
+        if (round_text_coords_for_crisp_rendering)
+        {
+            x = J3ML::Math::Floor(x);
+            y = J3ML::Math::Floor(y);
+        }
+
         CachedFont* cachedFont = fontCache.getFont(size, font.index);
 
         if (font.face == nullptr)
-            jlog::Fatal("Drawing a string with an uninitialized font?");
+            Logger::Fatal("Drawing a string with an uninitialized font?");
 
         //If the font doesn't exist in the cache yet.
         if (!cachedFont)
             cachedFont = CacheFont(font, size);
 
         glColor4ubv(color.ptr());
+
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnable(GL_TEXTURE_2D);
         //Texture parameters are restored when the texture_handle is bound
-        glBindTexture(GL_TEXTURE_2D, *cachedFont->getTexture());
+        glBindTexture(GL_TEXTURE_2D, *cachedFont->getTextureHandle());
 
         std::vector<std::array<GLfloat, 12>> vertices(text.size());
         std::vector<std::array<GLfloat, 12>> texcoords(text.size());
@@ -143,16 +158,32 @@ namespace JGL {
         glDrawArrays(GL_TRIANGLES, 0, (int) vertices.size() * 6);
         glBindTexture(GL_TEXTURE_2D, 0);
         glColor4f(1, 1, 1, 1);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisable(GL_TEXTURE_2D);
     }
 
     void J3D::DrawString(const Color4& color, const std::string& text, const Vector3& pos, float scale, u32 size, const Font& font, const EulerAngle& angle, bool draw_back_face) {
         // TODO: Determine the proper scale factor mathematically
+        // This number was arrived at holistically.
         scale = scale * 0.002f;
         scale = -scale;
         float x = pos.x;
         float y = pos.y;
         float z = pos.z;
 
+        // TODO: this is broken because it causes the text to be shifted downwards.
+        /*
+        bool round_text_coords_for_crisp_rendering = true;
+
+        // TODO: This currently does not account for non-integer scale factors.
+        if (round_text_coords_for_crisp_rendering)
+        {
+            x = J3ML::Math::Floor(x);
+            y = J3ML::Math::Floor(y);
+            z = J3ML::Math::Floor(z);
+        }
+         */
+
         CachedFont* cachedFont = fontCache.getFont(size, font.index);
         if (font.face == nullptr)
             jlog::Fatal("Drawing a string with an uninitialized font?");
@@ -160,8 +191,10 @@ namespace JGL {
         if (!cachedFont)
             cachedFont = CacheFont(font, size);
 
+        glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+        glEnable(GL_TEXTURE_2D);
         glColor4ubv(color.ptr());
-        glBindTexture(GL_TEXTURE_2D, *cachedFont->getTexture());
+        glBindTexture(GL_TEXTURE_2D, *cachedFont->getTextureHandle());
 
         std::vector<std::array<GLfloat, 18>> vertices(text.size());
         std::vector<std::array<GLfloat, 12>> texcoords(text.size());
@@ -211,6 +244,8 @@ namespace JGL {
 
         glBindTexture(GL_TEXTURE_2D, 0);
         glColor4f(1, 1, 1, 1);
+        glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+        glDisable(GL_TEXTURE_2D);
         glPopMatrix();
     }
 }

src/types/Font.cpp

@@ -82,8 +82,7 @@ namespace JGL
         //return newIndex;
     }
 
-    Font::~Font()
-    {
+    Font::~Font() {
         //Detail::UnloadFont(this->index);
     }
 

src/types/FontCache.cpp

@@ -2,7 +2,7 @@
 
 using namespace JGL;
 
-char CachedGlyph::getCharacter() {
+char CachedGlyph::getCharacter() const {
     return character;
 }
 
@@ -25,11 +25,11 @@ void JGL::CachedFont::appendGlyph(JGL::CachedGlyph* glyph) {
     glyphs.emplace(glyph->getCharacter(), glyph);
 }
 
-unsigned int JGL::CachedFont::getFontSize() {
+unsigned int JGL::CachedFont::getFontSize() const {
     return font_size;
 }
 
-unsigned int JGL::CachedFont::getFontIndex() {
+unsigned int JGL::CachedFont::getFontIndex() const {
     return font_index;
 }
 
@@ -52,7 +52,7 @@ std::unordered_map<char, CachedGlyph*> CachedFont::getGlyphs() {
     return glyphs;
 }
 
-const GLuint* CachedFont::getTexture() {
+const GLuint* CachedFont::getTextureHandle() {
     return &texture;
 }
 
@@ -64,6 +64,15 @@ GLsizei CachedFont::getTextureHeight() const {
     return texture_height;
 }
 
+void CachedFont::Erase() {
+    if (texture != 0)
+        glDeleteTextures(1, &texture);
+}
+
+CachedFont::~CachedFont() {
+    Erase();
+}
+
 void FontCache::appendFont(CachedFont* font) {
     cachedFonts.push_back(font);
 }

src/types/Light.cpp

@@ -0,0 +1,19 @@
+#include <JGL/types/Light.h>
+#include <glad/glad.h>
+
+JGL::Light::Light(const Vector3& position, const Color4& ambient, const Color4& diffuse, const Color4& specular) {
+    this->position = Vector4(position, 1.0f);
+    this->ambient = ambient;
+    this->diffuse = diffuse;
+    this->specular = specular;
+}
+
+Vector3 JGL::Light::GetNormalizedSceenSpaceCoordinates() const {
+    GLint viewport[4];
+    glGetIntegerv(GL_VIEWPORT, viewport);
+
+    float normalized_x = 2.0f * (position.x - viewport[0]) / viewport[2] - 1.0f;
+    float normalized_y = 2.0f * (position.y - viewport[1]) / viewport[3] - 1.0f;
+
+    return {normalized_x, normalized_y, position.z};
+}

src/types/RenderTarget.cpp

@@ -1,8 +1,9 @@
 #include <JGL/types/RenderTarget.h>
-#include <jlog/Logger.hpp>
+#include <JGL/types/Texture.h>
+#include <JGL/logger/logger.h>
 #include <stdexcept>
 
-JGL::Texture* JGL::RenderTarget::GetJGLTexture() const {
+const JGL::Texture* JGL::RenderTarget::GetJGLTexture() const {
     return texture;
 }
 
@@ -25,9 +26,8 @@ GLuint JGL::RenderTarget::GetActiveGLFramebufferHandle() {
 }
 
 void JGL::RenderTarget::SetActiveGLRenderTarget(const RenderTarget& render_target) {
-    RenderTarget rt = render_target;
-    glBindFramebuffer(GL_FRAMEBUFFER, rt.GetGLFramebufferObjectHandle());
-    glViewport(0,0, rt.GetDimensions().x, rt.GetDimensions().y);
+    glBindFramebuffer(GL_FRAMEBUFFER, render_target.MSAAEnabled() ? render_target.msaa_framebuffer_object : render_target.GetGLFramebufferObjectHandle());
+    glViewport(0,0, render_target.GetDimensions().x, render_target.GetDimensions().y);
 }
 
 Vector2 JGL::RenderTarget::GetDimensions() const {
@@ -36,25 +36,48 @@ Vector2 JGL::RenderTarget::GetDimensions() const {
 
 void JGL::RenderTarget::Erase() {
     if (GetActiveGLFramebufferHandle() == framebuffer_object)
-        jlog::Warning("Deleting the framebuffer that's currently in use?");
-
-    texture->Erase();
+        Logger::Warning("Deleting the framebuffer that's currently in use?");
 
     if (using_depth)
         glDeleteRenderbuffers(1, &depth_buffer);
 
     glDeleteFramebuffers(1, &framebuffer_object);
+
+    if (MSAAEnabled())
+        SetMSAAEnabled(MSAA_SAMPLE_RATE::MSAA_NONE);
 }
 
 Color4 JGL::RenderTarget::GetClearColor() const {
     return clear_color;
 }
 
-JGL::RenderTarget::RenderTarget(const Vector2& size, const Color4& clear_color, bool use_depth) {
+/// Idk why you'd ever want to clear it out if you're rendering onto a texture you passed in :shrug:.
+JGL::RenderTarget::RenderTarget(const JGL::Texture* texture, const Color4& clear_color) {
     GLuint current_fbo = GetActiveGLFramebufferHandle();
     GLint viewport[4] = {0, 0, 0, 0};
     glGetIntegerv(GL_VIEWPORT, viewport);
 
+    glGenFramebuffers(1, &framebuffer_object);
+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_object);
+    glViewport(0,0, size.x, size.y);
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture->GetGLTextureHandle(), 0);
+
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+        throw std::runtime_error("A new framebuffer could not be allocated.");
+
+    glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+    glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+    this->clear_color = clear_color;
+    this->size = texture->GetDimensions();
+    this->texture = texture;
+    texture_created_by_us = false;
+}
+
+JGL::RenderTarget::RenderTarget(const Vector2& size, const Color4& clear_color, bool use_depth, MSAA_SAMPLE_RATE sample_rate) {
+    GLuint current_fbo = GetActiveGLFramebufferHandle();
+    GLint viewport[4] = {0, 0, 0, 0};
+    glGetIntegerv(GL_VIEWPORT, viewport);
+    //Textures behave strangely if they're not square aaaaaaaaaaaaa.
     unsigned int biggest;
     if (size.x >= size.y)
         biggest = size.x;
@@ -82,12 +105,240 @@ JGL::RenderTarget::RenderTarget(const Vector2& size, const Color4& clear_color,
     glClear(GL_COLOR_BUFFER_BIT);
     glClearColor(old_clear_color[0], old_clear_color[1], old_clear_color[2], old_clear_color[3]);
 
-    GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-    if (status != GL_FRAMEBUFFER_COMPLETE)
-        throw std::runtime_error("Error " + std::to_string(status) + "while generating framebuffer");
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+        throw std::runtime_error("A new framebuffer could not be allocated.");
 
     glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
     glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
     this->clear_color = clear_color;
     this->size = size;
+    texture_created_by_us = true;
+
+    if (sample_rate != MSAA_SAMPLE_RATE::MSAA_NONE)
+        SetMSAAEnabled(sample_rate);
+}
+
+std::vector<GLfloat> JGL::RenderTarget::GetData() const {
+    std::vector<GLfloat> data(GetDimensions().x * GetDimensions().y * 4);
+    GLuint current_fbo = GetActiveGLFramebufferHandle();
+
+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_object);
+    glReadPixels(0, 0, GetDimensions().x, GetDimensions().y, GL_RGBA, GL_FLOAT, data.data());
+    glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+    return data;
+
+}
+
+void JGL::RenderTarget::Resize(const Vector2& new_size) {
+    if (!texture_created_by_us)
+        Logger::Fatal("Resizing a texture that already existed?");
+
+    GLuint current_fbo = GetActiveGLFramebufferHandle();
+    GLfloat old_clear_color[4];
+    GLint old_viewport[4] = {0, 0, 0, 0};
+    glGetIntegerv(GL_VIEWPORT, old_viewport);
+    glGetFloatv(GL_COLOR_CLEAR_VALUE, old_clear_color);
+
+    /* If what was previously not part of the renderable area is big enough to
+     * just set the new size without reading data back */
+    if (new_size.x <= texture->GetDimensions().x && new_size.y <= texture->GetDimensions().y) {
+        size = new_size;
+
+        // Clear.
+        glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_object);
+        auto cc = GetClearColor();
+        glClearColor(cc.RedChannelNormalized(), cc.GreenChannelNormalized(), cc.BlueChannelNormalized(), cc.AlphaChannelNormalized());
+        glViewport(0,0, size.x, size.y);
+        glClear(GL_COLOR_BUFFER_BIT);
+        if (using_depth)
+            glClear(GL_DEPTH_BUFFER_BIT);
+
+        glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+        glClearColor(old_clear_color[0], old_clear_color[1], old_clear_color[2], old_clear_color[3]);
+        glViewport(old_viewport[0], old_viewport[1], old_viewport[2], old_viewport[3]);
+        return;
+    }
+
+    //If we have to remake the texture.
+    glBindFramebuffer(GL_FRAMEBUFFER, framebuffer_object);
+
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0);
+    // Erase it.
+    delete texture;
+
+    unsigned int biggest;
+    if (new_size.x >= new_size.y)
+        biggest = new_size.x;
+    else
+        biggest = new_size.y;
+
+    auto cc = GetClearColor();
+    glClearColor(cc.RedChannelNormalized(), cc.GreenChannelNormalized(), cc.BlueChannelNormalized(), cc.AlphaChannelNormalized());
+    glViewport(0,0, size.x, size.y);
+
+    texture = new Texture(Vector2((float) biggest, (float) biggest));
+    glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, texture->GetGLTextureHandle(), 0);
+
+    glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+    glClearColor(old_clear_color[0], old_clear_color[1], old_clear_color[2], old_clear_color[3]);
+    glViewport(old_viewport[0], old_viewport[1], old_viewport[2], old_viewport[3]);
+    size = new_size;
+
+    //Disable & Re-enable MSAA so the msaa buffer is remade with the correct dimensions.
+    if (MSAAEnabled()) {
+        MSAA_SAMPLE_RATE current_sample_rate = msaa_sample_rate;
+        SetMSAAEnabled(MSAA_SAMPLE_RATE::MSAA_NONE);
+        SetMSAAEnabled(current_sample_rate);
+    }
+}
+
+JGL::RenderTarget::~RenderTarget() {
+    Erase();
+    if (texture_created_by_us)
+        delete texture;
+}
+
+bool JGL::RenderTarget::TextureCreatedByRenderTarget() const {
+    return texture_created_by_us;
+}
+
+JGL::MSAA_SAMPLE_RATE JGL::RenderTarget::GetMSAASampleRate() const {
+    return msaa_sample_rate;
+}
+
+bool JGL::RenderTarget::MSAAEnabled() const {
+        return msaa_sample_rate != MSAA_SAMPLE_RATE::MSAA_NONE;
+}
+
+void JGL::RenderTarget::SetMSAAEnabled(JGL::MSAA_SAMPLE_RATE sample_rate) {
+    // If we'd be setting the same sample_rate we already have.
+    if (sample_rate == msaa_sample_rate)
+        return;
+
+    // If we'd be rendering onto a texture and not a plain render target we don't want this.
+    if (!TextureCreatedByRenderTarget())
+        return;
+
+    // Remove it if they request no msaa or if what they requested is different than what they already have.
+    if (sample_rate == MSAA_SAMPLE_RATE::MSAA_NONE || msaa_sample_rate != MSAA_SAMPLE_RATE::MSAA_NONE) {
+        if(using_depth)
+            glDeleteRenderbuffers(1, &msaa_depth_buffer);
+        glDeleteRenderbuffers(1, &msaa_render_buffer);
+        glDeleteFramebuffers(1, &msaa_framebuffer_object);
+
+        msaa_framebuffer_object = 0;
+        msaa_depth_buffer = 0;
+        msaa_render_buffer = 0;
+        msaa_sample_rate = MSAA_SAMPLE_RATE::MSAA_NONE;
+
+        // Only return here if they specifically requested no MSAA. else continue to change mode.
+        if (sample_rate == MSAA_SAMPLE_RATE::MSAA_NONE)
+            return;
+    }
+
+    GLuint current_fbo = GetActiveGLFramebufferHandle();
+    glGenFramebuffers(1, &msaa_framebuffer_object);
+    glBindFramebuffer(GL_FRAMEBUFFER, msaa_framebuffer_object);
+
+    GLint current_renderbuffer = 0;
+    glGetIntegerv(GL_RENDERBUFFER_BINDING, &current_renderbuffer);
+    glGenRenderbuffers(1, &msaa_render_buffer);
+    glBindRenderbuffer(GL_RENDERBUFFER, msaa_render_buffer);
+    glRenderbufferStorageMultisample(GL_RENDERBUFFER, JGL::to_int(sample_rate), GL_RGBA, size.x, size.y);
+    glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, msaa_render_buffer);
+
+    if (using_depth) {
+        glGenRenderbuffers(1, &msaa_depth_buffer);
+        glBindRenderbuffer(GL_RENDERBUFFER, msaa_depth_buffer);
+        glRenderbufferStorageMultisample(GL_RENDERBUFFER, JGL::to_int(sample_rate), GL_DEPTH_COMPONENT, size.x, size.y);
+        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, msaa_depth_buffer);
+    }
+
+    bool failure = false;
+    if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+        failure = true,
+        Logger::Fatal("A new MSAA " + std::to_string(to_int(sample_rate)) + "x framebuffer couldn't be allocated.");
+
+    glBindRenderbuffer(GL_RENDERBUFFER, current_renderbuffer);
+    glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+    msaa_sample_rate = sample_rate;
+
+    if (failure)
+        SetMSAAEnabled(MSAA_SAMPLE_RATE::MSAA_NONE);
+}
+
+void JGL::RenderTarget::Blit() const {
+    if (MSAAEnabled() && TextureCreatedByRenderTarget()) {
+
+        // Save the GL state.
+        GLuint current_fbo = GetActiveGLFramebufferHandle();
+        GLint current_draw_fbo = 0;
+        GLint current_read_fbo = 0;
+        glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &current_read_fbo);
+        glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_draw_fbo);
+
+        // Draw the contents of one into the other.
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, msaa_framebuffer_object);
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, framebuffer_object);
+        glBlitFramebuffer(0, 0, size.x, size.y, 0, 0, size.x, size.y, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+        // Put the GL state back.
+        glBindFramebuffer(GL_READ_FRAMEBUFFER, current_read_fbo);
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, current_draw_fbo);
+        glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+    }
+
+    // Fixes using render targets on a texture that has mipmaps.
+    if (GetJGLTexture()->GetFilteringMode() == TextureFilteringMode::MIPMAP_NEAREST
+        || GetJGLTexture()->GetFilteringMode() == TextureFilteringMode::MIPMAP_BILINEAR ||
+        GetJGLTexture()->GetFilteringMode() == TextureFilteringMode::MIPMAP_TRILINEAR) {
+        GLint current_texture = 0;
+        glGetIntegerv(GL_TEXTURE_BINDING_2D, &current_texture);
+
+        glBindTexture(GL_TEXTURE_2D, GetJGLTexture()->GetGLTextureHandle());
+        glGenerateMipmap(GL_TEXTURE_2D);
+
+        glBindTexture(GL_TEXTURE_2D, current_texture);
+    }
+}
+
+void JGL::RenderTarget::Blit(const JGL::RenderTarget& source, JGL::RenderTarget* destination) {
+    if (source.size != destination->size)
+        Logger::Warning("Blitting a render target but they're not the same size?");
+
+    // Save the GL state.
+    GLuint current_fbo = GetActiveGLFramebufferHandle();
+    GLint current_draw_fbo = 0;
+    GLint current_read_fbo = 0;
+    glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &current_read_fbo);
+    glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &current_draw_fbo);
+
+    // Draw the contents of one into the other.
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, source.framebuffer_object);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, destination->framebuffer_object);
+    glBlitFramebuffer(0, 0, source.size.x, source.size.y, 0, 0, source.size.x, source.size.y, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+
+    // Put the GL state back.
+    glBindFramebuffer(GL_READ_FRAMEBUFFER, current_read_fbo);
+    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, current_draw_fbo);
+    glBindFramebuffer(GL_FRAMEBUFFER, current_fbo);
+}
+
+JGL::RenderTarget::RenderTarget(const JGL::RenderTarget& rhs) {
+    auto* this_render_target = new RenderTarget(rhs.size, rhs.clear_color, rhs.using_depth, rhs.msaa_sample_rate);
+    RenderTarget::Blit(rhs, this_render_target);
+
+    this->clear_color = this_render_target->clear_color;
+    this->size = this_render_target->size;
+    this->using_depth = this_render_target->using_depth;
+    this->texture_created_by_us = true;
+    this->texture = this_render_target->texture;
+    this->framebuffer_object = this_render_target->framebuffer_object;
+    this->depth_buffer = this_render_target->depth_buffer;
+    this->msaa_sample_rate = this_render_target->msaa_sample_rate;
+    this->msaa_framebuffer_object = this_render_target->msaa_framebuffer_object;
+    this->msaa_depth_buffer = this_render_target->msaa_depth_buffer;
+    this->msaa_render_buffer = this_render_target->msaa_render_buffer;
+
+    operator delete(this_render_target);
 }

src/types/Texture.cpp

@@ -1,14 +1,14 @@
 #include <JGL/types/Texture.h>
 #include <iostream>
+#include <JGL/types/RenderTarget.h>
 
-using namespace ReTexture;
+using namespace ReImage;
 
 namespace JGL
 {
-    Texture::Texture(const std::string& file, const ReTexture::TextureFlag& flags, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode)
+    Texture::Texture(const std::string& file, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode, const TextureFlag& flags)
     {
-        auto *t = new ReTexture::SoftwareTexture(file, flags);
-
+        auto* t = new ReImage::Image(file, flags);
         GLuint previous_texture;
         glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*) &previous_texture);
 
@@ -16,21 +16,6 @@ namespace JGL
         texture_flags = flags;
 
         delete t;
-
-        glBindTexture(GL_TEXTURE_2D, previous_texture);
-    }
-
-    Texture::Texture(const std::string& file, TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode) {
-        GLuint previous_texture;
-        glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*) &previous_texture);
-
-        auto* t = new SoftwareTexture(file);
-
-        load(t, {(float) t->getWidth(), (float) t->getHeight()}, t->getTextureFormat(), filtering_mode, wrapping_mode);
-        texture_flags = TextureFlag::NONE;
-
-        delete t;
-        glBindTexture(GL_TEXTURE_2D, previous_texture);
     }
 
     Texture::Texture(const Vector2& size) {
@@ -52,73 +37,59 @@ namespace JGL
         texture_size = size;
         texture_filtering_mode = TextureFilteringMode::NEAREST;
         texture_wrapping_mode = TextureWrappingMode::CLAMP_TO_EDGE;
-        texture_flags = TextureFlag::NONE;
+        // Because in vram it'll be right side up.
+        texture_flags = TextureFlag::INVERT_Y;
 
         glBindTexture(GL_TEXTURE_2D, previous_texture);
+
     }
 
-    void Texture::load(SoftwareTexture* software_texture, const Vector2& size, const TextureFormat& format,
+    void Texture::load(Image* software_texture, const Vector2& size, const TextureFormat& format,
                            TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode) {
+
+        GLuint previous_texture;
+        glGetIntegerv(GL_TEXTURE_BINDING_2D, (GLint*) &previous_texture);
+
             glGenTextures(1, &texture_handle);
             glBindTexture(GL_TEXTURE_2D, texture_handle);
 
             if (format == TextureFormat::RGBA)
                 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (int) size.x, (int) size.y, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                             software_texture->pixelData.data());
+                             software_texture->pixel_data.data());
 
             else if (format == TextureFormat::RGB)
                 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, (int) size.x, (int) size.y, 0, GL_RGB, GL_UNSIGNED_BYTE,
-                             software_texture->pixelData.data());
+                             software_texture->pixel_data.data());
 
             if (wrapping_mode == TextureWrappingMode::CLAMP_TO_EDGE)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
             else if (wrapping_mode == TextureWrappingMode::REPEAT)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
             else if (wrapping_mode == TextureWrappingMode::MIRRORED_REPEAT)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
 
             else if (wrapping_mode == TextureWrappingMode::CLAMP_TO_BORDER)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
             if (filtering_mode == TextureFilteringMode::NEAREST)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
             else if (filtering_mode == TextureFilteringMode::BILINEAR)
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR),
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
             else if (filtering_mode == TextureFilteringMode::MIPMAP_NEAREST ||
                      filtering_mode == TextureFilteringMode::MIPMAP_BILINEAR ||
                      filtering_mode == TextureFilteringMode::MIPMAP_TRILINEAR) {
-                //3 mipmap levels.
-                auto *m1 = new SoftwareTexture(software_texture->downscale(2));
-                auto *m2 = new SoftwareTexture(software_texture->downscale(4));
-                auto *m3 = new SoftwareTexture(software_texture->downscale(8));
 
+                glGenerateMipmap(GL_TEXTURE_2D);
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_BASE_LEVEL, 0);
-                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 3);
-
-                if (format == TextureFormat::RGBA) {
-                    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGBA, m1->getWidth(), m1->getHeight(), 0, GL_RGBA,
-                                 GL_UNSIGNED_BYTE, m1->pixelData.data());
-                    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGBA, m2->getWidth(), m2->getHeight(), 0, GL_RGBA,
-                                 GL_UNSIGNED_BYTE, m2->pixelData.data());
-                    glTexImage2D(GL_TEXTURE_2D, 3, GL_RGBA, m3->getWidth(), m3->getHeight(), 0, GL_RGBA,
-                                 GL_UNSIGNED_BYTE, m3->pixelData.data());
-                } else if (format == TextureFormat::RGB) {
-                    glTexImage2D(GL_TEXTURE_2D, 1, GL_RGB, m1->getWidth(), m1->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
-                                 m1->pixelData.data());
-                    glTexImage2D(GL_TEXTURE_2D, 2, GL_RGB, m2->getWidth(), m2->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
-                                 m2->pixelData.data());
-                    glTexImage2D(GL_TEXTURE_2D, 3, GL_RGB, m3->getWidth(), m3->getHeight(), 0, GL_RGB, GL_UNSIGNED_BYTE,
-                                 m3->pixelData.data());
-                }
 
                 if (filtering_mode == TextureFilteringMode::MIPMAP_NEAREST)
                     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST),
@@ -131,65 +102,91 @@ namespace JGL
                 else if (filtering_mode == TextureFilteringMode::MIPMAP_TRILINEAR)
                     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR),
                     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-                delete m1;
-                delete m2;
-                delete m3;
             }
             texture_size = size;
             texture_format = format;
             texture_filtering_mode = filtering_mode;
+            glBindTexture(GL_TEXTURE_2D, previous_texture);
     }
 
     std::vector<Color4> JGL::Texture::GetPixelData() const {
-            std::vector<Color4> result((size_t) (texture_size.x * texture_size.y));
-            glBindTexture(GL_TEXTURE_2D, texture_handle);
+        GLint current_texture;
+        glGetIntegerv(GL_TEXTURE_BINDING_2D, &current_texture);
 
-            if (texture_format == TextureFormat::RGBA) {
-                glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, result.data());
-                return result;
-            }
+        std::vector<Color4> result((size_t) (texture_size.x * texture_size.y));
+        glBindTexture(GL_TEXTURE_2D, texture_handle);
 
-            //if RGB
-            std::vector<Color3> color3((size_t) (texture_size.x * texture_size.y));
-
-            glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, color3.data());
-
-            for (const auto &c: color3)
-                result.emplace_back(c);
+        if (texture_format == TextureFormat::RGBA) {
+            glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, result.data());
+            glBindTexture(GL_TEXTURE_2D, current_texture);
             return result;
         }
 
-        void Texture::Erase() {
-            if (texture_handle != 0)
-                glDeleteTextures(1, &texture_handle);
-        }
+        //if RGB
+        std::vector<Color3> color3((size_t) (texture_size.x * texture_size.y));
+        glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, color3.data());
+        for (const auto &c: color3)
+            result.emplace_back(c);
 
-        GLuint Texture::GetGLTextureHandle() const {
-            return texture_handle;
-        }
+        glBindTexture(GL_TEXTURE_2D, current_texture);
+        return result;
+    }
 
-        Vector2 Texture::GetDimensions() const {
-            return texture_size;
-        }
+    void Texture::Erase() {
+        if (texture_handle != 0)
+            glDeleteTextures(1, &texture_handle);
+        texture_handle = 0;
+    }
 
-        TextureFlag Texture::GetFlags() const {
-            return texture_flags;
-        }
+    GLuint Texture::GetGLTextureHandle() const {
+        return texture_handle;
+    }
 
-        TextureFormat Texture::GetFormat() const {
-            return texture_format;
-        }
+    Vector2 Texture::GetDimensions() const {
+        return texture_size;
+    }
+
+    TextureFlag Texture::GetFlags() const {
+        return texture_flags;
+    }
+
+    TextureFormat Texture::GetFormat() const {
+        return texture_format;
+    }
 
     TextureFilteringMode Texture::GetFilteringMode() const {
         return texture_filtering_mode;
     }
 
-    void Texture::SetTextureHandle(GLuint handle) {
-        texture_handle = handle;
-    }
-
     TextureWrappingMode Texture::GetWrappingMode() const {
         return texture_wrapping_mode;
     }
+
+    Texture::Texture(Image* software_texture, const Vector2& size, const TextureFormat& format,
+                     TextureFilteringMode filtering_mode, TextureWrappingMode wrapping_mode) {
+        load(software_texture, size, format, filtering_mode, wrapping_mode);
+    }
+
+    Texture::~Texture() {
+        Erase();
+    }
+
+    Texture::Texture(const Texture& rhs) {
+        auto* this_texture = new Texture(rhs.GetDimensions());
+        auto this_render_target = RenderTarget(this);
+        auto rhs_render_target = RenderTarget(&rhs);
+
+        RenderTarget::Blit(rhs_render_target, &this_render_target);
+
+        this->texture_handle = this_texture->texture_handle;
+        this->texture_size = this_texture->texture_size;
+        this->texture_flags = this_texture->texture_flags;
+        this->texture_format = this_texture->texture_format;
+        this->texture_filtering_mode = this_texture->texture_filtering_mode;
+        this->texture_wrapping_mode = this_texture->texture_wrapping_mode;
+
+        // Free the memory of "this_texture" without calling the destructor.
+        // In 99% of cases you wouldn't want this. But in this scenario we do.
+        operator delete(this_texture);
+    }
 }

src/types/VRamList.cpp

@@ -1,18 +1,19 @@
 #include <JGL/types/VRamList.h>
-#include <jlog/Logger.hpp>
+#include <JGL/logger/logger.h>
 #include <cstring>
 
-void JGL::VRamList::load(const GLfloat* data, const long& s) {
+void JGL::VRamList::load(const GLfloat* data, const long& size) {
     GLint current_array_buffer = 0;
     glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &current_array_buffer);
     glGenBuffers(1, &list_handle);
     glBindBuffer(GL_ARRAY_BUFFER, list_handle);
     glBufferData(GL_ARRAY_BUFFER, size, data, GL_STATIC_DRAW);
     glBindBuffer(GL_ARRAY_BUFFER, current_array_buffer);
-    size = s;
+    element_array_buffer = false;
+    num_elements = size / sizeof(GLfloat);
 }
 
-void JGL::VRamList::load(const GLuint* data, const long& s) {
+void JGL::VRamList::load(const GLuint* data, const long& size) {
     GLint current_element_array_buffer = 0;
     glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &current_element_array_buffer);
     glGenBuffers(1, &list_handle);
@@ -20,33 +21,14 @@ void JGL::VRamList::load(const GLuint* data, const long& s) {
     glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, data, GL_STATIC_DRAW);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, current_element_array_buffer);
     element_array_buffer = true;
-    size = s;
-}
-
-JGL::VRamList::VRamList(const GLfloat* data, const long& size) {
-    long data_size = (long) sizeof(GLfloat) * size;
-    load(data, data_size);
-}
-
-JGL::VRamList::VRamList(const GLuint* data, const long& size) {
-    load(data, (long) sizeof(GLuint) * size);
-}
-
-JGL::VRamList::VRamList(Vector2* data, const long& size) {
-    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector2) * size);
-}
-
-JGL::VRamList::VRamList(Vector3* data, const long& size) {
-    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector3) * size);
-}
-
-JGL::VRamList::VRamList(Vector4* data, const long& size) {
-    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector4) * size);
+    num_elements = size / sizeof(GLuint);
 }
 
 void JGL::VRamList::Erase() {
-    if (list_handle == 0)
-        jlog::Warning("Erasing an uninitialized array buffer?");
+    if (list_handle == 0) {
+        JGL::Logger::Warning("Erasing an uninitialized VRamList?");
+        return;
+    }
 
     GLint current_element_array_buffer = 0;
     glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &current_element_array_buffer);
@@ -54,32 +36,235 @@ void JGL::VRamList::Erase() {
     glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &current_array_buffer);
 
     if (element_array_buffer && current_element_array_buffer == list_handle)
-        jlog::Warning("Erasing an element array buffer while it's in use?");
+        JGL::Logger::Warning("Erasing an element array buffer while it's in use?");
 
     else if (!element_array_buffer && current_array_buffer == list_handle)
-        jlog::Warning("Erasing an array buffer while it's in use?");
+        JGL::Logger::Warning("Erasing an array buffer while it's in use?");
 
     glDeleteBuffers(1, &list_handle);
+    list_handle = 0;
 }
 
 GLuint JGL::VRamList::GetHandle() const {
     return list_handle;
 }
 
-bool JGL::VRamList::IsIntegerArray() const {
-    return element_array_buffer;
-}
-
 bool JGL::VRamList::IsFloatArray() const {
     return !element_array_buffer;
 }
 
-long JGL::VRamList::GetSize() const {
-    return size;
+long JGL::VRamList::GetLength() const {
+    return num_elements;
 }
 
-long JGL::VRamList::GetDataSize() const {
+size_t JGL::VRamList::GetSize() const {
     if (element_array_buffer)
-        return (long) sizeof(GLuint) * size;
-    return (long) sizeof(GLfloat) * size;
+        return sizeof(GLuint) * num_elements;
+    return sizeof(GLfloat) * num_elements;
+}
+
+void JGL::VRamList::SetData(void* data, const long& length) {
+    bool should_resize = (this->num_elements != length);
+
+    if (should_resize) {
+        glDeleteBuffers(1, &list_handle);
+        list_handle = 0;
+
+        if (!element_array_buffer)
+            load((GLfloat*) data, sizeof(GLfloat) * length);
+        else
+            load((GLuint*) data, sizeof(GLuint) * length);
+        return;
+    }
+
+    GLint current_buffer = 0;
+    GLenum buffer_type = GL_ARRAY_BUFFER;
+    GLenum buffer_binding = GL_ARRAY_BUFFER_BINDING;
+    if (element_array_buffer)
+        buffer_type = GL_ELEMENT_ARRAY_BUFFER,
+        buffer_binding = GL_ELEMENT_ARRAY_BUFFER_BINDING;
+
+    glGetIntegerv(buffer_binding, &current_buffer);
+    glBindBuffer(buffer_type, list_handle);
+
+    void* vram = glMapBuffer(buffer_type, GL_WRITE_ONLY);
+    if (!vram)
+        JGL::Logger::Fatal("Mapping in a VBO that doesn't exist?");
+
+    memcpy(vram, data, (element_array_buffer ? sizeof(GLuint) : sizeof(GLfloat)) * length);
+    
+    if (!glUnmapBuffer(buffer_type))
+        JGL::Logger::Fatal("We couldn't unmap the buffer?");
+
+    glBindBuffer(buffer_type, current_buffer);
+}
+
+void JGL::VRamList::UpdateData(void* data, const long& offset, const long& length) {
+
+    if (offset + length > num_elements) {
+        JGL::Logger::Warning("Using UpdateData to out-of-bounds write the VRamList? I'll resize it for you, But this is slow.");
+        unsigned long oob_delta = (offset + length) - num_elements;
+
+        if (element_array_buffer) {
+            auto list_data = GetDataUI();
+            list_data.resize(list_data.size() + oob_delta);
+            memcpy(list_data.data() + (offset * sizeof(GLuint)), data, length * sizeof(GLuint));
+            SetData(list_data.data(), list_data.size());
+        }
+        else {
+            auto list_data = GetDataF();
+            list_data.resize(list_data.size() + oob_delta);
+            memcpy(list_data.data() + (offset * sizeof(GLfloat)), data, length * sizeof(GLfloat));
+            SetData(list_data.data(), list_data.size());
+        }
+    }
+
+    GLint current_buffer = 0;
+    GLenum buffer_type = GL_ARRAY_BUFFER;
+    GLenum buffer_binding = GL_ARRAY_BUFFER_BINDING;
+
+    if (element_array_buffer)
+        buffer_type = GL_ELEMENT_ARRAY_BUFFER,
+        buffer_binding = GL_ELEMENT_ARRAY_BUFFER_BINDING;
+
+    glGetIntegerv(buffer_binding, &current_buffer);
+    glBindBuffer(buffer_type, list_handle);
+
+    void* vram = glMapBuffer(buffer_type, GL_WRITE_ONLY);
+    if (!vram)
+        JGL::Logger::Fatal("Mapping in a VBO that doesn't exist?");
+
+    size_t element_size = element_array_buffer ? sizeof(GLuint) : sizeof(GLfloat);
+    memcpy(reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(vram) + (offset * element_size)), data, length * element_size);
+
+    if (!glUnmapBuffer(buffer_type))
+        JGL::Logger::Fatal("We couldn't unmap the buffer?");
+
+    glBindBuffer(buffer_type, current_buffer);
+}
+
+std::vector<GLfloat> JGL::VRamList::GetDataF() const {
+    if (element_array_buffer)
+        JGL::Logger::Warning("Getting data as GLfloat but the buffer data is GLuint?");
+
+    GLint current_buffer = 0;
+    glGetIntegerv(GL_ARRAY_BUFFER_BINDING, &current_buffer);
+    glBindBuffer(GL_ARRAY_BUFFER, list_handle);
+
+    std::vector<GLfloat> data(num_elements);
+    void* vram = glMapBuffer(GL_ARRAY_BUFFER, GL_READ_ONLY);
+    if (vram == nullptr)
+        JGL::Logger::Fatal("Mapping in a VBO that doesn't exist?");
+
+    memcpy(data.data(), vram, num_elements * sizeof(GLfloat));
+
+    glUnmapBuffer(GL_ARRAY_BUFFER);
+    glBindBuffer(GL_ARRAY_BUFFER, current_buffer);
+
+    return data;
+}
+
+std::vector<GLuint> JGL::VRamList::GetDataUI() const {
+    if (!element_array_buffer)
+        JGL::Logger::Warning("Getting data as GLuint but the buffer data is GLfloat?");
+
+    GLint current_buffer = 0;
+    glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &current_buffer);
+
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, list_handle);
+    std::vector<GLuint> data(num_elements);
+
+    void* vram = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY);
+    if (vram == nullptr)
+        JGL::Logger::Fatal("Mapping in a VBO that doesn't exist?");
+
+    memcpy(data.data(), vram, num_elements * sizeof(GLuint));
+
+    glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, current_buffer);
+
+    return data;
+}
+
+JGL::VRamList::VRamList(const GLfloat* data, const long& length) {
+    load(data, (long) sizeof(GLfloat) * length);
+}
+
+JGL::VRamList::VRamList(const GLuint* data, const long& length) {
+    load(data, (long) sizeof(GLuint) * length);
+}
+
+JGL::VRamList::VRamList(Vector2* data, const long& length) {
+    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector2) * length);
+}
+
+JGL::VRamList::VRamList(Vector3* data, const long& length) {
+    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector3) * length);
+}
+
+JGL::VRamList::VRamList(Vector4* data, const long& length) {
+    load(reinterpret_cast<GLfloat*>(data), (long) sizeof(Vector4) * length);
+}
+
+void JGL::VRamList::SetData(const GLfloat* data, const long& length) {
+    SetData((void*) data, length);
+}
+
+void JGL::VRamList::SetData(const Vector2* data, const long& length) {
+    SetData((void*) data, length * 2);
+}
+
+void JGL::VRamList::SetData(const Vector3* data, const long& length) {
+    SetData((void*) data, length * 3);
+}
+
+void JGL::VRamList::SetData(const Vector4* data, const long& length) {
+    SetData((void*) data, length * 4);
+}
+
+void JGL::VRamList::SetData(const GLuint* data, const long& length) {
+    SetData((void*) data, length);
+}
+
+void JGL::VRamList::SetData(const Vector2i* data, const long& length) {
+    SetData((void*) data, length * 2);
+}
+
+void JGL::VRamList::UpdateData(const GLfloat* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length);
+}
+
+void JGL::VRamList::UpdateData(const Vector2* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length * 2);
+}
+
+void JGL::VRamList::UpdateData(const Vector3* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length * 3);
+}
+
+void JGL::VRamList::UpdateData(const Vector4* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length * 4);
+}
+
+void JGL::VRamList::UpdateData(const GLuint* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length);
+}
+
+void JGL::VRamList::UpdateData(const Vector2i* data, const long& offset, const long& length) {
+    UpdateData((void*) data, offset, length * 2);
+}
+
+JGL::VRamList::~VRamList() {
+    Erase();
+}
+
+JGL::VRamList::VRamList(const JGL::VRamList& rhs) {
+    if (rhs.element_array_buffer) {
+        auto data_array = rhs.GetDataUI();
+        this->load(data_array.data(), data_array.size());
+        return;
+    }
+
+    auto data_array = rhs.GetDataF();
+    this->load(data_array.data(), data_array.size());
 }