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

Fixed attached base frequencies in 'bars'

Browse Source
This commit is contained in:
Jarcode
2019-03-09 15:27:35 -08:00
parent 8ccbf22732
commit f7170afb75
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shaders/bars/1.frag
View File

@@ -49,13 +49,15 @@ void main() {
#else #else
float d = AREA_HEIGHT - AREA_Y; float d = AREA_HEIGHT - AREA_Y;
#endif #endif
float nbars = floor((AREA_WIDTH * 0.5F) / float(BAR_WIDTH + BAR_GAP)) * 2;
float section = BAR_WIDTH + BAR_GAP; /* size of section for each bar (including gap) */ float section = BAR_WIDTH + BAR_GAP; /* size of section for each bar (including gap) */
float center = section / 2.0F; /* half section, distance to center */ float center = section / 2.0F; /* half section, distance to center */
float m = abs(mod(dx, section)); /* position in section */ float m = abs(mod(dx, section)); /* position in section */
float md = m - center; /* position in section from center line */ float md = m - center; /* position in section from center line */
float nbars = floor((AREA_WIDTH * 0.5F) / section) * 2;
float p, s;
if (md < ceil(float(BAR_WIDTH) / 2) && md >= -floor(float(BAR_WIDTH) / 2)) { /* if not in gap */ if (md < ceil(float(BAR_WIDTH) / 2) && md >= -floor(float(BAR_WIDTH) / 2)) { /* if not in gap */
float p = int(dx / section) / float(nbars / 2); /* position, (-1.0F, 1.0F)) */ s = dx / section;
p = (sign(s) == 1.0 ? ceil(s) : floor(s)) / float(nbars / 2); /* position, (-1.0F, 1.0F)) */
p += sign(p) * ((0.5F + center) / AREA_WIDTH); /* index center of bar position */ p += sign(p) * ((0.5F + center) / AREA_WIDTH); /* index center of bar position */
/* Apply smooth function and index texture */ /* Apply smooth function and index texture */
#define smooth_f(tex, p) smooth_audio(tex, audio_sz, p) #define smooth_f(tex, p) smooth_audio(tex, audio_sz, p)
@@ -66,7 +68,7 @@ void main() {
return; return;
} }
/* handle user options and store result of indexing in 'v' */ /* handle user options and store result of indexing in 'v' */
if (p >= 0.0F) { if (p > 0.0F) {
#if DIRECTION == 1 #if DIRECTION == 1
p = 1.0F - p; p = 1.0F - p;
#endif #endif