diff --git a/src/game/Level.cpp b/src/game/Level.cpp index b551055..c89670b 100644 --- a/src/game/Level.cpp +++ b/src/game/Level.cpp @@ -80,7 +80,6 @@ namespace Game else { CreateTransform(Transform.M, {0.0f, -30.0f, 100.0f}, {}, {100.0f, 10.0f, 100.0f}); - // Nothing for now } } } diff --git a/src/game/compiled-shaders/dx11/frag.bin b/src/game/compiled-shaders/dx11/frag.bin index ed22548..f72be6a 100644 Binary files a/src/game/compiled-shaders/dx11/frag.bin and b/src/game/compiled-shaders/dx11/frag.bin differ diff --git a/src/game/compiled-shaders/glsl/frag.bin b/src/game/compiled-shaders/glsl/frag.bin index 6c70e3c..2fcde08 100644 Binary files a/src/game/compiled-shaders/glsl/frag.bin and b/src/game/compiled-shaders/glsl/frag.bin differ diff --git a/src/game/compiled-shaders/spirv/frag.bin b/src/game/compiled-shaders/spirv/frag.bin index c867604..3ebb57c 100644 Binary files a/src/game/compiled-shaders/spirv/frag.bin and b/src/game/compiled-shaders/spirv/frag.bin differ diff --git a/src/game/shaders/frag.sc b/src/game/shaders/frag.sc index 2b6380f..f33b6ff 100644 --- a/src/game/shaders/frag.sc +++ b/src/game/shaders/frag.sc @@ -9,7 +9,7 @@ float circle(vec2 uv, float radius) // float result = distSq / (radius * radius); float result = sqrt(distSq) / radius / 2; // float result = sqrt(distSq) / radius; - // return result < 1.0; + return result < 0.4; return clamp(1.0 - result, 0.0, 1.0); } @@ -41,7 +41,7 @@ float circles(vec2 uv, float level, float subLevel) void main() { - float baseScale = 4.0; + float baseScale = 10.0; float2 dx = ddx(v_uv0 * baseScale); float2 dy = ddy(v_uv0 * baseScale); float2x2 mat = float2x2(dx, dy); @@ -53,7 +53,8 @@ void main() float2 freq = sqrt(float2(qq + discriminant, qq - discriminant) / 2.0); float spacing = freq.y * exp2(2.0); - spacing *= 128.0; // TODO: check reference to see how to calculate this! + spacing = 1.0 / spacing; + spacing *= 1.0; // TODO: check reference to see how to calculate this! float spacingLog = max(log2(spacing), 1.0); int patternScaleLevel = floor(spacingLog); float patternFractional = spacingLog - patternScaleLevel;