diff options
| author | Bryce Harrington <b.harrington@samsung.com> | 2014-04-16 20:11:20 -0700 |
|---|---|---|
| committer | Bryce Harrington <b.harrington@samsung.com> | 2014-04-16 20:24:51 -0700 |
| commit | 2b549264d7a7ac4a74f480661a644837b4a93dc3 (patch) | |
| tree | b27c12b68c9661b57a3eb889afc79a0fa6bc7c7e /src/kinetics.cpp | |
| parent | ebb93a06c84caa2b80a1ce76a8433a176ba92eed (diff) | |
Whitespace cleanup
Diffstat (limited to 'src/kinetics.cpp')
| -rw-r--r-- | src/kinetics.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/src/kinetics.cpp b/src/kinetics.cpp index 3444e75..62f099b 100644 --- a/src/kinetics.cpp +++ b/src/kinetics.cpp @@ -1,4 +1,5 @@ #include <kinetics.h> + void generate_color (double *color) { @@ -12,6 +13,7 @@ void kinetics_destroy (kinetics_t *kinetics) { free(kinetics); } + void kinetics_init (kinetics_t *kinetics) { kinetics->angle = drand48 () * 2 * M_PI; @@ -29,8 +31,7 @@ void kinetics_init (kinetics_t *kinetics) generate_color (kinetics->shadow_color); kinetics->rotation = drand48 () * 2 * M_PI; - - kinetics->line_width = 20;//drand48() * 20; + kinetics->line_width = 20; //drand48() * 20; /* inset shadow */ kinetics->shadow_color[0] = 0; @@ -62,7 +63,6 @@ void kinetics_init (kinetics_t *kinetics) kinetics->drop_x_offset = -30; kinetics->drop_y_offset = -5; kinetics->drop_line_width = kinetics->line_width; - } void kinetics_update (kinetics_t *kinetics, double delta) @@ -73,31 +73,31 @@ void kinetics_update (kinetics_t *kinetics, double delta) double height = kinetics->height/2; if (x + w > WIDTH) { - if (kinetics->angle >= 0 && kinetics->angle < M_PI / 2) - kinetics->angle = M_PI - kinetics->angle; - else if (kinetics->angle > M_PI / 2 * 3) - kinetics->angle -= (kinetics->angle - M_PI /2 * 3) * 2; - x = WIDTH - w; + if (kinetics->angle >= 0 && kinetics->angle < M_PI / 2) + kinetics->angle = M_PI - kinetics->angle; + else if (kinetics->angle > M_PI / 2 * 3) + kinetics->angle -= (kinetics->angle - M_PI /2 * 3) * 2; + x = WIDTH - w; } if (x - w < 0) { - if (kinetics->angle > M_PI / 2 && kinetics->angle < M_PI) - kinetics->angle = M_PI - kinetics->angle; - else if (kinetics->angle > M_PI && kinetics->angle < M_PI / 2 * 3) - kinetics->angle += (M_PI / 2 * 3 - kinetics->angle) * 2; - x = w; + if (kinetics->angle > M_PI / 2 && kinetics->angle < M_PI) + kinetics->angle = M_PI - kinetics->angle; + else if (kinetics->angle > M_PI && kinetics->angle < M_PI / 2 * 3) + kinetics->angle += (M_PI / 2 * 3 - kinetics->angle) * 2; + x = w; } if (y + w > HEIGHT) { - if (kinetics->angle > 0 && kinetics->angle < 2 * M_PI) - kinetics->angle = M_PI * 2 - kinetics->angle; - y = HEIGHT - w; + if (kinetics->angle > 0 && kinetics->angle < 2 * M_PI) + kinetics->angle = M_PI * 2 - kinetics->angle; + y = HEIGHT - w; } if (y - w < 0) { - if (kinetics->angle > M_PI && kinetics->angle < M_PI * 2) - kinetics->angle = kinetics->angle - (kinetics->angle - M_PI) * 2; - y = w; + if (kinetics->angle > M_PI && kinetics->angle < M_PI * 2) + kinetics->angle = kinetics->angle - (kinetics->angle - M_PI) * 2; + y = w; } kinetics->x = x; @@ -105,7 +105,5 @@ void kinetics_update (kinetics_t *kinetics, double delta) kinetics->rotation += M_PI / 9; if (kinetics->rotation > 2 * M_PI) - kinetics->rotation -= 2 * M_PI; + kinetics->rotation -= 2 * M_PI; } - - |