Refactored DrawSprite

include/JGL/Color3.h

@@ -1,42 +0,0 @@
-#pragma once
-
-#include <J3ML/J3ML.h>
-
-namespace JGL
-{
-    using namespace J3ML;
-    /// Represents a 3-channel color value, with Red, Green and Blue components.
-    class Color3 {
-    public:
-        u8 r;
-        u8 g;
-        u8 b;
-
-    public:
-        /// Explicitly constructs a Color3 from the given Red, Green, and Blue values.
-        Color3(u8 R, u8 G, u8 B);
-        /// Returns a Color3 parsed from the given hexadecimal string.
-        static Color3 FromHex(const std::string& hexCode);
-
-        Color3() = default;
-    public:
-        /// Returns a Color3 that is somewhere in-between this and the given Color3, determined by the alpha [0-1].
-        Color3 Lerp(const Color3& rhs, float alpha) const;
-
-        /// Returns the red channel [0-255].
-        u8 RedChannel  () const;
-        /// Returns the green channel [0-255].
-        u8 GreenChannel() const;
-        /// Returns the blue channel [0-255].
-        u8 BlueChannel () const;
-        /// Returns the red channel normalized from [0-255] to [0-1].
-        float RedChannelNormalized ()  const;
-        /// Returns the green channel normalized from [0-255] to [0-1].
-        float GreenChannelNormalized() const;
-        /// Returns the blue channel normalized from [0-255] to [0-1].
-        float BlueChannelNormalized()  const;
-
-    };
-
-
-}

include/JGL/Color4.h

@@ -1,33 +0,0 @@
-#pragma once
-
-#include <JGL/Color3.h>
-
-namespace JGL
-{
-
-    /// Represents a 4-channel color value, with Red, Green, Blue, and Alpha components.
-    class Color4 {
-    public:
-        u8 r;
-        u8 g;
-        u8 b;
-        u8 a;
-    public:
-        Color4() = default;
-        explicit Color4(const Color3& color3, u8 alpha = 255);
-        Color4(u8 red, u8 green, u8 blue, u8 alpha = 255);
-        static Color4 FromColor3(const Color3& color3, u8 alpha = 255);
-        static Color4 FromHex(const std::string& hexCode, u8 alpha = 255);
-
-    public:
-        u8 RedChannel() const;
-        u8 GreenChannel() const;
-        u8 BlueChannel() const;
-        u8 AlphaChannel() const;
-
-        float RedChannelNormalized() const;
-        float GreenChannelNormalized() const;
-        float BlueChannelNormalized() const;
-        float AlphaChannelNormalized() const;
-    };
-}

include/JGL/Colors.h

@@ -1,178 +0,0 @@
-#pragma once
-
-
-#include <JGL/Color3.h>
-
-namespace JGL
-{
-    namespace Colors {
-        namespace Primary {
-            static const Color3 Red{255, 0, 0};
-            static const Color3 Green{0, 255, 0};
-            static const Color3 Blue{0, 0, 255};
-            static const Color3 White{255, 255, 255};
-            static const Color3 Black{0, 0, 0};
-            static const Color3 Gray{128, 128, 128};
-            static const Color3 DarkGray{192, 192, 192};
-            static const Color3 LightGray{64, 64, 64};
-            static const Color3 Yellow{255, 255, 0};
-        }
-        using namespace Primary;
-        namespace Reds {
-            static const Color3 Fuchsia {255, 0, 255};
-            static const Color3 LightSalmon{255, 160, 122};
-            static const Color3 Salmon{250, 128, 114};
-            static const Color3 DarkSalmon{233, 150, 122};
-            static const Color3 LightCoral{240, 128, 128};
-            static const Color3 IndianRed{205, 92, 92};
-            static const Color3 Crimson{220, 20, 60};
-            static const Color3 Firebrick{178, 34, 34};
-            static const Color3 DarkRed{139, 0, 0};
-        }
-        namespace Oranges {
-            static const Color3 Coral{255, 127, 80};
-            static const Color3 Tomato{255, 99, 71};
-            static const Color3 OrangeRed{255, 69, 0};
-            static const Color3 Gold{255, 215, 0};
-            static const Color3 Orange{255, 165, 0};
-            static const Color3 DarkOrange{255, 140, 0};
-        }
-        namespace Yellows {
-            static const Color3 LightYellow{255, 255, 224};
-            static const Color3 LemonChiffon{255, 250, 205};
-            static const Color3 LightGoldenrodYellow{250, 250, 210};
-            static const Color3 PapayaWhip{255, 239, 213};
-            static const Color3 Moccasin{255, 228, 181};
-            static const Color3 PeachPuff{255, 218, 185};
-            static const Color3 PaleGoldenrod{238, 232, 170};
-            static const Color3 Khaki{240, 230, 140};
-            static const Color3 DarkKhaki{189, 183, 107};
-        }
-        namespace Greens {
-            static const Color3 LawnGreen{124, 252, 0};
-            static const Color3 Chartreuse{127, 255, 0};
-            static const Color3 LimeGreen{50, 205, 50};
-            static const Color3 ForestGreen{34, 139, 34};
-            static const Color3 DarkGreen{0, 100, 0};
-            static const Color3 GreenYellow{173, 255, 47};
-            static const Color3 YellowGreen{154, 205, 50};
-            static const Color3 SpringGreen{0, 255, 127};
-            static const Color3 MediumSpringGreen{0, 250, 154};
-            static const Color3 LightGreen{144, 238, 144};
-            static const Color3 PaleGreen{152, 251, 152};
-            static const Color3 DarkSeaGreen{143, 188, 143};
-            static const Color3 MediumSeaGreen{60, 179, 113};
-            static const Color3 SeaGreen{46, 139, 87};
-            static const Color3 DarkOliveGreen{85, 107, 47};
-            static const Color3 OliveDrab{107, 142, 35};
-            static const Color3 Lime{0, 255, 0};
-            static const Color3 Olive{128, 128, 0};
-        }
-        namespace Cyans {
-            static const Color3 LightCyan{224, 255, 255};
-            static const Color3 Cyan{0, 255, 255};
-            static const Color3 Aqua{0, 255, 255};
-            static const Color3 Aquamarine{127, 255, 212};
-            static const Color3 MediumAquamarine{102, 205, 170};
-            static const Color3 PaleTurquoise{175, 238, 238};
-            static const Color3 Turquoise{64, 224, 208};
-            static const Color3 MediumTurquoise{72, 209, 204};
-            static const Color3 DarkTurquoise{0, 206, 209};
-            static const Color3 LightSeaGreen{32, 178, 170};
-            static const Color3 CadetBlue{95, 158, 160};
-            static const Color3 DarkCyan{0, 139, 139};
-            static const Color3 Teal{0, 128, 128};
-        }
-        namespace Blues {
-            static const Color3 PowderBlue{176, 224, 230};
-            static const Color3 LightBlue{173, 216, 230};
-            static const Color3 LightSkyBlue{135, 206, 250};
-            static const Color3 SkyBlue{135, 206, 235};
-            static const Color3 DeepSkyBlue{0, 191, 255};
-            static const Color3 LightSteelBlue{176, 196, 222};
-            static const Color3 DodgerBlue{30, 144, 255};
-            static const Color3 CornflowerBlue{100, 149, 237};
-            static const Color3 SteelBlue{70, 130, 180};
-            static const Color3 RoyalBlue{65, 105, 225};
-            static const Color3 MediumBlue{0, 0, 205};
-            static const Color3 DarkBlue{0, 0, 139};
-            static const Color3 Navy{0, 0, 128};
-            static const Color3 MidnightBlue{25, 25, 112};
-            static const Color3 MediumSlateBlue{123, 104, 238};
-            static const Color3 SlateBlue{106, 90, 205};
-            static const Color3 DarkSlateBlue{72, 61, 139};
-        }
-
-
-        namespace Purples {
-            static const Color3 Lavender{230, 230, 250};
-            static const Color3 Thistle{216, 191, 216};
-            static const Color3 Plum{221, 160, 221};
-            static const Color3 Violet{238, 160, 221};
-            static const Color3 Orchid{218, 112, 214};
-            static const Color3 Fuchsia{255, 0, 255};
-            static const Color3 Magenta{255, 0, 255};
-            static const Color3 MediumOrchid{186, 85, 211};
-            static const Color3 MediumPurple{147, 112, 219};
-            static const Color3 BlueViolet{138, 43, 226};
-            static const Color3 DarkViolet{148, 0, 211};
-            static const Color3 DarkOrchid{153, 50, 204};
-            static const Color3 DarkMagenta{139, 0, 128};
-            static const Color3 Purple{128, 0, 128};
-            static const Color3 Indigo{75, 0, 130};
-        }
-        namespace Pinks {
-            static const Color3 Pink{255, 129, 203};
-            static const Color3 LightPink{255, 182, 193};
-            static const Color3 HotPink{255, 105, 180};
-            static const Color3 DeepPink{255, 20, 147};
-            static const Color3 PaleVioletRed{219, 112, 147};
-            static const Color3 MediumVioletRed{199, 21, 133};
-        }
-        namespace Whites {
-            static const Color3 Snow{255, 250, 250};
-            static const Color3 Honeydew{240, 255, 240};
-            static const Color3 MintCream{245, 255, 250};
-            static const Color3 Azure{240, 255, 255};
-            static const Color3 AliceBlue{240, 248, 255};
-            static const Color3 GhostWhite{248, 248, 255};
-            static const Color3 WhiteSmoke{245, 245, 245};
-            static const Color3 SeaShell{255, 245, 238};
-            static const Color3 Beige{245, 245, 220};
-            static const Color3 OldLace{253, 245, 230};
-            static const Color3 FloralWhite{255, 250, 240};
-            static const Color3 Ivory{255, 255, 240};
-            static const Color3 AntiqueWhite{250, 240, 215};
-            static const Color3 Linen{250, 240, 230};
-            static const Color3 LavenderBlush{255, 240, 245};
-            static const Color3 MistyRose{255, 228, 255};
-        }
-        namespace Grays {
-            static const Color3 Gainsboro{220, 220, 220};
-            static const Color3 LightGray{211, 211, 211};
-            static const Color3 Silver{192, 192, 192};
-            static const Color3 DimGray{105, 105, 105};
-            static const Color3 LightSlateGray{119, 136, 153};
-            static const Color3 SlateGray{112, 128, 144};
-            static const Color3 DarkSlateGray{47, 79, 79};
-        }
-        namespace Browns {
-            static const Color3 CornSilk{255, 248, 220};
-            static const Color3 BlanchedAlmond{255, 235, 205};
-            static const Color3 Bisque{255, 228, 196};
-            static const Color3 NavajoWhite{255, 222, 173};
-            static const Color3 Wheat{254, 222, 179};
-            static const Color3 BurlyWood{222, 184, 135};
-            static const Color3 Tan{210, 180, 140};
-            static const Color3 RosyBrown{188, 143, 143};
-            static const Color3 SandyBrown{244, 164, 96};
-            static const Color3 GoldenRod{218, 165, 32};
-            static const Color3 Peru{205, 133, 63};
-            static const Color3 Chocolate{210, 105, 30};
-            static const Color3 SaddleBrown{139, 69, 19};
-            static const Color3 Sienna{160, 82, 45};
-            static const Color3 Brown{164, 42, 42};
-            static const Color3 Maroon{128, 0, 0};
-        }
-    }
-}

include/JGL/JGL.h

@@ -14,7 +14,9 @@
 
 #include <string>
 #include <iostream>
-#include <JGL/Color4.h>
+#include <Color3.hpp>
+#include <Color4.hpp>
+#include <Colors.hpp>
 #include <JGL/Texture.h>
 #include <JGL/enums.h>
 #include <JGL/FontCache.h>
@@ -26,19 +28,21 @@
 #include <J3ML/Geometry/Capsule.h>
 #include <J3ML/Geometry/TriangleMesh.h>
 
-// OpenGL Wrapper for rendering 2D graphics primitives in both a 2D and 3D context
+
+/// OpenGL Wrapper for rendering 2D graphics primitives in both a 2D and 3D context
 namespace JGL {
 
     using namespace J3ML::LinearAlgebra;
     using namespace J3ML::Geometry;
 
-    /// TODO:
+    /// TODO: Implement HSV and other color representation conversions
     struct HSV {
         float hue;
         float saturation;
         float value;
     };
 
+    /// TODO: Migrate to using J3ML's definition once finished (hint hint)
     struct Triangle2D
     {
         Vector2 A;
@@ -46,20 +50,14 @@ namespace JGL {
         Vector2 C;
     };
 
-    struct Triangle3D
-    {
-        Vector3 A;
-        Vector3 B;
-        Vector3 C;
-    };
-
     void Update(const Vector2& window_size);
-    //bool InitTextEngine();
-    Font LoadFont(const std::string& font_path); // TODO: Fully deprecate
     void PurgeFontCache();
 
-    void SetActiveFont(const Font& font); // TODO: Implement
-    // TODO: implement correct coloring
+    // TODO: Implement
+    void SetActiveFont(const Font& font);
+
+    // TODO: Overrides specifically for Color3 are not **strictly** necessary, Color3 and Color4 should implicitly convert back and forth.
+
 
     /// Drawing functions for primitive 2D Shapes.
     /// Each function is overloaded with Color3 and Color4 for optional transparency.
@@ -75,12 +73,12 @@ namespace JGL {
         void End();
 
         /// Plots a single pixel on the screen.
-        /// @param color  A 3-or-4 channel color value. @see classes Color3, Color4
+        /// @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.
-        void DrawPixel(const Color3& color, const Vector2& coordinates);
-        void DrawPixel(const Color3& color, float x, float y);
-        void DrawPixel(const Color4& color, const Vector2& coordinates);
-        void DrawPixel(const Color4& color, float x, float y);
+        void DrawPoint(const Color3& color, const Vector2& coordinates, float radius = 1.f);
+        void DrawPoint(const Color3& color, float x, float y, float radius = 1.f);
+        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 line (segment) on the screen.
         /// @param color A 3-or-4 channel color value. @see classes Color3, Color4.
@@ -102,17 +100,35 @@ namespace JGL {
         void OutlineRect(const Color4& color, const Vector2& pos, const Vector2& size, float thickness = 1);
         void OutlineRect(const Color3& color, const Vector2& pos, const Vector2& size, float thickness = 1);
 
-        ///Draws a sprite to the screen.
-        void DrawSprite(const GLuint& texture, const Vector2& pos, const Vector2& size, u8 opacity = 255, Inversion::Inversion inversion = Inversion::None);
-        void DrawSprite(const GLuint& texture, float x, float y, float w, float h, u8 opacity = 255, Inversion::Inversion inversion = Inversion::None);
+        /// Draws a sprite to the screen by passing a GLuint that represents a handle to a loaded texture.
+        /// @param texture
+        /// @param position
+        /// @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 32-bit RGBA value represented as four unsigned 8-bit integers.
+        /// @param inversion
+        /// @see class Texture
+        void DrawSprite(const Texture& texture,
+                        const Vector2& position,
+                        const Vector2& origin = Vector2(0,0),
+                        const Vector2& scale = Vector2(1,1),
+                        const Color4& color = Colors::White,
+                        Inversion inversion = Inversion::None);
+        void DrawSprite(const Texture& texture,
+                        float positionX, float positionY,
+                        float originX = 0, float originY = 0,
+                        float scaleX = 1, float scaleY = 1,
+                        const Color4& color = Colors::White,
+                        Inversion inversion = Inversion::None);
 
-        ///Draws a non axis-aligned fill rect to the screen.
-        ///The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
+
+        /// Draws a non axis-aligned fill rect to the screen.
+        /// The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
         void FillQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4);
         void FillQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4);
 
-        ///Draws a non axis-aligned outline rect to the screen.
-        ///The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
+        /// Draws a non axis-aligned outline rect to the screen.
+        /// The order of the vertices must be such that if you were to connect them you'd never go diagonally across the quad.
         void OutlineQuad(const Color4& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness = 1);
         void OutlineQuad(const Color3& color, const Vector2& v1, const Vector2& v2, const Vector2& v3, const Vector2& v4, float thickness = 1);
 
@@ -121,8 +137,8 @@ namespace JGL {
         void FillRect(const Color3& color, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle where the color transitions across it.
-        void FillGradientRect(const Color4& color1, const Color4& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size);
-        void FillGradientRect(const Color3& color1, const Color3& color2, const Gradient::Gradient& gradient, const Vector2& pos, const Vector2& size);
+        void FillGradientRect(const Color4& color1, const Color4& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size);
+        void FillGradientRect(const Color3& color1, const Color3& color2, const Gradient& gradient, const Vector2& pos, const Vector2& size);
 
         /// Draws a filled rectangle with rounded corners on the screen.
         void FillRoundedRect(const Color4& color, const Vector2 &pos, const Vector2 &size, float radius = 5, unsigned int subdivisions = 8);
@@ -137,12 +153,22 @@ namespace JGL {
         void FillCircle(const Color3& 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
         void OutlineTriangle(const Color4& color, const Triangle2D& tri, float thickness = 1);
         void OutlineTriangle(const Color3& color, const Triangle2D& tri, float thickness = 1);
-        // TODO: Implement an overload that simply takes 3 Vector3's
+        void OutlineTriangle(const Color4& color,
+                             const Vector2& triA, const Vector2& triB, const Vector2& triC,
+                             float thickness = 1);
+        void OutlineTriangle(const Color3& color,
+                             const Vector2& triA, const Vector2& triB, const Vector2& triC,
+                             float thickness = 1);
+        // TODO: Take more Focalin
 
         /// Draws a filled triangle on the screen.
         void FillTriangle(const Color4& color, const Triangle2D& tri);
+        void FIllTriangle(const Color4& color, const Vector2& triA, const Vector2& triB, const Vector2& triC);
         void FillTriangle(const Color3& color, const Triangle2D& tri);
 
         /// Draws a triangle where each corner is defined by a given color, Smoothly transitioning between them.
@@ -165,6 +191,7 @@ namespace JGL {
         void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
     }
 
+    /// Drawing functions for primitive 3D Shapes.
     namespace J3D {
         void Begin();
         void End();
@@ -179,7 +206,7 @@ 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);
-        void DrawString(const Color3& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, const Font& font);
+        void DrawString(const Color4& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, const Font& font);
 
         void DrawMatrixGizmo     (const Matrix3x3&, const Vector3&);
         void DrawMatrixGizmo     (const Matrix4x4&);

include/JGL/Texture.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <ReTexture/Texture.h>
 #include <J3ML/LinearAlgebra.h>
-#include <JGL/Color3.h>
-#include <JGL/Color4.h>
+#include <Color3.hpp>
+#include <Color4.hpp>
 #include <glad/glad.h>
 
 namespace JGL {
@@ -23,9 +23,10 @@ namespace JGL {
         CLAMP_TO_BORDER = 3 //Effectively the same as clamp_to_edge
     };
 
+    /// Represents texture data loaded on the GPU. Contains a handle that can be passed to OpenGL draw calls.
     class Texture {
     private:
-        GLuint texture = 0;
+        GLuint texture_handle = 0;
         Vector2 texture_size = {0, 0};
         ReTexture::TextureFlag texture_flags;
         ReTexture::TextureFormat texture_format;
@@ -35,13 +36,15 @@ namespace JGL {
     public:
         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);
-        GLuint getTexture();
-        Vector2 getSize();
-        void erase();
-        TextureFilteringMode getFilteringMode();
-        TextureFlag getFlags();
-        TextureFormat getFormat();
-        std::vector<Color4> getPixelData();
+    public:
+        GLuint GetGLTextureHandle() const;
+        Vector2 GetDimensions() const;
+        TextureFilteringMode GetFilteringMode() const;
+        TextureFlag GetFlags() const;
+        TextureFormat GetFormat() const;
+        std::vector<Color4> GetPixelData() const;
+
+        void Erase();
     };
 
 }

include/JGL/Texture2D.hpp

@@ -1,37 +0,0 @@
-#pragma once
-
-#include <GL/gl.h>
-
-namespace JGL
-{
-
-    // TODO: Please implement the Texture2D class wrapper,
-    // so we can refactor DrawSprite() to take a Texture2D
-    // then i'll start building JUI::Image Widget to use Texture2D.
-
-    enum class TextureWrapMode
-    {
-        REPEAT, MIRRORED_REPEAT, CLAMP_TO_EDGE, CLAMP_TO_BORDER
-    };
-
-    enum class TextureFilterMode
-    {
-        NEAREST, LINEAR
-    };
-
-    /// Texture2D is a class-wrapper for OpenGL texture handles.
-    class Texture2D
-    {
-    public:
-        Texture2D() = default;
-    protected:
-    private:
-        unsigned int width;
-        unsigned int height;
-        GLuint handle;
-        TextureWrapMode wrap_vertical;
-        TextureWrapMode wrap_horizontal;
-        TextureFilterMode filter_min;
-        TextureFilterMode filter_max;
-    };
-}

include/JGL/enums.h

@@ -1,7 +1,7 @@
 #pragma once
 
-namespace JGL::Inversion {
-    enum Inversion {
+namespace JGL {
+    enum class Inversion : u8 {
         None = 0,
         Vertical = 1,
         Horizontal = 2,
@@ -10,17 +10,24 @@ namespace JGL::Inversion {
     inline Inversion operator|(Inversion a, Inversion b) {
         return static_cast<Inversion>(static_cast<int>(a) | static_cast<int>(b));
     }
+    inline bool operator&(Inversion a, Inversion b) {
+        return (u8)a & (u8)b;
+    }
 }
 
-namespace JGL::Gradient {
-    enum Gradient {
+namespace JGL {
+    enum class Gradient : u8 {
         Vertical = 0,
         Horizontal = 1,
         DiagonalTopLeft = 2,
-        DiagonalBottomLeft = 3
+        DiagonalBottomLeft = 4
     };
 
     inline Gradient operator|(Gradient a, Gradient b) {
         return static_cast<Gradient>(static_cast<int>(a) | static_cast<int>(b));
     }
+
+    inline bool operator&(Gradient a, Gradient b) {
+        return (u8)a & (u8)b;
+    }
 }