diff options
Diffstat (limited to 'tile-atlas.cpp')
| -rw-r--r-- | tile-atlas.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tile-atlas.cpp b/tile-atlas.cpp index ac786bd1..d5d56cce 100644 --- a/tile-atlas.cpp +++ b/tile-atlas.cpp @@ -5,15 +5,14 @@ namespace Magnum::Examples { -tile_atlas::tile_atlas(Containers::StringView name, const ImageView2D& image, Vector2i dims) : +tile_atlas::tile_atlas(Containers::StringView name, const ImageView2D& image, Vector2ui dims) : name_{name}, size_{image.size()}, dims_{dims} { CORRADE_INTERNAL_ASSERT(dims_[0] > 0 && dims_[1] > 0); - CORRADE_INTERNAL_ASSERT(size_ % dims_ == Vector2i{}); - CORRADE_INTERNAL_ASSERT(dims.product() < 256); - CORRADE_INTERNAL_ASSERT(tile_size() * dims_ == size_); + CORRADE_INTERNAL_ASSERT(size_ % dims_ == Vector2ui{}); + CORRADE_INTERNAL_ASSERT(dims_.product() < 256); tex_.setWrapping(GL::SamplerWrapping::ClampToBorder) .setMagnificationFilter(GL::SamplerFilter::Linear) .setMinificationFilter(GL::SamplerFilter::Linear) @@ -24,10 +23,10 @@ tile_atlas::tile_atlas(Containers::StringView name, const ImageView2D& image, Ve std::array<Vector2, 4> tile_atlas::texcoords_for_id(std::size_t id_) const { - ASSERT(id_ < size()); - const Vector2i id = { (int)id_ % dims_[0], (int)id_ / dims_[0] }; - const Vector2 p1(tile_size()); - const auto p0 = Vector2(id * p1); + const auto sz = size_/dims_; + ASSERT(id_ < sz.product()); + const Vector2ui id = { (unsigned)id_ % dims_[0], (unsigned)id_ / dims_[0] }; + const Vector2 p0(id * sz), p1(sz); const auto x0 = p0.x(), x1 = p1.x(), y0 = p0.y(), y1 = p1.y(); return {{ { x0+x1, y0+y1 }, // bottom right |