From 7332c3e56ad51c05aa9f7779feb4d79364e7c513 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 26 Sep 2022 14:08:40 -0400 Subject: [PATCH] undo nearest neighbor --- engine/xe_image.cpp | 6 +++--- res/image/blocks.png | Bin 0 -> 7481 bytes src/chunk.hpp | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 res/image/blocks.png diff --git a/engine/xe_image.cpp b/engine/xe_image.cpp index 64538ce..7be2b3b 100644 --- a/engine/xe_image.cpp +++ b/engine/xe_image.cpp @@ -223,9 +223,9 @@ void Image::createTextureSampler() { samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO; samplerInfo.magFilter = VK_FILTER_LINEAR; samplerInfo.minFilter = VK_FILTER_LINEAR; - samplerInfo.addressModeU = VK_SAMPLER_ADDRESS_MODE_REPEAT; - samplerInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_REPEAT; - samplerInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_REPEAT; + samplerInfo.addressModeU = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; + samplerInfo.addressModeV = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; + samplerInfo.addressModeW = VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE; samplerInfo.anisotropyEnable = VK_TRUE; samplerInfo.maxAnisotropy = xeDevice.getAnisotropy(); samplerInfo.borderColor = VK_BORDER_COLOR_INT_OPAQUE_BLACK; diff --git a/res/image/blocks.png b/res/image/blocks.png new file mode 100644 index 0000000000000000000000000000000000000000..24f734a2d697735e6cf8040a31bd7a1118ceb33f GIT binary patch literal 7481 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 literal 0 HcmV?d00001 diff --git a/src/chunk.hpp b/src/chunk.hpp index 4c6101c..d10adc9 100644 --- a/src/chunk.hpp +++ b/src/chunk.hpp @@ -14,6 +14,7 @@ #define INVALID 0 #define AIR 1 #define DIRT 2 +#define GRASS 3 namespace app { @@ -110,12 +111,12 @@ const float nm[6][3] = { const float uv[6][2] = { + {1.f,0.f}, {1.f,1.f}, {0.f,1.f}, + {0.f,1.f}, {0.f,0.f}, - {0.f,0.f}, - {1.f,0.f}, - {1.f,1.f} + {1.f,0.f} }; } \ No newline at end of file