fruchti/colorchord
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Force float constants for TCC

Browse source
This commit is contained in:
Sam Ellicott 2020-05-17 19:19:21 -04:00
parent 92f765817c
commit ffc4ac5d41
2 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
colorchord2/color.c
View file

@ -9,23 +9,23 @@ uint32_t CCtoHEX( float note, float sat, float value )
{ {
float hue = 0.0; float hue = 0.0;
note = fmodf( note, 1.0 ); note = fmodf( note, 1.0 );
note *= 12; note *= 12.0;
if( note < 4 ) if( note < 4.0 )
{ {
//Needs to be YELLOW->RED //Needs to be YELLOW->RED
hue = (4 - note) / 24.0; hue = (4.0 - note) / 24.0;
} }
else if( note < 8 ) else if( note < 8.0 )
{ {
// [4] [8] // [4] [8]
//Needs to be RED->BLUE //Needs to be RED->BLUE
hue = ( 4 - note ) / 12.0; hue = ( 4.0 - note ) / 12.0;
} }
else else
{ {
// [8] [12] // [8] [12]
//Needs to be BLUE->YELLOW //Needs to be BLUE->YELLOW
hue = ( 12 - note ) / 8.0 + 1./6.; hue = ( 12.0 - note ) / 8.0 + 1.0/6.0;
} }
return HSVtoHEX( hue, sat, value ); return HSVtoHEX( hue, sat, value );
} }
@ -41,44 +41,44 @@ uint32_t CCtoHEX( float note, float sat, float value )
uint32_t HSVtoHEX( float hue, float sat, float value ) uint32_t HSVtoHEX( float hue, float sat, float value )
{ {
float pr = 0; float pr = 0.0;
float pg = 0; float pg = 0.0;
float pb = 0; float pb = 0.0;
short ora = 0; short ora = 0.0;
short og = 0; short og = 0.0;
short ob = 0; short ob = 0.0;
float ro = fmod( hue * 6, 6. ); float ro = fmod( hue * 6.0, 6.0 );
float avg = 0; float avg = 0.0;
ro = fmod( ro + 6 + 1, 6 ); //Hue was 60* off... ro = fmod( ro + 6.0 + 1.0, 6.0 ); //Hue was 60* off...
if( ro < 1 ) //yellow->red if( ro < 1.0 ) //yellow->red
{ {
pr = 1; pr = 1.0;
pg = 1. - ro; pg = 1.0 - ro;
} else if( ro < 2 ) } else if( ro < 2.0 )
{ {
pr = 1; pr = 1.0;
pb = ro - 1.; pb = ro - 1.0;
} else if( ro < 3 ) } else if( ro < 3.0 )
{ {
pr = 3. - ro; pr = 3.0 - ro;
pb = 1; pb = 1.0;
} else if( ro < 4 ) } else if( ro < 4.0 )
{ {
pb = 1; pb = 1.0;
pg = ro - 3; pg = ro - 3.0;
} else if( ro < 5 ) } else if( ro < 5.0 )
{ {
pb = 5 - ro; pb = 5.0 - ro;
pg = 1; pg = 1.0;
} else } else
{ {
pg = 1; pg = 1.0;
pr = ro - 5; pr = ro - 5.0;
} }
//Actually, above math is backwards, oops! //Actually, above math is backwards, oops!
@ -90,9 +90,9 @@ uint32_t HSVtoHEX( float hue, float sat, float value )
avg += pg; avg += pg;
avg += pb; avg += pb;
pr = pr * sat + avg * (1.-sat); pr = pr * sat + avg * (1.0-sat);
pg = pg * sat + avg * (1.-sat); pg = pg * sat + avg * (1.0-sat);
pb = pb * sat + avg * (1.-sat); pb = pb * sat + avg * (1.0-sat);
ora = pr * 255; ora = pr * 255;
og = pb * 255; og = pb * 255;

3
colorchord2/main.c
View file

@ -533,7 +533,8 @@ int main(int argc, char ** argv)
{ {
//printf( "%f %f /", note_positions[i], note_amplitudes[i] ); //printf( "%f %f /", note_positions[i], note_amplitudes[i] );
if( nf->note_amplitudes_out[i] < 0 ) continue; if( nf->note_amplitudes_out[i] < 0 ) continue;
CNFGDialogColor = CCtoHEX( (nf->note_positions[i] / freqbins), 1.0, 1.0 ); float note = (float) nf->note_positions[i] / freqbins;
CNFGDialogColor = CCtoHEX( note, 1.0, 1.0 );
CNFGDrawBox( ((float)i / note_peaks) * screenx, 480 - nf->note_amplitudes_out[i] * 100, ((float)(i+1) / note_peaks) * screenx, 480 ); CNFGDrawBox( ((float)i / note_peaks) * screenx, 480 - nf->note_amplitudes_out[i] * 100, ((float)(i+1) / note_peaks) * screenx, 480 );
CNFGPenX = ((float)(i+.4) / note_peaks) * screenx; CNFGPenX = ((float)(i+.4) / note_peaks) * screenx;
CNFGPenY = screeny - 30; CNFGPenY = screeny - 30;