Gradient FillRect + GradientLine

include/JGL/Color3.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <JGL/Color4.h>
 #include <J3ML/J3ML.h>
 
 namespace JGL
@@ -10,16 +9,9 @@ namespace JGL
         u8 r;
         u8 g;
         u8 b;
-
         Color3 Lerp(const Color3& rhs, float alpha) const;
-        Color4 WithAlphaChannel(float alpha = 1) const;
         Color3(u8 R, u8 G, u8 B) : r(R), g(G), b(B) {}
-        Color3(const Color4& c)
-        {
-            this->r = c.r;
-            this->g = c.g;
-            this->b = c.b;
-        }
+
         u8 RedChannel  () const { return r; }
         u8 GreenChannel() const { return g; }
         u8 BlueChannel () const { return b; }

include/JGL/Color4.h

@@ -1,8 +1,14 @@
 #pragma once
 
+#include <JGL/Color3.h>
+
 namespace JGL
 {
-    struct Color4{
+    class Color4 {
+    public:
+        explicit Color4(const Color3& color3, unsigned int alpha) {r = color3.r; g = color3.g; b = color3.b; a = alpha;}
+        Color4(int red, int green, int blue, int alpha = 127) : r(red), g(green), b(blue), a(alpha) {}
+        static Color4 FromColor3(const Color3& color3, unsigned int alpha = 127) {return Color4(color3, alpha);}
         int r;
         int g;
         int b;

include/JGL/Gradient.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include <J3ML/J3ML.h>
+
+namespace JGL {
+    enum class Gradient : u8 {
+        Vertical = 0,
+        Horizontal = 1,
+        DiagonalTopLeft = 2,
+        DiagonalBottomLeft = 3
+    };
+}

include/JGL/JGL.h

@@ -5,7 +5,8 @@
 
 #include <string>
 #include <iostream>
-#include <JGL/Color3.h>
+#include <JGL/Color4.h>
+#include <JGL/Gradient.h>
 #include <JGL/FontCache.h>
 #include <J3ML/LinearAlgebra.h>
 #include <J3ML/LinearAlgebra/Vector2.h>
@@ -88,6 +89,12 @@ 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.
+        void DrawGradientLine(const Color4& color1, const Color4& color2, const Vector2& A, const Vector2& B, float thickness = 1);
+        void DrawGradientLine(const Color3& color1, const Color3& color2, const Vector2& A, const Vector2& B, float thickness = 1);
+        void DrawGradientLine(const Color4& color1, const Color4& color2, float x, float y, float w, float h, float thickness = 1);
+        void DrawGradientLine(const Color3& color1, const Color3& color2, float x, float y, float w, float h, float thickness = 1);
+
         /// Draws an outline of a rectangle on the screen.
         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);
@@ -96,21 +103,21 @@ namespace JGL {
         void FillRect(const Color4& color, const Vector2& pos, const Vector2& size);
         void FillRect(const Color3& color, const Vector2& pos, const Vector2& size);
 
-
-        /// Draws an outline of a rectangle with rounded corners on the screen.
-        void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
+        /// Draws a filled rectangle where the color transitions across it.
+        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 = 10);
-        void FillRoundedRect(const Color3& color, const Vector2& pos, const Vector2& size, float radius = 5, unsigned int subdivisions = 10);
+        void FillRoundedRect(const Color4 &color, const Vector2 &pos, const Vector2 &size, float radius = 5, unsigned int subdivisions = 8);
+        void FillRoundedRect(const Color3& color, const Vector2& pos, const Vector2& size, float radius = 5, unsigned int subdivisions = 8);
 
         /// Draws an outline of a circle on the screen.
         void OutlineCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions = 16, float thickness = 1);
         void OutlineCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions = 16, float thickness = 1);
 
         /// Draws a filled circle on the screen.
-        void FillCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions = 16);
-        void FillCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions = 16);
+        void FillCircle(const Color4& color, const Vector2& center, float radius, unsigned int subdivisions = 8);
+        void FillCircle(const Color3& color, const Vector2& center, float radius, unsigned int subdivisions = 8);
 
         /// Draws an outline of a triangle on the screen.
         void OutlineTriangle(const Color4& color, const Triangle2D& tri, float thickness = 1);
@@ -133,8 +140,9 @@ namespace JGL {
         void DrawCubicBezierCurve();
         void OutlinePolygon    (const Color4& color, std::vector<Vector2> points);
         void FillPolygon       (const Color4& color, std::vector<Vector2> points, float thickness = 1);
-        void GradientFillRect  ();
+        void OutlineRoundedRect(const Color4& color, const Vector2& pos, const Vector2& size, float radius = 5, float thickness = 1);
     }
+
     namespace J3D {
         void Begin();
         void End();