a

5 files changed, 20 insertions, 19 deletions

diff --git a/loader.hpp b/loader.hpp
index abe8034d..b6a1d1b4 100644
--- a/loader.hpp
+++ b/loader.hpp
@@ -13,9 +13,9 @@ struct tile_atlas;
 
 struct loader_
 {
-    virtual std::string shader(const Containers::StringView& filename) = 0;
-    virtual Trade::ImageData2D tile_texture(const Containers::StringView& filename) = 0;
-    virtual std::shared_ptr<struct tile_atlas> tile_atlas(const Containers::StringView& filename, Vector2i size) = 0;
+    virtual std::string shader(Containers::StringView filename) = 0;
+    virtual Trade::ImageData2D tile_texture(Containers::StringView filename) = 0;
+    virtual std::shared_ptr<struct tile_atlas> tile_atlas(Containers::StringView filename, Vector2i size) = 0;
     static void destroy();
 
     loader_(const loader_&) = delete;
diff --git a/main/loader-impl.cpp b/main/loader-impl.cpp
index 24d43fdb..1f15ea68 100644
--- a/main/loader-impl.cpp
+++ b/main/loader-impl.cpp
@@ -28,15 +28,15 @@ struct loader_impl final : loader_
 
     std::unordered_map<std::string, std::shared_ptr<struct tile_atlas>> atlas_map;
 
-    std::string shader(const Containers::StringView& filename) override;
-    Trade::ImageData2D tile_texture(const Containers::StringView& filename) override;
-    std::shared_ptr<struct tile_atlas> tile_atlas(const Containers::StringView& filename, Vector2i size) override;
+    std::string shader(Containers::StringView filename) override;
+    Trade::ImageData2D tile_texture(Containers::StringView filename) override;
+    std::shared_ptr<struct tile_atlas> tile_atlas(Containers::StringView filename, Vector2i size) override;
 
     explicit loader_impl();
     ~loader_impl() override;
 };
 
-std::string loader_impl::shader(const Containers::StringView& filename)
+std::string loader_impl::shader(Containers::StringView filename)
 {
     if (!shader_res)
         shader_res = std::make_optional<Utility::Resource>("game/shaders");
@@ -46,7 +46,7 @@ std::string loader_impl::shader(const Containers::StringView& filename)
     return ret;
 }
 
-std::shared_ptr<tile_atlas> loader_impl::tile_atlas(const Containers::StringView& name, Vector2i size)
+std::shared_ptr<tile_atlas> loader_impl::tile_atlas(Containers::StringView name, Vector2i size)
 {
     auto it = atlas_map.find(name);
     if (it != atlas_map.end())
@@ -57,7 +57,7 @@ std::shared_ptr<tile_atlas> loader_impl::tile_atlas(const Containers::StringView
     return atlas;
 }
 
-Trade::ImageData2D loader_impl::tile_texture(const Containers::StringView& filename)
+Trade::ImageData2D loader_impl::tile_texture(Containers::StringView filename)
 {
     if(!tga_importer || !tga_importer->openFile(filename))
         ABORT("can't open tile image '%s'", filename.cbegin());
diff --git a/main/main.cpp b/main/main.cpp
index f58228c6..4acdd471 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -56,7 +56,7 @@ struct app final : Platform::Application
     tile_shader _shader;
     tile_atlas_ floor1 = loader.tile_atlas("../share/game/images/metal1.tga", {2, 2});
     tile_atlas_ floor2 = loader.tile_atlas("../share/game/images/floor1.tga", {4, 4});
-    tile_atlas_ wall1 = loader.tile_atlas("../share/game/images/metal2.tga", {2, 2});
+    tile_atlas_ wall1 = loader.tile_atlas("../share/game/images/wood2.tga", {2, 2});
     tile_atlas_ wall2 = loader.tile_atlas("../share/game/images/wood1.tga", {2, 2});
     chunk _chunk = make_test_chunk();
     floor_mesh _floor_mesh;
@@ -104,7 +104,7 @@ app::app(const Arguments& arguments):
               .setTitle("Test")
               .setSize({1024, 768}, dpi_policy::Physical),
           GLConfiguration{}
-              //.setSampleCount(16)
+              .setSampleCount(4)
     }
 {
     reset_camera_offset();
diff --git a/tile-atlas.cpp b/tile-atlas.cpp
index 21dcc57f..0e3192ec 100644
--- a/tile-atlas.cpp
+++ b/tile-atlas.cpp
@@ -5,7 +5,7 @@
 
 namespace Magnum::Examples {
 
-tile_atlas::tile_atlas(const Containers::StringView& name, const ImageView2D& image, Vector2i dims) :
+tile_atlas::tile_atlas(Containers::StringView name, const ImageView2D& image, Vector2i dims) :
     name_{name},
     size_{image.size()},
     dims_{dims}
@@ -14,9 +14,9 @@ tile_atlas::tile_atlas(const Containers::StringView& name, const ImageView2D& im
     CORRADE_INTERNAL_ASSERT(size_ % dims_ == Vector2i{});
     CORRADE_INTERNAL_ASSERT(dims.product() < 256);
     CORRADE_INTERNAL_ASSERT(tile_size() * dims_ == size_);
-    tex_.setWrapping(GL::SamplerWrapping::Repeat)
-        .setMagnificationFilter(GL::SamplerFilter::Nearest)
-        .setMinificationFilter(GL::SamplerFilter::Nearest)
+    tex_.setWrapping(GL::SamplerWrapping::ClampToBorder)
+        .setMagnificationFilter(GL::SamplerFilter::Linear)
+        .setMinificationFilter(GL::SamplerFilter::Linear)
         .setMaxAnisotropy(0)
         .setStorage(GL::textureFormat(image.format()), image.size())
         .setSubImage({}, image);
@@ -28,8 +28,9 @@ std::array<Vector2, 4> tile_atlas::texcoords_for_id(std::size_t id2) const
     auto id_ = (int)id2;
     ASSERT(id_ >= 0 && id_ < dims_.product());
     Vector2i id = { id_ % dims_[0], id_ / dims_[0] };
-    constexpr Vector2 half{.5f, .5f};
-    auto p0 = Vector2(id * tile_size_) + half;
+    constexpr Vector2 _05{.5f, .5f};
+    constexpr Vector2 _10{1, 1};
+    auto p0 = Vector2(id * tile_size_);
     auto p1 = Vector2(tile_size_);
     auto x0 = p0.x(), x1 = p1.x(), y0 = p0.y(), y1 = p1.y();
     return {{
diff --git a/tile-atlas.hpp b/tile-atlas.hpp
index 759cd6c7..f4886962 100644
--- a/tile-atlas.hpp
+++ b/tile-atlas.hpp
@@ -11,7 +11,7 @@ struct tile_atlas final
 {
     using quad = std::array<Vector3, 4>;
 
-    tile_atlas(const Containers::StringView& name, const ImageView2D& img, Vector2i dimensions);
+    tile_atlas(Containers::StringView name, const ImageView2D& img, Vector2i dimensions);
 
     std::array<Vector2, 4> texcoords_for_id(std::size_t id) const;
     static constexpr quad floor_quad(Vector3 center, Vector2 size);
@@ -22,7 +22,7 @@ struct tile_atlas final
     Vector2i tile_size() const { return size_ / dims_; }
     Vector2i dimensions() const { return dims_; }
     GL::RectangleTexture& texture() { return tex_; }
-    std::string name() const { return name_; }
+    Containers::StringView name() const { return name_; }
 
 private:
     GL::RectangleTexture tex_;