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

improve shadows

Browse Source
This commit is contained in:
MihailRis 2025-05-21 21:41:01 +03:00
parent 44f7051a94
commit ed5efd9c3a
5 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/scripts/hud.lua
View File

@ -58,5 +58,5 @@ function on_hud_open()
local slot = gfx.posteffects.index("core:default") local slot = gfx.posteffects.index("core:default")
gfx.posteffects.set_effect(slot, "ssao") gfx.posteffects.set_effect(slot, "ssao")
--gfx.posteffects.set_intensity(slot, 1.0) gfx.posteffects.set_intensity(slot, 1.0)
end end

27
res/shaders/effects/ssao.glsl
View File

@ -16,24 +16,21 @@ vec4 effect() {
vec3 bitangent = cross(normal, tangent); vec3 bitangent = cross(normal, tangent);
mat3 tbn = mat3(tangent, bitangent, normal); mat3 tbn = mat3(tangent, bitangent, normal);
float occlusion = 1.0; float occlusion = 0.0;
if (u_enableShadows) { for (int i = 0; i < kernelSize; i++) {
occlusion = 0.0; vec3 samplePos = tbn * u_ssaoSamples[i];
for (int i = 0; i < kernelSize; i++) { samplePos = position + samplePos * radius;
vec3 samplePos = tbn * u_ssaoSamples[i];
samplePos = position + samplePos * radius;
vec4 offset = vec4(samplePos, 1.0); vec4 offset = vec4(samplePos, 1.0);
offset = u_projection * offset; offset = u_projection * offset;
offset.xyz /= offset.w; offset.xyz /= offset.w;
offset.xyz = offset.xyz * 0.5 + 0.5; offset.xyz = offset.xyz * 0.5 + 0.5;
float sampleDepth = texture(u_position, offset.xy).z; float sampleDepth = texture(u_position, offset.xy).z;
float rangeCheck = smoothstep(0.0, 1.0, radius / abs(position.z - sampleDepth)); float rangeCheck = smoothstep(0.0, 1.0, radius / abs(position.z - sampleDepth));
occlusion += (sampleDepth >= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck; occlusion += (sampleDepth >= samplePos.z + bias ? 1.0 : 0.0) * rangeCheck;
}
occlusion = min(1.0, 1.05 - (occlusion / kernelSize));
} }
occlusion = min(1.0, 1.05 - (occlusion / kernelSize));
float z = -position.z * 0.02; float z = -position.z * 0.02;
z = max(0.0, 1.0 - z); z = max(0.0, 1.0 - z);

50
res/shaders/lib/shadows.glsl
View File

@ -1,22 +1,21 @@
#ifndef SHADOWS_GLSL_ #ifndef SHADOWS_GLSL_
#define SHADOWS_GLSL_ #define SHADOWS_GLSL_
uniform sampler2DShadow u_shadows; uniform sampler2DShadow u_shadows[2];
uniform sampler2DShadow u_wideShadows; uniform mat4 u_shadowsMatrix[2];
uniform int u_shadowsRes; uniform int u_shadowsRes;
uniform bool u_blurShadows; uniform bool u_blurShadows;
uniform mat4 u_shadowsMatrix;
uniform mat4 u_wideShadowsMatrix;
float calc_shadow() { float calc_shadow() {
float shadow = 1.0; float shadow = 1.0;
if (u_enableShadows) { if (u_enableShadows) {
vec4 mpos = u_shadowsMatrix * vec4(a_modelpos.xyz + a_realnormal * 0.04, 1.0); vec4 mpos = u_shadowsMatrix[0] * vec4(a_modelpos.xyz + a_realnormal * 0.04, 1.0);
vec3 projCoords = mpos.xyz / mpos.w; vec3 projCoords = mpos.xyz / mpos.w;
projCoords = projCoords * 0.5 + 0.5; projCoords = projCoords * 0.5 + 0.5;
projCoords.z -= 0.0001; projCoords.z -= 0.0001;
vec4 wmpos = u_wideShadowsMatrix * vec4(a_modelpos.xyz + a_realnormal * 0.2, 1.0); vec4 wmpos = u_shadowsMatrix[1] * vec4(a_modelpos.xyz + a_realnormal * 0.2, 1.0);
vec3 wprojCoords = wmpos.xyz / wmpos.w; vec3 wprojCoords = wmpos.xyz / wmpos.w;
wprojCoords = wprojCoords * 0.5 + 0.5; wprojCoords = wprojCoords * 0.5 + 0.5;
wprojCoords.z -= 0.0001; wprojCoords.z -= 0.0001;
@ -24,22 +23,37 @@ float calc_shadow() {
shadow = 0.0; shadow = 0.0;
if (dot(a_realnormal, u_sunDir) < 0.0) { if (dot(a_realnormal, u_sunDir) < 0.0) {
if (u_blurShadows) { if (u_blurShadows || true) {
const vec3 offsets[4] = vec3[4]( if (a_distance > 64) {
vec3(0.5, 0.5, 0.0), for (int y = -1; y <= 1; y++) {
vec3(-0.5, 0.5, 0.0), for (int x = -1; x <= 1; x++) {
vec3(0.5, -0.5, 0.0), shadow += texture(
vec3(-0.5, -0.5, 0.0) u_shadows[1],
); wprojCoords.xyz +
for (int i = 0; i < 4; i++) { vec3(x, y, -(abs(x) + abs(y))) /
shadow += texture(u_shadows, projCoords.xyz + offsets[i] / u_shadowsRes); u_shadowsRes
);
}
}
shadow /= 9;
} else {
for (int y = -2; y <= 2; y++) {
for (int x = -2; x <= 2; x++) {
shadow += texture(
u_shadows[0],
projCoords.xyz +
vec3(x, y, -(abs(x) + abs(y))) /
u_shadowsRes * 1.0
);
}
}
shadow /= 25;
} }
shadow /= 4;
} else { } else {
if (a_distance > 32.0) { if (a_distance > 32.0) {
shadow = texture(u_wideShadows, wprojCoords.xyz); shadow = texture(u_shadows[1], wprojCoords.xyz);
} else { } else {
shadow = texture(u_shadows, projCoords.xyz); shadow = texture(u_shadows[0], projCoords.xyz);
} }
} }
shadow = shadow * 0.5 + 0.5; shadow = shadow * 0.5 + 0.5;

15
src/graphics/render/BlocksRenderer.cpp
View File

@ -203,21 +203,16 @@ void BlocksRenderer::blockXSprite(
const float w = size.x / 1.41f; const float w = size.x / 1.41f;
const glm::vec4 tint (0.8f); const glm::vec4 tint (0.8f);
glm::vec3 n; glm::vec3 n(0.0f, 1.0f, 0.0f);
float bias = 0.05f;
n = glm::vec3(-0.7f, 0, -0.7f); face({x + xs, y, z + zs}, w, size.y, 0, {-1, 0, 1}, {0, 1, 0}, n,
face(glm::vec3(x + xs, y, z + zs) + n * bias, w, size.y, 0, {-1, 0, 1}, {0, 1, 0}, n,
texface1, lights2, tint); texface1, lights2, tint);
n = glm::vec3(-0.7f, 0, 0.7f); face({x + xs, y, z + zs}, w, size.y, 0, {1, 0, 1}, {0, 1, 0}, n,
face(glm::vec3(x + xs, y, z + zs) + n * bias, w, size.y, 0, {1, 0, 1}, {0, 1, 0}, n,
texface1, lights1, tint); texface1, lights1, tint);
n = glm::vec3(0.7f, 0, -0.7f); face({x + xs, y, z + zs}, w, size.y, 0, {-1, 0, -1}, {0, 1, 0}, n,
face(glm::vec3(x + xs, y, z + zs) + n * bias, w, size.y, 0, {-1, 0, -1}, {0, 1, 0}, n,
texface2, lights2, tint); texface2, lights2, tint);
n = glm::vec3(0.7f, 0, 0.7f); face({x + xs, y, z + zs}, w, size.y, 0, {1, 0, -1}, {0, 1, 0}, n,
face(glm::vec3(x + xs, y, z + zs) + n * bias, w, size.y, 0, {1, 0, -1}, {0, 1, 0}, n,
texface2, lights1, tint); texface2, lights1, tint);
} }

35
src/graphics/render/WorldRenderer.cpp
View File

@ -131,17 +131,17 @@ void WorldRenderer::setupWorldShader(
shader.uniform1i("u_enableShadows", shadows); shader.uniform1i("u_enableShadows", shadows);
if (shadows) { if (shadows) {
shader.uniformMatrix("u_shadowsMatrix", shadowCamera.getProjView()); shader.uniformMatrix("u_shadowsMatrix[0]", shadowCamera.getProjView());
shader.uniformMatrix("u_wideShadowsMatrix", wideShadowCamera.getProjView()); shader.uniformMatrix("u_shadowsMatrix[1]", wideShadowCamera.getProjView());
shader.uniform3f("u_sunDir", shadowCamera.front); shader.uniform3f("u_sunDir", shadowCamera.front);
shader.uniform1i("u_shadowsRes", shadowMap->getResolution()); shader.uniform1i("u_shadowsRes", shadowMap->getResolution());
glActiveTexture(GL_TEXTURE4); glActiveTexture(GL_TEXTURE4);
shader.uniform1i("u_shadows", 4); shader.uniform1i("u_shadows[0]", 4);
glBindTexture(GL_TEXTURE_2D, shadowMap->getDepthMap()); glBindTexture(GL_TEXTURE_2D, shadowMap->getDepthMap());
glActiveTexture(GL_TEXTURE5); glActiveTexture(GL_TEXTURE5);
shader.uniform1i("u_wideShadows", 5); shader.uniform1i("u_shadows[1]", 5);
glBindTexture(GL_TEXTURE_2D, wideShadowMap->getDepthMap()); glBindTexture(GL_TEXTURE_2D, wideShadowMap->getDepthMap());
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
@ -358,11 +358,13 @@ void WorldRenderer::generateShadowsMap(
const auto& settings = engine.getSettings(); const auto& settings = engine.getSettings();
int resolution = shadowMap.getResolution(); int resolution = shadowMap.getResolution();
float shadowMapScale = 0.2f / (1 << glm::max(0L, settings.graphics.shadowsQuality.get())) * scale; float shadowMapScale =
0.2f / (1 << glm::max(0L, settings.graphics.shadowsQuality.get())) *
scale;
float shadowMapSize = resolution * shadowMapScale; float shadowMapSize = resolution * shadowMapScale;
glm::vec3 basePos = glm::floor(camera.position / 500.0f) * 500.0f; glm::vec3 basePos = glm::floor(camera.position);
shadowCamera = Camera(basePos + glm::mod(camera.position, 500.0f), shadowMapSize); shadowCamera = Camera(basePos, shadowMapSize);
shadowCamera.near = 0.1f; shadowCamera.near = 0.1f;
shadowCamera.far = 800.0f; shadowCamera.far = 800.0f;
shadowCamera.perspective = false; shadowCamera.perspective = false;
@ -378,20 +380,15 @@ void WorldRenderer::generateShadowsMap(
shadowCamera.position -= shadowCamera.front * 200.0f; shadowCamera.position -= shadowCamera.front * 200.0f;
shadowCamera.position += shadowCamera.up * 10.0f; shadowCamera.position += shadowCamera.up * 10.0f;
shadowCamera.position += camera.front * 100.0f;
auto view = shadowCamera.getView(); auto view = shadowCamera.getView();
auto currentPos = shadowCamera.position; auto currentPos = shadowCamera.position;
auto min = view * glm::dvec4(currentPos - (shadowCamera.right + shadowCamera.up) * (shadowMapSize * 0.5f), 1.0f); auto min = view * glm::vec4(currentPos - (shadowCamera.right + shadowCamera.up) * (shadowMapSize * 0.5f), 1.0f);
auto max = view * glm::dvec4(currentPos + (shadowCamera.right + shadowCamera.up) * (shadowMapSize * 0.5f), 1.0f); auto max = view * glm::vec4(currentPos + (shadowCamera.right + shadowCamera.up) * (shadowMapSize * 0.5f), 1.0f);
float texelSize = (max.x - min.x) / shadowMapSize; shadowCamera.setProjection(glm::ortho(min.x, max.x, min.y, max.y, 0.1f, 800.0f));
float snappedLeft = glm::round(min.x / texelSize) * texelSize;
float snappedBottom = glm::round(min.y / texelSize) * texelSize;
float snappedRight = snappedLeft + shadowMapSize * texelSize;
float snappedTop = snappedBottom + shadowMapSize * texelSize;
shadowCamera.setProjection(glm::ortho(snappedLeft, snappedRight, snappedBottom, snappedTop, 0.1f, 800.0f));
{ {
frustumCulling->update(shadowCamera.getProjView()); frustumCulling->update(shadowCamera.getProjView());
@ -426,7 +423,7 @@ void WorldRenderer::draw(
const auto& settings = engine.getSettings(); const auto& settings = engine.getSettings();
gbufferPipeline = settings.graphics.advancedRender.get(); gbufferPipeline = settings.graphics.advancedRender.get();
int shadowsQuality = settings.graphics.shadowsQuality.get(); int shadowsQuality = settings.graphics.shadowsQuality.get();
int resolution = 512 << shadowsQuality; int resolution = 1024 << shadowsQuality;
if (shadowsQuality > 0 && !shadows) { if (shadowsQuality > 0 && !shadows) {
shadowMap = std::make_unique<ShadowMap>(resolution); shadowMap = std::make_unique<ShadowMap>(resolution);
wideShadowMap = std::make_unique<ShadowMap>(resolution); wideShadowMap = std::make_unique<ShadowMap>(resolution);
@ -454,11 +451,11 @@ void WorldRenderer::draw(
chunks->update(); chunks->update();
static int frameid = 0; static int frameid = 0;
if (shadows) { if (shadows && frameid % 3 == 0) {
if (frameid % 2 == 0) { if (frameid % 2 == 0) {
generateShadowsMap(camera, pctx, *shadowMap, shadowCamera, 1.0f); generateShadowsMap(camera, pctx, *shadowMap, shadowCamera, 1.0f);
} else { } else {
generateShadowsMap(camera, pctx, *wideShadowMap, wideShadowCamera, 8.0f); generateShadowsMap(camera, pctx, *wideShadowMap, wideShadowCamera, 4.0f);
} }
} }
frameid++; frameid++;