From eeedd2061bee36f49ea20e898e8edf3676bd15b5 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 23 Feb 2022 13:25:39 +0100 Subject: flush --- atlas.cpp | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'atlas.cpp') diff --git a/atlas.cpp b/atlas.cpp index 5b6310fd..d6b6a0c2 100644 --- a/atlas.cpp +++ b/atlas.cpp @@ -17,8 +17,8 @@ atlas_texture::atlas_texture(const Trade::ImageData2D& image, Vector2i dims) : tex_.setWrapping(GL::SamplerWrapping::ClampToEdge) .setMagnificationFilter(GL::SamplerFilter::Linear) .setMinificationFilter(GL::SamplerFilter::Linear) - .setMaxAnisotropy(8) - .setStorage(6, GL::textureFormat(image.format()), image.size()) + .setMaxAnisotropy(0) + .setStorage(1, GL::textureFormat(image.format()), image.size()) .setSubImage(0, {}, image); } @@ -41,10 +41,21 @@ std::array atlas_texture::floor_quad(Vector3 center, Vector2 size) { float x = size[0]*.5f, y = size[1]*.5f; return {{ - { x + center[0], -y + center[1], 0}, - { x + center[0], y + center[1], 0}, - {-x + center[0], -y + center[1], 0}, - {-x + center[0], y + center[1], 0}, + { x + center[0], -y + center[1], center[2]}, + { x + center[0], y + center[1], center[2]}, + {-x + center[0], -y + center[1], center[2]}, + {-x + center[0], y + center[1], center[2]}, + }}; +} + +std::array atlas_texture::wall_quad(Vector3 center, Vector3 size) +{ + float x = size[0]*.5f, y = size[1]*.5f, z = size[2]; + return {{ + { x + center[0], -y + center[1], + center[2] }, + { x + center[0], -y + center[1], z+ center[2] }, + {-x + center[0], y + center[1], + center[2] }, + {-x + center[0], y + center[1], z+ center[2] }, }}; } -- cgit v1.2.3