natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adspartan :texture_set: improve texturing at the chunks' borders to avoid visible disconnects

Browse Source 
876dca9355
This commit is contained in:
T1ti
2024-08-30 22:47:12 +02:00
parent 3f62034c40
commit 8336c2367b
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/noggit/texture_set.cpp
View File

@@ -755,6 +755,29 @@ bool TextureSet::paintTexture(float xbase, float zbase, float x, float z, Brush*
float zPos, xPos, dist, radius; float zPos, xPos, dist, radius;
// todo: investigate the root cause
// shift brush origin to avoid disconnects at the chunks' borders
if (x < xbase)
{
float chunk_dist = std::abs(x - (std::fmod(x, CHUNKSIZE)) - xbase) / CHUNKSIZE;
x += TEXDETAILSIZE * chunk_dist;
}
if (x > xbase + CHUNKSIZE)
{
float chunk_dist = std::abs(x - (std::fmod(x, CHUNKSIZE)) - xbase) / CHUNKSIZE;
x -= TEXDETAILSIZE * chunk_dist;
}
if (z < zbase)
{
float chunk_dist = std::abs(z - (std::fmod(z, CHUNKSIZE)) - zbase) / CHUNKSIZE;
z += TEXDETAILSIZE * chunk_dist;
}
if (z > zbase + CHUNKSIZE)
{
float chunk_dist = std::abs(z - (std::fmod(z, CHUNKSIZE)) - zbase) / CHUNKSIZE;
z -= TEXDETAILSIZE * chunk_dist;
}
int tex_layer = get_texture_index_or_add (std::move (texture), strength); int tex_layer = get_texture_index_or_add (std::move (texture), strength);
if (tex_layer == -1 || nTextures == 1) if (tex_layer == -1 || nTextures == 1)
@@ -779,7 +802,7 @@ bool TextureSet::paintTexture(float xbase, float zbase, float x, float z, Brush*
xPos = xbase; xPos = xbase;
for (int i = 0; i < 64; ++i) for (int i = 0; i < 64; ++i)
{ {
dist = misc::dist(x, z, xPos + TEXDETAILSIZE / 2.0f, zPos + TEXDETAILSIZE / 2.0f); dist = misc::getShortestDist(x, z, xPos, zPos, TEXDETAILSIZE);
if (dist <= radius) if (dist <= radius)
{ {