diff options
Diffstat (limited to 'tile-atlas.cpp')
| -rw-r--r-- | tile-atlas.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tile-atlas.cpp b/tile-atlas.cpp index a716c376..07f59696 100644 --- a/tile-atlas.cpp +++ b/tile-atlas.cpp @@ -6,13 +6,12 @@ namespace Magnum::Examples { tile_atlas::tile_atlas(const ImageView2D& image, Vector2i dims) : size_{image.size()}, - dims_{dims}, - tile_size_{size_ / dims} + dims_{dims} { CORRADE_INTERNAL_ASSERT(dims_[0] > 0 && dims_[1] > 0); - CORRADE_INTERNAL_ASSERT(tile_size_ * dims_ == size_); CORRADE_INTERNAL_ASSERT(size_ % dims_ == Vector2i{}); CORRADE_INTERNAL_ASSERT(dims.product() < 256); + CORRADE_INTERNAL_ASSERT(tile_size() * dims_ == size_); tex_.setWrapping(GL::SamplerWrapping::ClampToEdge) .setMagnificationFilter(GL::SamplerFilter::Nearest) .setMinificationFilter(GL::SamplerFilter::Linear) @@ -23,6 +22,7 @@ tile_atlas::tile_atlas(const ImageView2D& image, Vector2i dims) : std::array<Vector2, 4> tile_atlas::texcoords_for_id(std::size_t id2) const { + const auto tile_size_ = tile_size(); auto id_ = (int)id2; CORRADE_INTERNAL_ASSERT(id_ >= 0 && id_ < dims_.product()); Vector2i id = { id_ % dims_[0], id_ / dims_[0] }; |