From eaa6c76bd92e292ac59dcfa0a7aa70cd1e2f50fb Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 11 Dec 2023 02:19:12 +0100
Subject: w

---
 src/tile-atlas.cpp | 13 +++----------
 src/tile-atlas.hpp |  9 +++------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/tile-atlas.cpp b/src/tile-atlas.cpp
index 1596247f..53156a84 100644
--- a/src/tile-atlas.cpp
+++ b/src/tile-atlas.cpp
@@ -12,9 +12,9 @@ namespace floormat {
 
 using namespace floormat::Quads;
 
-tile_atlas::tile_atlas(StringView path, StringView name, const ImageView2D& image, Vector2ub tile_count, Optional<enum pass_mode> p) :
+tile_atlas::tile_atlas(StringView path, StringView name, const ImageView2D& image, Vector2ub tile_count, enum pass_mode p) :
     texcoords_{make_texcoords_array(Vector2ui(image.size()), tile_count)},
-    path_{path}, name_{name}, size_{image.size()}, dims_{tile_count}, passability{std::move(p)}
+    path_{path}, name_{name}, size_{image.size()}, dims_{tile_count}, passability{p}
 {
     constexpr auto variant_max = std::numeric_limits<variant_t>::max();
     fm_soft_assert(num_tiles() <= variant_max);
@@ -54,13 +54,6 @@ auto tile_atlas::make_texcoords_array(Vector2ui pixel_size, Vector2ub tile_count
 }
 
 size_t tile_atlas::num_tiles() const { return Vector2ui{dims_}.product(); }
-Optional<enum pass_mode> tile_atlas::pass_mode() const { return passability; }
-enum pass_mode tile_atlas::pass_mode(enum pass_mode p) const { return passability ? *passability : p; }
-
-void tile_atlas::set_pass_mode(enum pass_mode p)
-{
-    fm_assert(!passability || passability == p);
-    passability = { InPlaceInit, p };
-}
+enum pass_mode tile_atlas::pass_mode() const { return passability; }
 
 } // namespace floormat
diff --git a/src/tile-atlas.hpp b/src/tile-atlas.hpp
index 1a06db4a..347da166 100644
--- a/src/tile-atlas.hpp
+++ b/src/tile-atlas.hpp
@@ -24,11 +24,10 @@ class tile_atlas final
     String path_, name_;
     Vector2ui size_;
     Vector2ub dims_;
-    Optional<enum pass_mode> passability;
+    enum pass_mode passability;
 
 public:
-    // todo remove Optional when wall atlases are fully implemented -sh 20231122
-    tile_atlas(StringView path, StringView name, const ImageView2D& img, Vector2ub tile_count, Optional<enum pass_mode> pass_mode);
+    tile_atlas(StringView path, StringView name, const ImageView2D& img, Vector2ub tile_count, enum pass_mode pass_mode);
 
     texcoords texcoords_for_id(size_t id) const;
 
@@ -37,9 +36,7 @@ public:
     Vector2ub num_tiles2() const { return dims_; }
     GL::Texture2D& texture() { return tex_; }
     StringView name() const { return name_; }
-    Optional<enum pass_mode> pass_mode() const; // todo remove later
-    enum pass_mode pass_mode(enum pass_mode p) const;
-    void set_pass_mode(enum pass_mode p); // todo remove later
+    enum pass_mode pass_mode() const;
 };
 
 
-- 
cgit v1.2.3