Commit 3c4c7f2b authored by Gargaj's avatar Gargaj
Browse files

add integrated fft textures to default shader

parent 8dc56129
...@@ -118,6 +118,7 @@ namespace Renderer ...@@ -118,6 +118,7 @@ namespace Renderer
"\n" "\n"
"uniform sampler1D texFFT; // towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n" "uniform sampler1D texFFT; // towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n"
"uniform sampler1D texFFTSmoothed; // this one has longer falloff and less harsh transients\n" "uniform sampler1D texFFTSmoothed; // this one has longer falloff and less harsh transients\n"
"uniform sampler1D texFFTIntegrated; // this is continually increasing\n"
"{%textures:begin%}" // leave off \n here "{%textures:begin%}" // leave off \n here
"uniform sampler2D {%textures:name%};\n" "uniform sampler2D {%textures:name%};\n"
"{%textures:end%}" // leave off \n here "{%textures:end%}" // leave off \n here
......
...@@ -107,6 +107,7 @@ namespace Renderer ...@@ -107,6 +107,7 @@ namespace Renderer
"{%textures:end%}" // leave off \n here "{%textures:end%}" // leave off \n here
"Texture1D texFFT; // towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n" "Texture1D texFFT; // towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n"
"Texture1D texFFTSmoothed; // this one has longer falloff and less harsh transients\n" "Texture1D texFFTSmoothed; // this one has longer falloff and less harsh transients\n"
"Texture1D texFFTIntegrated; // this is continually increasing\n"
"SamplerState smp;\n" "SamplerState smp;\n"
"\n" "\n"
"cbuffer constants\n" "cbuffer constants\n"
......
...@@ -105,6 +105,8 @@ namespace Renderer ...@@ -105,6 +105,8 @@ namespace Renderer
"// towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n" "// towards 0.0 is bass / lower freq, towards 1.0 is higher / treble freq\n"
"texture texFFTSmoothedT; sampler1D texFFTSmoothed = sampler_state { Texture = <texFFTSmoothedT>; }; \n" "texture texFFTSmoothedT; sampler1D texFFTSmoothed = sampler_state { Texture = <texFFTSmoothedT>; }; \n"
"// this one has longer falloff and less harsh transients\n" "// this one has longer falloff and less harsh transients\n"
"texture texFFTIntegratedT; sampler1D texFFTIntegrated = sampler_state { Texture = <texFFTIntegratedT>; }; \n"
"// this is continually increasing\n"
"\n" "\n"
"{%textures:begin%}" // leave off \n here "{%textures:begin%}" // leave off \n here
"texture raw{%textures:name%}; sampler2D {%textures:name%} = sampler_state { Texture = <raw{%textures:name%}>; };\n" "texture raw{%textures:name%}; sampler2D {%textures:name%} = sampler_state { Texture = <raw{%textures:name%}>; };\n"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment