deon/glava
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Load system config for 'smooth_parameters.glsl'

Browse Source
This commit is contained in:
Jarcode
2019-03-09 21:13:27 -08:00
parent d07b93d54e
commit bfea8e167a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shaders/smooth_parameters.glsl
View File

@@ -27,10 +27,10 @@
output is jagged and sporadic. output is jagged and sporadic.
- hybrid uses the results from both `average` and `maximum` - hybrid uses the results from both `average` and `maximum`
with the weight provided in `SAMPLE_HYBRID_WEIGHT` */ with the weight provided in `SAMPLE_HYBRID_WEIGHT` */
#define SAMPLE_MODE average //#define SAMPLE_MODE average
/* Weight should be provided in the range (0, 1). Higher values favour /* Weight should be provided in the range (0, 1). Higher values favour
averaged results. `hybrid` mode only. */ averaged results. `hybrid` mode only. */
#define SAMPLE_HYBRID_WEIGHT 0.65 //#define SAMPLE_HYBRID_WEIGHT 0.65
/* Factor used to scale frequencies. Lower values allows lower /* Factor used to scale frequencies. Lower values allows lower
frequencies to occupy more space. */ frequencies to occupy more space. */

2
shaders/util/smooth.glsl
View File

@@ -10,6 +10,7 @@
#define PI 3.14159265359 #define PI 3.14159265359
#endif #endif
#include "@smooth_parameters.glsl"
#include ":smooth_parameters.glsl" #include ":smooth_parameters.glsl"
/* window value t that resides in range [0, sz)*/ /* window value t that resides in range [0, sz)*/
@@ -43,6 +44,7 @@ float smooth_audio(in sampler1D tex, int tex_sz, highp float idx) {
smax = scale_audio(clamp(idx + SMOOTH_FACTOR, 0, 1)) * tex_sz; smax = scale_audio(clamp(idx + SMOOTH_FACTOR, 0, 1)) * tex_sz;
float m = ((smax - smin) / 2.0F), s, w; float m = ((smax - smin) / 2.0F), s, w;
float rm = smin + m; /* middle */ float rm = smin + m; /* middle */
#if SAMPLE_MODE == average #if SAMPLE_MODE == average
float avg = 0, weight = 0; float avg = 0, weight = 0;
for (s = smin; s <= smax; s += 1.0F) { for (s = smin; s <= smax; s += 1.0F) {