blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use monotonic clock time for animations

This commit is contained in:
Tony Crisci 2017-08-31 23:43:02 -04:00
parent 35eee80f9b
commit 6d26fda57c
1 changed files with 64 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
examples/output-layout.c
View File

@ -32,48 +32,16 @@ struct sample_state {
struct wlr_output_layout *layout; struct wlr_output_layout *layout;
float x_offs, y_offs; float x_offs, y_offs;
float x_vel, y_vel; float x_vel, y_vel;
struct wlr_output *main_output; struct timespec ts_last;
}; };
static void handle_output_frame(struct output_state *output, static void animate_cat(struct sample_state *sample,
struct timespec *ts) { struct wlr_output *output) {
struct compositor_state *state = output->compositor; struct timespec ts;
struct sample_state *sample = state->data; clock_gettime(CLOCK_MONOTONIC, &ts);
struct wlr_output *wlr_output = output->output; long ms = (ts.tv_sec - sample->ts_last.tv_sec) * 1000 +
(ts.tv_nsec - sample->ts_last.tv_nsec) / 1000000;
if (sample->main_output == NULL) { // how many seconds have passed since the last time we animated
sample->main_output = wlr_output;
}
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
bool intersects = wlr_output_layout_intersects(sample->layout,
output->output, sample->x_offs, sample->y_offs,
sample->x_offs + 128, sample->y_offs + 128);
if (intersects) {
float matrix[16];
// transform global coordinates to local coordinates
double local_x = sample->x_offs;
double local_y = sample->y_offs;
wlr_output_layout_output_coords(sample->layout, output->output,
&local_x, &local_y);
wlr_texture_get_matrix(sample->cat_texture, &matrix,
&wlr_output->transform_matrix, local_x, local_y);
wlr_render_with_matrix(sample->renderer,
sample->cat_texture, &matrix);
}
wlr_renderer_end(sample->renderer);
wlr_output_swap_buffers(wlr_output);
if (output->output == sample->main_output) {
long ms = (ts->tv_sec - output->last_frame.tv_sec) * 1000 +
(ts->tv_nsec - output->last_frame.tv_nsec) / 1000000;
// how many seconds have passed since the last frame
float seconds = ms / 1000.0f; float seconds = ms / 1000.0f;
if (seconds > 0.1f) { if (seconds > 0.1f) {
@ -94,11 +62,10 @@ static void handle_output_frame(struct output_state *output,
if (ur_collision && ul_collision && ll_collision && lr_collision) { if (ur_collision && ul_collision && ll_collision && lr_collision) {
// oops we went off the screen somehow // oops we went off the screen somehow
struct wlr_output_layout_output *main_l_output; struct wlr_output_layout_output *l_output =
main_l_output = wlr_output_layout_get(sample->layout, output);
wlr_output_layout_get(sample->layout, sample->main_output); sample->x_offs = l_output->x + 20;
sample->x_offs = main_l_output->x + 20; sample->y_offs = l_output->y + 20;
sample->y_offs = main_l_output->y + 20;
} else if (ur_collision && ul_collision) { } else if (ur_collision && ul_collision) {
sample->y_vel = fabs(sample->y_vel); sample->y_vel = fabs(sample->y_vel);
} else if (lr_collision && ll_collision) { } else if (lr_collision && ll_collision) {
@ -124,7 +91,42 @@ static void handle_output_frame(struct output_state *output,
sample->x_offs += sample->x_vel * seconds; sample->x_offs += sample->x_vel * seconds;
sample->y_offs += sample->y_vel * seconds; sample->y_offs += sample->y_vel * seconds;
sample->ts_last = ts;
}
static void handle_output_frame(struct output_state *output,
struct timespec *ts) {
struct compositor_state *state = output->compositor;
struct sample_state *sample = state->data;
struct wlr_output *wlr_output = output->output;
wlr_output_make_current(wlr_output);
wlr_renderer_begin(sample->renderer, wlr_output);
animate_cat(sample, output->output);
bool intersects = wlr_output_layout_intersects(sample->layout,
output->output, sample->x_offs, sample->y_offs,
sample->x_offs + 128, sample->y_offs + 128);
if (intersects) {
float matrix[16];
// transform global coordinates to local coordinates
double local_x = sample->x_offs;
double local_y = sample->y_offs;
wlr_output_layout_output_coords(sample->layout, output->output,
&local_x, &local_y);
wlr_texture_get_matrix(sample->cat_texture, &matrix,
&wlr_output->transform_matrix, local_x, local_y);
wlr_render_with_matrix(sample->renderer,
sample->cat_texture, &matrix);
} }
wlr_renderer_end(sample->renderer);
wlr_output_swap_buffers(wlr_output);
} }
static void handle_output_add(struct output_state *ostate) { static void handle_output_add(struct output_state *ostate) {
@ -144,11 +146,6 @@ static void handle_output_add(struct output_state *ostate) {
static void handle_output_remove(struct output_state *ostate) { static void handle_output_remove(struct output_state *ostate) {
struct sample_state *sample = ostate->compositor->data; struct sample_state *sample = ostate->compositor->data;
if (sample->main_output == ostate->output) {
sample->main_output = NULL;
}
wlr_output_layout_remove(sample->layout, ostate->output); wlr_output_layout_remove(sample->layout, ostate->output);
} }
@ -189,6 +186,7 @@ int main(int argc, char *argv[]) {
state.x_vel = 500; state.x_vel = 500;
state.y_vel = 500; state.y_vel = 500;
state.layout = wlr_output_layout_init(); state.layout = wlr_output_layout_init();
clock_gettime(CLOCK_MONOTONIC, &state.ts_last);
state.config = parse_args(argc, argv); state.config = parse_args(argc, argv);