From 94b1374cc3e5baf0d317b9b191e782cac25afe7f Mon Sep 17 00:00:00 2001 From: rexim Date: Sun, 22 Dec 2019 00:04:48 +0700 Subject: [PATCH] scroll -> items_scroll --- src/game/level_picker.c | 16 ++++++++-------- src/game/level_picker.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/game/level_picker.c b/src/game/level_picker.c index 6085ae73..4a3fe5b2 100644 --- a/src/game/level_picker.c +++ b/src/game/level_picker.c @@ -79,7 +79,7 @@ int level_picker_render(const LevelPicker *level_picker, camera, vec(viewport.w * 0.5f - title_size.x * 0.5f, TITLE_MARGIN_TOP)); - const float proportional_scroll = level_picker->scroll.y * scrolling_area_height / level_picker->size.y; + const float proportional_scroll = level_picker->items_scroll.y * scrolling_area_height / level_picker->size.y; const float number_of_items_in_scrolling_area = scrolling_area_height / ITEM_HEIGHT; const float percent_of_visible_items = number_of_items_in_scrolling_area / ((float) level_picker->items.count - 1); @@ -110,7 +110,7 @@ int level_picker_render(const LevelPicker *level_picker, for (size_t i = 0; i < level_picker->items.count; ++i) { const Vec2f current_position = vec_sum( level_picker->items_position, - vec(0.0f, (float) i * ITEM_HEIGHT + level_picker->scroll.y)); + vec(0.0f, (float) i * ITEM_HEIGHT + level_picker->items_scroll.y)); if(current_position.y > level_picker->items_position.y + scrolling_area_height || current_position.y < level_picker->items_position.y) { @@ -171,11 +171,11 @@ int level_picker_update(LevelPicker *level_picker, const Rect viewport = camera_view_port_screen(camera); const float scrolling_area_height = viewport.h - ITEM_HEIGHT - level_picker->items_position.y; - if ((float) level_picker->items_cursor * ITEM_HEIGHT + level_picker->scroll.y > scrolling_area_height) { - level_picker->scroll.y -= ITEM_HEIGHT * SCROLLING_SPEED_FRACTION; + if ((float) level_picker->items_cursor * ITEM_HEIGHT + level_picker->items_scroll.y > scrolling_area_height) { + level_picker->items_scroll.y -= ITEM_HEIGHT * SCROLLING_SPEED_FRACTION; } - if ((float) level_picker->items_cursor * ITEM_HEIGHT + level_picker->scroll.y < 0) { - level_picker->scroll.y += ITEM_HEIGHT * SCROLLING_SPEED_FRACTION; + if ((float) level_picker->items_cursor * ITEM_HEIGHT + level_picker->items_scroll.y < 0) { + level_picker->items_scroll.y += ITEM_HEIGHT * SCROLLING_SPEED_FRACTION; } vec_add(&level_picker->camera_position, @@ -263,7 +263,7 @@ int level_picker_event(LevelPicker *level_picker, const Vec2f mouse_pos = vec((float) event->motion.x, (float) event->motion.y); Vec2f position = vec_sum( level_picker->items_position, - level_picker->scroll); + level_picker->items_scroll); for (size_t i = 0; i < level_picker->items.count; ++i) { const char *item_text = dynarray_pointer_at( @@ -299,7 +299,7 @@ int level_picker_event(LevelPicker *level_picker, Vec2f position = vec_sum( level_picker->items_position, - level_picker->scroll); + level_picker->items_scroll); vec_add(&position, vec(0.0f, (float) level_picker->items_cursor * single_item_height)); const char *item_text = diff --git a/src/game/level_picker.h b/src/game/level_picker.h index 5571b784..c8f632a9 100644 --- a/src/game/level_picker.h +++ b/src/game/level_picker.h @@ -15,7 +15,7 @@ typedef struct { Dynarray items; size_t items_cursor; int selected_item; - Vec2f scroll; + Vec2f items_scroll; Vec2f items_position; Vec2f size; } LevelPicker; -- 2.44.0