From ebbe8c97495e6bcf4e541def42aa35fc6cbef90a Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:36 +0300 Subject: [PATCH 01/17] build: pin Engine to feat/voxel-lighting --- Engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine b/Engine index 16459d9..2c07d52 160000 --- a/Engine +++ b/Engine @@ -1 +1 @@ -Subproject commit 16459d9e9518bb977a5fa26ea36379ae2a917d6b +Subproject commit 2c07d5229c7eb33581eb1bc32d9d6f5a0fa21a09 From 7f03a3aeb141f296957ea71d35bfe0f3bcab0007 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:37 +0300 Subject: [PATCH 02/17] shaders: rebuild game SPIR-V for FrameData version 2 --- Game/assets/shaders/gbuffer_voxel.vert.spv | Bin 6492 -> 6704 bytes .../shaders/shadow_depth_voxel.vert.spv | Bin 3268 -> 3480 bytes Game/assets/shaders/water_shader.vert.spv | Bin 5708 -> 5904 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Game/assets/shaders/gbuffer_voxel.vert.spv b/Game/assets/shaders/gbuffer_voxel.vert.spv index 63927d6df00f2d9cfa25e9706453c08f96b70fb1..dd43992ebe57236e8ffa1d7bca6e0afedd4c951f 100644 GIT binary patch literal 6704 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 c1gh6oqHK{!4weJfRH@93e#xZlIVtU7w?)f!i zOjCFy>mSv0z-Yfk7WN=rstv z=r9-uQHYi|U1_fd@nDpCm?a4Jb;#h-Q0v6Ra6#CKhEbew@1&Q%nzP@ED-~wR3EN6E z?5|>Vlub7$m2Q$u>Oyl*X{^!mLRT54oL2icT|pW($noh7%sC;^?CVlBAj3(go$&vh zsb^WSC3JNr_fZ%4;LHwZFPyRAbOiV8&(asCYCo2D?2qyX$FXl_nv=`QT$f{3xF*zj zXGP{hBL^1cyP?R;aIC`2_CVlpJX^XEnnl}4^V?dV70?-gdwVGGm`ehC;Q0Qim33iF PzM^ Date: Mon, 9 Nov 2026 19:12:42 +0300 Subject: [PATCH 03/17] world: linear albedo from an sRGB atlas --- Game/assets/shaders/flat_shader.frag | 3 ++- Game/assets/shaders/flat_shader.frag.spv | Bin 12928 -> 13748 bytes Game/assets/shaders/flat_shader_gl.frag | 3 ++- Game/src/World/TextureAtlas.cpp | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Game/assets/shaders/flat_shader.frag b/Game/assets/shaders/flat_shader.frag index 946920f..bb23d69 100644 --- a/Game/assets/shaders/flat_shader.frag +++ b/Game/assets/shaders/flat_shader.frag @@ -13,6 +13,7 @@ layout(set = 0, binding = 0) uniform sampler2D diffuseTexture; #include "sleak/shadow_light.glsl" #include "sleak/frame.glsl" +#include "sleak/color.glsl" layout(set = 3, binding = 0) uniform sampler2DShadow shadowMap; @@ -73,7 +74,7 @@ void main() { // AO is stored in vertex color. Apply only to ambient. float ao = fragColor.r; - vec3 baseColor = texColor.rgb; + vec3 baseColor = SleakLinearToSrgb(texColor.rgb); vec3 N = normalize(fragWorldNorm); vec3 lightDir = normalize(uLightDir.xyz); diff --git a/Game/assets/shaders/flat_shader.frag.spv b/Game/assets/shaders/flat_shader.frag.spv index 3bc97ba40d385916b2289b4bae0dadb623cbe02b..5c40f2d4a0fcc6466ac31d4a4cf2d954e091e3d3 100644 GIT binary patch literal 13748 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 literal 12928 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 X-v}my`Afg|YM+QqLR@=ouKoW5S_@9s diff --git a/Game/assets/shaders/flat_shader_gl.frag b/Game/assets/shaders/flat_shader_gl.frag index 60e7a45..f16adb1 100644 --- a/Game/assets/shaders/flat_shader_gl.frag +++ b/Game/assets/shaders/flat_shader_gl.frag @@ -41,6 +41,7 @@ layout(std140, binding = 5) uniform ShadowUBO { }; #include "sleak/frame.glsl" +#include "sleak/color.glsl" layout(binding = 0) uniform sampler2D diffuseTexture; layout(binding = 3) uniform sampler2DShadow shadowMap; @@ -104,7 +105,7 @@ void main() { // AO is stored in vertex color. Apply only to ambient. float ao = fragColor.r; - vec3 baseColor = texColor.rgb; + vec3 baseColor = SleakLinearToSrgb(texColor.rgb); vec3 N = normalize(fragWorldNorm); diff --git a/Game/src/World/TextureAtlas.cpp b/Game/src/World/TextureAtlas.cpp index cc7c47c..0ca2f96 100644 --- a/Game/src/World/TextureAtlas.cpp +++ b/Game/src/World/TextureAtlas.cpp @@ -130,6 +130,7 @@ Sleak::RefPtr TextureAtlas::BuildAtlas() { desc.width = static_cast(atlasW); desc.height = static_cast(atlasH); desc.mipLevels = maxMips; + desc.srgb = true; // sampled as linear albedo const Sleak::TextureMipLevel level0{atlas.data(), atlas.size()}; return Sleak::CreateTexture(desc, &level0, 1); } From afd22222eee35e3bde40c27eafc14b5fc7d7d0d4 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:46 +0300 Subject: [PATCH 04/17] world: grade grass and leaf tiles toward vanilla plains colors --- Game/src/World/TextureAtlas.cpp | 106 +++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/Game/src/World/TextureAtlas.cpp b/Game/src/World/TextureAtlas.cpp index 0ca2f96..2f08217 100644 --- a/Game/src/World/TextureAtlas.cpp +++ b/Game/src/World/TextureAtlas.cpp @@ -1,9 +1,12 @@ #include "World/TextureAtlas.hpp" -#include "World/Block.hpp" + #include #include -#include #include +#include +#include + +#include "World/Block.hpp" using namespace Sleak; using namespace Sleak::UI; @@ -39,6 +42,99 @@ static const char* s_tilePaths[] = { static_assert(sizeof(s_tilePaths) / sizeof(s_tilePaths[0]) == TILE_COUNT, "Tile path count must match TILE_COUNT"); +namespace { + +/// Per-channel linear-light grade that moves a tile's mean to a target. +struct TileGrade { + int tile; + float target[3]; // sRGB 0-255 of the graded texels' mean linear color + bool fringeOnly; // only the grass fringe of a side tile +}; + +// Grass and leaves toward vanilla plains colors under the BSL noon light; +// other tiles keep their colors. Tune against the BSL noon references. +constexpr TileGrade TILE_GRADES[] = { + {TILE_GRASS_TOP, {66.0f, 89.0f, 45.0f}, false}, + {TILE_GRASS_SIDE, {66.0f, 89.0f, 45.0f}, true}, + {TILE_OAK_LEAVES, {61.0f, 88.0f, 24.0f}, false}, +}; + +// Grass fringe texels: green above red and blue by this ratio +constexpr float FRINGE_GREEN_RATIO = 1.15f; +// Texels below this alpha are cut out and stay out of the mean +constexpr unsigned char GRADE_MIN_ALPHA = 128; +// Gain range that keeps a bad target from wiping out a channel +constexpr float GRADE_GAIN_MIN = 0.05f; +constexpr float GRADE_GAIN_MAX = 8.0f; +// sRGB transfer (IEC 61966-2-1) +constexpr float SRGB_LINEAR_KNEE = 0.04045f; +constexpr float SRGB_ENCODE_KNEE = 0.0031308f; +constexpr float SRGB_LINEAR_SLOPE = 12.92f; +constexpr float SRGB_SCALE = 1.055f; +constexpr float SRGB_OFFSET = 0.055f; +constexpr float SRGB_GAMMA = 2.4f; +constexpr float CHANNEL_MAX = 255.0f; +constexpr float ROUND_HALF = 0.5f; +constexpr int RGBA = 4; +constexpr int RGB = 3; +constexpr int ALPHA = 3; + +/// Linear light of an sRGB channel in [0, 1]. +float SrgbToLinear(float c) { + return c <= SRGB_LINEAR_KNEE + ? c / SRGB_LINEAR_SLOPE + : std::pow((c + SRGB_OFFSET) / SRGB_SCALE, SRGB_GAMMA); +} + +/// sRGB encoding of a linear channel, clamped to [0, 1]. +float LinearToSrgb(float c) { + c = std::clamp(c, 0.0f, 1.0f); + return c <= SRGB_ENCODE_KNEE + ? c * SRGB_LINEAR_SLOPE + : SRGB_SCALE * std::pow(c, 1.0f / SRGB_GAMMA) - SRGB_OFFSET; +} + +/// True for the green grass fringe texels of a side tile. +bool IsGrassFringe(const unsigned char* px) { + return px[1] > px[0] * FRINGE_GREEN_RATIO && + px[1] > px[2] * FRINGE_GREEN_RATIO; +} + +/// Grades a tile's RGBA8 texels in place, in linear light. +void GradeTile(unsigned char* pixels, int texels, const TileGrade& grade) { + double sum[RGB] = {}; + int counted = 0; + for (int i = 0; i < texels; ++i) { + const unsigned char* px = pixels + i * RGBA; + if (px[ALPHA] < GRADE_MIN_ALPHA) continue; + if (grade.fringeOnly && !IsGrassFringe(px)) continue; + for (int c = 0; c < RGB; ++c) + sum[c] += SrgbToLinear(px[c] / CHANNEL_MAX); + ++counted; + } + if (counted == 0) return; + + float gain[RGB]; + for (int c = 0; c < RGB; ++c) { + const float mean = static_cast(sum[c] / counted); + const float target = SrgbToLinear(grade.target[c] / CHANNEL_MAX); + gain[c] = mean > 0.0f ? std::clamp(target / mean, GRADE_GAIN_MIN, + GRADE_GAIN_MAX) + : 1.0f; + } + for (int i = 0; i < texels; ++i) { + unsigned char* px = pixels + i * RGBA; + if (grade.fringeOnly && !IsGrassFringe(px)) continue; + for (int c = 0; c < RGB; ++c) { + const float lin = SrgbToLinear(px[c] / CHANNEL_MAX) * gain[c]; + px[c] = static_cast(LinearToSrgb(lin) * CHANNEL_MAX + + ROUND_HALF); + } + } +} + +} // namespace + /// Resamples src (srcW x srcH) into dst (dstW x dstH) using nearest neighbor. static void ResampleNearest(const unsigned char* src, int srcW, int srcH, unsigned char* dst, int dstW, int dstH) { @@ -71,6 +167,12 @@ Sleak::RefPtr TextureAtlas::BuildAtlas() { } } + // Level-0 grades; the GPU builds the mips from the graded texels + for (const TileGrade& grade : TILE_GRADES) { + TileData& t = tiles[grade.tile]; + if (t.pixels) GradeTile(t.pixels, t.w * t.h, grade); + } + if (tileSize == 0) tileSize = 16; // fallback // Wrapped gutters: each cell holds the tile plus PAD px of the tile From b1c66fe4a5e44b18bce0eb25e0a4e0d78ce321c1 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:46 +0300 Subject: [PATCH 05/17] shaders: voxel GBuffer channels for emission, block and sky light --- Game/assets/shaders/gbuffer_voxel.frag | 18 ++++---- Game/assets/shaders/gbuffer_voxel.frag.spv | Bin 10060 -> 10600 bytes Game/assets/shaders/gbuffer_voxel_gl.frag | 16 +++---- .../shaders/include/craft/shading_models.glsl | 8 ++++ .../shaders/include/craft/voxel_surface.glsl | 41 ++++++++++++++++++ 5 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 Game/assets/shaders/include/craft/voxel_surface.glsl diff --git a/Game/assets/shaders/gbuffer_voxel.frag b/Game/assets/shaders/gbuffer_voxel.frag index 6ef1d16..dcd41b8 100644 --- a/Game/assets/shaders/gbuffer_voxel.frag +++ b/Game/assets/shaders/gbuffer_voxel.frag @@ -1,10 +1,11 @@ #version 450 #extension GL_GOOGLE_include_directive : require -// GBuffer pass, voxel format: engine gbuffer.frag plus RT3 (voxel model) +// GBuffer pass, voxel format: engine gbuffer.frag with the voxel RT2 and RT3 +// (craft/voxel_surface.glsl) #include "sleak/frame.glsl" -#include "craft/shading_models.glsl" +#include "craft/voxel_surface.glsl" layout(location = 0) in vec3 fragWorldPos; layout(location = 1) in vec3 fragWorldNorm; @@ -90,14 +91,11 @@ void main() { : fragColor.r * aoFactor; ao = clamp(ao, 0.0, 1.0); - // --- Emissive (HDR in RT2.gba) --- - vec3 emissive = hasEmissiveMap != 0u - ? texture(texEmissive, uv).rgb * emissiveFactor.rgb * emissiveFactor.w - : emissiveFactor.rgb * emissiveFactor.w; - outAlbedoAO = SleakFrameGuard(vec4(albedoSample.rgb, ao)); outNormalRough = vec4(N * 0.5 + 0.5, roughness); - outMetalEmit = vec4(metallic, emissive); - outMotionModel = SleakEncodeMotionModel(vec2(0.0), 0.0, - CRAFT_SHADING_MODEL_VOXEL); + outMetalEmit = CraftEncodeVoxelRT2(metallic, + CraftTexelEmission(albedoSample.rgb), + CRAFT_NO_BLOCK_LIGHT); + outMotionModel = CraftEncodeVoxelRT3(CRAFT_SKY_LIGHT_OPEN, + CRAFT_SHADING_MODEL_VOXEL); } diff --git a/Game/assets/shaders/gbuffer_voxel.frag.spv b/Game/assets/shaders/gbuffer_voxel.frag.spv index e7c99170316be01ab254ef3ed923ec639dc5dc76..68c73180f589c7a45f05ca0b3072fc0200b8ebaf 100644 GIT binary patch literal 10600 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 P^Hq>FUc;=9`RMciK*9_g literal 10060 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 O_0{J5=5ej!uJ!*sv$!Du diff --git a/Game/assets/shaders/gbuffer_voxel_gl.frag b/Game/assets/shaders/gbuffer_voxel_gl.frag index ba7ed29..ea45cc8 100644 --- a/Game/assets/shaders/gbuffer_voxel_gl.frag +++ b/Game/assets/shaders/gbuffer_voxel_gl.frag @@ -1,7 +1,8 @@ #version 450 core #extension GL_GOOGLE_include_directive : require -// GBuffer pass, OpenGL, voxel format: engine gbuffer_gl.frag plus RT3 +// GBuffer pass, OpenGL, voxel format: engine gbuffer_gl.frag with the voxel +// RT2 and RT3 (craft/voxel_surface.glsl) in vec3 fragWorldPos; in vec3 fragWorldNorm; @@ -52,7 +53,7 @@ layout(std140, binding = 1) uniform MaterialUBO { }; #include "sleak/frame.glsl" -#include "craft/shading_models.glsl" +#include "craft/voxel_surface.glsl" void main() { vec2 uv = fragUV * matTiling + matOffset; @@ -79,13 +80,12 @@ void main() { : matMetallic; float ao = (HasAOMap != 0u) ? texture(aoTexture, uv).r : (matAO * fragColor.r); - float emitScale = (HasEmissiveMap != 0u) - ? length(texture(emissiveTexture, uv).rgb) - : length(matEmissiveColor) * matEmissiveIntensity; outAlbedoAO = SleakFrameGuard(vec4(albedo.rgb, ao)); outNormalRough = vec4(N * 0.5 + 0.5, roughness); // pack normal to [0,1] - outMetalEmit = vec4(metallic, clamp(emitScale, 0.0, 1.0), 0.0, 1.0); - outMotionModel = SleakEncodeMotionModel(vec2(0.0), 0.0, - CRAFT_SHADING_MODEL_VOXEL); + outMetalEmit = CraftEncodeVoxelRT2(metallic, + CraftTexelEmission(albedo.rgb), + CRAFT_NO_BLOCK_LIGHT); + outMotionModel = CraftEncodeVoxelRT3(CRAFT_SKY_LIGHT_OPEN, + CRAFT_SHADING_MODEL_VOXEL); } diff --git a/Game/assets/shaders/include/craft/shading_models.glsl b/Game/assets/shaders/include/craft/shading_models.glsl index 838c140..9f81f41 100644 --- a/Game/assets/shaders/include/craft/shading_models.glsl +++ b/Game/assets/shaders/include/craft/shading_models.glsl @@ -5,5 +5,13 @@ // SleakCraft shading model ids in GBuffer RT3.w; 0 belongs to the engine #define CRAFT_SHADING_MODEL_VOXEL 1u +// Last id the voxel lighting shades (phase 11 appends foliage) +#define CRAFT_SHADING_MODEL_LAST_VOXEL CRAFT_SHADING_MODEL_VOXEL + +/// True for ids the voxel lighting composition shades. +bool CraftIsVoxelModel(uint id) { + return id >= CRAFT_SHADING_MODEL_VOXEL && + id <= CRAFT_SHADING_MODEL_LAST_VOXEL; +} #endif diff --git a/Game/assets/shaders/include/craft/voxel_surface.glsl b/Game/assets/shaders/include/craft/voxel_surface.glsl new file mode 100644 index 0000000..218fa3a --- /dev/null +++ b/Game/assets/shaders/include/craft/voxel_surface.glsl @@ -0,0 +1,41 @@ +#ifndef CRAFT_VOXEL_SURFACE_GLSL +#define CRAFT_VOXEL_SURFACE_GLSL + +#include "craft/shading_models.glsl" + +// Voxel GBuffer channels beyond the engine layout: +// RT2 r metallic (0), g emission, b block light, a reserved; +// RT3 z sky light (phase 8 fills it), w shading model +// Sky light written until per-voxel sky light exists +#define CRAFT_SKY_LIGHT_OPEN 1.0 +// No block emits light and no torch light exists yet +#define CRAFT_NO_EMISSION 0.0 +#define CRAFT_NO_BLOCK_LIGHT 0.0 +// RT2 alpha is unused by voxels +#define CRAFT_RT2_RESERVED 0.0 + +/// RT2 of a voxel texel. +vec4 CraftEncodeVoxelRT2(float metallic, float emission, float blockLight) { + return vec4(metallic, clamp(emission, 0.0, 1.0), + clamp(blockLight, 0.0, 1.0), CRAFT_RT2_RESERVED); +} + +/// RT3 of a voxel texel: no object motion yet. +vec4 CraftEncodeVoxelRT3(float skyLight, uint shadingModel) { + return SleakEncodeMotionModel(vec2(0.0), clamp(skyLight, 0.0, 1.0), + shadingModel); +} + +/// Emission strength of an atlas texel; a hook for emissive blocks. +float CraftTexelEmission(vec3 albedo) { return CRAFT_NO_EMISSION; } + +/// Emission strength stored in a voxel texel's RT2. +float CraftVoxelEmission(vec4 rt2) { return clamp(rt2.g, 0.0, 1.0); } + +/// Block light stored in a voxel texel's RT2. +float CraftVoxelBlockLight(vec4 rt2) { return clamp(rt2.b, 0.0, 1.0); } + +/// Sky light stored in a voxel texel's RT3. +float CraftVoxelSkyLight(vec4 rt3) { return clamp(rt3.z, 0.0, 1.0); } + +#endif From 296399b04ca4bc1d9ec81a7b529a497960ba4378 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:57 +0300 Subject: [PATCH 06/17] world: voxel lighting palette in the game frame block --- .github/workflows/ci.yml | 11 +- Game/assets/shaders/include/craft/frame.glsl | 20 ++++ Game/include/MainScene.hpp | 27 +++-- Game/include/World/VoxelLighting.hpp | 107 +++++++++++++++++++ Game/src/MainScene.cpp | 3 + Game/src/World/VoxelLighting.cpp | 106 ++++++++++++++++++ 6 files changed, 262 insertions(+), 12 deletions(-) create mode 100644 Game/assets/shaders/include/craft/frame.glsl create mode 100644 Game/include/World/VoxelLighting.hpp create mode 100644 Game/src/World/VoxelLighting.cpp diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cafc3d0..5b13040 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -196,7 +196,7 @@ jobs: - name: Install shader tools run: | sudo apt-get update - sudo apt-get install -y glslc glslang-tools + sudo apt-get install -y glslc glslang-tools spirv-tools # Byte comparison against the committed .spv is not usable here: glslc # embeds its own generator version, so a different toolchain produces @@ -297,6 +297,15 @@ jobs: done exit $fail + - name: Game frame block matches its C++ mirror + working-directory: SleakCraft + run: | + python3 Engine/scripts/check_ubo_layout.py \ + --header Game/include/World/VoxelLighting.hpp \ + --include-dir Engine/assets/shaders/include \ + --include-dir Game/assets/shaders/include \ + --check CraftFrameData:craft/frame.glsl:CraftFrameUBO + # Compiling proves nothing about whether the game runs. Runners have no GPU, # but Mesa's software Vulkan (lavapipe) plus a virtual display is enough to # boot the real binary into a real world and catch startup crashes, missing diff --git a/Game/assets/shaders/include/craft/frame.glsl b/Game/assets/shaders/include/craft/frame.glsl new file mode 100644 index 0000000..a54abfd --- /dev/null +++ b/Game/assets/shaders/include/craft/frame.glsl @@ -0,0 +1,20 @@ +#ifndef CRAFT_FRAME_GLSL +#define CRAFT_FRAME_GLSL + +#include "sleak/frame.glsl" + +// SleakCraft per-frame block (CraftFrameData in World/VoxelLighting.hpp), +// std140, append only; colors are linear (squared authoring values) +SLEAK_FRAME_USER_BLOCK CraftFrameUBO { + vec4 SunColor; // rgb direct sun or moon light + vec4 AmbientColor; // rgb sky light reaching shadowed faces + vec4 MinLightColor; // rgb floor light where the sky is hidden + vec4 BlockLightColor; // rgb torch tint at full block light + vec4 NightTint; // rgb unit hue of moonlit desaturation + vec4 WeatherTint; // rgb unit hue of rainy desaturation + vec4 Sky; // sun visibility, rain, shadow fade, night vision + vec4 Look; // desaturation, emission gain, albedo balance, + // SSAO exponent +} uCraft; + +#endif diff --git a/Game/include/MainScene.hpp b/Game/include/MainScene.hpp index dc154cb..94197f1 100644 --- a/Game/include/MainScene.hpp +++ b/Game/include/MainScene.hpp @@ -2,21 +2,23 @@ #define _MAIN_SCENE_HPP_ #include -#include -#include -#include -#include #include -#include "World/ChunkManager.hpp" -#include "World/Block.hpp" -#include "World/SaveManager.hpp" -#include "World/BlockEffects.hpp" -#include "World/WorldPersistence.hpp" -#include "Player/PlayerController.hpp" +#include +#include +#include +#include + #include "Player/BlockInteraction.hpp" +#include "Player/PlayerController.hpp" +#include "UI/Hotbar.hpp" #include "UI/HudPanel.hpp" #include "UI/SettingsPanel.hpp" -#include "UI/Hotbar.hpp" +#include "World/Block.hpp" +#include "World/BlockEffects.hpp" +#include "World/ChunkManager.hpp" +#include "World/SaveManager.hpp" +#include "World/VoxelLighting.hpp" +#include "World/WorldPersistence.hpp" namespace Sleak { class Material; class DirectionalLight; } @@ -69,6 +71,8 @@ class MainScene : public Sleak::Scene { float GetSaveMessageTimer() const { return m_saveMessageTimer; } const std::string& GetSaveMessage() const { return m_saveMessage; } float GetGameTime() const { return m_gameTime; } + /// Voxel palette the settings panel scales. + VoxelLighting& GetVoxelLighting() { return m_voxelLighting; } // Accessors for HudPanel/SettingsPanel (toggles that engine setup code // in MainScene also reads at Initialize time) @@ -116,6 +120,7 @@ class MainScene : public Sleak::Scene { Sleak::RefPtr m_waterMaterial; ChunkManager m_chunkManager; BlockEffects m_blockEffects; + VoxelLighting m_voxelLighting; SaveManager m_saveManager; WorldPersistence m_worldPersistence; PlayerController m_playerController; diff --git a/Game/include/World/VoxelLighting.hpp b/Game/include/World/VoxelLighting.hpp new file mode 100644 index 0000000..5c14e22 --- /dev/null +++ b/Game/include/World/VoxelLighting.hpp @@ -0,0 +1,107 @@ +#ifndef _VOXEL_LIGHTING_HPP_ +#define _VOXEL_LIGHTING_HPP_ + +#include + +namespace Sleak { +struct GraphicsConfig; +} + +/// A palette color in authoring space: (r, g, b) / 255 times an intensity. +/// Palettes blend here; shaders get the square, which is linear light. +struct SqrtColor { + float r = 0.0f; + float g = 0.0f; + float b = 0.0f; +}; + +/// A palette key as authored: 0-255 channels and an intensity. +struct AuthoredKey { + float r; + float g; + float b; + float intensity; +}; + +/// Noon sun and sky ambient keys (BSL v10 defaults). +inline constexpr AuthoredKey NOON_SUN_KEY{196.0f, 220.0f, 255.0f, 1.40f}; +inline constexpr AuthoredKey NOON_AMBIENT_KEY{120.0f, 172.0f, 255.0f, 0.60f}; + +/// SqrtColor of an authored key. +SqrtColor ToSqrtColor(const AuthoredKey& key); + +/// Linear blend in authoring space, as time-of-day keys mix. +SqrtColor BlendColor(const SqrtColor& from, const SqrtColor& to, float t); + +/// Light colors and sky state of one moment, in authoring space. +struct LightingPalette { + SqrtColor sun; + SqrtColor ambient; + SqrtColor moon; + SqrtColor weather; + SqrtColor blockLight; + float sunVisibility = 1.0f; + float rain = 0.0f; + float shadowFade = 1.0f; + float nightVision = 0.0f; +}; + +/// Linear multiplier the settings panel applies on top of a palette color. +struct LightMultiplier { + float r = 1.0f; + float g = 1.0f; + float b = 1.0f; + float scale = 1.0f; +}; + +/// SleakCraft's per-frame shader block (craft/frame.glsl), std140, append +/// only. Colors are linear. +struct CraftFrameData { + float SunColor[4]; + float AmbientColor[4]; + float MinLightColor[4]; + float BlockLightColor[4]; + float NightTint[4]; + float WeatherTint[4]; + float Sky[4]; + float Look[4]; +}; +static_assert(offsetof(CraftFrameData, SunColor) == 0); +static_assert(offsetof(CraftFrameData, AmbientColor) == 16); +static_assert(offsetof(CraftFrameData, MinLightColor) == 32); +static_assert(offsetof(CraftFrameData, BlockLightColor) == 48); +static_assert(offsetof(CraftFrameData, NightTint) == 64); +static_assert(offsetof(CraftFrameData, WeatherTint) == 80); +static_assert(offsetof(CraftFrameData, Sky) == 96); +static_assert(offsetof(CraftFrameData, Look) == 112); +static_assert(sizeof(CraftFrameData) == 128); + +/// Owns the voxel lighting palette and sends it as the game frame block. +class VoxelLighting { + public: + /// BSL-style noon: blue-white sun, blue sky ambient, open sky. + static LightingPalette NoonPalette(); + + /// Palette used from the next Upload on. + void SetPalette(const LightingPalette& palette) { m_palette = palette; } + /// Palette of the next Upload. + const LightingPalette& GetPalette() const { return m_palette; } + + /// Settings multipliers on the sun and sky ambient colors. + void SetMultipliers(const LightMultiplier& sun, + const LightMultiplier& ambient) { + m_sunMultiplier = sun; + m_ambientMultiplier = ambient; + } + + /// Builds the block from the palette and the look settings and sends + /// it; called every frame, since scene activation clears the block. + void Upload(const Sleak::GraphicsConfig& config) const; + + private: + LightingPalette m_palette = NoonPalette(); + LightMultiplier m_sunMultiplier; + LightMultiplier m_ambientMultiplier; +}; + +#endif // _VOXEL_LIGHTING_HPP_ diff --git a/Game/src/MainScene.cpp b/Game/src/MainScene.cpp index 4cf4cfb..1e5b977 100644 --- a/Game/src/MainScene.cpp +++ b/Game/src/MainScene.cpp @@ -286,6 +286,9 @@ void MainScene::Update(float deltaTime) { Scene::Update(deltaTime); + if (auto* app = Sleak::Application::GetInstance()) + m_voxelLighting.Upload(app->GetGraphicsConfig()); + m_hudPanel.Update(deltaTime); if (cam) { diff --git a/Game/src/World/VoxelLighting.cpp b/Game/src/World/VoxelLighting.cpp new file mode 100644 index 0000000..244d82e --- /dev/null +++ b/Game/src/World/VoxelLighting.cpp @@ -0,0 +1,106 @@ +#include "World/VoxelLighting.hpp" + +#include +#include +#include +#include +#include + +namespace { + +// Authoring channels run 0-255 +constexpr float CHANNEL_MAX = 255.0f; +// Moon, rain and torch keys (BSL v10 defaults) +constexpr AuthoredKey MOON_KEY{96.0f, 192.0f, 255.0f, 1.00f}; +constexpr AuthoredKey RAIN_KEY{176.0f, 224.0f, 255.0f, 1.20f}; +constexpr AuthoredKey TORCH_KEY{255.0f, 212.0f, 160.0f, 0.85f}; +// Cave floor: grey authored like the palette, then scaled down +constexpr float MIN_LIGHT_GREY = 128.0f; +constexpr float MIN_LIGHT_SCALE = 0.04f; +// Desaturation keeps 1 - this * factor of the color's chroma +constexpr float DESAT_PER_FACTOR = 0.4f; +// Emissive gain, albedo balancing, SSAO exponent (BSL defaults) +constexpr float EMISSION_GAIN = 4.0f; +constexpr float ALBEDO_BALANCE = 0.25f; +constexpr float SSAO_EXPONENT = 1.0f; +// Keeps a tint hue defined when its color is black +constexpr float TINT_EPSILON = 1e-6f; +constexpr int RGB = 3; + +/// Linear light of an authored color, written as rgb plus a zero w. +void WriteLinear(const SqrtColor& c, float out[4]) { + out[0] = c.r * c.r; + out[1] = c.g * c.g; + out[2] = c.b * c.b; + out[3] = 0.0f; +} + +/// Linear light of an authored color times a settings multiplier. +void WriteScaled(const SqrtColor& c, const LightMultiplier& m, float out[4]) { + WriteLinear(c, out); + const float gain[RGB] = {m.r, m.g, m.b}; + for (int i = 0; i < RGB; ++i) + out[i] *= std::max(gain[i], 0.0f) * std::max(m.scale, 0.0f); +} + +/// Unit-length hue of an authored color's linear light. +void WriteHue(const SqrtColor& c, float out[4]) { + WriteLinear(c, out); + const float len = + std::sqrt(out[0] * out[0] + out[1] * out[1] + out[2] * out[2]); + for (int i = 0; i < RGB; ++i) out[i] /= std::max(len, TINT_EPSILON); +} + +} // namespace + +SqrtColor ToSqrtColor(const AuthoredKey& key) { + const float scale = key.intensity / CHANNEL_MAX; + return {key.r * scale, key.g * scale, key.b * scale}; +} + +SqrtColor BlendColor(const SqrtColor& from, const SqrtColor& to, float t) { + return {from.r + (to.r - from.r) * t, from.g + (to.g - from.g) * t, + from.b + (to.b - from.b) * t}; +} + +LightingPalette VoxelLighting::NoonPalette() { + LightingPalette p; + p.sun = ToSqrtColor(NOON_SUN_KEY); + p.ambient = ToSqrtColor(NOON_AMBIENT_KEY); + p.moon = ToSqrtColor(MOON_KEY); + p.weather = ToSqrtColor(RAIN_KEY); + p.blockLight = ToSqrtColor(TORCH_KEY); + return p; +} + +void VoxelLighting::Upload(const Sleak::GraphicsConfig& config) const { + CraftFrameData d{}; + WriteScaled(m_palette.sun, m_sunMultiplier, d.SunColor); + WriteScaled(m_palette.ambient, m_ambientMultiplier, d.AmbientColor); + const SqrtColor grey = ToSqrtColor( + {MIN_LIGHT_GREY, MIN_LIGHT_GREY, MIN_LIGHT_GREY, config.minLight}); + WriteLinear(grey, d.MinLightColor); + for (int i = 0; i < RGB; ++i) d.MinLightColor[i] *= MIN_LIGHT_SCALE; + WriteLinear(m_palette.blockLight, d.BlockLightColor); + WriteHue(m_palette.moon, d.NightTint); + WriteHue(m_palette.weather, d.WeatherTint); + + d.Sky[0] = m_palette.sunVisibility; + d.Sky[1] = m_palette.rain; + d.Sky[2] = m_palette.shadowFade; + d.Sky[3] = m_palette.nightVision; + + d.Look[0] = + config.desaturationEnabled + ? std::max(1.0f - DESAT_PER_FACTOR * config.desaturationFactor, + 0.0f) + : 0.0f; + d.Look[1] = EMISSION_GAIN; + d.Look[2] = ALBEDO_BALANCE; + d.Look[3] = SSAO_EXPONENT; + + auto* app = Sleak::Application::GetInstance(); + if (app && !app->SetFrameUserData(&d, sizeof(d))) + SLEAK_ERROR("VoxelLighting: frame block of {} bytes rejected", + sizeof(d)); +} From 0e17f5b5b778cb5ab5cf194c809a86568d30c18b Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:12:57 +0300 Subject: [PATCH 07/17] shaders: BSL-style voxel lighting composition --- .../shaders/include/craft/lighting.glsl | 158 ++++++++++++++++++ .../shaders/include/craft/lighting_pass.glsl | 64 +++++++ Game/assets/shaders/lighting_voxel.frag | 158 +++--------------- Game/assets/shaders/lighting_voxel.frag.spv | Bin 42384 -> 54580 bytes Game/assets/shaders/lighting_voxel_gl.frag | 129 ++------------ 5 files changed, 264 insertions(+), 245 deletions(-) create mode 100644 Game/assets/shaders/include/craft/lighting.glsl create mode 100644 Game/assets/shaders/include/craft/lighting_pass.glsl diff --git a/Game/assets/shaders/include/craft/lighting.glsl b/Game/assets/shaders/include/craft/lighting.glsl new file mode 100644 index 0000000..086aa5f --- /dev/null +++ b/Game/assets/shaders/include/craft/lighting.glsl @@ -0,0 +1,158 @@ +#ifndef CRAFT_LIGHTING_GLSL +#define CRAFT_LIGHTING_GLSL + +#include "craft/frame.glsl" + +// Face brightness: (up base + up slope * n.y + side spread * (side pivot - +// |n.x|) * (1 - |n.y|))^2, so top 1, z sides 0.72, x sides 0.49, bottom 0.25 +#define CRAFT_FACE_UP_BASE 0.75 +#define CRAFT_FACE_UP_SLOPE 0.25 +#define CRAFT_FACE_SIDE_SPREAD 0.15 +#define CRAFT_FACE_SIDE_PIVOT 0.667 +// Terminator remap of N.L +#define CRAFT_NDOTL_GAIN 1.01 +#define CRAFT_NDOTL_OFFSET 0.01 +// Share of direct light rain removes +#define CRAFT_RAIN_SUN_LOSS 0.95 +// Torch curve (level^power * gain + level * linear)^2 +#define CRAFT_BLOCK_POWER 10.0 +#define CRAFT_BLOCK_GAIN 1.6 +#define CRAFT_BLOCK_LINEAR 0.6 +// Emissive texels: tint toward white, flatten exponent +#define CRAFT_EMISSION_WHITE 0.5 +#define CRAFT_FLATTEN_POWER 128.0 +// Light night vision adds everywhere +#define CRAFT_NIGHT_VISION_LIGHT 0.25 +// Foliage: wrap of N.L and forward scattering lobe +#define CRAFT_SSS_WRAP 0.7 +#define CRAFT_SSS_LOBE_POWER 16.0 +#define CRAFT_HALF 0.5 +// Desaturation: rain keep, block light edges, cave grey, tint gain +#define CRAFT_DESAT_RAIN_KEEP 0.7 +#define CRAFT_DESAT_BLOCK_LOW 0.25 +#define CRAFT_DESAT_BLOCK_HIGH 1.0 +#define CRAFT_DESAT_CAVE_GREY 0.4 +#define CRAFT_DESAT_TINT_GAIN 1.7 +// Rec. 601 luma +#define CRAFT_LUMA vec3(0.299, 0.587, 0.114) +// Keeps normalize away from a zero vector +#define CRAFT_COLOR_EPSILON 1e-5 + +/// Decoded voxel GBuffer texel. +struct CraftSurface { + vec3 albedo; // linear + float ao; // baked vertex AO + vec3 normal; // world, unit length + float sky; // sky light 0..1 + float block; // block light 0..1 + float emission; // 0..1 + float sss; // foliage scattering 0..1 +}; + +/// Light geometry and shadow map result of one pixel. +struct CraftLightSample { + vec3 toLight; // unit, world + vec3 toPixel; // unit, camera to pixel + float shadow; // shadow map visibility 0..1 +}; + +/// Minecraft-like face brightness from the world normal. +float CraftFaceShade(vec3 n) { + float f = CRAFT_FACE_UP_BASE + CRAFT_FACE_UP_SLOPE * n.y + + CRAFT_FACE_SIDE_SPREAD * (CRAFT_FACE_SIDE_PIVOT - abs(n.x)) * + (1.0 - abs(n.y)); + return f * f; +} + +/// True when the shadow map can change this pixel. +bool CraftNeedsShadow(CraftSurface s, vec3 toLight) { + return dot(s.normal, toLight) > 0.0 || s.sss > 0.0; +} + +/// Torch light at a block light level. +vec3 CraftBlockLight(float level) { + float curve = pow(level, CRAFT_BLOCK_POWER) * CRAFT_BLOCK_GAIN + + level * CRAFT_BLOCK_LINEAR; + return uCraft.BlockLightColor.rgb * (curve * curve); +} + +/// 1 for emitters, which skip face shading and AO; 0 for other texels. +float CraftLightFlatten(float emission) { + return 1.0 - pow(1.0 - emission, CRAFT_FLATTEN_POWER); +} + +/// Self light of an emissive texel, tinted by its own hue. +vec3 CraftEmissionLight(vec3 albedo, float emission) { + vec3 hue = normalize(albedo + CRAFT_COLOR_EPSILON); + return mix(hue, vec3(1.0), emission * CRAFT_EMISSION_WHITE) * emission * + uCraft.Look.y; +} + +/// Pulls dark colors away from daylight toward a moon, rain or cave grey. +vec3 CraftDesaturate(vec3 color, CraftSurface s, float flatten) { + float weight = uCraft.Look.x; + if (weight <= 0.0) return color; + float daylight = sqrt(s.sky) * uCraft.Sky.x * + (1.0 - CRAFT_DESAT_RAIN_KEEP * uCraft.Sky.y); + float unlit = 1.0 - s.block; + float amount = clamp(1.0 - daylight, 0.0, 1.0) * + smoothstep(CRAFT_DESAT_BLOCK_LOW, CRAFT_DESAT_BLOCK_HIGH, + unlit * unlit) * + (1.0 - flatten); + vec3 outdoor = mix(uCraft.WeatherTint.rgb, uCraft.NightTint.rgb, + (1.0 - uCraft.Sky.x) * (1.0 - uCraft.Sky.y)); + vec3 tint = mix(vec3(CRAFT_DESAT_CAVE_GREY), outdoor, sqrt(s.sky)) * + CRAFT_DESAT_TINT_GAIN; + vec3 grey = mix(color, dot(color, CRAFT_LUMA) * tint, weight); + return mix(color, grey, amount); +} + +/// Lit voxel color in linear scene units, before SSAO and fog. +vec3 CraftShadeSurface(CraftSurface s, CraftLightSample l) { + // Shadow, terminator + float visibility = clamp(l.shadow, 0.0, 1.0); + visibility *= mix(visibility, 1.0, s.sss); + float nDotL = clamp(dot(s.normal, l.toLight), 0.0, 1.0); + nDotL = clamp(nDotL * CRAFT_NDOTL_GAIN - CRAFT_NDOTL_OFFSET, 0.0, 1.0); + + // Foliage wrap and forward scattering + float scatter = 0.0; + if (s.sss > 0.0) { + float forward = clamp(dot(l.toPixel, l.toLight) * CRAFT_HALF + + CRAFT_HALF, 0.0, 1.0); + scatter = pow(forward, CRAFT_SSS_LOBE_POWER) * (1.0 - uCraft.Sky.y) * + s.sss * uCraft.Sky.z; + nDotL = mix(nDotL, 1.0, sqrt(s.sss) * CRAFT_SSS_WRAP); + nDotL = mix(nDotL, 1.0, scatter); + } + + // Sky: ambient where blocked, sun where lit + float sunShare = visibility * nDotL * + (1.0 - CRAFT_RAIN_SUN_LOSS * uCraft.Sky.y) * uCraft.Sky.z; + vec3 sky = mix(uCraft.AmbientColor.rgb * s.sky, uCraft.SunColor.rgb, + sunShare) * + (s.sky * s.sky) * (1.0 + scatter * visibility); + + // Torch, emission, night vision, cave floor + float flatten = CraftLightFlatten(s.emission); + vec3 light = sky + CraftBlockLight(s.block) + + CraftEmissionLight(s.albedo, s.emission) + + vec3(uCraft.Sky.w * CRAFT_NIGHT_VISION_LIGHT) + + uCraft.MinLightColor.rgb * (1.0 - s.sky * s.sky); + + // Albedo balance, face shading, squared vertex AO + float brightest = max(s.albedo.r, max(s.albedo.g, s.albedo.b)); + vec3 albedo = + s.albedo / (1.0 + brightest * uCraft.Look.z * (1.0 - flatten)); + float face = mix(CraftFaceShade(s.normal), 1.0, flatten); + float ao = mix(s.ao, 1.0, flatten); + vec3 color = albedo * max(light, vec3(0.0)) * face * (ao * ao); + return CraftDesaturate(color, s, flatten); +} + +/// Screen-space AO multiplier of the whole lit color. +float CraftAmbientOcclusion(float ssao) { + return pow(clamp(ssao, 0.0, 1.0), uCraft.Look.w); +} + +#endif diff --git a/Game/assets/shaders/include/craft/lighting_pass.glsl b/Game/assets/shaders/include/craft/lighting_pass.glsl new file mode 100644 index 0000000..aab7cf5 --- /dev/null +++ b/Game/assets/shaders/include/craft/lighting_pass.glsl @@ -0,0 +1,64 @@ +#ifndef CRAFT_LIGHTING_PASS_GLSL +#define CRAFT_LIGHTING_PASS_GLSL + +// Voxel half of SleakCraft's deferred lighting stems (lighting_voxel and +// lighting_voxel_gl); fog stays with each stem. Includes stay outside #ifdef: +// the OpenGL resolver expands them all. + +#include "sleak/lighting_default.glsl" +#include "sleak/frame_output.glsl" +#include "craft/voxel_surface.glsl" +#include "craft/lighting.glsl" + +// No foliage scattering until a foliage shading model exists +#define CRAFT_NO_SCATTERING 0.0 +// N.L that leaves the OpenGL helper's back-face fade at 1 +#define CRAFT_FULL_FACING 1.0 +// Upper HDR clamp that keeps NaNs out of the bloom chain +#define CRAFT_MAX_HDR 1000.0 + +/// Voxel surface of one GBuffer texel. +CraftSurface CraftDecodeSurface(ivec2 px, vec4 rt3) { + vec4 albedoAO = texelFetch(gAlbedoAO, px, 0); + vec4 normalRough = texelFetch(gNormalRough, px, 0); + vec4 metalEmit = texelFetch(gMetalEmit, px, 0); + CraftSurface s; + s.albedo = max(albedoAO.rgb, vec3(0.0)); + s.ao = clamp(albedoAO.a, 0.0, 1.0); + s.normal = normalize(normalRough.rgb * 2.0 - 1.0); + s.sky = CraftVoxelSkyLight(rt3); + s.block = CraftVoxelBlockLight(metalEmit); + s.emission = CraftVoxelEmission(metalEmit); + s.sss = CRAFT_NO_SCATTERING; + return s; +} + +/// Raw sun visibility from the backend's shadow filter. +float CraftShadowVisibility(vec3 worldPos, vec3 n) { +#ifdef VULKAN + return SleakCalcShadow(worldPos, n); +#else + return SleakCalcShadowPCF(worldPos, CRAFT_FULL_FACING); +#endif +} + +/// Voxel lighting of one non-sky pixel in linear scene units, before fog. +vec3 CraftShadeVoxel(ivec2 px, vec2 uv, float depth, vec4 rt3, + out vec3 worldPos) { + worldPos = SleakReconstructWorldPos(uv, depth); + CraftSurface s = CraftDecodeSurface(px, rt3); + + CraftLightSample l; + l.toLight = normalize(uFrame.LightDir.xyz); + l.toPixel = normalize(worldPos - uFrame.CameraPos.xyz); + l.shadow = CraftNeedsShadow(s, l.toLight) + ? CraftShadowVisibility(worldPos, s.normal) + : 0.0; + + vec3 color = CraftShadeSurface(s, l); + if (SleakSSAOEnabled()) + color *= CraftAmbientOcclusion(texture(gSSAO, uv).r); + return clamp(color, vec3(0.0), vec3(CRAFT_MAX_HDR)); +} + +#endif diff --git a/Game/assets/shaders/lighting_voxel.frag b/Game/assets/shaders/lighting_voxel.frag index d2b2fc9..2a56758 100644 --- a/Game/assets/shaders/lighting_voxel.frag +++ b/Game/assets/shaders/lighting_voxel.frag @@ -1,145 +1,35 @@ #version 450 #extension GL_GOOGLE_include_directive : require -// SleakCraft deferred lighting, Vulkan: voxel pixels get CraftShadeVoxel -#include "sleak/lighting_default.glsl" -#include "craft/shading_models.glsl" - -// Wrap lighting: N.L * scale + offset -const float CRAFT_WRAP_SCALE = 0.85; -const float CRAFT_WRAP_OFFSET = 0.15; -// N.L below which back faces get no direct light -const float CRAFT_SHADOW_FACE_FADE = 0.15; -// Ground bounce relative to the sky ambient -const vec3 CRAFT_GROUND_TINT = vec3(0.55, 0.50, 0.45); -// SSAO can at most halve the ambient term -const float CRAFT_SSAO_FLOOR = 0.5; -// Upper HDR clamp that keeps NaNs out of the bloom chain -const float CRAFT_MAX_HDR = 1000.0; - -/// Voxel lighting of one non-sky pixel: wrap diffuse sun with PCF shadow, -/// hemisphere ambient, extra lights, emissive, fog. Linear HDR. -vec3 CraftShadeVoxel(ivec2 px, vec2 uv, float depth) { - vec3 worldPos = SleakReconstructWorldPos(uv, depth); - vec4 albedoAO = texelFetch(gAlbedoAO, px, 0); - vec4 normalRg = texelFetch(gNormalRough, px, 0); - vec4 metalEmit = texelFetch(gMetalEmit, px, 0); - - vec3 albedo = albedoAO.rgb; - float bakedAO = albedoAO.a; - float ssao = texture(gSSAO, uv).r; - float ao = bakedAO * ssao; - vec3 N = normalize(normalRg.rgb * 2.0 - 1.0); - float roughness = normalRg.a; - float metallic = metalEmit.r; - vec3 emissive = metalEmit.gba; - - vec3 V = normalize(uCameraPos.xyz - worldPos); - float NdotV = max(dot(N, V), 0.0); - - vec3 F0 = mix(SLEAK_DIELECTRIC_F0, albedo, metallic); - - vec3 Lo = vec3(0.0); - vec3 ambient; - if (iblEnabled != 0u) { - // Cook-Torrance sun - vec3 L = normalize(-uLightDir.xyz); - vec3 H = normalize(V + L); - float NdotL = max(dot(N, L), 0.0); - - if (NdotL > 0.0) { - float D = SleakDistributionGGX(N, H, roughness); - float G = SleakGeometrySmith(N, V, L, roughness); - vec3 F = SleakFresnelSchlick(max(dot(H, V), 0.0), F0); - - vec3 kS = F; - vec3 kD = (vec3(1.0) - kS) * (1.0 - metallic); - - vec3 specular = (D * G * F) / - (4.0 * NdotV * NdotL + SLEAK_BRDF_EPSILON); - - float shadow = SleakCalcShadow(worldPos, N); - shadow *= smoothstep(0.0, CRAFT_SHADOW_FACE_FADE, dot(N, L)); - - vec3 lightColor = uLightColor.rgb * uLightColor.a; - Lo = (kD * albedo / SLEAK_PI + specular) * lightColor * NdotL * - shadow; - } - - // Extra directional lights, no shadows - for (uint li = 0u; li < uNumExtraLights; ++li) { - vec3 Lx = normalize(-uExtraDir[li].xyz); - vec3 Hx = normalize(V + Lx); - float NdotLx = max(dot(N, Lx), 0.0); - if (NdotLx > 0.0) { - float Dx = SleakDistributionGGX(N, Hx, roughness); - float Gx = SleakGeometrySmith(N, V, Lx, roughness); - vec3 Fx = SleakFresnelSchlick(max(dot(Hx, V), 0.0), F0); - vec3 kSx = Fx; - vec3 kDx = (vec3(1.0) - kSx) * (1.0 - metallic); - vec3 specx = (Dx * Gx * Fx) / - (4.0 * NdotV * NdotLx + SLEAK_BRDF_EPSILON); - vec3 lightColorx = uExtraColor[li].rgb * uExtraColor[li].a; - Lo += (kDx * albedo / SLEAK_PI + specx) * lightColorx * NdotLx; - } - } - - // Split-sum IBL - vec3 F_amb = SleakFresnelSchlickRoughness(NdotV, F0, roughness); - vec3 kS_amb = F_amb; - vec3 kD_amb = (1.0 - kS_amb) * (1.0 - metallic); - - vec3 irradiance = texture(iblIrradiance, N).rgb; - vec3 diffuse_ibl = kD_amb * irradiance * albedo; - - vec3 R = reflect(-V, N); - vec3 prefilteredColor = - textureLod(iblPrefilter, R, roughness * maxReflectionLOD).rgb; - vec2 brdf = texture(iblBrdfLUT, vec2(NdotV, roughness)).rg; - vec3 specular_ibl = prefilteredColor * (F_amb * brdf.x + brdf.y); - - ambient = (diffuse_ibl + specular_ibl) * ao * iblIntensity; - } else { - // Wrap diffuse sun and hemisphere ambient - vec3 skyAmbient = uAmbient.rgb * uAmbient.a; - vec3 groundAmbient = skyAmbient * CRAFT_GROUND_TINT; - float hemisphere = N.y * 0.5 + 0.5; - vec3 Ldir = normalize(-uLightDir.xyz); - float rawNdL = dot(N, Ldir); - float wrapNdL = - clamp(rawNdL * CRAFT_WRAP_SCALE + CRAFT_WRAP_OFFSET, 0.0, 1.0); - float shad = 0.0; - if (rawNdL > -CRAFT_SHADOW_FACE_FADE) - shad = SleakCalcShadow(worldPos, N) * - smoothstep(-CRAFT_SHADOW_FACE_FADE, 0.0, rawNdL); - vec3 direct = uLightColor.rgb * uLightColor.a * wrapNdL * shad; - for (uint li = 0u; li < uNumExtraLights; ++li) { - vec3 Lx = normalize(-uExtraDir[li].xyz); - float NdLx = max(dot(N, Lx), 0.0); - direct += uExtraColor[li].rgb * uExtraColor[li].a * NdLx; - } - float aoGL = bakedAO * (CRAFT_SSAO_FLOOR + CRAFT_SSAO_FLOOR * ssao); - ambient = albedo * mix(groundAmbient, skyAmbient, hemisphere) * aoGL; - Lo = albedo * direct; - } - - vec3 color = ambient + Lo + emissive; - - // Fog in linear HDR; the composite pass tonemaps - color = SleakApplyFog(color, worldPos); - return clamp(color, vec3(0.0), vec3(CRAFT_MAX_HDR)); +// SleakCraft deferred lighting, Vulkan (Application::SetLightingShader). +// Voxel pixels get the composition in craft/lighting.glsl in linear scene +// units; engine materials keep SleakShadeDefault. The composite tonemaps. + +#include "craft/lighting_pass.glsl" + +/// Today's fog with its colors moved to scene units, so it displays as before. +vec3 CraftApplySceneFog(vec3 color, vec3 worldPos) { + float amount = SleakFogAmount(worldPos); + if (amount <= 0.0) return color; + vec3 fog = SleakLegacyToScene(SleakFogColor(worldPos), SleakFrameOutput()); + return mix(color, fog, amount); } void main() { - ivec2 px = ivec2(gl_FragCoord.xy); + ivec2 px = ivec2(gl_FragCoord.xy); float depth = texelFetch(gDepth, px, 0).r; - if (depth >= 1.0) { outColor = vec4(0.0, 0.0, 0.0, 1.0); return; } - + if (depth >= 1.0) { + outColor = vec4(0.0, 0.0, 0.0, 1.0); + return; + } + vec4 rt3 = SleakReadMotionModel(px); vec3 color; - if (SleakShadingModel(SleakReadMotionModel(px)) == - CRAFT_SHADING_MODEL_VOXEL) - color = CraftShadeVoxel(px, fragUV, depth); - else + if (CraftIsVoxelModel(SleakShadingModel(rt3))) { + vec3 worldPos; + color = CraftShadeVoxel(px, fragUV, depth, rt3, worldPos); + color = CraftApplySceneFog(color, worldPos); + } else { color = SleakShadeDefault(px, fragUV, depth); + } outColor = SleakFrameGuard(vec4(color, 1.0)); } diff --git a/Game/assets/shaders/lighting_voxel.frag.spv b/Game/assets/shaders/lighting_voxel.frag.spv index 256088fa6c3ed4f844990a42ca2210ed061697f4..0572b85b01cf166189ee744eb579a2b49869ba9d 100644 GIT binary patch literal 54580 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 literal 42384 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 Date: Mon, 9 Nov 2026 19:12:57 +0300 Subject: [PATCH 08/17] shaders: water keeps its look under the soft transform --- Game/assets/shaders/water_shader.frag | 14 +++++++++++--- Game/assets/shaders/water_shader.frag.spv | Bin 50360 -> 60816 bytes 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Game/assets/shaders/water_shader.frag b/Game/assets/shaders/water_shader.frag index 5af8058..d8460bf 100644 --- a/Game/assets/shaders/water_shader.frag +++ b/Game/assets/shaders/water_shader.frag @@ -10,6 +10,7 @@ layout(location = 0) out vec4 outColor; #include "sleak/shadow_light.glsl" #include "sleak/frame.glsl" +#include "sleak/frame_output.glsl" layout(set = 3, binding = 0) uniform sampler2DShadow shadowMap; @@ -46,7 +47,9 @@ vec3 Reconstruct(vec2 uv, float depth) { return w.xyz / w.w; } float DepthToNdc(float depth) { return depth; } -vec3 SceneToLinear(vec3 c) { return c; } +vec3 SceneToLinear(vec3 c) { + return SleakSceneToLegacy(c, SleakFrameOutput()); +} vec3 SkyRadiance(vec3 dir, float lod) { return textureLod(skyCube, dir, lod).rgb; } @@ -102,11 +105,15 @@ float FogAmount(vec3 p) { } return 1.0 - (1.0 - distFog) * (1.0 - heightFog); } -vec3 FogColorAt(vec3 p) { +vec3 LegacyFogColorAt(vec3 p) { vec3 viewDir = normalize(p - uCameraPos.xyz); float t = smoothstep(0.0, 1.0, clamp(SignedToUnit(viewDir.y), 0.0, 1.0)); return mix(uFogColor.rgb, uFogZenithColor.rgb, t); } +// Fog color as the lighting pass applied it to the snapshot +vec3 FogColorAt(vec3 p) { + return SleakLegacyToScene(LegacyFogColorAt(p), SleakFrameOutput()); +} // ==== SHARED WATER BODY (keep identical in water_shader_gl.frag) ==== @@ -528,7 +535,8 @@ void main() { float footprint = max(length(dFdx(P.xz)), length(dFdy(P.xz))); WaterResult w = ShadeWater(P, fragNormal, fragTime, footprint); - vec3 color = mix(w.color, FogColorAt(P), FogAmount(P)); + vec3 color = mix(w.color, LegacyFogColorAt(P), FogAmount(P)); + color = SleakLegacyToScene(color, SleakFrameOutput()); float alpha = 1.0; if (IsSet(uSceneFlags.x)) color = mix(w.backdrop, color, w.edge); diff --git a/Game/assets/shaders/water_shader.frag.spv b/Game/assets/shaders/water_shader.frag.spv index 3e1f3e18e4ea272a5d7e191ccd9c9751b738ebdf..4178e8d45c38ae5b0d510c0daa29998188be4dd4 100644 GIT binary patch literal 60816 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 literal 50360 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 b8+F Date: Mon, 9 Nov 2026 19:13:02 +0300 Subject: [PATCH 09/17] world: soft output, blend bloom, SSAO and fixed engine light --- Game/include/MainScene.hpp | 2 +- Game/src/MainScene.cpp | 55 ++++++++++++++++++++++++++++++-------- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/Game/include/MainScene.hpp b/Game/include/MainScene.hpp index 94197f1..25e1a7b 100644 --- a/Game/include/MainScene.hpp +++ b/Game/include/MainScene.hpp @@ -96,7 +96,7 @@ class MainScene : public Sleak::Scene { void SetupMaterial(); void SetupSkybox(); /// Creates the sun light and applies the voxel-tuned GraphicsConfig - /// (shadows on, SSAO/SSR/IBL/bloom off) plus fog and culling settings. + /// (BSL output, shadows, SSAO, blend bloom) plus fog and culling settings. void SetupLighting(); void RenderUI(); diff --git a/Game/src/MainScene.cpp b/Game/src/MainScene.cpp index 1e5b977..3af5fe0 100644 --- a/Game/src/MainScene.cpp +++ b/Game/src/MainScene.cpp @@ -28,6 +28,25 @@ // Post-TAA RCAS strength (0 = off, 1 = strongest) #define DEFAULT_SHARPEN_STRENGTH 0.5f +namespace { + +// Engine sun and ambient as before the voxel palette (water, forward path) +constexpr float LEGACY_SUN_COLOR[3] = {1.00f, 0.96f, 0.88f}; +constexpr float LEGACY_SUN_INTENSITY = 0.69f; +constexpr float LEGACY_AMBIENT_COLOR[3] = {0.45f, 0.62f, 1.00f}; +constexpr float LEGACY_AMBIENT_INTENSITY = 0.725f; +// Output look (BSL v10 defaults) +constexpr float LOOK_EXPOSURE = 4.0f; +constexpr float LOOK_GAMMA = 2.2f; +constexpr float LOOK_SATURATION = 1.0f; +constexpr float LOOK_WHITE_CURVE = 2.0f; +constexpr float LOOK_WHITE_PATH = 1.0f; +constexpr float LOOK_BLOOM_BLEND = 0.2f; +constexpr float LOOK_DESATURATION_FACTOR = 1.5f; +constexpr float LOOK_MIN_LIGHT = 0.5f; + +} // namespace + using namespace Sleak; using namespace Sleak::Math; @@ -387,22 +406,37 @@ void MainScene::SetupSkybox() { void MainScene::SetupLighting() { m_sun = new DirectionalLight("Sun"); m_sun->SetDirection(m_settingsPanel.ComputeSunDirection()); - float sunR, sunG, sunB; - m_settingsPanel.GetSunColor(sunR, sunG, sunB); - m_sun->SetColor(sunR, sunG, sunB); - m_sun->SetIntensity(m_settingsPanel.GetSunIntensity()); + m_sun->SetColor(LEGACY_SUN_COLOR[0], LEGACY_SUN_COLOR[1], + LEGACY_SUN_COLOR[2]); + m_sun->SetIntensity(LEGACY_SUN_INTENSITY); m_sun->SetLightSize(4.0f); m_settingsPanel.AttachSun(m_sun); - // Voxel-tuned graphics config: shadows on, no SSAO/SSR/IBL/bloom. + // Voxel-tuned graphics config: shadows and SSAO on, no SSR/IBL. Sleak::GraphicsConfig cfg = Sleak::GraphicsConfig::Preset(Sleak::GraphicsQuality::Medium); - cfg.ssaoEnabled = false; + cfg.ssaoEnabled = true; cfg.ssrEnabled = false; cfg.iblEnabled = false; - cfg.bloomEnabled = false; // match OpenGL ref (no post-FX bloom chain) cfg.taaEnabled = true; // VK only for now cfg.sharpenStrength = DEFAULT_SHARPEN_STRENGTH; + // BSL output: soft curve, x4 exposure, gamma 2.2, blend bloom, dither + cfg.tonemapEnabled = true; + cfg.tonemapOperator = Sleak::TonemapOperator::SoftRational; + cfg.exposure = LOOK_EXPOSURE; + cfg.gamma = LOOK_GAMMA; + cfg.saturation = LOOK_SATURATION; + cfg.tonemapWhiteCurve = LOOK_WHITE_CURVE; + cfg.tonemapWhitePath = LOOK_WHITE_PATH; + cfg.filmGrainEnabled = true; + cfg.bloomEnabled = true; + cfg.bloomMode = Sleak::BloomMode::Blend; + cfg.bloomBlend = LOOK_BLOOM_BLEND; + cfg.desaturationEnabled = true; + cfg.desaturationFactor = LOOK_DESATURATION_FACTOR; + cfg.minLight = LOOK_MIN_LIGHT; + // Linear albedo keeps sRGB precision in RT0 + cfg.gbufferAlbedoSRGB = true; cfg.shadowMapResolution = 3072; // BSL ULTRA tier; 4096 spiked VK frames cfg.shadowFrustumSize = 128.0f; // half-extent, 256 m ≈ fog range cfg.shadowCasterDistance = 256.0f; @@ -440,10 +474,9 @@ void MainScene::SetupLighting() { auto* lm = GetLightManager(); if (lm) { - float ambR, ambG, ambB; - m_settingsPanel.GetAmbientColor(ambR, ambG, ambB); - lm->SetAmbientColor(ambR, ambG, ambB); - lm->SetAmbientIntensity(m_settingsPanel.GetAmbientIntensity()); + lm->SetAmbientColor(LEGACY_AMBIENT_COLOR[0], LEGACY_AMBIENT_COLOR[1], + LEGACY_AMBIENT_COLOR[2]); + lm->SetAmbientIntensity(LEGACY_AMBIENT_INTENSITY); float horizonR, horizonG, horizonB; m_settingsPanel.GetFogHorizonColor(horizonR, horizonG, horizonB); From 9f6354eeb5177af8840c1403665e78cac5ab8081 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:13:02 +0300 Subject: [PATCH 10/17] world: block effects in the voxel vertex format --- Game/include/World/BlockEffects.hpp | 62 +++-- Game/src/MainScene.cpp | 3 +- Game/src/World/BlockEffects.cpp | 349 +++++++++++++--------------- 3 files changed, 203 insertions(+), 211 deletions(-) diff --git a/Game/include/World/BlockEffects.hpp b/Game/include/World/BlockEffects.hpp index d17bc54..fc25749 100644 --- a/Game/include/World/BlockEffects.hpp +++ b/Game/include/World/BlockEffects.hpp @@ -1,15 +1,17 @@ #ifndef _BLOCK_EFFECTS_HPP_ #define _BLOCK_EFFECTS_HPP_ -#include "Block.hpp" #include #include +#include +#include #include +#include "Block.hpp" +#include "VoxelVertex.hpp" + namespace Sleak { - class Material; - class GameObject; - class SceneBase; +class Material; } /// A block's scale-in placement animation, tracked until its duration elapses. @@ -18,7 +20,7 @@ struct PlaceEffect { BlockType type; float timer; float duration; - Sleak::GameObject* obj = nullptr; + bool done = false; }; /// One gravity-affected debris quad from a broken block, facing the camera. @@ -27,16 +29,18 @@ struct BreakParticle { Sleak::Math::Vector3D vel; float life; float maxLife; - Sleak::GameObject* obj = nullptr; + uint8_t tile; }; -/// Purely visual block place/break effects (scale-in cube, debris particles). -/// Owns their scene objects; the actual voxel edit happens separately once -/// a placement's animation completes (see PopCompletedPlacements). +/// Purely visual block place/break effects (scale-in cube, debris particles), +/// drawn in the voxel vertex format so they get the voxel GBuffer, lighting +/// and shadows. The voxel edit happens once a placement's animation +/// completes (see PopCompletedPlacements). /// @ingroup world class BlockEffects { -public: - void Initialize(Sleak::SceneBase* scene, const Sleak::RefPtr& material); + public: + /// Keeps the block material the effects draw with. + void Initialize(const Sleak::RefPtr& material); /// Spawns a scale-in cube at a block position; the real SetBlockAt call /// is deferred until this effect completes. @@ -44,32 +48,50 @@ class BlockEffects { /// Spawns a burst of camera-facing debris quads at a broken block. void SpawnBreakEffect(int x, int y, int z, BlockType type); - /// Advances place-effect scale and particle physics, removing finished ones. + /// Advances place-effect scale and particle physics, then rebuilds the + /// effect mesh for this frame. void Update(float deltaTime, const Sleak::Math::Vector3D& cameraPos); + /// Submits this frame's effect mesh with the block material. + void Render() const; + /// Drops every effect without committing placements. void Cleanup(); - struct CompletedPlace { int x, y, z; BlockType type; }; + struct CompletedPlace { + int x, y, z; + BlockType type; + }; /// Removes and returns placements whose animation finished this frame. std::vector PopCompletedPlacements(); /// Force-completes every still-animating placement; used by save/exit /// paths so no in-flight placement is lost. std::vector DrainAllPlacements(); + private: + /// Appends the scaled, textured cube of a running place effect. + void AppendPlaceCube(const PlaceEffect& effect); + /// Appends a two-sided quad facing the camera for a break particle. + void AppendParticle(const BreakParticle& particle, + const Sleak::Math::Vector3D& cameraPos); + /// Uploads the effects of this frame, or releases the mesh when idle. + void RebuildMesh(const Sleak::Math::Vector3D& cameraPos); -private: - /// Builds a textured unit-cube GameObject for a place effect. - Sleak::GameObject* CreatePlaceCube(BlockType type); - /// Builds a single-tile textured quad GameObject for a break particle. - Sleak::GameObject* CreateParticleQuad(uint8_t tileIndex); - - Sleak::SceneBase* m_scene = nullptr; Sleak::RefPtr m_material; std::vector m_placeEffects; std::vector m_breakParticles; + VoxelVertexBuffer m_vertices; + std::vector m_indices; + Sleak::MeshHandle m_mesh; + static constexpr float PLACE_DURATION = 0.15f; + static constexpr float PLACE_START_SCALE = 0.3f; static constexpr float BREAK_LIFETIME = 0.6f; + static constexpr float BREAK_LIFETIME_JITTER = 0.1f; + static constexpr float BREAK_SPREAD = 0.3f; + static constexpr float BREAK_SIDE_SPEED = 1.5f; + static constexpr float BREAK_UP_SPEED_MIN = 1.5f; + static constexpr float BREAK_UP_SPEED_MAX = 4.0f; static constexpr float PARTICLE_SIZE = 0.1f; static constexpr int PARTICLES_PER_BLOCK = 8; static constexpr float PARTICLE_GRAVITY = -12.0f; diff --git a/Game/src/MainScene.cpp b/Game/src/MainScene.cpp index 3af5fe0..79bd13c 100644 --- a/Game/src/MainScene.cpp +++ b/Game/src/MainScene.cpp @@ -93,7 +93,7 @@ bool MainScene::Initialize() { m_saveManager.SetSavePath(m_savePath); m_chunkManager.Initialize(this, m_blockMaterial); - m_blockEffects.Initialize(this, m_blockMaterial); + m_blockEffects.Initialize(m_blockMaterial); // Captures load synchronously if (!Sleak::CommandLine::GetValue("-capture").empty()) @@ -320,6 +320,7 @@ void MainScene::Update(float deltaTime) { m_chunkManager.SetShadowLightVP(lm ? lm->GetShadowLightVP() : nullptr); m_chunkManager.Update(pos.GetX(), pos.GetY(), pos.GetZ()); m_chunkManager.RenderColumns(); + m_blockEffects.Render(); m_chunkManager.RenderWater(); m_blockInteraction.RenderOutline(); diff --git a/Game/src/World/BlockEffects.cpp b/Game/src/World/BlockEffects.cpp index f2c9bf9..82179e8 100644 --- a/Game/src/World/BlockEffects.cpp +++ b/Game/src/World/BlockEffects.cpp @@ -1,141 +1,79 @@ #include "World/BlockEffects.hpp" -#include "World/TextureAtlas.hpp" -#include -#include -#include -#include -#include -#include + #include +#include #include +#include "World/TextureAtlas.hpp" + using namespace Sleak; using namespace Sleak::Math; +namespace { + +constexpr int QUAD_CORNERS = 4; +constexpr int QUAD_INDICES = 6; + +/// One cube face: corners in the chunk mesher's order, normal, atlas face. +struct FaceInfo { + float positions[QUAD_CORNERS][3]; + float nx, ny, nz; + BlockFace face; +}; + +// Same corner order and winding as Chunk::GenerateMeshData +constexpr int CUBE_FACE_COUNT = 6; +constexpr FaceInfo CUBE_FACES[CUBE_FACE_COUNT] = { + {{{0, 1, 0}, {0, 1, 1}, {1, 1, 1}, {1, 1, 0}}, 0, 1, 0, BlockFace::Top}, + {{{0, 0, 1}, {0, 0, 0}, {1, 0, 0}, {1, 0, 1}}, 0, -1, 0, BlockFace::Bottom}, + {{{1, 0, 1}, {1, 1, 1}, {0, 1, 1}, {0, 0, 1}}, 0, 0, 1, BlockFace::North}, + {{{0, 0, 0}, {0, 1, 0}, {1, 1, 0}, {1, 0, 0}}, 0, 0, -1, BlockFace::South}, + {{{1, 0, 0}, {1, 1, 0}, {1, 1, 1}, {1, 0, 1}}, 1, 0, 0, BlockFace::East}, + {{{0, 0, 1}, {0, 1, 1}, {0, 1, 0}, {0, 0, 0}}, -1, 0, 0, BlockFace::West}, +}; +// Front faces of a quad, and the same triangles seen from behind +constexpr uint32_t QUAD_FRONT[QUAD_INDICES] = {0, 2, 1, 0, 3, 2}; +constexpr uint32_t QUAD_BACK[QUAD_INDICES] = {0, 1, 2, 0, 2, 3}; +// A particle quad is drawn from both sides +constexpr int PARTICLE_SIDES = 2; +constexpr float HALF = 0.5f; +// Billboard fallbacks when the camera sits on the particle or above it +constexpr float BILLBOARD_EPSILON = 1e-4f; +const Vector3D WORLD_UP(0.0f, 1.0f, 0.0f); +const Vector3D WORLD_FORWARD(0.0f, 0.0f, 1.0f); +const Vector3D WORLD_RIGHT(1.0f, 0.0f, 0.0f); + /// Uniform random float in [lo, hi). -static float RandFloat(float lo, float hi) { +float RandFloat(float lo, float hi) { float t = static_cast(rand()) / static_cast(RAND_MAX); return lo + t * (hi - lo); } -/// Builds a unit cube (0..1) with correct per-face textures. -static void BuildBlockCube(BlockType type, VertexGroup& verts, IndexGroup& inds) { - struct FaceInfo { - float positions[4][3]; - float nx, ny, nz; - BlockFace face; - }; - - FaceInfo faces[6] = { - {{{0,1,0}, {0,1,1}, {1,1,1}, {1,1,0}}, 0, 1, 0, BlockFace::Top}, - {{{0,0,1}, {0,0,0}, {1,0,0}, {1,0,1}}, 0, -1, 0, BlockFace::Bottom}, - {{{1,0,1}, {1,1,1}, {0,1,1}, {0,0,1}}, 0, 0, 1, BlockFace::North}, - {{{0,0,0}, {0,1,0}, {1,1,0}, {1,0,0}}, 0, 0, -1, BlockFace::South}, - {{{1,0,0}, {1,1,0}, {1,1,1}, {1,0,1}}, 1, 0, 0, BlockFace::East}, - {{{0,0,1}, {0,1,1}, {0,1,0}, {0,0,0}}, -1, 0, 0, BlockFace::West}, - }; - - for (int f = 0; f < 6; f++) { - AtlasUV uv = TextureAtlas::GetTileUV( - GetBlockTextureTile(type, faces[f].face)); - - float uvs[4][2] = { - {uv.u0, uv.v1}, {uv.u0, uv.v0}, {uv.u1, uv.v0}, {uv.u1, uv.v1} - }; - - uint32_t base = static_cast(verts.GetSize()); - for (int i = 0; i < 4; i++) { - Vertex v(faces[f].positions[i][0], - faces[f].positions[i][1], - faces[f].positions[i][2], - faces[f].nx, faces[f].ny, faces[f].nz, - 1, 0, 0, 1, - uvs[i][0], uvs[i][1]); - v.SetColor(1.0f, 1.0f, 1.0f, 1.0f); - verts.AddVertex(v); - } - inds.add(base); inds.add(base + 2); inds.add(base + 1); - inds.add(base); inds.add(base + 3); inds.add(base + 2); - } +/// Atlas UVs of a quad's corners in the chunk mesher's order. +void QuadUVs(const AtlasUV& uv, float out[QUAD_CORNERS][2]) { + out[0][0] = uv.u0; + out[0][1] = uv.v1; + out[1][0] = uv.u0; + out[1][1] = uv.v0; + out[2][0] = uv.u1; + out[2][1] = uv.v0; + out[3][0] = uv.u1; + out[3][1] = uv.v1; } -void BlockEffects::Initialize(SceneBase* scene, const RefPtr& material) { - m_scene = scene; - m_material = material; +/// Appends a quad's six indices, offset to its first vertex. +void AppendIndices(std::vector& indices, uint32_t base, + const uint32_t (&order)[QUAD_INDICES]) { + for (uint32_t i : order) indices.push_back(base + i); } -GameObject* BlockEffects::CreatePlaceCube(BlockType type) { - VertexGroup verts; - IndexGroup inds; - BuildBlockCube(type, verts, inds); - - MeshData meshData; - meshData.vertices = std::move(verts); - meshData.indices = std::move(inds); +} // namespace - auto* obj = new GameObject("PlaceEffect"); - obj->AddComponent(Vector3D(0, 0, 0)); - obj->AddComponent(m_material); - obj->AddComponent(std::move(meshData)); - obj->Initialize(); - return obj; -} - -GameObject* BlockEffects::CreateParticleQuad(uint8_t tileIndex) { - VertexGroup verts; - IndexGroup inds; - - AtlasUV uv = TextureAtlas::GetTileUV(tileIndex); - - // Two-sided quad on XY plane facing +Z, centered at origin - // Rotated each frame to face camera via TransformComponent - float h = 0.5f; - uint32_t base = 0; - Vertex v0(-h, -h, 0, 0, 0, 1, 1, 0, 0, 1, uv.u0, uv.v1); - Vertex v1(-h, h, 0, 0, 0, 1, 1, 0, 0, 1, uv.u0, uv.v0); - Vertex v2( h, h, 0, 0, 0, 1, 1, 0, 0, 1, uv.u1, uv.v0); - Vertex v3( h, -h, 0, 0, 0, 1, 1, 0, 0, 1, uv.u1, uv.v1); - v0.SetColor(1, 1, 1, 1); v1.SetColor(1, 1, 1, 1); - v2.SetColor(1, 1, 1, 1); v3.SetColor(1, 1, 1, 1); - verts.AddVertex(v0); verts.AddVertex(v1); - verts.AddVertex(v2); verts.AddVertex(v3); - - // Front - inds.add(base); inds.add(base + 2); inds.add(base + 1); - inds.add(base); inds.add(base + 3); inds.add(base + 2); - // Back (reverse winding) - inds.add(base); inds.add(base + 1); inds.add(base + 2); - inds.add(base); inds.add(base + 2); inds.add(base + 3); - - MeshData meshData; - meshData.vertices = std::move(verts); - meshData.indices = std::move(inds); - - auto* obj = new GameObject("BreakParticle"); - obj->AddComponent(Vector3D(0, 0, 0)); - obj->AddComponent(m_material); - obj->AddComponent(std::move(meshData)); - obj->Initialize(); - - auto* tr = obj->GetComponent(); - if (tr) tr->SetScale(Vector3D(PARTICLE_SIZE, PARTICLE_SIZE, PARTICLE_SIZE)); - - return obj; +void BlockEffects::Initialize(const RefPtr& material) { + m_material = material; } void BlockEffects::SpawnPlaceEffect(int x, int y, int z, BlockType type) { - auto* obj = CreatePlaceCube(type); - - float startScale = 0.3f; - float offset = (1.0f - startScale) * 0.5f; - auto* tr = obj->GetComponent(); - if (tr) { - tr->SetPosition(Vector3D(x + offset, y + offset, z + offset)); - tr->SetScale(Vector3D(startScale, startScale, startScale)); - } - - m_scene->AddObject(obj); - PlaceEffect effect; effect.x = x; effect.y = y; @@ -143,97 +81,136 @@ void BlockEffects::SpawnPlaceEffect(int x, int y, int z, BlockType type) { effect.type = type; effect.timer = 0.0f; effect.duration = PLACE_DURATION; - effect.obj = obj; m_placeEffects.push_back(effect); } void BlockEffects::SpawnBreakEffect(int x, int y, int z, BlockType type) { - uint8_t tile = GetBlockTextureTile(type, BlockFace::South); - float cx = static_cast(x) + 0.5f; - float cy = static_cast(y) + 0.5f; - float cz = static_cast(z) + 0.5f; + const uint8_t tile = GetBlockTextureTile(type, BlockFace::South); + const Vector3D center(static_cast(x) + HALF, + static_cast(y) + HALF, + static_cast(z) + HALF); for (int i = 0; i < PARTICLES_PER_BLOCK; i++) { - float px = cx + RandFloat(-0.3f, 0.3f); - float py = cy + RandFloat(-0.3f, 0.3f); - float pz = cz + RandFloat(-0.3f, 0.3f); - - auto* obj = CreateParticleQuad(tile); - auto* tr = obj->GetComponent(); - if (tr) tr->SetPosition(Vector3D(px, py, pz)); - m_scene->AddObject(obj); - BreakParticle p; - p.pos = Vector3D(px, py, pz); - p.vel = Vector3D(RandFloat(-1.5f, 1.5f), - RandFloat(1.5f, 4.0f), - RandFloat(-1.5f, 1.5f)); + p.pos = center + Vector3D(RandFloat(-BREAK_SPREAD, BREAK_SPREAD), + RandFloat(-BREAK_SPREAD, BREAK_SPREAD), + RandFloat(-BREAK_SPREAD, BREAK_SPREAD)); + p.vel = Vector3D(RandFloat(-BREAK_SIDE_SPEED, BREAK_SIDE_SPEED), + RandFloat(BREAK_UP_SPEED_MIN, BREAK_UP_SPEED_MAX), + RandFloat(-BREAK_SIDE_SPEED, BREAK_SIDE_SPEED)); p.life = 0.0f; - p.maxLife = BREAK_LIFETIME + RandFloat(-0.1f, 0.1f); - p.obj = obj; + p.maxLife = BREAK_LIFETIME + + RandFloat(-BREAK_LIFETIME_JITTER, BREAK_LIFETIME_JITTER); + p.tile = tile; m_breakParticles.push_back(p); } } void BlockEffects::Update(float deltaTime, const Vector3D& cameraPos) { - // Update place effects — animate scale for (auto& effect : m_placeEffects) { effect.timer += deltaTime; - if (effect.timer >= effect.duration) { - if (effect.obj) { - m_scene->RemoveObject(effect.obj); - effect.obj = nullptr; - } - continue; - } - - float t = effect.timer / effect.duration; - t = 1.0f - (1.0f - t) * (1.0f - t); - float scale = 0.3f + t * 0.7f; - float offset = (1.0f - scale) * 0.5f; - - auto* tr = effect.obj->GetComponent(); - if (tr) { - tr->SetPosition(Vector3D(effect.x + offset, - effect.y + offset, - effect.z + offset)); - tr->SetScale(Vector3D(scale, scale, scale)); - } + if (effect.timer >= effect.duration) effect.done = true; } - // Update break particles — move via TransformComponent for (auto& p : m_breakParticles) { p.life += deltaTime; - if (p.life >= p.maxLife) { - if (p.obj) { - m_scene->RemoveObject(p.obj); - p.obj = nullptr; - } - continue; - } - p.vel = p.vel + Vector3D(0, PARTICLE_GRAVITY, 0) * deltaTime; p.pos = p.pos + p.vel * deltaTime; + } + m_breakParticles.erase( + std::remove_if( + m_breakParticles.begin(), m_breakParticles.end(), + [](const BreakParticle& p) { return p.life >= p.maxLife; }), + m_breakParticles.end()); - auto* tr = p.obj->GetComponent(); - if (tr) { - tr->SetPosition(p.pos); - tr->LookAt(cameraPos); + RebuildMesh(cameraPos); +} + +void BlockEffects::Render() const { + if (!m_mesh.IsValid() || !m_material.IsValid()) return; + MeshBatch::BeginBatch(m_material.get()); + MeshBatch::Draw(m_mesh); + MeshBatch::EndBatch(); +} + +void BlockEffects::AppendPlaceCube(const PlaceEffect& effect) { + // Ease-out scale-in, centered on the block + float t = effect.timer / effect.duration; + t = 1.0f - (1.0f - t) * (1.0f - t); + const float scale = PLACE_START_SCALE + t * (1.0f - PLACE_START_SCALE); + const float offset = (1.0f - scale) * HALF; + const float origin[3] = {effect.x + offset, effect.y + offset, + effect.z + offset}; + + for (const FaceInfo& f : CUBE_FACES) { + float uvs[QUAD_CORNERS][2]; + QuadUVs( + TextureAtlas::GetTileUV(GetBlockTextureTile(effect.type, f.face)), + uvs); + const uint32_t base = static_cast(m_vertices.GetSize()); + for (int i = 0; i < QUAD_CORNERS; i++) { + m_vertices.AddVertex( + VoxelVertex(origin[0] + f.positions[i][0] * scale, + origin[1] + f.positions[i][1] * scale, + origin[2] + f.positions[i][2] * scale, f.nx, f.ny, + f.nz, uvs[i][0], uvs[i][1])); } + AppendIndices(m_indices, base, QUAD_FRONT); } +} - // Remove dead particles from list - m_breakParticles.erase( - std::remove_if(m_breakParticles.begin(), m_breakParticles.end(), - [](const BreakParticle& p) { return p.obj == nullptr; }), - m_breakParticles.end()); +void BlockEffects::AppendParticle(const BreakParticle& particle, + const Vector3D& cameraPos) { + // Billboard basis: forward to the camera, right and up across it + Vector3D forward = cameraPos - particle.pos; + forward = forward.Magnitude() > BILLBOARD_EPSILON ? forward.Normalized() + : WORLD_FORWARD; + Vector3D right = WORLD_UP.Cross(forward); + right = right.Magnitude() > BILLBOARD_EPSILON ? right.Normalized() + : WORLD_RIGHT; + const Vector3D up = forward.Cross(right); + + const float h = PARTICLE_SIZE * HALF; + // Bottom right, top right, top left, bottom left, as a north face + const Vector3D corners[QUAD_CORNERS] = { + particle.pos + right * h - up * h, particle.pos + right * h + up * h, + particle.pos - right * h + up * h, particle.pos - right * h - up * h}; + float uvs[QUAD_CORNERS][2]; + QuadUVs(TextureAtlas::GetTileUV(particle.tile), uvs); + + for (int side = 0; side < PARTICLE_SIDES; side++) { + const Vector3D n = side == 0 ? forward : forward * -1.0f; + const uint32_t base = static_cast(m_vertices.GetSize()); + for (int i = 0; i < QUAD_CORNERS; i++) { + m_vertices.AddVertex(VoxelVertex( + corners[i].GetX(), corners[i].GetY(), corners[i].GetZ(), + n.GetX(), n.GetY(), n.GetZ(), uvs[i][0], uvs[i][1])); + } + AppendIndices(m_indices, base, side == 0 ? QUAD_FRONT : QUAD_BACK); + } } +void BlockEffects::RebuildMesh(const Vector3D& cameraPos) { + m_vertices.clear(); + m_indices.clear(); + for (const auto& effect : m_placeEffects) + if (!effect.done) AppendPlaceCube(effect); + for (const auto& p : m_breakParticles) AppendParticle(p, cameraPos); -std::vector BlockEffects::PopCompletedPlacements() { + if (m_indices.empty()) { + m_mesh = MeshHandle(); + return; + } + m_mesh = MeshBatch::CreateMesh(GetVoxelVertexFormat(), m_vertices.GetData(), + m_vertices.GetSizeInBytes(), + m_indices.data(), m_indices.size()); +} + +std::vector +BlockEffects::PopCompletedPlacements() { std::vector result; for (auto it = m_placeEffects.begin(); it != m_placeEffects.end();) { - if (it->obj == nullptr) { + if (it->done) { result.push_back({it->x, it->y, it->z, it->type}); it = m_placeEffects.erase(it); } else { @@ -244,24 +221,16 @@ std::vector BlockEffects::PopCompletedPlacements() } std::vector BlockEffects::DrainAllPlacements() { - // Commit everything still animating — used by save/exit paths + // Commit everything still animating, for the save and exit paths std::vector result; result.reserve(m_placeEffects.size()); - for (auto& e : m_placeEffects) { - if (e.obj) m_scene->RemoveObject(e.obj); - result.push_back({e.x, e.y, e.z, e.type}); - } + for (auto& e : m_placeEffects) result.push_back({e.x, e.y, e.z, e.type}); m_placeEffects.clear(); return result; } void BlockEffects::Cleanup() { - for (auto& e : m_placeEffects) { - if (e.obj) m_scene->RemoveObject(e.obj); - } - for (auto& p : m_breakParticles) { - if (p.obj) m_scene->RemoveObject(p.obj); - } m_placeEffects.clear(); m_breakParticles.clear(); + m_mesh = MeshHandle(); } From 15efa5c4fa1d4c1ef6f464bc782b51476bffda77 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:13:12 +0300 Subject: [PATCH 11/17] ui: sun and ambient sliders scale the voxel palette --- Game/include/MainScene.hpp | 2 +- Game/include/UI/SettingsPanel.hpp | 30 ++++------------- Game/src/UI/SettingsPanel.cpp | 55 +++++++++++++++++-------------- 3 files changed, 39 insertions(+), 48 deletions(-) diff --git a/Game/include/MainScene.hpp b/Game/include/MainScene.hpp index 25e1a7b..e092f60 100644 --- a/Game/include/MainScene.hpp +++ b/Game/include/MainScene.hpp @@ -158,7 +158,7 @@ class MainScene : public Sleak::Scene { std::string m_keyReleasedHandlerId; // Sun light created here (needs Scene::AddObject/shadow config); live - // elevation/azimuth/color/intensity edits live on SettingsPanel. + // elevation/azimuth edits live on SettingsPanel. Sleak::DirectionalLight* m_sun = nullptr; }; diff --git a/Game/include/UI/SettingsPanel.hpp b/Game/include/UI/SettingsPanel.hpp index 76df20e..4d4829b 100644 --- a/Game/include/UI/SettingsPanel.hpp +++ b/Game/include/UI/SettingsPanel.hpp @@ -4,6 +4,8 @@ #include #include +#include "World/VoxelLighting.hpp" + class ChunkManager; class MainScene; namespace Sleak { class DirectionalLight; class Application; } @@ -31,18 +33,6 @@ class SettingsPanel { // Initial-value accessors for MainScene::SetupMaterial/SetupLighting. /// Converts the elevation/azimuth sliders into a light direction vector. Sleak::Math::Vector3D ComputeSunDirection() const; - void GetSunColor(float& r, float& g, float& b) const { - r = m_sunColorR; - g = m_sunColorG; - b = m_sunColorB; - } - float GetSunIntensity() const { return m_sunIntensity; } - void GetAmbientColor(float& r, float& g, float& b) const { - r = m_ambientColorR; - g = m_ambientColorG; - b = m_ambientColorB; - } - float GetAmbientIntensity() const { return m_ambientIntensity; } void GetFogHorizonColor(float& r, float& g, float& b) const { r = m_fogHorizonR; g = m_fogHorizonG; @@ -72,7 +62,7 @@ class SettingsPanel { void RenderMSAASection(); /// Render distance slider; also re-derives fog distances on change. void RenderRenderDistanceSection(); - /// Sun, ambient, and fog sliders; pushes live edits to the light manager. + /// Sun direction, voxel sun and ambient multipliers, and fog sliders. void RenderLightingSection(); /// SSAO toggle and radius/bias/power sliders. void RenderSSAOSection(); @@ -94,16 +84,10 @@ class SettingsPanel { // Sun state (live-editable) float m_sunElevation = 65.0f; // degrees above horizon (0=sunrise, 90=noon) float m_sunAzimuth = 255.0f; // degrees clockwise from north - float m_sunIntensity = 0.69f; - float m_sunColorR = 1.00f; - float m_sunColorG = 0.96f; - float m_sunColorB = 0.88f; - - // Ambient state - float m_ambientIntensity = 0.725f; - float m_ambientColorR = 0.45f; - float m_ambientColorG = 0.62f; - float m_ambientColorB = 1.00f; + + // Multipliers on the voxel palette's sun and sky ambient (1 = palette) + LightMultiplier m_sunMultiplier; + LightMultiplier m_ambientMultiplier; // Texture quality state Sleak::TextureFilter m_texFilter = Sleak::TextureFilter::Nearest; diff --git a/Game/src/UI/SettingsPanel.cpp b/Game/src/UI/SettingsPanel.cpp index f2a53bb..bfbdc6e 100644 --- a/Game/src/UI/SettingsPanel.cpp +++ b/Game/src/UI/SettingsPanel.cpp @@ -15,6 +15,29 @@ using namespace Sleak; using namespace Sleak::Math; +namespace { + +// Voxel palette multiplier sliders +constexpr float MULTIPLIER_CHANNEL_STEP = 0.005f; +constexpr float MULTIPLIER_CHANNEL_MAX = 2.0f; +constexpr float MULTIPLIER_SCALE_STEP = 0.01f; +constexpr float MULTIPLIER_SCALE_MAX = 4.0f; + +/// Intensity and RGB sliders of one multiplier; true when any changed. +bool DragMultiplier(const char* intensity, const char* r, const char* g, + const char* b, LightMultiplier& m) { + bool changed = UI::DragFloat(intensity, &m.scale, MULTIPLIER_SCALE_STEP, + 0.0f, MULTIPLIER_SCALE_MAX); + changed |= UI::DragFloat(r, &m.r, MULTIPLIER_CHANNEL_STEP, 0.0f, + MULTIPLIER_CHANNEL_MAX); + changed |= UI::DragFloat(g, &m.g, MULTIPLIER_CHANNEL_STEP, 0.0f, + MULTIPLIER_CHANNEL_MAX); + changed |= UI::DragFloat(b, &m.b, MULTIPLIER_CHANNEL_STEP, 0.0f, + MULTIPLIER_CHANNEL_MAX); + return changed; +} + +} // namespace SettingsPanel::SettingsPanel(ChunkManager& chunkManager, MainScene& scene) : m_chunkManager(chunkManager), m_scene(scene) { @@ -163,35 +186,19 @@ void SettingsPanel::RenderLightingSection() { UI::DragFloat("Azimuth", &m_sunAzimuth, 1.0f, 0.0f, 360.0f); if (sunDirChanged && m_sun) m_sun->SetDirection(ComputeSunDirection()); - if (UI::DragFloat("Sun Intensity", &m_sunIntensity, 0.01f, 0.0f, 5.0f) && - m_sun) - m_sun->SetIntensity(m_sunIntensity); - - bool sunColorChanged = false; - sunColorChanged |= UI::DragFloat("Sun R", &m_sunColorR, 0.005f, 0.0f, 1.0f); - sunColorChanged |= UI::DragFloat("Sun G", &m_sunColorG, 0.005f, 0.0f, 1.0f); - sunColorChanged |= UI::DragFloat("Sun B", &m_sunColorB, 0.005f, 0.0f, 1.0f); - if (sunColorChanged && m_sun) - m_sun->SetColor(m_sunColorR, m_sunColorG, m_sunColorB); + bool paletteChanged = DragMultiplier("Sun Intensity", "Sun R", "Sun G", + "Sun B", m_sunMultiplier); UI::Separator(); UI::Text("-- Ambient --"); + paletteChanged |= DragMultiplier("Amb Intensity", "Amb R", "Amb G", "Amb B", + m_ambientMultiplier); + if (paletteChanged) + m_scene.GetVoxelLighting().SetMultipliers(m_sunMultiplier, + m_ambientMultiplier); + auto* lm = m_scene.GetLightManager(); - if (UI::DragFloat("Amb Intensity", &m_ambientIntensity, 0.005f, 0.0f, - 2.0f) && - lm) - lm->SetAmbientIntensity(m_ambientIntensity); - - bool ambColorChanged = false; - ambColorChanged |= - UI::DragFloat("Amb R", &m_ambientColorR, 0.005f, 0.0f, 1.0f); - ambColorChanged |= - UI::DragFloat("Amb G", &m_ambientColorG, 0.005f, 0.0f, 1.0f); - ambColorChanged |= - UI::DragFloat("Amb B", &m_ambientColorB, 0.005f, 0.0f, 1.0f); - if (ambColorChanged && lm) - lm->SetAmbientColor(m_ambientColorR, m_ambientColorG, m_ambientColorB); UI::Separator(); UI::Text("-- Fog --"); From 4bc3dbc82ce113466c9113373c917854701abb2a Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 19:13:12 +0300 Subject: [PATCH 12/17] ui: noon sun at 50 degrees --- Game/include/UI/SettingsPanel.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Game/include/UI/SettingsPanel.hpp b/Game/include/UI/SettingsPanel.hpp index 4d4829b..15e9e24 100644 --- a/Game/include/UI/SettingsPanel.hpp +++ b/Game/include/UI/SettingsPanel.hpp @@ -81,8 +81,8 @@ class SettingsPanel { bool isDeferredEnabled = false; bool isTAAEnabled = false; - // Sun state (live-editable) - float m_sunElevation = 65.0f; // degrees above horizon (0=sunrise, 90=noon) + // Sun direction (live-editable); 50 degrees is BSL's noon height + float m_sunElevation = 50.0f; // degrees above the horizon float m_sunAzimuth = 255.0f; // degrees clockwise from north // Multipliers on the voxel palette's sun and sky ambient (1 = palette) From 0262914debf71b0893ae0ff1b86f018ec7408e9e Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Mon, 9 Nov 2026 20:52:33 +0300 Subject: [PATCH 13/17] world: tune the leaf grade against the BSL canopy --- Game/src/World/TextureAtlas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Game/src/World/TextureAtlas.cpp b/Game/src/World/TextureAtlas.cpp index 2f08217..4f75216 100644 --- a/Game/src/World/TextureAtlas.cpp +++ b/Game/src/World/TextureAtlas.cpp @@ -56,7 +56,7 @@ struct TileGrade { constexpr TileGrade TILE_GRADES[] = { {TILE_GRASS_TOP, {66.0f, 89.0f, 45.0f}, false}, {TILE_GRASS_SIDE, {66.0f, 89.0f, 45.0f}, true}, - {TILE_OAK_LEAVES, {61.0f, 88.0f, 24.0f}, false}, + {TILE_OAK_LEAVES, {68.0f, 92.0f, 42.0f}, false}, }; // Grass fringe texels: green above red and blue by this ratio From bd910a2912f47007f14856d78c6658df5837bfe9 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Tue, 10 Nov 2026 02:23:33 +0300 Subject: [PATCH 14/17] build: pin Engine to the review fixes --- Engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine b/Engine index 2c07d52..be66c56 160000 --- a/Engine +++ b/Engine @@ -1 +1 @@ -Subproject commit 2c07d5229c7eb33581eb1bc32d9d6f5a0fa21a09 +Subproject commit be66c5652faaacc4becd15049ea3409e5b398394 From 4efd5744495e417293b086dad7c68d6618d8333c Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Tue, 10 Nov 2026 02:23:33 +0300 Subject: [PATCH 15/17] world: block effects as scene objects on shared voxel meshes --- Game/include/World/BlockEffects.hpp | 54 ++++--- Game/src/MainScene.cpp | 3 +- Game/src/World/BlockEffects.cpp | 235 ++++++++++++++++------------ 3 files changed, 166 insertions(+), 126 deletions(-) diff --git a/Game/include/World/BlockEffects.hpp b/Game/include/World/BlockEffects.hpp index fc25749..44ddd0a 100644 --- a/Game/include/World/BlockEffects.hpp +++ b/Game/include/World/BlockEffects.hpp @@ -5,14 +5,16 @@ #include #include #include +#include #include #include "Block.hpp" -#include "VoxelVertex.hpp" namespace Sleak { class Material; -} +class GameObject; +class SceneBase; +} // namespace Sleak /// A block's scale-in placement animation, tracked until its duration elapses. struct PlaceEffect { @@ -20,7 +22,7 @@ struct PlaceEffect { BlockType type; float timer; float duration; - bool done = false; + Sleak::GameObject* obj = nullptr; }; /// One gravity-affected debris quad from a broken block, facing the camera. @@ -29,18 +31,20 @@ struct BreakParticle { Sleak::Math::Vector3D vel; float life; float maxLife; - uint8_t tile; + Sleak::GameObject* obj = nullptr; }; -/// Purely visual block place/break effects (scale-in cube, debris particles), -/// drawn in the voxel vertex format so they get the voxel GBuffer, lighting -/// and shadows. The voxel edit happens once a placement's animation -/// completes (see PopCompletedPlacements). +/// Purely visual block place/break effects (scale-in cube, debris particles). +/// Owns their scene objects, which draw voxel-format meshes built once per +/// block type or tile, so they get the voxel GBuffer, lighting and shadows. +/// The voxel edit happens once a placement's animation completes (see +/// PopCompletedPlacements). /// @ingroup world class BlockEffects { public: - /// Keeps the block material the effects draw with. - void Initialize(const Sleak::RefPtr& material); + /// Keeps the scene the effect objects join and the block material. + void Initialize(Sleak::SceneBase* scene, + const Sleak::RefPtr& material); /// Spawns a scale-in cube at a block position; the real SetBlockAt call /// is deferred until this effect completes. @@ -48,12 +52,10 @@ class BlockEffects { /// Spawns a burst of camera-facing debris quads at a broken block. void SpawnBreakEffect(int x, int y, int z, BlockType type); - /// Advances place-effect scale and particle physics, then rebuilds the - /// effect mesh for this frame. + /// Advances place-effect scale and particle physics, removing finished + /// ones. void Update(float deltaTime, const Sleak::Math::Vector3D& cameraPos); - /// Submits this frame's effect mesh with the block material. - void Render() const; - /// Drops every effect without committing placements. + /// Removes every effect object without committing placements. void Cleanup(); struct CompletedPlace { @@ -67,22 +69,24 @@ class BlockEffects { std::vector DrainAllPlacements(); private: - /// Appends the scaled, textured cube of a running place effect. - void AppendPlaceCube(const PlaceEffect& effect); - /// Appends a two-sided quad facing the camera for a break particle. - void AppendParticle(const BreakParticle& particle, - const Sleak::Math::Vector3D& cameraPos); - /// Uploads the effects of this frame, or releases the mesh when idle. - void RebuildMesh(const Sleak::Math::Vector3D& cameraPos); + /// Unit cube of a block type in the voxel format, built on first use. + const Sleak::MeshHandle& CubeMesh(BlockType type); + /// Two-sided quad of an atlas tile in the voxel format, built on first + /// use. + const Sleak::MeshHandle& QuadMesh(uint8_t tile); + /// Scene-ready object drawing a mesh with the block material. + Sleak::GameObject* CreateEffectObject(const char* name, + const Sleak::MeshHandle& mesh); + Sleak::SceneBase* m_scene = nullptr; Sleak::RefPtr m_material; std::vector m_placeEffects; std::vector m_breakParticles; - VoxelVertexBuffer m_vertices; - std::vector m_indices; - Sleak::MeshHandle m_mesh; + // Shared by every effect object of a type or tile + std::unordered_map m_cubeMeshes; + std::unordered_map m_quadMeshes; static constexpr float PLACE_DURATION = 0.15f; static constexpr float PLACE_START_SCALE = 0.3f; diff --git a/Game/src/MainScene.cpp b/Game/src/MainScene.cpp index 79bd13c..3af5fe0 100644 --- a/Game/src/MainScene.cpp +++ b/Game/src/MainScene.cpp @@ -93,7 +93,7 @@ bool MainScene::Initialize() { m_saveManager.SetSavePath(m_savePath); m_chunkManager.Initialize(this, m_blockMaterial); - m_blockEffects.Initialize(m_blockMaterial); + m_blockEffects.Initialize(this, m_blockMaterial); // Captures load synchronously if (!Sleak::CommandLine::GetValue("-capture").empty()) @@ -320,7 +320,6 @@ void MainScene::Update(float deltaTime) { m_chunkManager.SetShadowLightVP(lm ? lm->GetShadowLightVP() : nullptr); m_chunkManager.Update(pos.GetX(), pos.GetY(), pos.GetZ()); m_chunkManager.RenderColumns(); - m_blockEffects.Render(); m_chunkManager.RenderWater(); m_blockInteraction.RenderOutline(); diff --git a/Game/src/World/BlockEffects.cpp b/Game/src/World/BlockEffects.cpp index 82179e8..c095fa7 100644 --- a/Game/src/World/BlockEffects.cpp +++ b/Game/src/World/BlockEffects.cpp @@ -1,10 +1,16 @@ #include "World/BlockEffects.hpp" +#include +#include +#include +#include +#include #include #include #include #include "World/TextureAtlas.hpp" +#include "World/VoxelVertex.hpp" using namespace Sleak; using namespace Sleak::Math; @@ -34,14 +40,12 @@ constexpr FaceInfo CUBE_FACES[CUBE_FACE_COUNT] = { // Front faces of a quad, and the same triangles seen from behind constexpr uint32_t QUAD_FRONT[QUAD_INDICES] = {0, 2, 1, 0, 3, 2}; constexpr uint32_t QUAD_BACK[QUAD_INDICES] = {0, 1, 2, 0, 2, 3}; -// A particle quad is drawn from both sides -constexpr int PARTICLE_SIDES = 2; constexpr float HALF = 0.5f; -// Billboard fallbacks when the camera sits on the particle or above it -constexpr float BILLBOARD_EPSILON = 1e-4f; -const Vector3D WORLD_UP(0.0f, 1.0f, 0.0f); -const Vector3D WORLD_FORWARD(0.0f, 0.0f, 1.0f); -const Vector3D WORLD_RIGHT(1.0f, 0.0f, 0.0f); +// Unit particle quad on z = 0, corners in the north-face order +constexpr float PARTICLE_CORNERS[QUAD_CORNERS][2] = { + {HALF, -HALF}, {HALF, HALF}, {-HALF, HALF}, {-HALF, -HALF}}; +// Particle sides: front faces toward +z, back faces toward -z +constexpr float PARTICLE_SIDE_NORMALS[] = {1.0f, -1.0f}; /// Uniform random float in [lo, hi). float RandFloat(float lo, float hi) { @@ -67,13 +71,86 @@ void AppendIndices(std::vector& indices, uint32_t base, for (uint32_t i : order) indices.push_back(base + i); } +/// GPU mesh of voxel vertices and indices. +MeshHandle UploadVoxelMesh(const VoxelVertexBuffer& vertices, + const std::vector& indices) { + return MeshBatch::CreateMesh(GetVoxelVertexFormat(), vertices.GetData(), + vertices.GetSizeInBytes(), indices.data(), + indices.size()); +} + } // namespace -void BlockEffects::Initialize(const RefPtr& material) { +void BlockEffects::Initialize(SceneBase* scene, + const RefPtr& material) { + m_scene = scene; m_material = material; } +const MeshHandle& BlockEffects::CubeMesh(BlockType type) { + auto it = m_cubeMeshes.find(type); + if (it != m_cubeMeshes.end()) return it->second; + + VoxelVertexBuffer vertices; + std::vector indices; + for (const FaceInfo& f : CUBE_FACES) { + float uvs[QUAD_CORNERS][2]; + QuadUVs(TextureAtlas::GetTileUV(GetBlockTextureTile(type, f.face)), + uvs); + const uint32_t base = static_cast(vertices.GetSize()); + for (int i = 0; i < QUAD_CORNERS; i++) { + vertices.AddVertex(VoxelVertex(f.positions[i][0], f.positions[i][1], + f.positions[i][2], f.nx, f.ny, f.nz, + uvs[i][0], uvs[i][1])); + } + AppendIndices(indices, base, QUAD_FRONT); + } + return m_cubeMeshes.emplace(type, UploadVoxelMesh(vertices, indices)) + .first->second; +} + +const MeshHandle& BlockEffects::QuadMesh(uint8_t tile) { + auto it = m_quadMeshes.find(tile); + if (it != m_quadMeshes.end()) return it->second; + + float uvs[QUAD_CORNERS][2]; + QuadUVs(TextureAtlas::GetTileUV(tile), uvs); + VoxelVertexBuffer vertices; + std::vector indices; + for (float nz : PARTICLE_SIDE_NORMALS) { + const uint32_t base = static_cast(vertices.GetSize()); + for (int i = 0; i < QUAD_CORNERS; i++) { + vertices.AddVertex(VoxelVertex(PARTICLE_CORNERS[i][0], + PARTICLE_CORNERS[i][1], 0.0f, 0.0f, + 0.0f, nz, uvs[i][0], uvs[i][1])); + } + AppendIndices(indices, base, nz > 0.0f ? QUAD_FRONT : QUAD_BACK); + } + return m_quadMeshes.emplace(tile, UploadVoxelMesh(vertices, indices)) + .first->second; +} + +GameObject* BlockEffects::CreateEffectObject(const char* name, + const MeshHandle& mesh) { + auto* obj = new GameObject(name); + obj->AddComponent(Vector3D(0, 0, 0)); + obj->AddComponent(m_material); + obj->AddComponent(mesh); + obj->Initialize(); + return obj; +} + void BlockEffects::SpawnPlaceEffect(int x, int y, int z, BlockType type) { + auto* obj = CreateEffectObject("PlaceEffect", CubeMesh(type)); + + const float offset = (1.0f - PLACE_START_SCALE) * HALF; + if (auto* tr = obj->GetComponent()) { + tr->SetPosition(Vector3D(x + offset, y + offset, z + offset)); + tr->SetScale( + Vector3D(PLACE_START_SCALE, PLACE_START_SCALE, PLACE_START_SCALE)); + } + m_scene->AddObject(obj); + PlaceEffect effect; effect.x = x; effect.y = y; @@ -81,11 +158,13 @@ void BlockEffects::SpawnPlaceEffect(int x, int y, int z, BlockType type) { effect.type = type; effect.timer = 0.0f; effect.duration = PLACE_DURATION; + effect.obj = obj; m_placeEffects.push_back(effect); } void BlockEffects::SpawnBreakEffect(int x, int y, int z, BlockType type) { - const uint8_t tile = GetBlockTextureTile(type, BlockFace::South); + const MeshHandle& quad = + QuadMesh(GetBlockTextureTile(type, BlockFace::South)); const Vector3D center(static_cast(x) + HALF, static_cast(y) + HALF, static_cast(z) + HALF); @@ -101,116 +180,66 @@ void BlockEffects::SpawnBreakEffect(int x, int y, int z, BlockType type) { p.life = 0.0f; p.maxLife = BREAK_LIFETIME + RandFloat(-BREAK_LIFETIME_JITTER, BREAK_LIFETIME_JITTER); - p.tile = tile; + + p.obj = CreateEffectObject("BreakParticle", quad); + if (auto* tr = p.obj->GetComponent()) { + tr->SetPosition(p.pos); + tr->SetScale(Vector3D(PARTICLE_SIZE, PARTICLE_SIZE, PARTICLE_SIZE)); + } + m_scene->AddObject(p.obj); m_breakParticles.push_back(p); } } void BlockEffects::Update(float deltaTime, const Vector3D& cameraPos) { + // Place effects: ease-out scale-in, centered on the block for (auto& effect : m_placeEffects) { + if (!effect.obj) continue; effect.timer += deltaTime; - if (effect.timer >= effect.duration) effect.done = true; + if (effect.timer >= effect.duration) { + m_scene->RemoveObject(effect.obj); + effect.obj = nullptr; + continue; + } + + float t = effect.timer / effect.duration; + t = 1.0f - (1.0f - t) * (1.0f - t); + const float scale = PLACE_START_SCALE + t * (1.0f - PLACE_START_SCALE); + const float offset = (1.0f - scale) * HALF; + if (auto* tr = effect.obj->GetComponent()) { + tr->SetPosition(Vector3D(effect.x + offset, effect.y + offset, + effect.z + offset)); + tr->SetScale(Vector3D(scale, scale, scale)); + } } + // Break particles: gravity, then face the camera for (auto& p : m_breakParticles) { p.life += deltaTime; + if (p.life >= p.maxLife) { + m_scene->RemoveObject(p.obj); + p.obj = nullptr; + continue; + } + p.vel = p.vel + Vector3D(0, PARTICLE_GRAVITY, 0) * deltaTime; p.pos = p.pos + p.vel * deltaTime; + if (auto* tr = p.obj->GetComponent()) { + tr->SetPosition(p.pos); + tr->LookAt(cameraPos); + } } m_breakParticles.erase( - std::remove_if( - m_breakParticles.begin(), m_breakParticles.end(), - [](const BreakParticle& p) { return p.life >= p.maxLife; }), + std::remove_if(m_breakParticles.begin(), m_breakParticles.end(), + [](const BreakParticle& p) { return p.obj == nullptr; }), m_breakParticles.end()); - - RebuildMesh(cameraPos); -} - -void BlockEffects::Render() const { - if (!m_mesh.IsValid() || !m_material.IsValid()) return; - MeshBatch::BeginBatch(m_material.get()); - MeshBatch::Draw(m_mesh); - MeshBatch::EndBatch(); -} - -void BlockEffects::AppendPlaceCube(const PlaceEffect& effect) { - // Ease-out scale-in, centered on the block - float t = effect.timer / effect.duration; - t = 1.0f - (1.0f - t) * (1.0f - t); - const float scale = PLACE_START_SCALE + t * (1.0f - PLACE_START_SCALE); - const float offset = (1.0f - scale) * HALF; - const float origin[3] = {effect.x + offset, effect.y + offset, - effect.z + offset}; - - for (const FaceInfo& f : CUBE_FACES) { - float uvs[QUAD_CORNERS][2]; - QuadUVs( - TextureAtlas::GetTileUV(GetBlockTextureTile(effect.type, f.face)), - uvs); - const uint32_t base = static_cast(m_vertices.GetSize()); - for (int i = 0; i < QUAD_CORNERS; i++) { - m_vertices.AddVertex( - VoxelVertex(origin[0] + f.positions[i][0] * scale, - origin[1] + f.positions[i][1] * scale, - origin[2] + f.positions[i][2] * scale, f.nx, f.ny, - f.nz, uvs[i][0], uvs[i][1])); - } - AppendIndices(m_indices, base, QUAD_FRONT); - } -} - -void BlockEffects::AppendParticle(const BreakParticle& particle, - const Vector3D& cameraPos) { - // Billboard basis: forward to the camera, right and up across it - Vector3D forward = cameraPos - particle.pos; - forward = forward.Magnitude() > BILLBOARD_EPSILON ? forward.Normalized() - : WORLD_FORWARD; - Vector3D right = WORLD_UP.Cross(forward); - right = right.Magnitude() > BILLBOARD_EPSILON ? right.Normalized() - : WORLD_RIGHT; - const Vector3D up = forward.Cross(right); - - const float h = PARTICLE_SIZE * HALF; - // Bottom right, top right, top left, bottom left, as a north face - const Vector3D corners[QUAD_CORNERS] = { - particle.pos + right * h - up * h, particle.pos + right * h + up * h, - particle.pos - right * h + up * h, particle.pos - right * h - up * h}; - float uvs[QUAD_CORNERS][2]; - QuadUVs(TextureAtlas::GetTileUV(particle.tile), uvs); - - for (int side = 0; side < PARTICLE_SIDES; side++) { - const Vector3D n = side == 0 ? forward : forward * -1.0f; - const uint32_t base = static_cast(m_vertices.GetSize()); - for (int i = 0; i < QUAD_CORNERS; i++) { - m_vertices.AddVertex(VoxelVertex( - corners[i].GetX(), corners[i].GetY(), corners[i].GetZ(), - n.GetX(), n.GetY(), n.GetZ(), uvs[i][0], uvs[i][1])); - } - AppendIndices(m_indices, base, side == 0 ? QUAD_FRONT : QUAD_BACK); - } -} - -void BlockEffects::RebuildMesh(const Vector3D& cameraPos) { - m_vertices.clear(); - m_indices.clear(); - for (const auto& effect : m_placeEffects) - if (!effect.done) AppendPlaceCube(effect); - for (const auto& p : m_breakParticles) AppendParticle(p, cameraPos); - - if (m_indices.empty()) { - m_mesh = MeshHandle(); - return; - } - m_mesh = MeshBatch::CreateMesh(GetVoxelVertexFormat(), m_vertices.GetData(), - m_vertices.GetSizeInBytes(), - m_indices.data(), m_indices.size()); } std::vector BlockEffects::PopCompletedPlacements() { std::vector result; for (auto it = m_placeEffects.begin(); it != m_placeEffects.end();) { - if (it->done) { + if (it->obj == nullptr) { result.push_back({it->x, it->y, it->z, it->type}); it = m_placeEffects.erase(it); } else { @@ -224,13 +253,21 @@ std::vector BlockEffects::DrainAllPlacements() { // Commit everything still animating, for the save and exit paths std::vector result; result.reserve(m_placeEffects.size()); - for (auto& e : m_placeEffects) result.push_back({e.x, e.y, e.z, e.type}); + for (auto& e : m_placeEffects) { + if (e.obj) m_scene->RemoveObject(e.obj); + result.push_back({e.x, e.y, e.z, e.type}); + } m_placeEffects.clear(); return result; } void BlockEffects::Cleanup() { + for (auto& e : m_placeEffects) { + if (e.obj) m_scene->RemoveObject(e.obj); + } + for (auto& p : m_breakParticles) { + if (p.obj) m_scene->RemoveObject(p.obj); + } m_placeEffects.clear(); m_breakParticles.clear(); - m_mesh = MeshHandle(); } From fe685244ee4a4af3cc4a53feb1e8a74d25e37c07 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Tue, 10 Nov 2026 02:23:33 +0300 Subject: [PATCH 16/17] world: correct the desaturation weight comment --- Game/src/World/VoxelLighting.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Game/src/World/VoxelLighting.cpp b/Game/src/World/VoxelLighting.cpp index 244d82e..5dfb956 100644 --- a/Game/src/World/VoxelLighting.cpp +++ b/Game/src/World/VoxelLighting.cpp @@ -17,7 +17,7 @@ constexpr AuthoredKey TORCH_KEY{255.0f, 212.0f, 160.0f, 0.85f}; // Cave floor: grey authored like the palette, then scaled down constexpr float MIN_LIGHT_GREY = 128.0f; constexpr float MIN_LIGHT_SCALE = 0.04f; -// Desaturation keeps 1 - this * factor of the color's chroma +// Desaturation removes 1 - this * factor of the color's chroma constexpr float DESAT_PER_FACTOR = 0.4f; // Emissive gain, albedo balancing, SSAO exponent (BSL defaults) constexpr float EMISSION_GAIN = 4.0f; From 283359b89f95501f6359ac3d32ab0d1e431d29b8 Mon Sep 17 00:00:00 2001 From: Canberk Pitirli Date: Tue, 10 Nov 2026 02:23:33 +0300 Subject: [PATCH 17/17] docs: per-frame order and the palette sliders --- docs/pages/architecture-overview.md | 16 +++++++++------- docs/pages/player-and-ui.md | 11 +++++++---- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/pages/architecture-overview.md b/docs/pages/architecture-overview.md index dbc39d2..8ed9a79 100644 --- a/docs/pages/architecture-overview.md +++ b/docs/pages/architecture-overview.md @@ -233,25 +233,27 @@ and `Game/assets/shaders`. The engine's own `CompileShaders` CMake target only w one before them: ``` -BlockEffects::Update // advance break/place animations +BlockEffects::Update // move break/place effect objects BlockInteraction::DrainCompletedPlacements // finished placements become real blocks -Sleak::Scene::Update // engine objects, lights, physics +Sleak::Scene::Update // engine objects (effects too), lights, physics +VoxelLighting::Upload // voxel palette into the game frame block HudPanel::Update PlayerController::Update // movement + voxel collision ChunkManager::Update // streaming, meshing, visibility ChunkManager::RenderColumns -water material tiling, then ChunkManager::RenderWater +ChunkManager::RenderWater BlockInteraction::RenderOutline auto-save check, message timers HudPanel::RenderCrosshair, HudPanel::Render, SettingsPanel::Render, Hotbar::Render ``` Placements drain before the engine update so a block finishing its animation -this frame is solid by the time collision runs. The player moves before +this frame is solid by the time collision runs. The voxel palette is sent +every frame because activating a scene clears the game frame block; the +lighting stem reads it in the same frame. The player moves before `ChunkManager::Update` so streaming centers on the position the player -actually reached. Water submits after the solid columns and after its -material tiling is advanced by the game clock, which is what animates the -surface. +actually reached. Water submits after the solid columns; its shader animates +the surface from the engine clock in `FrameData`. --- diff --git a/docs/pages/player-and-ui.md b/docs/pages/player-and-ui.md index 6a3f29f..419cd4e 100644 --- a/docs/pages/player-and-ui.md +++ b/docs/pages/player-and-ui.md @@ -104,10 +104,13 @@ ENGINE_API void Text(const char* fmt, ...); currently visible. - **`SettingsPanel`** (`Game/src/UI/SettingsPanel.cpp`) renders general, culling, MSAA, render-distance, lighting, SSAO, IBL, and texture-filter sections, and pushes live - edits straight to the light manager and block material. It owns the sun/ambient/fog - slider state itself; crosshair, vsync, and multithreaded-loading toggles are read and - written through `MainScene`, because `MainScene::SetupLighting` also reads them once - at scene initialize time. + edits straight to the light manager and block material. Its sun elevation and + azimuth turn the engine sun; its sun and ambient intensity and RGB sliders are + multipliers (1 = unchanged) on the voxel palette (`VoxelLighting::SetMultipliers`), + so they change the voxel lighting while the engine sun and ambient that water still + reads stay fixed. It owns that slider state and the fog state itself; crosshair, + vsync, and multithreaded-loading toggles are read and written through `MainScene`, + because `MainScene::SetupLighting` also reads them once at scene initialize time. - **`Hotbar`** (`Game/src/UI/Hotbar.cpp`) lazily loads the nine slot icon textures on first render, then draws the strip; selection state lives on `BlockInteraction`, which `Hotbar` reads by reference rather than duplicating.