diff options
Diffstat (limited to 'src/wall-atlas.cpp')
| -rw-r--r-- | src/wall-atlas.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wall-atlas.cpp b/src/wall-atlas.cpp index 31659cca..3c2ac3cf 100644 --- a/src/wall-atlas.cpp +++ b/src/wall-atlas.cpp @@ -70,15 +70,13 @@ Vector2i wall_atlas::expected_size(int depth, Tag group) } } -wall_atlas::wall_atlas(Info info, const ImageView2D& img, - Array<Frame> frames, - Array<Direction> directions, - std::array<DirArrayIndex, 4> direction_to_DirArrayIndex) - : _dir_array{ std::move(directions) }, _frame_array{ std::move(frames) }, - _info{ std::move(info) }, - _direction_to_Direction_array_index{ direction_to_DirArrayIndex } +wall_atlas::wall_atlas(wall_atlas_def def, String path, const ImageView2D& img) + : _dir_array{std::move(def.direction_array)}, + _frame_array{std::move(def.frames)}, + _info{std::move(def.header)}, _path{std::move(path)}, + _direction_to_Direction_array_index{def.direction_to_Direction_array_index} { - _texture.setLabel(_info.name) + _texture.setLabel(_path) .setWrapping(GL::SamplerWrapping::ClampToEdge) .setMagnificationFilter(GL::SamplerFilter::Nearest) .setMinificationFilter(GL::SamplerFilter::Linear) @@ -149,9 +147,7 @@ auto wall_atlas::direction(size_t dir) const -> const Direction* uint8_t wall_atlas::direction_count() const { return (uint8_t)_dir_array.size(); } auto wall_atlas::raw_frame_array() const -> ArrayView<const Frame> { return _frame_array; } -auto wall_atlas::info() const -> const Info& { return _info; } GL::Texture2D& wall_atlas::texture() { fm_debug_assert(_texture.id()); return _texture; } -StringView wall_atlas::name() const { return _info.name; } size_t wall_atlas::enum_to_index(enum rotation r) { |