planer: building preview moved to mastaba class from planer logic

Author: dalerank

src/building/construction/build_planner.cpp

@@ -1630,14 +1630,6 @@ void build_planner::draw_graphics(painter &ctx) {
         draw_entertainment_venue(end, pixel, build_type, ctx);
         return;
 
-    case BUILDING_SMALL_MASTABA:
-        building_small_mastaba::ghost_preview(ctx, build_type, pixel, start, end);
-        return;
-
-    case BUILDING_MEDIUM_MASTABA:
-        building_medium_mastaba::ghost_preview(ctx, build_type, pixel, start, end);
-        return;
-
     case BUILDING_FORT_ARCHERS:
     case BUILDING_FORT_CHARIOTEERS:
     case BUILDING_FORT_INFANTRY:

src/building/monument_mastaba.cpp

@@ -55,6 +55,63 @@ struct mastaba_part {
     building *b;
 };
 
+template<typename T>
+void building_mastaba::static_params_t<T>::planer_setup_preview_graphics(build_planner &planer) const {
+    switch (city_view_orientation() / 2) {
+    case 0: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
+    case 1: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
+    case 2: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
+    case 3: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
+    }
+}
+
+template<class T>
+void building_mastaba::static_params_t<T>::planer_ghost_preview(build_planner &planer, painter &ctx, tile2i start, tile2i end, vec2i pixel) const {
+    int image_id = anim[animkeys().base].first_img();
+    auto get_image = [image_id] (tile2i tile, tile2i start, vec2i size) {
+        if (tile == start) {
+            return image_id;
+        }
+
+        if (tile == start.shifted(size.x - 1, 0)) {
+            return image_id - 2;
+        }
+
+        if (tile == start.shifted(size.x - 1, size.y - 1)) {
+            return image_id - 4;
+        }
+
+        if (tile == start.shifted(0, size.y - 1)) {
+            return image_id - 6;
+        }
+
+        if (tile.y() == start.y()) { return image_id - 1; }
+        if (tile.y() == start.y() + size.y - 1) { return image_id - 5; }
+        if (tile.x() == start.x()) { return image_id - 7; }
+        if (tile.x() == start.x() + size.x - 1) { return image_id - 3; }
+
+        return (image_id + 5 + (tile.x() + tile.y()) % 7);
+    };
+
+    vec2i size{ 1, 1 };
+    vec2i size_b = init_tiles_size();
+    switch (city_view_orientation() / 2) {
+    case 0: size = { size_b.x, size_b.y }; break;
+    case 1: size = { size_b.y, size_b.x }; break;
+    case 2: size = { size_b.x, size_b.y }; break;
+    case 3: size = { size_b.y, size_b.x }; break;
+    }
+
+    for (int i = 0; i < size.x; ++i) {
+        for (int j = 0; j < size.y; ++j) {
+            vec2i p = pixel + (vec2i(-30, 15) * i) + (vec2i(30, 15) * j);
+            int image_id = get_image(end.shifted(i, j), end, size);
+            ImageDraw::isometric_from_drawtile(ctx, image_id, p, COLOR_MASK_GREEN);
+            ImageDraw::isometric_from_drawtile_top(ctx, image_id, p, COLOR_MASK_GREEN, 1.f);
+        }
+    }
+}
+
 void map_mastaba_tiles_add(int building_id, tile2i tile, int size, int image_id, int terrain) {
     int x_leftmost, y_leftmost;
     switch (city_view_orientation()) {
@@ -147,28 +204,11 @@ void building_small_mastaba::update_day() {
         return;
     }
 
-    building_mastaba::update_day(init_tiles_size());
+    building_mastaba::update_day(current_params().init_tiles_size());
 }
 
 bool building_small_mastaba::draw_ornaments_and_animations_flat(painter &ctx, vec2i point, tile2i tile, color mask) {
-    return draw_ornaments_and_animations_flat_impl(base, ctx, point, tile, mask, init_tiles_size());
-}
-
-void building_small_mastaba::ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end) {
-    building_mastaba::ghost_preview(ctx, type, pixel, start, end, init_tiles_size());
-}
-
-vec2i building_small_mastaba::init_tiles_size() {
-    return vec2i(10, 4);
-}
-
-void building_small_mastaba::static_params::planer_setup_preview_graphics(build_planner &planer) const {
-    switch (city_view_orientation() / 2) {
-    case 0: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
-    case 1: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
-    case 2: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
-    case 3: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
-    }
+    return draw_ornaments_and_animations_flat_impl(base, ctx, point, tile, mask, current_params().init_tiles_size());
 }
 
 int building_mastaba::get_image(int orientation, tile2i tile, tile2i start, tile2i end) {
@@ -237,51 +277,6 @@ int building_small_mastabe_get_bricks_image(int orientation, e_building_type typ
 void building_mastaba::on_create(int orientation) {
 }
 
-void building_mastaba::ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end, const vec2i size_b) {
-    int image_id = small_mastaba_m.anim[animkeys().base].first_img();
-    auto get_image = [image_id] (tile2i tile, tile2i start, vec2i size) {
-        if (tile == start) {
-            return image_id;
-        }
-
-        if (tile == start.shifted(size.x - 1, 0)) {
-            return image_id - 2;
-        }
-
-        if (tile == start.shifted(size.x - 1, size.y - 1)) {
-            return image_id - 4;
-        }
-
-        if (tile == start.shifted(0, size.y - 1)) {
-            return image_id - 6;
-        }
-
-        if (tile.y() == start.y()) { return image_id - 1; }
-        if (tile.y() == start.y() + size.y - 1) { return image_id - 5; }
-        if (tile.x() == start.x()) { return image_id - 7; }
-        if (tile.x() == start.x() + size.x - 1) { return image_id - 3; }
-
-        return (image_id + 5 + (tile.x() + tile.y()) % 7);
-    };
-
-    vec2i size{ 1, 1 };
-    switch (city_view_orientation() / 2) {
-    case 0: size = { size_b.x, size_b.y }; break;
-    case 1: size = { size_b.y, size_b.x }; break;
-    case 2: size = { size_b.x, size_b.y }; break;
-    case 3: size = { size_b.y, size_b.x }; break;
-    }
-
-    for (int i = 0; i < size.x; ++i) {
-        for (int j = 0; j < size.y; ++j) {
-            vec2i p = pixel + (vec2i(-30, 15) * i) + (vec2i(30, 15) * j);
-            int image_id = get_image(end.shifted(i, j), end, size);
-            ImageDraw::isometric_from_drawtile(ctx, image_id, p, COLOR_MASK_GREEN);
-            ImageDraw::isometric_from_drawtile_top(ctx, image_id, p, COLOR_MASK_GREEN, 1.f);
-        }
-    }
-}
-
 bool building_mastaba::draw_ornaments_and_animations_flat_impl(building &base, painter &ctx, vec2i point, tile2i tile, color color_mask, const vec2i tiles_size) {
     if (building_monument_is_finished(&base)) {
         return false;
@@ -630,7 +625,7 @@ bool building_small_mastaba::draw_ornaments_and_animations_height(painter &ctx,
         return false;
     }
 
-    return draw_ornaments_and_animations_hight_impl(base, ctx, point, tile, color_mask, init_tiles_size());
+    return draw_ornaments_and_animations_hight_impl(base, ctx, point, tile, color_mask, current_params().init_tiles_size());
 }
 
 void game_cheat_finish_phase(std::istream &, std::ostream &) {
@@ -655,16 +650,8 @@ void game_cheat_finish_phase(std::istream &, std::ostream &) {
     });
 }
 
-void building_medium_mastaba::ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end) {
-    building_mastaba::ghost_preview(ctx, type, pixel, start, end, vec2i{ 14, 6 });
-}
-
-vec2i building_medium_mastaba::init_tiles_size() {
-    return vec2i(14, 6);
-}
-
 bool building_medium_mastaba::draw_ornaments_and_animations_flat(painter &ctx, vec2i point, tile2i tile, color mask) {
-    return draw_ornaments_and_animations_flat_impl(base, ctx, point, tile, mask, init_tiles_size());
+    return draw_ornaments_and_animations_flat_impl(base, ctx, point, tile, mask, current_params().init_tiles_size());
 }
 
 bool building_medium_mastaba::draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color color_mask) {
@@ -676,7 +663,7 @@ bool building_medium_mastaba::draw_ornaments_and_animations_height(painter &ctx,
         return false;
     }
 
-    return draw_ornaments_and_animations_hight_impl(base, ctx, point, tile, color_mask, init_tiles_size());
+    return draw_ornaments_and_animations_hight_impl(base, ctx, point, tile, color_mask, current_params().init_tiles_size());
 }
 
 void building_medium_mastaba::on_place(int orientation, int variant) {
@@ -767,14 +754,5 @@ void building_medium_mastaba::update_day() {
         return;
     }
 
-    building_mastaba::update_day(init_tiles_size());
-}
-
-void building_medium_mastaba::static_params::planer_setup_preview_graphics(build_planner &planer) const {
-    switch (city_view_orientation() / 2) {
-    case 0: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
-    case 1: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
-    case 2: planer.init_tiles(init_tiles_size().y, init_tiles_size().x); break;
-    case 3: planer.init_tiles(init_tiles_size().x, init_tiles_size().y); break;
-    }
+    building_mastaba::update_day(current_params().init_tiles_size());
 }

src/building/monument_mastaba.h

@@ -20,14 +20,20 @@ class building_mastaba : public building_impl {
     virtual void update_month() override;
     virtual void update_map_orientation(int map_orientation) override;
     virtual bool force_draw_flat_tile(painter &ctx, tile2i tile, vec2i pixel, color mask) override;
+
+    template<typename T>
+    struct static_params_t : public buildings::model_t<T> {
+        virtual void planer_ghost_preview(build_planner &planer, painter &ctx, tile2i tile, tile2i end, vec2i pixel) const override;
+        virtual void planer_setup_preview_graphics(build_planner &planer) const override;
+        virtual vec2i init_tiles_size() const { return vec2i(0, 0); }
+    };
 
     bool draw_ornaments_and_animations_flat_impl(building &base, painter &ctx, vec2i point, tile2i tile, color mask, const vec2i tiles_size);
     bool draw_ornaments_and_animations_hight_impl(building &base, painter &ctx, vec2i point, tile2i tile, color mask, const vec2i tiles_size);
 
     void update_day(const vec2i tiles_size);
     custom_span<uint16_t> active_workers();
 
-    static void ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end, const vec2i size);
     static void update_images(building *b, int curr_phase, const vec2i size_b);
     static void finalize(building *b, const vec2i size_b);
     static int get_image(int orientation, tile2i tile, tile2i start, tile2i end);
@@ -36,22 +42,19 @@ class building_mastaba : public building_impl {
 class building_small_mastaba : public building_mastaba {
 public:
     BUILDING_METAINFO(BUILDING_SMALL_MASTABA, building_small_mastaba)
-
     building_small_mastaba(building & b) : building_mastaba(b) {}
-
     virtual building_small_mastaba *dcast_small_mastaba() override { return this; }
 
-    struct static_params : public buildings::model_t<building_small_mastaba> {
-        virtual void planer_setup_preview_graphics(build_planner &planer) const override;
+    struct static_params : public static_params_t<building_small_mastaba> {
+        virtual vec2i init_tiles_size() const { return vec2i(10, 4); }
     };
 
     virtual void on_place(int orientation, int variant) override;
     virtual void update_day() override;
     virtual bool draw_ornaments_and_animations_flat(painter &ctx, vec2i point, tile2i tile, color mask) override;
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color mask) override;
 
-    static void ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end);
-    static vec2i init_tiles_size();
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };
 
 class building_small_mastaba_part_side : public building_small_mastaba {
@@ -79,17 +82,16 @@ class building_medium_mastaba : public building_mastaba {
 
     virtual building_medium_mastaba *dcast_medium_mastaba() override { return nullptr; }
 
-    struct static_params : public buildings::model_t<building_medium_mastaba> {
-        virtual void planer_setup_preview_graphics(build_planner &planer) const override;
+    struct static_params : public static_params_t<building_medium_mastaba> {
+        virtual vec2i init_tiles_size() const { return vec2i(14, 6); }
     };
 
     virtual void on_place(int orientation, int variant) override;
     virtual void update_day() override;
     virtual bool draw_ornaments_and_animations_flat(painter &ctx, vec2i point, tile2i tile, color mask) override;
     virtual bool draw_ornaments_and_animations_height(painter &ctx, vec2i point, tile2i tile, color mask) override;
 
-    static void ghost_preview(painter &ctx, e_building_type type, vec2i pixel, tile2i start, tile2i end);
-    static vec2i init_tiles_size();
+    static const static_params &current_params() { return (const static_params &)params(TYPE); }
 };
 
 class building_medium_mastaba_part_side : public building_medium_mastaba {