From 3fcd960c9caad82de48eca43018842e1325c06f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20J=C3=A4rvisalo?= Date: Tue, 15 Jul 2025 00:32:15 +0300 Subject: [PATCH] Enable crinkler --- leviathan.vcxproj | 6 +++--- src/fft.cpp | 3 +++ src/fft.h | 5 ----- src/shaders/fragment.frag | 2 +- src/shaders/fragment.inl | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/leviathan.vcxproj b/leviathan.vcxproj index e15b617..45d71f4 100644 --- a/leviathan.vcxproj +++ b/leviathan.vcxproj @@ -350,7 +350,7 @@ shader_minifier.exe -v -o src\shaders\post.inl src\shaders\post.frag 0x0409 - /RANGE:opengl32 /HASHTRIES:300 /COMPMODE:SLOW /ORDERTRIES:9000 /REPORT:out.html /PROGRESSGUI /HASHSIZE:1000 /UNSAFEIMPORT /UNALIGNCODE /SATURATE /NOINITIALIZERS /TRANSFORM:CALLS /TRUNCATEFLOATS:32 %(AdditionalOptions) + /CRINKLER /RANGE:opengl32 /HASHTRIES:500 /COMPMODE:SLOW /ORDERTRIES:9000 /REPORT:out.html /PROGRESSGUI /HASHSIZE:1000 /UNSAFEIMPORT /UNALIGNCODE /SATURATE /NOINITIALIZERS /TRANSFORM:CALLS /TRUNCATEFLOATS:32 %(AdditionalOptions) opengl32.lib;dsound.lib;src/sointu/song.obj;%(AdditionalDependencies) out\leviathan-release.exe @@ -407,7 +407,7 @@ shader_minifier.exe -v -o src\shaders\post.inl src\shaders\post.frag true Size ../;%(AdditionalIncludeDirectories) - WINDOWS;A32BITS;SIMD;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WINDOWS;A32BITS;SIMD;NDEBUG;_CRT_SECURE_NO_WARNINGS;WINDOWS_IGNORE_PACKING_MISMATCH;%(PreprocessorDefinitions) false false MultiThreaded @@ -428,7 +428,7 @@ shader_minifier.exe -v -o src\shaders\post.inl src\shaders\post.frag false false Default - NotSet + NoExtensions true false ProgramDatabase diff --git a/src/fft.cpp b/src/fft.cpp index 7f66f45..186c935 100644 --- a/src/fft.cpp +++ b/src/fft.cpp @@ -3,6 +3,9 @@ static float window[FFT_SIZE]; +constexpr float M_PI = 3.14159; + + // Call once before use void init_hamming_window() { for (int i = 0; i < FFT_SIZE; i++) { diff --git a/src/fft.h b/src/fft.h index 9c74bb7..6e424bc 100644 --- a/src/fft.h +++ b/src/fft.h @@ -2,11 +2,6 @@ #include #include - -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - #define FFT_SIZE 4096 void init_hamming_window(); void compute_fft(float* time_data, float* freq_out); \ No newline at end of file diff --git a/src/shaders/fragment.frag b/src/shaders/fragment.frag index 7f92b95..2e98c1c 100644 --- a/src/shaders/fragment.frag +++ b/src/shaders/fragment.frag @@ -3,7 +3,7 @@ precision mediump float; out vec4 o; const float PI = 22./7.; layout(location = 0) uniform float syncs[7]; -layout(location = 8) uniform float fft_output[512]; // FFT_SIZE / 4 +layout(location = 8) uniform float fft_output[1024]; // FFT_SIZE / 4 float u_time = syncs[0]; vec3 render(vec2 uv, float time) { diff --git a/src/shaders/fragment.inl b/src/shaders/fragment.inl index 409ee35..2a78d16 100644 --- a/src/shaders/fragment.inl +++ b/src/shaders/fragment.inl @@ -11,7 +11,7 @@ const char *fragment_frag = "out vec4 f;" "const float m=22./7.;" "layout(location=0)uniform float v[7];" - "layout(location=8)uniform float l[512];" + "layout(location=8)uniform float l[1024];" "float n=v[0];" "void main()" "{"