RPJosh
/
wlsunset
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow direct high-to-low state transition

master
Kenny Levinsen 2020-09-26 19:37:52 +02:00
parent 25ab690fa9
commit a74f7fd44f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main.c
View File

@ -73,7 +73,6 @@ struct context {
time_t stop_time; time_t stop_time;
int cur_temp; int cur_temp;
enum state state; enum state state;
time_t animation_start;
bool new_output; bool new_output;
struct wl_list outputs; struct wl_list outputs;
@ -280,11 +279,10 @@ start:
break; break;
} }
ctx->state = ANIMATING_TO_LOW; ctx->state = ANIMATING_TO_LOW;
ctx->animation_start = ctx->stop_time;
// fallthrough // fallthrough
case ANIMATING_TO_LOW: case ANIMATING_TO_LOW:
if (now <= ctx->animation_start + ctx->duration) { if (now > ctx->start_time && now <= ctx->stop_time + ctx->duration) {
time_pos = clamp(((double)now - (double)ctx->animation_start) / (double)ctx->duration); time_pos = clamp(((double)now - (double)ctx->stop_time) / (double)ctx->duration);
temp_pos = (double)(ctx->high_temp - ctx->low_temp) * time_pos; temp_pos = (double)(ctx->high_temp - ctx->low_temp) * time_pos;
temp = ctx->high_temp - temp_pos; temp = ctx->high_temp - temp_pos;
break; break;
@ -297,11 +295,10 @@ start:
break; break;
} }
ctx->state = ANIMATING_TO_HIGH; ctx->state = ANIMATING_TO_HIGH;
ctx->animation_start = ctx->start_time;
// fallthrough // fallthrough
case ANIMATING_TO_HIGH: case ANIMATING_TO_HIGH:
if (now <= ctx->animation_start + ctx->duration) { if (now <= ctx->start_time + ctx->duration) {
time_pos = clamp(((double)now - (double)ctx->animation_start) / (double)ctx->duration); time_pos = clamp(((double)now - (double)ctx->start_time) / (double)ctx->duration);
temp_pos = (double)(ctx->high_temp - ctx->low_temp) * time_pos; temp_pos = (double)(ctx->high_temp - ctx->low_temp) * time_pos;
temp = ctx->low_temp + temp_pos; temp = ctx->low_temp + temp_pos;
break; break;