chaotickittyasteroid/voxel-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix literally fucking everything

Browse source
This commit is contained in:
catangent 2025-08-03 17:54:28 +01:00
parent 0b7eb66703
commit 109d666eb8
9 changed files with 235 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

57
resources/shaders/tiling.fs
View file

@ -1,6 +1,7 @@
#version 330 core
uniform sampler2D diffuseMap;
uniform sampler2D occlusionMap;
uniform vec2 textureTiling;
in vec2 fragTexCoord;
@ -17,30 +18,52 @@ flat in int quadWidth;
out vec4 outColor;
// this is a shitty approximation of arcsin(x)/pi that gets the tails right and is reasonably close to the actual arcsin(x)/pi curve.
float fakeArcsin(float x) {
x = clamp(x, -1.0, 1.0);
float ax = abs(x);
float sqrtPart = sqrt(1.0 - ax);
float result = 0.5 - sqrtPart * (0.5 - 0.06667 * ax);
return x < 0.0 ? -result : result;
int calculate_ao_square()
{
ivec2 tileCoord = ivec2(fragTileTexCoord);
int ao_square = 0;
if(tileCoord.x == quadWidth - 1 && ((occlusionSides.x & uint(1 << tileCoord.y)) > uint(0))) ao_square |= 1 << 0;
if(tileCoord.x == quadWidth - 1 && tileCoord.y == quadHeight - 1 && bottomRightObscured > 0) ao_square |= 1 << 1;
if(tileCoord.x == quadWidth - 1 && tileCoord.y != quadHeight - 1 && ((occlusionSides.x & uint(1 << (tileCoord.y+1))) > uint(0))) ao_square |= 1 << 1;
if(tileCoord.x != quadWidth - 1 && tileCoord.y == quadHeight - 1 && ((occlusionSides.w & uint(1 << (tileCoord.x+1))) > uint(0))) ao_square |= 1 << 1;
if(tileCoord.y == quadHeight - 1 && ((occlusionSides.w & uint(1 << tileCoord.x)) > uint(0))) ao_square |= 1 << 2;
if(tileCoord.x == 0 && tileCoord.y == quadHeight - 1 && bottomLeftObscured > 0) ao_square |= 1 << 3;
if(tileCoord.x == 0 && tileCoord.y != quadHeight - 1 && ((occlusionSides.y & uint(1 << (tileCoord.y+1))) > uint(0))) ao_square |= 1 << 3;
if(tileCoord.x != 0 && tileCoord.y == quadHeight - 1 && ((occlusionSides.w & uint(1 << (tileCoord.x-1))) > uint(0))) ao_square |= 1 << 3;
if(tileCoord.x == 0 && ((occlusionSides.y & uint(1 << tileCoord.y)) > uint(0))) ao_square |= 1 << 4;
if(tileCoord.x == 0 && tileCoord.y == 0 && topRightObscured > 0) ao_square |= 1 << 5;
if(tileCoord.x == 0 && tileCoord.y != 0 && ((occlusionSides.y & uint(1 << (tileCoord.y-1))) > uint(0))) ao_square |= 1 << 5;
if(tileCoord.x != 0 && tileCoord.y == 0 && ((occlusionSides.z & uint(1 << (tileCoord.x-1))) > uint(0))) ao_square |= 1 << 5;
if(tileCoord.y == 0 && ((occlusionSides.z & uint(1 << tileCoord.x)) > uint(0))) ao_square |= 1 << 6;
if(tileCoord.x == quadWidth - 1 && tileCoord.y == 0 && topLeftObscured > 0) ao_square |= 1 << 7;
if(tileCoord.x == quadWidth - 1 && tileCoord.y != 0 && ((occlusionSides.x & uint(1 << (tileCoord.y-1))) > uint(0))) ao_square |= 1 << 7;
if(tileCoord.x != quadWidth - 1 && tileCoord.y == 0 && ((occlusionSides.z & uint(1 << (tileCoord.x+1))) > uint(0))) ao_square |= 1 << 7;
return ao_square;
}
void main()
{
vec2 texCoord = (floor(fragTexCoord*textureTiling) + fract(fragTileTexCoord)) / textureTiling;
int ao_square = calculate_ao_square();
outColor = texture(diffuseMap, texCoord);
ivec2 floorFragTileTexCoord = ivec2(fragTileTexCoord);
if(floorFragTileTexCoord.x < 1 && ((occlusionSides.x >> floorFragTileTexCoord.x) & uint(1)) == uint(1)) {
outColor *= 0.5 + fakeArcsin(fragTileTexCoord.x);
}
outColor *= texture(occlusionMap, (vec2(ao_square, 0)+fract(fragTileTexCoord))/vec2(256, 1));
outColor.a = 1;
uint bit = uint(fragTileTexCoord * 32);
outColor.g = (((occlusionSides.x >> bit) & uint(1)) == uint(1)) ?
((bit % uint(2) == uint(0)) ? 1.0 : 0.8):
((bit % uint(2) == uint(0)) ? 0.0 : 0.2);
//uint bit = uint(fragTileTexCoord * 32);
//outColor.g = (((uint(quadWidth) >> bit) & uint(1)) == uint(1)) ?
// ((bit % uint(2) == uint(0)) ? 1.0 : 0.8):
// ((bit % uint(2) == uint(0)) ? 0.0 : 0.2);
}

2
resources/shaders/tiling.vs
View file

@ -29,7 +29,7 @@ void main() {
gl_Position = mvp*vec4(vertexPosition, 1.0);
// metadata 1 parsing
int metadata1W = int(vertexMetadata1.w);
int metadata1W = int(vertexMetadata1.x);
topLeftObscured = (metadata1W & 0x1); // Take 0th bit.
topRightObscured = (metadata1W & 0x2) >> 1; // Take 1st bits.
bottomLeftObscured = (metadata1W & 0x4) >> 2; // Take 2nd bits.