]> git.lizzy.rs Git - nothing.git/blobdiff - src/game/level.c
Merge pull request #1 from tsoding/master
[nothing.git] / src / game / level.c
index 66bee90f14a6bff93d0d890392d3bc1cde808e65..c6d9c4d870148a11e75742a6d89cde6533679997 100644 (file)
@@ -18,6 +18,7 @@
 #include "game/level/rigid_bodies.h"
 #include "game/level_metadata.h"
 #include "game/level/level_editor/proto_rect.h"
+#include "game/level/level_editor/layer.h"
 #include "system/line_stream.h"
 #include "system/log.h"
 #include "system/lt.h"
@@ -35,15 +36,21 @@ struct Level
 
     const char *file_name;
     LevelMetadata *metadata;
+    // TODO(#812): LevelEditor does not support Background
     Background *background;
     RigidBodies *rigid_bodies;
+    // TODO(#813): LevelEditor does not support Player
     Player *player;
     Platforms *platforms;
+    // TODO(#815): LevelEditor does not support Goals
     Goals *goals;
+    // TODO(#816): LevelEditor does not support Lava
     Lava *lava;
     Platforms *back_platforms;
     Boxes *boxes;
+    // TODO(#818): LevelEditor does not support Labels
     Labels *labels;
+    // TODO(#819): LevelEditor does not support Regions
     Regions *regions;
 
     bool edit_mode;
@@ -59,7 +66,7 @@ Level *create_level_from_file(const char *file_name, Broadcast *broadcast)
         return NULL;
     }
 
-    Level *const level = PUSH_LT(lt, nth_alloc(sizeof(Level)), free);
+    Level *const level = PUSH_LT(lt, nth_calloc(1, sizeof(Level)), free);
     if (level == NULL) {
         RETURN_LT(lt, NULL);
     }
@@ -110,9 +117,14 @@ Level *create_level_from_file(const char *file_name, Broadcast *broadcast)
         RETURN_LT(lt, NULL);
     }
 
+    Layer *platforms_layer = create_layer_from_line_stream(level_stream);
+    if (platforms_layer == NULL) {
+        RETURN_LT(lt, NULL);
+    }
+
     level->platforms = PUSH_LT(
         lt,
-        create_platforms_from_line_stream(level_stream),
+        create_platforms_from_layer(platforms_layer),
         destroy_platforms);
     if (level->platforms == NULL) {
         RETURN_LT(lt, NULL);
@@ -134,17 +146,27 @@ Level *create_level_from_file(const char *file_name, Broadcast *broadcast)
         RETURN_LT(lt, NULL);
     }
 
+    Layer *back_platforms_layer = create_layer_from_line_stream(level_stream);
+    if (back_platforms_layer == NULL) {
+        RETURN_LT(lt, NULL);
+    }
+
     level->back_platforms = PUSH_LT(
         lt,
-        create_platforms_from_line_stream(level_stream),
+        create_platforms_from_layer(back_platforms_layer),
         destroy_platforms);
     if (level->back_platforms == NULL) {
         RETURN_LT(lt, NULL);
     }
 
+    Layer *boxes_layer = create_layer_from_line_stream(level_stream);
+    if (boxes_layer == NULL) {
+        RETURN_LT(lt, NULL);
+    }
+
     level->boxes = PUSH_LT(
         lt,
-        create_boxes_from_line_stream(level_stream, level->rigid_bodies, level->player),
+        create_boxes_from_layer(boxes_layer, level->rigid_bodies),
         destroy_boxes);
     if (level->boxes == NULL) {
         RETURN_LT(lt, NULL);
@@ -169,7 +191,10 @@ Level *create_level_from_file(const char *file_name, Broadcast *broadcast)
     level->edit_mode = false;
     level->level_editor = PUSH_LT(
         lt,
-        create_level_editor(level->boxes),
+        create_level_editor(
+            boxes_layer,
+            platforms_layer,
+            back_platforms_layer),
         destroy_level_editor);
     if (level->level_editor == NULL) {
         RETURN_LT(lt, NULL);
@@ -186,6 +211,7 @@ void destroy_level(Level *level)
     RETURN_LT0(level->lt);
 }
 
+
 int level_render(const Level *level, Camera *camera)
 {
     trace_assert(level);
@@ -194,6 +220,14 @@ int level_render(const Level *level, Camera *camera)
         return -1;
     }
 
+    if (level->edit_mode) {
+        if (level_editor_render(level->level_editor, camera) < 0) {
+            return -1;
+        }
+
+        return 0;
+    }
+
     if (platforms_render(level->back_platforms, camera) < 0) {
         return -1;
     }
@@ -226,12 +260,6 @@ int level_render(const Level *level, Camera *camera)
         return -1;
     }
 
-    if (level->edit_mode) {
-        if (level_editor_render(level->level_editor, camera) < 0) {
-            return -1;
-        }
-    }
-
     return 0;
 }
 
@@ -272,9 +300,45 @@ int level_event(Level *level, const SDL_Event *event, const Camera *camera)
     switch (event->type) {
     case SDL_KEYDOWN:
         switch (event->key.keysym.sym) {
-        case SDLK_SPACE:
+        case SDLK_SPACE: {
             player_jump(level->player);
-            break;
+        } break;
+
+        case SDLK_TAB: {
+            level->edit_mode = !level->edit_mode;
+            SDL_SetRelativeMouseMode(level->edit_mode);
+            if (!level->edit_mode) {
+                level->boxes = RESET_LT(
+                    level->lt,
+                    level->boxes,
+                    create_boxes_from_layer(
+                        level_editor_boxes(level->level_editor),
+                        level->rigid_bodies));
+                if (level->boxes == NULL) {
+                    return -1;
+                }
+
+                level->platforms = RESET_LT(
+                    level->lt,
+                    level->platforms,
+                    create_platforms_from_layer(
+                        level_editor_platforms(
+                            level->level_editor)));
+                if (level->platforms == NULL) {
+                    return -1;
+                }
+
+                level->back_platforms = RESET_LT(
+                    level->lt,
+                    level->back_platforms,
+                    create_platforms_from_layer(
+                        level_editor_back_platforms(
+                            level->level_editor)));
+                if (level->back_platforms == NULL) {
+                    return -1;
+                }
+            }
+        };
         }
         break;
 
@@ -315,91 +379,6 @@ int level_input(Level *level,
     return 0;
 }
 
-int level_reload_preserve_player(Level *level, Broadcast *broadcast)
-{
-    Lt * const lt = create_lt();
-    if (lt == NULL) {
-        return -1;
-    }
-
-    log_info("Soft-reloading the level from '%s'...\n", level->file_name);
-
-    /* TODO(#104): duplicate code in create_level_from_file and level_reload_preserve_player */
-
-    LineStream * const level_stream = PUSH_LT(
-        lt,
-        create_line_stream(
-            level->file_name,
-            "r",
-            LEVEL_LINE_MAX_LENGTH),
-        destroy_line_stream);
-    if (level_stream == NULL) {
-        RETURN_LT(lt, -1);
-    }
-
-    LevelMetadata *const metadata = create_level_metadata_from_line_stream(level_stream);
-    if (metadata == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->metadata = RESET_LT(level->lt, level->metadata, metadata);
-
-    Background * const background = create_background_from_line_stream(level_stream);
-    if (background == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->background = RESET_LT(level->lt, level->background, background);
-
-    Player * const skipped_player = create_player_from_line_stream(level_stream, level->rigid_bodies, broadcast);
-    if (skipped_player == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    destroy_player(skipped_player);
-
-    Platforms * const platforms = create_platforms_from_line_stream(level_stream);
-    if (platforms == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->platforms = RESET_LT(level->lt, level->platforms, platforms);
-
-    Goals * const goals = create_goals_from_line_stream(level_stream);
-    if (goals == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->goals = RESET_LT(level->lt, level->goals, goals);
-
-    Lava * const lava = create_lava_from_line_stream(level_stream);
-    if (lava == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->lava = RESET_LT(level->lt, level->lava, lava);
-
-    Platforms * const back_platforms = create_platforms_from_line_stream(level_stream);
-    if (back_platforms == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->back_platforms = RESET_LT(level->lt, level->back_platforms, back_platforms);
-
-    Boxes * const boxes = create_boxes_from_line_stream(level_stream, level->rigid_bodies, level->player);
-    if (boxes == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->boxes = RESET_LT(level->lt, level->boxes, boxes);
-
-    Labels * const labels = create_labels_from_line_stream(level_stream);
-    if (labels == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->labels = RESET_LT(level->lt, level->labels, labels);
-
-    Regions * const regions = create_regions_from_line_stream(level_stream, broadcast);
-    if (regions == NULL) {
-        RETURN_LT(lt, -1);
-    }
-    level->regions = RESET_LT(level->lt, level->regions, regions);
-
-    RETURN_LT(lt, 0);
-}
-
 int level_sound(Level *level, Sound_samples *sound_samples)
 {
     if (goals_sound(level->goals, sound_samples) < 0) {
@@ -464,21 +443,6 @@ struct EvalResult level_send(Level *level, Gc *gc, struct Scope *scope, struct E
         rigid_bodies_apply_force(level->rigid_bodies, (size_t) id, vec((float) x, (float) y));
 
         return eval_success(NIL(gc));
-    } else if (strcmp(target, "body-add") == 0) {
-        long int x = 0, y = 0, w = 0, h = 0;
-        const char *color = 0;
-        res = match_list(gc, "dddds", rest, &x, &y, &w, &h, &color);
-        if (res.is_error) {
-            return res;
-        }
-
-        return eval_success(
-            NUMBER(
-                gc,
-                (long int) rigid_bodies_add(
-                    level->rigid_bodies,
-                    rect((float)x, (float)y, (float)w, (float)h),
-                    hexstr(color))));
     } else if (strcmp(target, "edit") == 0) {
         level->edit_mode = !level->edit_mode;
         SDL_SetRelativeMouseMode(level->edit_mode);