Rework dynamic arrays

Author: vtereshkov

build_umplot_linux.sh

@@ -1,2 +1,2 @@
-gcc -O3 -fPIC umplot.c -o umplot.umi -shared -static-libgcc -L$PWD -lm -lraylib -lpthread
+gcc -O3 -fPIC umplot.c -o umplot.umi -shared -static-libgcc -L$PWD -lm -lraylib -lumka -lpthread
 

build_umplot_windows_mingw.bat

@@ -1 +1 @@
-gcc -O3 umplot.c -o umplot.umi -shared -Wl,--dll -static-libgcc -static -lraylib -L%cd% -lkernel32 -luser32 -lgdi32 -lwinmm 
+gcc -O3 umplot.c -o umplot.umi -shared -Wl,--dll -static-libgcc -static -lraylib -lumka -L%cd% -lkernel32 -luser32 -lgdi32 -lwinmm 

umplot.c

@@ -31,7 +31,6 @@ typedef struct
 typedef struct
 {
     UmkaDynArray(Point) points;
-    int64_t actLen;
     char *name;
     Style style;
 } Series;
@@ -92,7 +91,7 @@ static Rectangle getLegendRect(const Plot *plot)
     if (!plot->legend.visible)
         return legendRect;
 
-    for (int iSeries = 0; iSeries < plot->series.len; iSeries++)
+    for (int iSeries = 0; iSeries < umkaGetDynArrayLen(&plot->series); iSeries++)
     {
         const int labelWidth = MeasureText(plot->series.data[iSeries].name, plot->grid.fontSize);
         if (labelWidth > legendRect.width)
@@ -155,10 +154,10 @@ static void resetTransform(const Plot *plot, ScreenTransform *transform)
     Point minPt = (Point){ DBL_MAX,  DBL_MAX};
     Point maxPt = (Point){-DBL_MAX, -DBL_MAX};
 
-    for (int iSeries = 0; iSeries < plot->series.len; iSeries++)
+    for (int iSeries = 0; iSeries < umkaGetDynArrayLen(&plot->series); iSeries++)
     {
         Series *series = &plot->series.data[iSeries];
-        for (int iPt = 0; iPt < series->points.len; iPt++)
+        for (int iPt = 0; iPt < umkaGetDynArrayLen(&series->points); iPt++)
         {
             const Point *pt = &series->points.data[iPt];
             if (pt->x > maxPt.x)  maxPt.x = pt->x;
@@ -208,18 +207,18 @@ static void drawGraph(const Plot *plot, const ScreenTransform *transform)
     Rectangle clientRect = getClientRect(plot);
     BeginScissorMode(clientRect.x, clientRect.y, clientRect.width, clientRect.height);
 
-    for (int iSeries = 0; iSeries < plot->series.len; iSeries++)
+    for (int iSeries = 0; iSeries < umkaGetDynArrayLen(&plot->series); iSeries++)
     {
         Series *series = &plot->series.data[iSeries];
         switch (series->style.kind)
         {
             case STYLE_LINE:
             {
-                if (series->points.len > 1)
+                if (umkaGetDynArrayLen(&series->points) > 1)
                 {
                     Vector2 prevPt = getScreenPoint(series->points.data[0], transform);                
 
-                    for (int iPt = 1; iPt < series->points.len; iPt++)
+                    for (int iPt = 1; iPt < umkaGetDynArrayLen(&series->points); iPt++)
                     {
                         Vector2 pt = getScreenPoint(series->points.data[iPt], transform); 
                         DrawLineEx(prevPt, pt, series->style.width, *(Color *)&series->style.color);
@@ -231,7 +230,7 @@ static void drawGraph(const Plot *plot, const ScreenTransform *transform)
 
             case STYLE_SCATTER:
             {
-                for (int iPt = 0; iPt < series->points.len; iPt++)
+                for (int iPt = 0; iPt < umkaGetDynArrayLen(&series->points); iPt++)
                 {
                     Vector2 pt = getScreenPoint(series->points.data[iPt], transform); 
                     DrawCircleV(pt, series->style.width, *(Color *)&series->style.color);
@@ -370,7 +369,7 @@ static void drawLegend(const Plot *plot, const Font *font)
 
     const Rectangle legendRect = getLegendRect(plot);
 
-    for (int iSeries = 0; iSeries < plot->series.len; iSeries++)
+    for (int iSeries = 0; iSeries < umkaGetDynArrayLen(&plot->series); iSeries++)
     {
         Series *series = &plot->series.data[iSeries];
 

umplot.um

@@ -16,7 +16,6 @@ type (
 
     Series* = struct {
         points: []Point
-        actLen: int
         name: str
         style: Style
     }
@@ -48,25 +47,14 @@ type (
 )
 
 fn (s: ^Series) clear*() {
-    s.points = make([]Point, 256)
-    s.actLen = 0
-}
-
-fn (s: ^Series) trim() {
-    if s.actLen < len(s.points) {
-        s.points = slice(s.points, 0, s.actLen)
-    }
+    s.points = []Point{}
 }
 
 fn (s: ^Series) add*(x, y: real) {
-    if len(s.points) == 0 {
+    if !valid(s.points) {
         s.clear()
     }
-    if s.actLen >= len(s.points) {    
-        s.points = append(s.points, make([]Point, len(s.points)))
-    }
-    s.points[s.actLen] = Point{x, y}
-    s.actLen++
+    s.points = append(s.points, Point{x, y})
 }
 
 fn init*(numSeries: int = 1, kind: int = STYLE_LINE): Plot {
@@ -105,10 +93,6 @@ fn init*(numSeries: int = 1, kind: int = STYLE_LINE): Plot {
 fn umplot_plot(p: ^Plot): int
 
 fn (p: ^Plot) plot*() {
-    for i := 0; i < len(p.series); i++ {
-        p.series[i].trim()      
-    }
-
     umplot_plot(p)
 }