diff options
| -rw-r--r-- | loader/loader.hpp | 1 | ||||
| -rw-r--r-- | src/tile-atlas.hpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/loader/loader.hpp b/loader/loader.hpp index 19d93021..181688fc 100644 --- a/loader/loader.hpp +++ b/loader/loader.hpp @@ -26,6 +26,7 @@ struct loader_ { virtual StringView shader(StringView filename) noexcept = 0; virtual Trade::ImageData2D texture(StringView prefix, StringView filename) noexcept(false) = 0; + // todo remove Optional when wall_atlas is fully implemented -sh 20231122 virtual std::shared_ptr<struct tile_atlas> tile_atlas(StringView filename, Vector2ub size, Optional<pass_mode> pass) noexcept(false) = 0; virtual std::shared_ptr<struct tile_atlas> tile_atlas(StringView filename) noexcept(false) = 0; virtual ArrayView<const String> anim_atlas_list() = 0; diff --git a/src/tile-atlas.hpp b/src/tile-atlas.hpp index 205da68f..45251c6d 100644 --- a/src/tile-atlas.hpp +++ b/src/tile-atlas.hpp @@ -15,6 +15,7 @@ struct tile_atlas final using quad = std::array<Vector3, 4>; using texcoords = std::array<Vector2, 4>; + // 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); texcoords texcoords_for_id(size_t id) const; @@ -24,9 +25,9 @@ struct tile_atlas final Vector2ub num_tiles2() const { return dims_; } GL::Texture2D& texture() { return tex_; } StringView name() const { return name_; } - Optional<enum pass_mode> pass_mode() const; + 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); + void set_pass_mode(enum pass_mode p); // todo remove later private: static std::unique_ptr<const texcoords[]> make_texcoords_array(Vector2ui pixel_size, Vector2ub tile_count); |