Pushing whats there

Reviewed-on: #20

config/visualizer.toml

@@ -3,7 +3,7 @@ tile_size_w = 48
 tile_size_h = 48
 
 [map]
-map_size_w = 20
-map_size_h = 20
+map_size_w = 80
+map_size_h = 50
 floor_char = '.'
 wall_char = '#'

scripts/algorithms/cellular_auotmata.lua

@@ -0,0 +1,84 @@
+CellularAutomata = {
+    map_w = 0,
+    map_h = 0,
+    iterations = 0,
+}
+
+function CellularAutomata.get_neighbors(map, x, y)
+    local min_x = math.max(0, x-1)
+    local min_y = math.max(0, y-1)
+    local max_x = math.min(x+1, map:get_width()-1)
+    local max_y = math.min(y+1, map:get_height()-1)
+    local result = {}
+    for mx = min_x, max_x do
+        for my = min_y, max_y do
+            table.insert(result, {x = mx, y = my})
+        end
+    end
+    return result
+end
+
+function CellularAutomata:initialize(w, h)
+    self.map_w = w
+    self.map_h = h
+    self.iterations = 3
+    math.randomseed()
+    for mx = 0, w-1 do
+        for my = 0, h-1 do
+            local is_wall = math.random(0, 1) == 1
+            if is_wall then
+                visualizer.map:draw_wall(mx, my)
+            else
+                visualizer.map:draw_floor(mx, my)
+            end
+        end
+    end
+end
+
+function CellularAutomata:update()
+    if self.iterations <= 0 then
+        return true
+    end
+
+    local old_map = visualizer.map
+    local new_map = old_map:clone()
+
+    for mx = 0, self.map_w - 1 do
+        for my = 0, self.map_h - 1 do
+            local neighbors = self.get_neighbors(old_map, mx, my)
+            local expected_neighbors = 9
+            local walls = expected_neighbors - #neighbors
+            local required_walls = 5
+            --print(old_map:is_wall(mx, my))
+            --print(new_map:is_wall(mx, my))
+            for k,v in ipairs(neighbors) do
+                if old_map:is_wall(v.x, v.y) then
+                    walls = walls + 1
+                end
+            end
+            if walls >= required_walls then
+                new_map:draw_wall(mx, my)
+            else
+                new_map:draw_floor(mx, my)
+            end
+            --print(old_map:is_wall(mx, my))
+            --print(new_map:is_wall(mx, my))
+        end
+    end
+
+    -- Now draw the new map onto the existing one
+    for mx = 0, self.map_w - 1 do
+        for my = 0, self.map_h - 1 do
+            if new_map:is_wall(mx, my) then
+                old_map:draw_wall(mx, my)
+            else
+                old_map:draw_floor(mx, my)
+            end
+        end
+    end
+
+    self.iterations = self.iterations - 1
+    return false
+end
+
+visualizer.algorithm_manager:register_algorithm("Cellular Automata", function (w, h) CellularAutomata:initialize(w, h) end, function () return CellularAutomata:update() end, 1)

scripts/algorithms/drunk_walk.lua

@@ -1,16 +1,16 @@
-require "math"
 DrunkenWalk = {
     curr_x = 0,
     curr_y = 0,
     map_w = 0,
     map_h = 0,
-    iterations = 30
+    iterations = 0
 }
 
 function DrunkenWalk:initialize(w, h)
-    math.randomseed(os.time())
+    math.randomseed()
     self.map_w = w
     self.map_h = h
+    self.iterations = 200
     visualizer.map:fill(true)
     self.curr_x = math.random(0, w-1)
     self.curr_y = math.random(0, h-1);
@@ -33,4 +33,4 @@ function DrunkenWalk:update()
     return false
 end
 
-visualizer.algorithm_manager:register_algorithm("Drunken Walk", function (w, h) DrunkenWalk:initialize(w, h) end, function () return DrunkenWalk:update() end, 5)
+visualizer.algorithm_manager:register_algorithm("Drunken Walk", function (w, h) DrunkenWalk:initialize(w, h) end, function () return DrunkenWalk:update() end, 60)

scripts/algorithms/test.lua

@@ -1,18 +0,0 @@
-Test = {}
-
-function Test.initialize(w, h)
-    visualizer.map:fill(false)
-    for mx = 0, w-1 do
-        for my = 0, h-1 do
-            if mx == 0 or mx == w-1 or my == 0 or my == h-1 then
-                visualizer.map:draw_wall(mx, my)
-            end
-        end
-    end
-end
-
-function Test.update()
-
-end
-
-visualizer.algorithm_manager:register_algorithm("Test", Test.initialize, Test.update, 1)

src/engine/rendering/renderer.hpp

@@ -62,6 +62,8 @@ public:
     virtual void draw_point(int x, int y, Color color) = 0;
     virtual void draw_text(std::optional<TextRenderDetails> details, std::string text,int x, int y)=0;
     virtual void draw_sprite(Sprite sprite, int x, int y)=0;
+    virtual void draw_sprite(Sprite sprite, int x, int y, float scale)=0;
+    virtual TextRenderDetails get_default_text_render_details()=0;
 
     virtual ~Renderer() = default;
 };

src/engine/rendering/sdl/sdlrenderer.cpp

@@ -20,7 +20,7 @@ void SdlRenderer::draw_text(std::optional<TextRenderDetails> details, std::strin
     TextRenderDetails unpacked_details = details.value_or(this->renderer_params.default_font);
     std::shared_ptr<TTF_Font> font = this->font_manager->fetch_resource(SdlFontArgs(unpacked_details.size, unpacked_details.font_path));
     std::shared_ptr<SDL_Texture> texture = this->texture_manager->load_text_as_texture(text, font, unpacked_details.color);
-    render_texture(x, y, texture, nullptr);
+    render_texture(x, y, texture, nullptr, nullptr);
 }
 
 SdlRenderer::~SdlRenderer() {
@@ -34,7 +34,7 @@ SdlRenderer::~SdlRenderer() {
     SDL_Quit();
 }
 
-void SdlRenderer::render_texture(int x, int y, const std::shared_ptr<SDL_Texture>& texture, SDL_Rect *src) {
+void SdlRenderer::render_texture(int x, int y, const std::shared_ptr<SDL_Texture>& texture, SDL_Rect *src, SDL_Rect *dest) {
     int w, h;
     if(src == nullptr) {
         SDL_QueryTexture(texture.get(), nullptr, nullptr, &w, &h);
@@ -43,11 +43,21 @@ void SdlRenderer::render_texture(int x, int y, const std::shared_ptr<SDL_Texture
         w = src->w;
         h = src->h;
     }
-    SDL_Rect rect = {x,y,w,h};
-    SDL_RenderCopy(this->renderer.get(), texture.get(), src, &rect);
+    SDL_Rect destination_rect;
+    if(dest == nullptr) {
+        destination_rect = {x,y,w,h};
+    }
+    else {
+        destination_rect = *dest;
+    }
+    SDL_RenderCopy(this->renderer.get(), texture.get(), src, &destination_rect);
 }
 
 void SdlRenderer::draw_sprite(Sprite sprite, int x, int y) {
+    this->draw_sprite(sprite, x, y, 1);
+}
+
+void SdlRenderer::draw_sprite(Sprite sprite, int x, int y, float scale) {
     SpriteSheet *sprite_sheet = sprite.sprite_sheet;
     TextureManagerFetchArgs args = TextureManagerFetchArgs {sprite_sheet->path, sprite_sheet->color_key};
     std::shared_ptr<SDL_Texture> texture = this->texture_manager->fetch_resource(args);
@@ -57,7 +67,8 @@ void SdlRenderer::draw_sprite(Sprite sprite, int x, int y) {
     int src_y = l*sprite_sheet->sprite_height;
     int src_x = (sprite_sheet->sprite_width * sprite.index) % w;
     auto source = SDL_Rect{src_x, src_y, sprite_sheet->sprite_width, sprite_sheet->sprite_height};
-    render_texture(x, y, texture, &source);
+    auto dest = SDL_Rect {x, y, (int)std::ceil(sprite_sheet->sprite_width * scale), (int)std::ceil(sprite_sheet->sprite_height * scale)};
+    render_texture(x, y, texture, &source, &dest);
 }
 
 SdlRenderer::SdlRenderer(RendererParams renderer_params) : renderer_params(std::move(renderer_params)) {
@@ -74,7 +85,7 @@ SdlRenderer::SdlRenderer(RendererParams renderer_params) : renderer_params(std::
         printf("Failed to initialize font loading: %s\n", TTF_GetError());
         exit(EXIT_FAILURE);
     }
-    SDL_Window* sdl_window = SDL_CreateWindow(renderer_params.title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, renderer_params.width, renderer_params.height, SDL_WINDOW_SHOWN);
+    SDL_Window* sdl_window = SDL_CreateWindow(this->renderer_params.title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, this->renderer_params.width, this->renderer_params.height, SDL_WINDOW_SHOWN);
     if(sdl_window == nullptr) {
         printf("error making window: %s\n", SDL_GetError());
         exit(EXIT_FAILURE);

src/engine/rendering/sdl/sdlrenderer.hpp

@@ -18,22 +18,22 @@ struct SDL_WindowDeleter {
 class SdlRenderer : public Renderer {
 public:
     ~SdlRenderer() override;
-
-    SdlRenderer(RendererParams renderer_params);
-
+    explicit SdlRenderer(RendererParams renderer_params);
     void draw_text(std::optional<TextRenderDetails> details, std::string text, int x, int y) override;
     void flush() override;
     void draw_point(int x, int y, Color color) override;
-
     void draw_sprite(Sprite sprite, int x, int y) override;
-
+    void draw_sprite(Sprite sprite, int x, int y, float scale) override;
+    TextRenderDetails get_default_text_render_details() override {
+        return this->renderer_params.default_font;
+    }
 private:
     RendererParams renderer_params;
     std::unique_ptr<SDL_Window, SDL_WindowDeleter> window;
     std::shared_ptr<SDL_Renderer> renderer = nullptr;
     std::unique_ptr<SdlTextureManager> texture_manager = nullptr;
     std::unique_ptr<SdlFontManager> font_manager = nullptr;
-    void render_texture(int x, int y, const std::shared_ptr<SDL_Texture>& texture, SDL_Rect *src);
+    void render_texture(int x, int y, const std::shared_ptr<SDL_Texture>& texture, SDL_Rect *src, SDL_Rect *dest);
 };
 
 

src/engine/scripting/luacontextmanager.cpp

@@ -11,6 +11,6 @@ std::string LuaContextManager::get_key(std::string args) {
 // TODO: Switch the arg to a struct and use that to init libraries
 std::shared_ptr<sol::state> LuaContextManager::load_resource(std::string args) {
     auto lua = std::make_shared<sol::state>();
-    lua->open_libraries(sol::lib::base, sol::lib::package, sol::lib::math, sol::lib::os);
+    lua->open_libraries(sol::lib::base, sol::lib::package, sol::lib::math, sol::lib::table);
     return lua;
 }

src/engine/utility/camera.cpp

@@ -25,7 +25,9 @@ void Camera::set_bounds(int max_x, int max_y) {
     this->cached_bounds = calculate_bounds();
 }
 
-Rectangle Camera::calculate_bounds() {
+Rectangle Camera::calculate_bounds() const {
+    auto tiles_rendered_x = this->get_tiles_rendered_x();
+    auto tiles_rendered_y = this->get_tiles_rendered_y();
     int minx = std::clamp(center.x-(tiles_rendered_x/2), 0, std::max(0,max_x - tiles_rendered_x));
     int miny = std::clamp(center.y-(tiles_rendered_y/2), 0, std::max(0,max_y - tiles_rendered_y));
     int width = std::min(tiles_rendered_x, max_x-minx);
@@ -50,3 +52,20 @@ ranges::any_view<Point> Camera::get_range() {
         });
     }) | ranges::views::join;
 }
+
+float Camera::get_scale() const {
+    return scale;
+}
+
+void Camera::set_scale(float scale) {
+    this->scale = scale;
+    this->cached_bounds = calculate_bounds();
+}
+
+int Camera::get_tiles_rendered_x() const {
+    return (int)std::ceil(tiles_rendered_x / this->scale);
+}
+
+int Camera::get_tiles_rendered_y() const {
+    return (int)std::ceil(tiles_rendered_y / this->scale);
+}

src/engine/utility/camera.hpp

@@ -20,7 +20,15 @@ private:
     int max_x=0;
     int max_y=0;
     Rectangle cached_bounds=Rectangle();
-    Rectangle calculate_bounds();
+    Rectangle calculate_bounds() const;
+    float scale = 1;
+    [[nodiscard]] int get_tiles_rendered_x() const;
+    [[nodiscard]] int get_tiles_rendered_y() const;
+public:
+    [[nodiscard]] float get_scale() const;
+
+    void set_scale(float scale);
+
 public:
     Rectangle get_bounds();
     void move_camera(Point new_center);

src/game/algorithmmanager.hpp

@@ -25,6 +25,9 @@ public:
     ranges::any_view<DungeonAlgorithm*, ranges::category::random_access | ranges::category::sized> get_algorithms();
     void load_algorithm(DungeonAlgorithm* algorithm, int w, int h);
     void tick_algorithm();
+    DungeonAlgorithm* get_currently_running_algorithm() {
+        return algorithm_done ? nullptr : loaded_algorithm;
+    }
     explicit AlgorithmManager(unsigned int targetFps) : target_fps(targetFps) {}
     AlgorithmManager() = default;
 };

src/game/tilemap.cpp

@@ -31,7 +31,6 @@ void TileMap::fill(bool wall) {
             draw_floor(p.x, p.y);
         }
     }
-
 }
 
 bool TileMap::is_wall(int x, int y) {
@@ -45,3 +44,7 @@ int TileMap::get_width() {
 int TileMap::get_height() {
     return grid.get_height();
 }
+
+TileMap TileMap::clone() {
+    return {this->get_width(), this->get_height(), this->wall_tile, this->floor_tile};
+}

src/game/tilemap.hpp

@@ -21,6 +21,7 @@ public:
     bool is_wall(int x, int y);
     int get_width();
     int get_height();
+    TileMap clone();
 
     TileMap(int width, int height, char wall_tile, char floor_tile) {
         this->grid = Grid2D<char>(width, height);

src/game/visualizer.cpp

@@ -16,6 +16,10 @@ bool Visualizer::update(InputResult input) {
         case KEY_LEFT: x -= 1; break;
         case KEY_UP: y -= 1; break;
         case KEY_DOWN: y += 1; break;
+        case KEY_KP_PLUS:
+            this->camera.set_scale(this->camera.get_scale() * 2); break;
+        case KEY_KP_MINUS:
+            this->camera.set_scale(this->camera.get_scale() / 2); break;
         default: break;
     }
     if(input.keycode >= InputProcessorKeycode::KEY_1 && input.keycode <= InputProcessorKeycode::KEY_9) {
@@ -36,6 +40,9 @@ bool Visualizer::update(InputResult input) {
 void Visualizer::render(Renderer *renderer) {
     SpriteSheet tiles = SpriteSheet{"sprites/map1.bmp", tile_width, tile_height};
     SpriteSheet characters = SpriteSheet{"sprites/character.bmp", tile_width, tile_height, COLOR_BLACK};
+    float scale = this->camera.get_scale();
+    int scaled_tile_width = (int)std::ceil(tile_width * scale);
+    int scaled_tile_height = (int)std::ceil(tile_height * scale);
     auto grass = Sprite{&tiles, 0};
     auto wall = Sprite{&tiles, 497};
     auto character = Sprite{&characters, this->sprite_index};
@@ -43,15 +50,27 @@ void Visualizer::render(Renderer *renderer) {
         auto wp = camera.camera_coords_to_screen_coords(p);
         int wx = wp.x, wy = wp.y;
         if(this->tile_map.get_tile(p.x, p.y) == floor_char) {
-            renderer->draw_sprite(grass, wx*tile_width, wy*tile_height);
+            renderer->draw_sprite(grass, wx*scaled_tile_width, wy*scaled_tile_height, scale);
         }
         else {
-            renderer->draw_sprite(wall, wx*tile_width, wy*tile_height);
+            renderer->draw_sprite(wall, wx*scaled_tile_width, wy*scaled_tile_height, scale);
         }
         if(p.x == x && p.y == y) {
-            renderer->draw_sprite(character, wx*tile_width, wy*tile_height);
+            renderer->draw_sprite(character, wx*scaled_tile_width, wy*scaled_tile_height, scale);
         }
     }
+
+    // Draw keycode to algo mappings
+    auto default_font_details = renderer->get_default_text_render_details();
+    auto running_algorithm = this->algorithm_manager.get_currently_running_algorithm();
+    for(auto pairing : this->keycode_to_algorithm) {
+        auto index = pairing.first-InputProcessorKeycode::KEY_1;
+        auto draw_params = default_font_details;
+        if(pairing.second == running_algorithm) {
+            draw_params.color = COLOR_RED;
+        }
+        renderer->draw_text(draw_params, fmt::format("{}: {}", index+1, pairing.second->name), 0, this->window_height-((index+1)*default_font_details.size));
+    }
 }
 
 void Visualizer::initialize(GameInitArgs args) {
@@ -92,6 +111,9 @@ void Visualizer::initialize_context() {
     tilemap_lua["draw_wall"] = &TileMap::draw_wall;
     tilemap_lua["fill"] = &TileMap::fill;
     tilemap_lua["is_wall"] = &TileMap::is_wall;
+    tilemap_lua["clone"] = &TileMap::clone;
+    tilemap_lua["get_width"] = &TileMap::get_width;
+    tilemap_lua["get_height"] = &TileMap::get_height;
 
     auto algo_manager_lua = lua->new_usertype<AlgorithmManager>("AlgorithmManager", sol::no_constructor);
     algo_manager_lua["register_algorithm"] = &AlgorithmManager::register_algorithm;