create_dynarray_from_memory -> create_dynarray

diff --git a/src/dynarray.h b/src/dynarray.h
index 15f228f2831736ae90b5ada7e98d9f7bc39363bd..1a8a5ec2604a42c5a5cd2044fb9ed1da10fce907 100644 (file)
--- a/src/dynarray.h
+++ b/src/dynarray.h
@@ -14,18 +14,19 @@ typedef struct {
 } Dynarray;
 
 static inline
-Dynarray create_dynarray(size_t element_size)
+Dynarray create_dynarray_malloc(size_t element_size)
 {
     Dynarray result = {
         .element_size = element_size,
         .count = 0,
         .data = malloc(DYNARRAY_CAPACITY * element_size)
     };
+    trace_assert(result.data);
     return result;
 }
 
 static inline
-Dynarray create_dynarray_from_memory(Memory *memory, size_t element_size)
+Dynarray create_dynarray(Memory *memory, size_t element_size)
 {
     trace_assert(memory);
     Dynarray result = {

diff --git a/src/game/level/boxes.c b/src/game/level/boxes.c
index fa6827df341471080e4d169eb4b85e4776c38f84..5635f6d57edf563b1247e10eb69ea995205794b5 100644 (file)
--- a/src/game/level/boxes.c
+++ b/src/game/level/boxes.c
@@ -34,9 +34,9 @@ Boxes *create_boxes_from_rect_layer(const RectLayer *layer, RigidBodies *rigid_b
     }
     boxes->lt = lt;
 
-    boxes->boxes_ids = create_dynarray(ENTITY_MAX_ID_SIZE);
-    boxes->body_ids = create_dynarray(sizeof(RigidBodyId));
-    boxes->body_colors = create_dynarray(sizeof(Color));
+    boxes->boxes_ids = create_dynarray_malloc(ENTITY_MAX_ID_SIZE);
+    boxes->body_ids = create_dynarray_malloc(sizeof(RigidBodyId));
+    boxes->body_colors = create_dynarray_malloc(sizeof(Color));
 
     boxes->rigid_bodies = rigid_bodies;
 

diff --git a/src/game/level/level_editor/label_layer.c b/src/game/level/level_editor/label_layer.c
index f28ceab51f5ab4aa63ef0443e2ef984ad6af5afa..dff29843b758f46707340bdac853cf4c731aef79 100644 (file)
--- a/src/game/level/level_editor/label_layer.c
+++ b/src/game/level/level_editor/label_layer.c
@@ -141,21 +141,6 @@ LayerPtr label_layer_as_layer(LabelLayer *label_layer)
     return layer;
 }
 
-LabelLayer create_label_layer(const char *id_name_prefix)
-{
-    LabelLayer result = {0};
-    result.ids = create_dynarray(sizeof(char) * LABEL_LAYER_ID_MAX_SIZE);
-    result.positions = create_dynarray(sizeof(Vec2f));
-    result.colors = create_dynarray(sizeof(Color));
-    result.texts = create_dynarray(sizeof(char) * LABEL_LAYER_TEXT_MAX_SIZE);
-    result.color_picker = create_color_picker_from_rgba(COLOR_RED);
-    result.selection = -1;
-    result.edit_field.font_size = LABELS_SIZE;
-    result.edit_field.font_color = COLOR_RED;
-    result.id_name_prefix = id_name_prefix;
-    return result;
-}
-
 LabelLayer *create_label_layer_from_memory(Memory *memory,
                                            const char *id_name_prefix)
 {
@@ -164,10 +149,10 @@ LabelLayer *create_label_layer_from_memory(Memory *memory,
 
     LabelLayer *result = memory_alloc(memory, sizeof(LabelLayer));
     memset(result, 0, sizeof(LabelLayer));
-    result->ids = create_dynarray_from_memory(memory, sizeof(char) * LABEL_LAYER_ID_MAX_SIZE);
-    result->positions = create_dynarray_from_memory(memory, sizeof(Vec2f));
-    result->colors = create_dynarray_from_memory(memory, sizeof(Color));
-    result->texts = create_dynarray_from_memory(memory, sizeof(char) * LABEL_LAYER_TEXT_MAX_SIZE);
+    result->ids = create_dynarray(memory, sizeof(char) * LABEL_LAYER_ID_MAX_SIZE);
+    result->positions = create_dynarray(memory, sizeof(Vec2f));
+    result->colors = create_dynarray(memory, sizeof(Color));
+    result->texts = create_dynarray(memory, sizeof(char) * LABEL_LAYER_TEXT_MAX_SIZE);
     result->color_picker = create_color_picker_from_rgba(COLOR_RED);
     result->selection = -1;
     result->edit_field.font_size = LABELS_SIZE;

diff --git a/src/game/level/level_editor/point_layer.c b/src/game/level/level_editor/point_layer.c
index 56d7318c0541df25cdf521059a6ba158d0e984e2..f9f8a54d5fabca0fe74e65c763774f1a950ee197 100644 (file)
--- a/src/game/level/level_editor/point_layer.c
+++ b/src/game/level/level_editor/point_layer.c
@@ -139,19 +139,6 @@ LayerPtr point_layer_as_layer(PointLayer *point_layer)
     return layer;
 }
 
-PointLayer create_point_layer(const char *id_name_prefix)
-{
-    PointLayer result = {0};
-    result.state = POINT_LAYER_IDLE;
-    result.positions = create_dynarray(sizeof(Vec2f));
-    result.colors = create_dynarray(sizeof(Color));
-    result.ids = create_dynarray(sizeof(char) * ID_MAX_SIZE);
-    result.edit_field.font_size = POINT_LAYER_ID_TEXT_SIZE;
-    result.edit_field.font_color = POINT_LAYER_ID_TEXT_COLOR;
-    result.id_name_prefix = id_name_prefix;
-    return result;
-}
-
 PointLayer *create_point_layer_from_memory(Memory *memory,
                                            const char *id_name_prefix)
 {
@@ -161,9 +148,9 @@ PointLayer *create_point_layer_from_memory(Memory *memory,
     PointLayer *result = memory_alloc(memory, sizeof(PointLayer));
     memset(result, 0, sizeof(PointLayer));
     result->state = POINT_LAYER_IDLE;
-    result->positions = create_dynarray_from_memory(memory, sizeof(Vec2f));
-    result->colors = create_dynarray_from_memory(memory, sizeof(Color));
-    result->ids = create_dynarray_from_memory(memory, sizeof(char) * ID_MAX_SIZE);
+    result->positions = create_dynarray(memory, sizeof(Vec2f));
+    result->colors = create_dynarray(memory, sizeof(Color));
+    result->ids = create_dynarray(memory, sizeof(char) * ID_MAX_SIZE);
     result->edit_field.font_size = POINT_LAYER_ID_TEXT_SIZE;
     result->edit_field.font_color = POINT_LAYER_ID_TEXT_COLOR;
     result->id_name_prefix = id_name_prefix;

diff --git a/src/game/level/level_editor/rect_layer.c b/src/game/level/level_editor/rect_layer.c
index f18b9bb31a89e13601295acf44d4ed97318761c2..5f3975d09c28a1cecc890eb22b12e08963bd1f97 100644 (file)
--- a/src/game/level/level_editor/rect_layer.c
+++ b/src/game/level/level_editor/rect_layer.c
@@ -806,10 +806,10 @@ RectLayer *create_rect_layer_from_memory(Memory *memory,
 
     RectLayer *rect_layer = memory_alloc(memory, sizeof(RectLayer));
 
-    rect_layer->ids = create_dynarray_from_memory(memory, sizeof(char) * ENTITY_MAX_ID_SIZE);
-    rect_layer->rects = create_dynarray_from_memory(memory, sizeof(Rect));
-    rect_layer->colors = create_dynarray_from_memory(memory, sizeof(Color));
-    rect_layer->actions = create_dynarray_from_memory(memory, sizeof(Action));
+    rect_layer->ids = create_dynarray(memory, sizeof(char) * ENTITY_MAX_ID_SIZE);
+    rect_layer->rects = create_dynarray(memory, sizeof(Rect));
+    rect_layer->colors = create_dynarray(memory, sizeof(Color));
+    rect_layer->actions = create_dynarray(memory, sizeof(Action));
     rect_layer->id_edit_field.font_size = RECT_LAYER_ID_LABEL_SIZE;
     rect_layer->id_edit_field.font_color = COLOR_BLACK;
     rect_layer->color_picker = create_color_picker_from_rgba(rgba(1.0f, 0.0f, 0.0f, 1.0f));

diff --git a/src/game/level_picker.c b/src/game/level_picker.c
index 4153c57aac5e6fbe11af39a95900a8e1f83d0103..e877383568e8189941128a09162626d42299a2f8 100644 (file)
--- a/src/game/level_picker.c
+++ b/src/game/level_picker.c
@@ -32,7 +32,7 @@ void level_picker_populate(LevelPicker *level_picker,
 
     {
         dynarray_clear(&level_picker->items);
-        level_picker->items = create_dynarray(METADATA_FILEPATH_MAX_SIZE);
+        level_picker->items = create_dynarray_malloc(METADATA_FILEPATH_MAX_SIZE);
 
         DIR *level_dir = opendir(dirpath);
         if (level_dir == NULL) {