X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame%2Flevel_picker.c;h=ac3c78ed369f347096760869942d90eeb391400d;hb=016bee583aa3145b41d4b9718f017d64eb5d37fa;hp=2131cd631aee7d53ceccf17083eed172d5e5f690;hpb=6b47c1d1deb469782006f761fdf35df3396cfc92;p=nothing.git diff --git a/src/game/level_picker.c b/src/game/level_picker.c index 2131cd63..ac3c78ed 100644 --- a/src/game/level_picker.c +++ b/src/game/level_picker.c @@ -19,12 +19,10 @@ struct LevelPicker { Lt *lt; - Background *background; + Background background; Vec2f camera_position; LevelFolder *level_folder; WigglyText wiggly_text; - Slider volume_slider; - Vec2f volume_slider_scale; ListSelector *list_selector; }; @@ -43,13 +41,7 @@ LevelPicker *create_level_picker(const Sprite_font *sprite_font, const char *dir } level_picker->lt = lt; - level_picker->background = PUSH_LT( - lt, - create_background(hexstr("073642")), - destroy_background); - if (level_picker->background == NULL) { - RETURN_LT(lt, NULL); - } + level_picker->background = create_background(hexstr("073642")); level_picker->camera_position = vec(0.0f, 0.0f); @@ -67,13 +59,6 @@ LevelPicker *create_level_picker(const Sprite_font *sprite_font, const char *dir .color = COLOR_WHITE, }; - level_picker->volume_slider = (Slider) { - .drag = 0, - .value = 80.0f, - .max_value = 100.0f, - }; - level_picker->volume_slider_scale = vec(0.25f, 0.10f); - level_picker->list_selector = PUSH_LT( lt, create_list_selector( @@ -103,7 +88,7 @@ int level_picker_render(const LevelPicker *level_picker, const Rect viewport = camera_view_port_screen(camera); - if (background_render(level_picker->background, camera) < 0) { + if (background_render(&level_picker->background, camera) < 0) { return -1; } @@ -138,20 +123,6 @@ int level_picker_render(const LevelPicker *level_picker, } } - { - /* CSS volume */ - const Rect position = { - .w = viewport.w * level_picker->volume_slider_scale.x, - .h = viewport.h * level_picker->volume_slider_scale.y, - .x = viewport.w - viewport.w * level_picker->volume_slider_scale.x - 5.0f, - .y = 5.0f, - }; - - /* HTML volume */ - if (slider_render(&level_picker->volume_slider, camera, position) < 0) { - return -1; - } - } return 0; } @@ -177,26 +148,6 @@ int level_picker_event(LevelPicker *level_picker, trace_assert(level_picker); trace_assert(event); - { - const Rect viewport = camera_view_port_screen(camera); - const Rect position = { - .w = viewport.w * level_picker->volume_slider_scale.x, - .h = viewport.h * level_picker->volume_slider_scale.y, - .x = viewport.w - viewport.w * level_picker->volume_slider_scale.x - 5.0f, - .y = 5.0f, - }; - int selected = 0; - if (slider_event( - &level_picker->volume_slider, - event, - position, - &selected) < 0) { - return -1; - } - if(selected){ - return 0; - } - } switch (event->type) { case SDL_WINDOWEVENT: { switch (event->window.event) { @@ -263,9 +214,3 @@ int level_picker_enter_camera_event(LevelPicker *level_picker, camera_center_at(camera, level_picker->camera_position); return 0; } - -float level_picker_get_volume(LevelPicker *level_picker) -{ - trace_assert(level_picker); - return level_picker->volume_slider.value; -}