multiple default colors & apply stencil to plot

Author: brachy84

src/main/java/com/cleanroommc/modularui/drawable/graph/GraphDrawable.java

@@ -3,6 +3,7 @@
 import com.cleanroommc.modularui.api.GuiAxis;
 import com.cleanroommc.modularui.api.drawable.IDrawable;
 import com.cleanroommc.modularui.drawable.GuiDraw;
+import com.cleanroommc.modularui.drawable.Stencil;
 import com.cleanroommc.modularui.screen.viewport.GuiContext;
 import com.cleanroommc.modularui.theme.WidgetTheme;
 import com.cleanroommc.modularui.utils.Color;
@@ -46,13 +47,15 @@ public void draw(GuiContext context, int x, int y, int width, int height, Widget
             this.view.postResize();
         }
         if (this.backgroundColor != 0) {
-            GuiDraw.drawRect(this.view.sx0, this.view.sy0, this.view.sx1 - this.view.sx0, this.view.sy1 - this.view.sy0, this.backgroundColor);
+            GuiDraw.drawRect(this.view.sx0, this.view.sy0, this.view.getScreenWidth(), this.view.getScreenHeight(), this.backgroundColor);
         }
         Platform.setupDrawColor();
         drawGrid(context);
+        Stencil.applyTransformed((int) this.view.sx0, (int) this.view.sy0, (int) (this.view.getScreenWidth() + 1), (int) (this.view.getScreenHeight() + 1));
         for (Plot plot : this.plots) {
             plot.draw(this.view);
         }
+        Stencil.remove();
         drawTicks(context);
         GuiDraw.drawBorderOutsideLTRB(this.view.sx0, this.view.sy0, this.view.sx1, this.view.sy1, 0.5f, Color.BLACK.main);
         this.x.drawLabels(this.view, this.y);
@@ -95,6 +98,15 @@ private boolean compute() {
         this.dirty = false;
         this.x.compute(this.plots);
         this.y.compute(this.plots);
+        int colorIndex = 0;
+        for (Plot plot : this.plots) {
+            if (plot.defaultColor) {
+                plot.color = Plot.DEFAULT_PLOT_COLORS[colorIndex];
+                if (++colorIndex == Plot.DEFAULT_PLOT_COLORS.length) {
+                    colorIndex = 0;
+                }
+            }
+        }
         return true;
     }
 

src/main/java/com/cleanroommc/modularui/drawable/graph/GraphView.java

@@ -106,4 +106,52 @@ public void setAspectRatio(float aspectRatio) {
     public float getAspectRatio() {
         return aspectRatio;
     }
+
+    public float getGraphX0() {
+        return gx0;
+    }
+
+    public float getGraphX1() {
+        return gx1;
+    }
+
+    public float getGraphY0() {
+        return gy0;
+    }
+
+    public float getGraphY1() {
+        return gy1;
+    }
+
+    public float getScreenX0() {
+        return sx0;
+    }
+
+    public float getScreenX1() {
+        return sx1;
+    }
+
+    public float getScreenY0() {
+        return sy0;
+    }
+
+    public float getScreenY1() {
+        return sy1;
+    }
+
+    public float getScreenWidth() {
+        return sx1 - sx0;
+    }
+
+    public float getScreenHeight() {
+        return sy1 - sy0;
+    }
+
+    public float getGraphWidth() {
+        return gx1 - gx0;
+    }
+
+    public float getGraphHeight() {
+        return gy1 - gy0;
+    }
 }

src/main/java/com/cleanroommc/modularui/drawable/graph/Plot.java

@@ -10,10 +10,22 @@
 
 public class Plot {
 
+    public static final int[] DEFAULT_PLOT_COLORS = {
+            Color.BLUE_ACCENT.main,
+            Color.ORANGE_ACCENT.darker(0),
+            Color.GREEN.main,
+            Color.RED.main,
+            Color.DEEP_PURPLE_ACCENT.main,
+            Color.BROWN.main,
+            Color.TEAL.main,
+            Color.LIME.main
+    };
+
     float[] xs = FloatArrayMath.EMPTY;
     float[] ys = FloatArrayMath.EMPTY;
     float thickness = 1f;
-    int color = Color.BLUE_ACCENT.main;
+    boolean defaultColor = true;
+    int color;
 
     private float[] vertexBuffer;
     private boolean dirty = true;
@@ -192,6 +204,7 @@ public Plot thickness(float thickness) {
 
     public Plot color(int color) {
         this.color = color;
+        this.defaultColor = color == 0;
         return this;
     }
 }