From bb156995cd452420f6484ffcb544a7c01b2703d9 Mon Sep 17 00:00:00 2001 From: Andreas Neumann Date: Thu, 25 Jan 2018 21:45:48 +0100 Subject: [PATCH] Amazing Slider Upgrade --- bin/assets/images/bar_texture.png | Bin 0 -> 2218 bytes bin/assets/images/scalar_button_pressed.png | Bin 0 -> 542 bytes bin/assets/images/scalar_button_unpressed.png | Bin 0 -> 1319 bytes settings.c | 42 ++++++++++++++---- settings.h | 1 + 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 bin/assets/images/bar_texture.png create mode 100644 bin/assets/images/scalar_button_pressed.png create mode 100644 bin/assets/images/scalar_button_unpressed.png diff --git a/bin/assets/images/bar_texture.png b/bin/assets/images/bar_texture.png new file mode 100644 index 0000000000000000000000000000000000000000..bde1483c72f24acb67890ca707c73c8adb1b6bd9 GIT binary patch literal 2218 zcmeAS@N?(olHy`uVBq!ia0y~yVCe(0UvaPj$s>+@$AA=Lage(c!@6@aFM%AEbVpxD z28NCO+*YL;vjb?hIQv;UIIBR>5jgR z3=A9lx&I`x0{NT;9+AZi3_>L!%y=(Nz5=LbkEe@cNJZS+yN-Q}9Yk0iuiyE9u17p4 z%6O;dD%IE4Ntb05zTRp$_Ov%xpFUaLLgZdKHJ zs0b>EBx_N_{X{x~Z<2+_BZbap6*R`%;}5@`s+iXNMT76L;qA*$FC0%`|F`xV7|~Ul<1eF*p8RmAAMNxmjUi{Iz$wetpJui lzXj?xp=LnGioO4suAKD9(>{=%3M||hJYD@<);T3K0RUN0>p=hj literal 0 HcmV?d00001 diff --git a/settings.c b/settings.c index 15d2fcf..a995e0c 100644 --- a/settings.c +++ b/settings.c @@ -19,6 +19,9 @@ SDL_Texture * Settings_Texture; SDL_Texture * Settings_Ball_Texture; SDL_Texture * Settings_Skins_Texture; SDL_Texture * Return_Button_Texture; +SDL_Texture * Bar_Texture; +SDL_Texture * Scalar_Button_Texture0; +SDL_Texture * Scalar_Button_Texture1; SDL_Rect Settings_rect; SDL_Rect Settings_Ball_rect; @@ -32,6 +35,7 @@ Slider BT; Uint32 Mousestate; bool Settings_IsInit = false; +bool IsLock=false; void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery) { Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV,1.5); @@ -48,21 +52,27 @@ void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery) { Return_Button_Texture = IMG_LoadTexture(renderer, "assets/images/return_button.png"); Return_Button_rect = (SDL_Rect){.x = 200, .y = 200, .w=75, .h=75}; + Bar_Texture = IMG_LoadTexture(renderer, "assets/images/bar_texture.png"); + Scalar_Button_Texture0 = IMG_LoadTexture(renderer, "assets/images/scalar_button_unpressed.png"); + Scalar_Button_Texture1 = IMG_LoadTexture(renderer, "assets/images/scalar_button_pressed.png"); + Settings_IsInit = true; } void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) { double x; - + if(!(Mousestate & SDL_BUTTON(SDL_BUTTON_LEFT))){ + IsLock=BV.IsLock=BS.IsLock=BT.IsLock=false; + } + Draw_Slider(renderer, &BV); + Draw_Slider(renderer, &BS); + Draw_Slider(renderer, &BT); SDL_RenderCopy(renderer, Settings_Texture, NULL, &Settings_rect); SDL_RenderCopy(renderer, Return_Button_Texture, NULL, &Return_Button_rect); SDL_RenderCopy(renderer, Settings_Skins_Texture, NULL, &Settings_Skins_rect); BALL_DrawTexture(renderer, &Settings_Ball_rect, scenery->ball.TextureIndex); Settings_Return(); - Draw_Slider(renderer, &BV); - Draw_Slider(renderer, &BS); - Draw_Slider(renderer, &BT); mapping(&x, &BS); scenery->ball.TargetRect.w = x; scenery->ball.TargetRect.h = x; @@ -76,20 +86,29 @@ void Settings_Deinitialize(){ if (Settings_IsInit) { SDL_DestroyTexture(Settings_Texture); SDL_DestroyTexture(Settings_Ball_Texture); + SDL_DestroyTexture(Bar_Texture); + SDL_DestroyTexture(Return_Button_Texture); + SDL_DestroyTexture(Settings_Skins_Texture); Settings_IsInit = false; } } void Draw_Slider(SDL_Renderer * renderer, Slider * beta){ SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255); - SDL_RenderDrawRect(renderer, &beta->Bar_rect); + SDL_RenderCopy(renderer, Bar_Texture, NULL, &beta->Bar_rect); int x, y; Mousestate = SDL_GetMouseState(&x, &y); x = round((float)x / XScale); y = round((float)y / YScale); - if (y <= ((beta->Bar_rect.y) + (beta->Bar_rect.h)) && y >= (beta->Bar_rect.y) && x <= (beta->Bar_rect.w + beta->Bar_rect.x) && x >= (beta->Bar_rect.x) && (Mousestate & SDL_BUTTON(SDL_BUTTON_LEFT))) { - SDL_RenderFillRect(renderer, &beta->Scalar_rect); - SDL_RenderDrawRect(renderer, &beta->Scalar_rect); + if ((y <= ((beta->Bar_rect.y) + (beta->Bar_rect.h)) && y >= (beta->Bar_rect.y) && x <= (beta->Bar_rect.w + beta->Bar_rect.x) && x >= (beta->Bar_rect.x) && (Mousestate & SDL_BUTTON(SDL_BUTTON_LEFT)))||beta->IsLock) { + if(!IsLock){ + beta->IsLock=true; + IsLock=true; + } + if(beta->IsLock){ + // SDL_RenderFillRect(renderer, &beta->Scalar_rect); + // SDL_RenderDrawRect(renderer, &beta->Scalar_rect); + SDL_RenderCopy(renderer, Scalar_Button_Texture1, NULL, &beta->Scalar_rect); if (x > (beta->Bar_rect.x + beta->Bar_rect.w - (beta->Scalar_rect.w) / 2)) { beta->Scalar_rect.x = (beta->Bar_rect.x + beta->Bar_rect.w - (beta->Scalar_rect.w)); beta->Slider_value = (beta->Bar_rect.x + beta->Bar_rect.w - (beta->Scalar_rect.w) / 2); @@ -100,8 +119,13 @@ void Draw_Slider(SDL_Renderer * renderer, Slider * beta){ beta->Scalar_rect.x = x - (beta->Scalar_rect.w / 2); beta->Slider_value = x; } + } else { + // SDL_RenderDrawRect(renderer, &beta->Scalar_rect); + SDL_RenderCopy(renderer, Scalar_Button_Texture0, NULL, &beta->Scalar_rect); + } } else { - SDL_RenderDrawRect(renderer, &beta->Scalar_rect); + // SDL_RenderDrawRect(renderer, &beta->Scalar_rect); + SDL_RenderCopy(renderer, Scalar_Button_Texture0, NULL, &beta->Scalar_rect); } } /* Draw_Slider */ diff --git a/settings.h b/settings.h index ca610b2..40c974c 100644 --- a/settings.h +++ b/settings.h @@ -14,6 +14,7 @@ typedef struct sliderstruct { SDL_Rect Bar_rect; SDL_Rect Scalar_rect; + bool IsLock; double Slider_value,min,max; } Slider;