use double for plot data points & more math

Author: brachy84

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

@@ -6,7 +6,7 @@
 public class AutoMajorTickFinder implements MajorTickFinder {
 
     private final boolean autoAdjust;
-    private float multiple = 10;
+    private double multiple = 10;
 
     public AutoMajorTickFinder(boolean autoAdjust) {
         this.autoAdjust = autoAdjust;
@@ -18,10 +18,10 @@ public AutoMajorTickFinder(float multiple) {
     }
 
     @Override
-    public float[] find(float min, float max, float[] ticks) {
+    public double[] find(double min, double max, double[] ticks) {
         int s = (int) Math.ceil((max - min) / multiple) + 2;
-        if (s > ticks.length) ticks = new float[s];
-        float next = (float) (Math.floor(min / multiple) * multiple);
+        if (s > ticks.length) ticks = new double[s];
+        double next = Math.floor(min / multiple) * multiple;
         for (int i = 0; i < s; i++) {
             ticks[i] = next;
             if (next > max) {
@@ -34,17 +34,17 @@ public float[] find(float min, float max, float[] ticks) {
         return ticks;
     }
 
-    void calculateAutoTickMultiple(float min, float max) {
-        float step = (max - min) / 5;
+    void calculateAutoTickMultiple(double min, double max) {
+        double step = (max - min) / 5;
         if (step < 1) {
             int significantPlaces = (int) Math.abs(Math.log10(step)) + 2;
-            float ten = (float) Math.pow(10, significantPlaces);
+            double ten = Math.pow(10, significantPlaces);
             step = (int) (step * ten + 0.2f) / ten;
         } else if (step == 1) {
             step = 0.2f;
         } else {
             int significantPlaces = (int) Math.log10(step) - 1;
-            float ten = (float) Math.pow(10, significantPlaces);
+            double ten = Math.pow(10, significantPlaces);
             step = (int) (step / ten + 0.2f) * ten;
         }
         setMultiple(step);
@@ -54,7 +54,7 @@ public boolean isAutoAdjust() {
         return autoAdjust;
     }
 
-    public void setMultiple(float multiple) {
+    public void setMultiple(double multiple) {
         this.multiple = multiple;
     }
 }

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

@@ -12,14 +12,14 @@ public AutoMinorTickFinder(int amountBetweenMajors) {
     }
 
     @Override
-    public float[] find(float min, float max, float[] majorTicks, float[] ticks) {
+    public double[] find(double min, double max, double[] majorTicks, double[] ticks) {
         int s = majorTicks.length * this.amountBetweenMajors;
-        if (ticks.length < s) ticks = new float[s];
+        if (ticks.length < s) ticks = new double[s];
         int k = 0;
         for (int i = 0; i < majorTicks.length - 1; i++) {
-            if (Float.isNaN(majorTicks[i + 1])) break;
-            float next = majorTicks[i];
-            float d = (majorTicks[i + 1] - next) / (amountBetweenMajors + 1);
+            if (Double.isNaN(majorTicks[i + 1])) break;
+            double next = majorTicks[i];
+            double d = (majorTicks[i + 1] - next) / (amountBetweenMajors + 1);
             for (int j = 0; j < amountBetweenMajors; j++) {
                 next += d;
                 if (next >= min) ticks[k++] = next;

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

@@ -4,7 +4,7 @@
 import com.cleanroommc.modularui.drawable.GuiDraw;
 import com.cleanroommc.modularui.drawable.text.TextRenderer;
 import com.cleanroommc.modularui.utils.Alignment;
-import com.cleanroommc.modularui.utils.FloatArrayMath;
+import com.cleanroommc.modularui.utils.DAM;
 
 import net.minecraft.client.renderer.BufferBuilder;
 
@@ -24,14 +24,14 @@ public class GraphAxis {
 
     public final GuiAxis axis;
 
-    public float[] majorTicks = new float[8];
-    public float[] minorTicks = new float[16];
+    public double[] majorTicks = new double[8];
+    public double[] minorTicks = new double[16];
     public TextRenderer.Line[] tickLabels = new TextRenderer.Line[8];
     private float maxLabelWidth = 0;
     public MajorTickFinder majorTickFinder = new AutoMajorTickFinder(true);
     public MinorTickFinder minorTickFinder = new AutoMinorTickFinder(2);
     public String label;
-    public float min, max;
+    public double min, max;
     public boolean autoLimits = true;
 
     public GraphAxis(GuiAxis axis) {
@@ -44,21 +44,21 @@ void compute(List<Plot> plots) {
                 this.min = 0;
                 this.max = 0;
             } else if (plots.size() == 1) {
-                this.min = FloatArrayMath.min(plots.get(0).getData(this.axis));
-                this.max = FloatArrayMath.max(plots.get(0).getData(this.axis));
+                this.min = DAM.min(plots.get(0).getData(this.axis));
+                this.max = DAM.max(plots.get(0).getData(this.axis));
             } else {
-                float min = Float.MAX_VALUE, max = Float.MIN_VALUE;
+                double min = Double.MAX_VALUE, max = Double.MIN_VALUE;
                 for (Plot plot : plots) {
-                    float m = FloatArrayMath.min(plot.getData(this.axis));
+                    double m = DAM.min(plot.getData(this.axis));
                     if (m < min) min = m;
-                    m = FloatArrayMath.max(plot.getData(this.axis));
+                    m = DAM.max(plot.getData(this.axis));
                     if (m > max) max = m;
                 }
                 this.min = min;
                 this.max = max;
             }
             if (this.axis.isVertical()) {
-                float padding = (this.max - this.min) * 0.05f;
+                double padding = (this.max - this.min) * 0.05f;
                 this.max += padding;
                 this.min -= padding;
             }
@@ -74,12 +74,12 @@ void compute(List<Plot> plots) {
         }
         textRenderer.setScale(TICK_LABEL_SCALE);
         this.maxLabelWidth = 0;
-        float maxDiff = FloatArrayMath.max(FloatArrayMath.diff(this.majorTicks));
+        double maxDiff = DAM.max(DAM.diff(this.majorTicks));
         int significantPlaces = (int) Math.abs(Math.log10(maxDiff)) + 2;
         DecimalFormat format = new DecimalFormat();
         format.setMaximumFractionDigits(significantPlaces);
         for (int i = 0; i < this.tickLabels.length; i++) {
-            if (Float.isNaN(this.majorTicks[i])) break;
+            if (Double.isNaN(this.majorTicks[i])) break;
             this.tickLabels[i] = textRenderer.line(format.format(this.majorTicks[i]));
             if (this.tickLabels[i].getWidth() > this.maxLabelWidth) {
                 this.maxLabelWidth = this.tickLabels[i].getWidth();
@@ -106,7 +106,7 @@ void applyPadding(GraphView graphView) {
     }
 
     void drawGridLines(BufferBuilder buffer, GraphView view, GraphAxis other, boolean major, float d, int r, int g, int b, int a) {
-        float[] pos = major ? this.majorTicks : this.minorTicks;
+        double[] pos = major ? this.majorTicks : this.minorTicks;
         float dHalf = d / 2;
         if (axis.isHorizontal()) {
             float otherMin = view.g2sY(other.max);
@@ -120,7 +120,7 @@ void drawGridLines(BufferBuilder buffer, GraphView view, GraphAxis other, boolea
     }
 
     void drawTicks(BufferBuilder buffer, GraphView view, GraphAxis other, boolean major, float thickness, float length, int r, int g, int b, int a) {
-        float[] pos = major ? this.majorTicks : this.minorTicks;
+        double[] pos = major ? this.majorTicks : this.minorTicks;
         float dHalf = thickness / 2;
         if (axis.isHorizontal()) {
             float otherMin = view.g2sY(other.min);
@@ -131,30 +131,30 @@ void drawTicks(BufferBuilder buffer, GraphView view, GraphAxis other, boolean ma
         }
     }
 
-    private void drawLinesOnHorizontal(BufferBuilder buffer, GraphView view, float[] pos, float dHalf,
+    private void drawLinesOnHorizontal(BufferBuilder buffer, GraphView view, double[] pos, float dHalf,
                                        float crossLow, float crossHigh, int r, int g, int b, int a) {
-        for (float p : pos) {
-            if (Float.isNaN(p)) break;
+        for (double p : pos) {
+            if (Double.isNaN(p)) break;
             if (p < min || p > max) continue;
 
-            p = view.g2sX(p);
+            float fp = view.g2sX(p);
 
-            float x0 = p - dHalf;
-            float x1 = p + dHalf;
+            float x0 = fp - dHalf;
+            float x1 = fp + dHalf;
             GuiDraw.drawRectRaw(buffer, x0, crossLow, x1, crossHigh, r, g, b, a);
         }
     }
 
-    private void drawLinesOnVertical(BufferBuilder buffer, GraphView view, float[] pos, float dHalf,
+    private void drawLinesOnVertical(BufferBuilder buffer, GraphView view, double[] pos, float dHalf,
                                      float crossLow, float crossHigh, int r, int g, int b, int a) {
-        for (float p : pos) {
-            if (Float.isNaN(p)) break;
+        for (double p : pos) {
+            if (Double.isNaN(p)) break;
             if (p < min || p > max) continue;
 
-            p = view.g2sY(p);
+            float fp = view.g2sY(p);
 
-            float y0 = p - dHalf;
-            float y1 = p + dHalf;
+            float y0 = fp - dHalf;
+            float y1 = fp + dHalf;
             GuiDraw.drawRectRaw(buffer, crossLow, y0, crossHigh, y1, r, g, b, a);
         }
     }
@@ -166,8 +166,8 @@ void drawLabels(GraphView view, GraphAxis other) {
             textRenderer.setAlignment(Alignment.TopCenter, 100);
             float y = view.g2sY(other.min) + TICK_LABEL_OFFSET;
             for (int i = 0; i < this.majorTicks.length; i++) {
-                float pos = this.majorTicks[i];
-                if (Float.isNaN(pos)) break;
+                double pos = this.majorTicks[i];
+                if (Double.isNaN(pos)) break;
                 if (pos < min || pos > max) continue;
                 textRenderer.setPos((int) (view.g2sX(pos) - 50), (int) y);
                 textRenderer.draw(this.tickLabels[i].getText());
@@ -177,8 +177,8 @@ void drawLabels(GraphView view, GraphAxis other) {
             textRenderer.setAlignment(Alignment.CenterRight, this.maxLabelWidth, 20);
             float x = view.g2sX(other.min) - TICK_LABEL_OFFSET - this.maxLabelWidth;
             for (int i = 0; i < this.majorTicks.length; i++) {
-                float pos = this.majorTicks[i];
-                if (Float.isNaN(pos)) break;
+                double pos = this.majorTicks[i];
+                if (Double.isNaN(pos)) break;
                 if (pos < min || pos > max) continue;
                 textRenderer.setPos((int) x, (int) (view.g2sY(pos) - 10));
                 textRenderer.draw(this.tickLabels[i].getText());
@@ -190,11 +190,11 @@ public GuiAxis getAxis() {
         return axis;
     }
 
-    public float getMax() {
+    public double getMax() {
         return max;
     }
 
-    public float getMin() {
+    public double getMin() {
         return min;
     }
 

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

@@ -21,7 +21,6 @@ public class GraphDrawable implements IDrawable {
     //private IDrawable background;
     private int backgroundColor = Color.WHITE.main;
 
-    private boolean borderTop = true, borderLeft = true, borderBottom = false, borderRight = false;
     private float majorTickThickness = 1f, majorTickLength = 3f, minorTickThickness = 0.5f, minorTickLength = 1.5f;
     private float gridLineWidth = 0.5f;
     private int gridLineColor = Color.withAlpha(Color.BLACK.main, 0.4f);
@@ -188,23 +187,23 @@ public GraphDrawable backgroundColor(int color) {
         return this;
     }
 
-    public GraphDrawable plot(float[] x, float[] y) {
+    public GraphDrawable plot(double[] x, double[] y) {
         return plot(new Plot().data(x, y));
     }
 
-    public GraphDrawable plot(float[] x, float[] y, int color) {
+    public GraphDrawable plot(double[] x, double[] y, int color) {
         return plot(new Plot()
                 .data(x, y)
                 .color(color));
     }
 
-    public GraphDrawable plot(float[] x, float[] y, float thickness) {
+    public GraphDrawable plot(double[] x, double[] y, float thickness) {
         return plot(new Plot()
                 .data(x, y)
                 .thickness(thickness));
     }
 
-    public GraphDrawable plot(float[] x, float[] y, float thickness, int color) {
+    public GraphDrawable plot(double[] x, double[] y, float thickness, int color) {
         return plot(new Plot()
                 .data(x, y)
                 .thickness(thickness)
@@ -213,6 +212,7 @@ public GraphDrawable plot(float[] x, float[] y, float thickness, int color) {
 
     public GraphDrawable plot(Plot plot) {
         this.plots.add(plot);
+        plot.redraw();
         return this;
     }