PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixed blocks UV

Browse Source
This commit is contained in:
MihailRis 2023-11-12 14:03:31 +03:00
parent 33b61fb499
commit 8161d84e36
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/BlocksRenderer.cpp
View File

@ -292,11 +292,11 @@ vec4 BlocksRenderer::pickSoftLight(int x, int y, int z, ivec3 right, ivec3 up) c
// Get texture atlas UV region for block face // Get texture atlas UV region for block face
inline UVRegion uvfor(const Block& def, uint face, int atlas_size) { inline UVRegion uvfor(const Block& def, uint face, int atlas_size) {
float uvsize = 1.0f / (float)atlas_size; float uvsize = 1.0f / (float)atlas_size;
float us = 0.0097; // TODO: replace with correct calculations (including 0.36) float us = 1.0f / (float)atlas_size / (float)atlas_size * ATLAS_MARGIN_SIZE * 0.8f;
const uint id = def.textureFaces[face]; const uint id = def.textureFaces[face];
float u = (id % atlas_size) * uvsize; float u = (id % atlas_size) * uvsize;
float v = 1.0f - (id / atlas_size + 1) * uvsize; float v = 1.0f - (id / atlas_size + 1) * uvsize;
return UVRegion(u+us, v+us, u + uvsize - us * 0.36f, v + uvsize - us * 0.36f); return UVRegion(u+us, v+us, u + uvsize - us, v + uvsize - us);
} }
void BlocksRenderer::render(const voxel* voxels, int atlas_size) { void BlocksRenderer::render(const voxel* voxels, int atlas_size) {

2
src/graphics/ImageData.cpp
View File

@ -59,7 +59,9 @@ ImageData* add_atlas_margins(ImageData* image, int grid_size) {
if (srcdata[((soy+ly) * srcwidth + sox + lx) * 4 + 3]) { if (srcdata[((soy+ly) * srcwidth + sox + lx) * 4 + 3]) {
for (int c = 0; c < 3; c++) { for (int c = 0; c < 3; c++) {
int val = srcdata[((soy+ly) * srcwidth + sox + lx) * 4 + c]; int val = srcdata[((soy+ly) * srcwidth + sox + lx) * 4 + c];
if (dstdata[((doy+ly) * dstwidth + dox + lx + 1) * 4 + 3] == 0)
dstdata[((doy+ly) * dstwidth + dox + lx + 1) * 4 + c] = val; dstdata[((doy+ly) * dstwidth + dox + lx + 1) * 4 + c] = val;
if (dstdata[((doy+ly + 1) * dstwidth + dox + lx) * 4 + 3] == 0)
dstdata[((doy+ly + 1) * dstwidth + dox + lx) * 4 + c] = val; dstdata[((doy+ly + 1) * dstwidth + dox + lx) * 4 + c] = val;
} }
} }