From 17ab05f279fa1c2e9be5e0e97aa9b33fa8267160 Mon Sep 17 00:00:00 2001 From: Andreas Neumann Date: Thu, 1 Feb 2018 12:44:47 +0100 Subject: [PATCH] Added ball size visualization in settings Deleted stepslider --- bin/assets/images/circle.png | Bin 0 -> 18506 bytes bin/assets/images/l_arrow_button.png | Bin 2607 -> 0 bytes bin/assets/images/r_arrow_button.png | Bin 2589 -> 0 bytes old/settings.c | 110 +++++++++++++++++++++++++++ old/settings.h | 38 +++++++++ settings.c | 42 ++++------ settings.h | 14 ---- 7 files changed, 162 insertions(+), 42 deletions(-) create mode 100644 bin/assets/images/circle.png delete mode 100644 bin/assets/images/l_arrow_button.png delete mode 100644 bin/assets/images/r_arrow_button.png create mode 100644 old/settings.c create mode 100644 old/settings.h diff --git a/bin/assets/images/circle.png b/bin/assets/images/circle.png new file mode 100644 index 0000000000000000000000000000000000000000..b082f66387534f81406015c0b3ecff5d44d6c2f9 GIT binary patch literal 18506 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 C6)N`t literal 0 HcmV?d00001 diff --git a/bin/assets/images/l_arrow_button.png b/bin/assets/images/l_arrow_button.png deleted file mode 100644 index 274d37f9eedee8d5faf37f5b7f16b61016aede60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2607 zcmbVOYgAKL7Cz^2l^ca2A)*2T7g9i$qNpfnh+G01d;y)Z6u~i6yO37K#ZV+HP`E*+ z;E0hvREh$bN(*DHU=_tzi8>=L#R3X~GLfKCKt+NONg%*%`lsW}(s51xOLftKGCRBAzXm}L$rmIS(=lR`|wfvyh;;GC?Ee>Ke$G$G3(Z1k&rSa@abs=l8$avbGjy$C&MQ`?Z7g8I{9?W4~F`1pc{bTAoNUew0 zW22N3DuQmgLnjNnGc@5{L(ZDL`Oj#Iq8YAinz9!HPtO{bF${}vz_)aQCyUyIO@Rbs zLhHO%#ELO#Emn^SXqwNWa4&L~w>DD~ZoXuh==Nk8aRH3_--^*|@Xhn69L0evpuR%a zmJ)zDytYqY0g<+NYE19?d`?&mMmoEGHBtdaYFq|J&oA4ZlU|H4Uo&8HWS_oN=^DkL(h}LzQYQ~;d1nSDT%M;lQe*&GhbUBHVJS+?p zFo^iy&V4pR2#4y_OHREZ6IXmiC*^A=4v+d%&ImDBy_;8^v0&n`uePl*KzHBDxFGg= z_|8R`+<=#PB~RlBl|P9^_JPf}q2^OLv@qlN5gwnNj_^n3NIyt^E+RLKf7=0>Y(!Lk z{|8#|@FSv`$7L4^ILk}ZeQ?vusx)XBDVLK($~(6kpv$rmPd#1Tyd5kpZ9m{>EKz=9 ziWxQgHPyC9n+CRqeChhqj`?fZ*`r)Is>A zV%!szlsN09)$+OPkep3g;{@Zeb>#L&Ytx`U34U%Ui#aM%=W4QM?rT6w4I>=`@+Y|EntC9Rz($+~JQV)+7QhLc8#n>cl zW0bQaE^BCAX7=c#^^}izCn+eZAAUi{rewoYi9svSJg0fFDa)T-6mj$ zyfppF11d2n*G0u5MVDiV3T??gHiO|B`v?7GXw*J3g+&LG=SLku^XSG6+{NG%0Zusb zPOrSplN+;IsbJBu$9s>6xS1W=seFyWlo6n-*VZa7Kx_F69_-e7a$3_tML6orjqzi+ z_2vOTPtIiT?qthK`;^fT*GF%OZA9~cIt3c7Me_6^s=+y^3E>dqG@<5&Jp*>Dz;3S~ z#G21$hcCd-i(%0Jw_^WZ6m*m}Z1&_fkG1rL0U{o6K;-mKVp8DbitB#fwp#(9O5X%= zi$cb~ED*Bu$Ga4s+(YQ8&13ao`m%^cm(3;ZMJP?ip)^xqjTjHY8W?<;nV}%v(4^g+ zCpZe;tQ(#qFjFYk+G*YCyew(7*qb$Eh$Zg_+mfR0%7y=ByZ{RF)vWJOMJ9aWjeEiQSZihP}JXHcq* z?rDEYHS~~iH222%)WkxjWy1uIMM*S;^)w&+3ro{r2Qpl<#R*d$uqL}C==guB03n{6 zdNmzwI8brzTi`DDa%bf~U|;+xHCo2Fv&bvRK+lDk_FcQXjCf%Z$~!KL1ul%5ReVnn z3YA+OAt5t_t@G$UyeZ(QYJE6|p4zuz4wh3(ZE@B0}m0ixKJ zU`btv^>?Z<-b$GUz|^MwwlAnKM|r4r$U&{YTM zX}|K(p%t+f(98K>I16UGv1moC_dd;JLRGrDOWYbl)G=Tte#*nMw0RAO>M*eZ2F|&r zNTz6w6{GjTB-MYH3>vNuy)NQ3nYQKAvxktC%UeDq0JMm8t;4hx)Md}LMhDUi4Oduc z5X=NppPX}SF?E4gnx%JU6K7>1 z`TN~g$|P{EYMo5i0XUzYZnP(z;C$98YkmQw`b*rgMbyoSb+N^f@i~le-R+gz=rclp z9zfhH_!udd!S&jEH|ae126!yG!;qbDUG>93!At<|x~w#adI}YHikTzw0pRiugzll6 e1pYjoi@u;JMo=quh0j2=YDHMcNoi~rLjM9p4fARM diff --git a/bin/assets/images/r_arrow_button.png b/bin/assets/images/r_arrow_button.png deleted file mode 100644 index 75fc981c157779ac15fd3f931125ed773dffd2a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2589 zcmbtVaa2>+8Nc`DqA!-fi=iM4Fc36!bpk~zNF=WqMa~%E3^yEV%#>12@su0|353E6 zvyzGuI#*;?0g9OuBQ5DW|y&_omhM%fMfYyWJ=@&3toZ{GcW zzwiCN`};mlO-U3i3RnaH5F~9<{2TyCLI|h@A#XS)Fb`6he444Q zFT%beG21cVAEaLa(bdJ9joeOzTViCNORAPJ;8$f2gcsXVMAEP6(KLR;zp95Y)4wDxB# zP<@_e;7SM``T8}Cbu~oV!zm%?IYEBuc@OA&FlAl6_9JRcTII{^=N{wG1e3&)$by;P z(L+oeMA=3TP)~(oHhyxg#FD~-A0&|geTb=gh(>lbN276k&4a#Y z`FEaFlILOXT7SI*Q|e;H0!4i#fPX)e{}!?le5b+Fzyv{bYS(Bc{+1+i2>ogOT7*+O z|M4AlNNQQh8mjvFiv6-g>pH^QoU#m!l5;cEcA%dkyw}BjN;OIuFe=G|xQ`^58rvM& zVgj(yXz`%6N*45emG&`LglrzPa57GBs2ZkRa)?@jsKDh6C~q&w#}wx!*3zkb@kVmlDytyWt&O(^} zA`yJnb7xEl$+_%A*=(dc@NPcWumMvn_(PDx)$R`BTl<=PNs-8~@5+R?hy+f1(S-~J z3qlj{Ct+U{6JDGCWGg^P?6s|=vlq)@82oWAY2hRnuEM8UKLs$%Az~KSKlvrXRacbY zzr5&UlNxq%l}ge%K9|0!0XsLwcav{=@V1DFQg@!DXlBulZOI@?Qa2)DK*t!reo2ch z4O8NeB33SEYd%rBdv50>PW9|{yg|_Z=I1A3u3weTkdsTFm&S<{dqL+N5i@~kX5JBJ z_YfNf;7^ts!GVRFKszrZJ{Wp>SCQ4(Vi{TzEGDb$X)TVFF=S`!*C1{6C2Cp1iSy~3-P4Tc;W*vM+iTRqMSeUFlRS=Ix zhIaJTf@{L&4;av3t0n(MqNWsM7uw+0iw<`hy?;wU zsq>2+c1%Z~ckz)^J448@M|vb|824ZZN3J{3H%-+aEiEh{M%H>B!p6#oU=tDjsQew! zb#tmLVjg9;$V$cWx;?P$sS zD&lffy|yDz{(H9_4Zc{lHOg%#_g~-Z%0$GFj!fO$-Ql*AgXz~DNBG2&lKYfjz3#S? za8*>Na=AtYE)CbUnz9;*$;#!W@495>w4kyH;YcV0u;nkh880yjBGrP!mJM#OoT;Zl z3<=a+K){I#g39zfdJxCD;n~%z68!Y$*SIOy_J%(`UVyMw_fnvH|JzVEl?@F;y#hCt zx5rNVS5SnC&!4Mzt)U5(-jePJGbby(&WRt{BW|4hBvt6J!05~@X-Bj8K&Icf&eh(od zKgjLHbB?I16=suBI4)cQ^zjH=I#uuCABczR@B*gZ2;kE*J^uQAiS5S#Y~6U0*1sUbyY#>ZESE#r1k@(rNiu3* z_@9TUnM~uHyhXxZrPznb>liLHjYOLyESHRMWVByei2Y4MH$5_^>{WLXNNuy}dn{P* qODLCZPs3TXnDvjXL9evoTv(cMV(Zger}cn5NgGlWO$q8U0R9EyP03UM diff --git a/old/settings.c b/old/settings.c new file mode 100644 index 0000000..70842ba --- /dev/null +++ b/old/settings.c @@ -0,0 +1,110 @@ +#include +#include +#include +#include +#include + +#include "settings.h" + +#define Slider_height 100 +#define Scalar_width 20 +#define Bar_width 400 +#define round(x) ((int) ((x) + .5)) +#define distance(x1,y1,x2,y2) ((int)(sqrt(pow(x2-x1,2)+pow(y2-y1,2)))) + +SDL_Texture* Settings_Texture; +SDL_Texture* Settings_Return_Button_Texture; + +SDL_Rect Settings_rect; +SDL_Rect Settings_Return_Button_rect; +Slider BV; +Slider BS; +Slider BT; +Uint32 Mousestate; +bool Settings_IsInit=false; + +void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery) { + Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV,1.5); + Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,30,100,&BS,scenery->ball.TargetRect.w); + Initialize_Slider(400,700,Scalar_width,Bar_width,Slider_height,0,8,&BT,scenery->ball.TextureIndex); + Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); + Settings_rect = (SDL_Rect){.x = 800, .y = 180, .w=313, .h=100}; + Settings_Return_Button_Texture = IMG_LoadTexture(renderer, "assets/images/return_button.png"); + Settings_Return_Button_rect = (SDL_Rect){.x = 200, .y = 200, .w=75, .h=75}; + Settings_IsInit = true; +} + +void Settings_Draw (SDL_Renderer* renderer,Scenery* scenery) { + double x; + scenery->ball.TargetRect.x=900; + scenery->ball.TargetRect.y=700; + SDL_RenderCopy(renderer, Settings_Texture, NULL, &Settings_rect); + SDL_RenderCopy(renderer, Settings_Return_Button_Texture, NULL, &Settings_Return_Button_rect); + Draw_Slider(renderer,&BV); + Draw_Slider(renderer,&BS); + Draw_Slider(renderer,&BT); + Draw_Ballstate(renderer,scenery); + mapping(&x,&BT); + scenery->ball.TextureIndex=round(x); + mapping(&x,&BS); + scenery->ball.TargetRect.w=x; + scenery->ball.TargetRect.h=x; + Settings_Return(); +} + +void Settings_Deinitialize(){ + if(Settings_IsInit){ + SDL_DestroyTexture(Settings_Texture); + SDL_DestroyTexture(Settings_Ball_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); + int x,y; + Mousestate=SDL_GetMouseState(&x,&y); + 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(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); + } + else if(xBar_rect.x+(beta->Scalar_rect.w)/2){ + beta->Scalar_rect.x=beta->Bar_rect.x; + beta->Slider_value=beta->Bar_rect.x+(beta->Scalar_rect.w)/2; + } + else{ + beta->Scalar_rect.x=x-(beta->Scalar_rect.w/2); + beta->Slider_value=x; + } + } + else{ + SDL_RenderDrawRect(renderer,&beta->Scalar_rect); + } +} + +void Draw_Ballstate(SDL_Renderer* renderer,Scenery* scenery){ + BALL_Draw(renderer, &(scenery->ball)); +} + +void mapping(double *x,Slider* beta){ + *x=((beta->max-beta->min)/(beta->Bar_rect.w-(beta->Scalar_rect.w)))*(beta->Slider_value-beta->Bar_rect.x-beta->Scalar_rect.w/2)+beta->min; +} + +void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta,double defaultvalue){ + beta->Scalar_rect = (SDL_Rect){.x=(defaultvalue-min)/(max-min)*(bw-sw/2)+x,.y=y,.w=sw,.h=h}; + beta->Bar_rect = (SDL_Rect){.x=x,.y=y,.w=bw,.h=h}; + beta->max=max; + beta->min=min; + beta->Slider_value=(defaultvalue-min)/(max-min)*(bw-sw/2)+x; +} + +void Settings_Return(Scenery* scenery){ + int x,y; + Mousestate=SDL_GetMouseState(&x,&y); + if((distance(x,y,237,237)<=37)&&(Mousestate & SDL_BUTTON(SDL_BUTTON_LEFT))) + GAME_ChangeState(MainMenu); +} diff --git a/old/settings.h b/old/settings.h new file mode 100644 index 0000000..c1a518b --- /dev/null +++ b/old/settings.h @@ -0,0 +1,38 @@ +#ifndef __Settings__ + +#define __Settings__ + +#include +#include +#include +#include +#include +#include +#include "breakout.h" +#include "gamestate.h" +#include "main.h" + +typedef struct sliderstruct { + SDL_Rect Bar_rect; + SDL_Rect Scalar_rect; + double Slider_value,min,max; +} Slider; + + +void Settings_Draw (SDL_Renderer* renderer,Scenery* scenery); + +void Draw_Slider(SDL_Renderer* renderer,Slider* beta); + +void Draw_Ballstate(SDL_Renderer* renderer,Scenery* scenery); + +void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery); + +void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta,double defaultvalue); + +void Settings_Deinitialize(); + +void mapping(double *x,Slider* beta); + +void Settings_Return(); + +#endif diff --git a/settings.c b/settings.c index f94da7a..900348b 100644 --- a/settings.c +++ b/settings.c @@ -22,19 +22,17 @@ SDL_Texture * Return_Button_Texture; SDL_Texture * Bar_Texture; SDL_Texture * Scalar_Button_Texture0; SDL_Texture * Scalar_Button_Texture1; -SDL_Texture * L_Arrow_Texture; -SDL_Texture * R_Arrow_Texture; - +SDL_Texture * Circle_Texture; SDL_Rect Settings_rect; SDL_Rect Settings_Ball_rect; SDL_Rect Settings_Skins_rect; SDL_Rect Return_Button_rect; +SDL_Rect Circle_rect; Slider BV; Slider BS; Slider BT; -Stepslider SBT; Uint32 Mousestate; @@ -43,9 +41,9 @@ 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); - Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,30,100,&BS,scenery->ball.TargetRect.w); + Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,10,100,&BS,scenery->ball.TargetRect.w); Initialize_Slider(400,700,Scalar_width,Bar_width,Slider_height,0,8,&BT,scenery->ball.TextureIndex); - Initialize_Stepslider(400,300,Scalar_width,Bar_width,Slider_height,0,8,&SBT,scenery->ball.TextureIndex); + //Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,0,8,&BT,scenery->paddle.TextureIndex); Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); Settings_rect = (SDL_Rect){.x = 647, .y = 50, .w=626, .h=200}; @@ -61,8 +59,8 @@ void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery) { Scalar_Button_Texture0 = IMG_LoadTexture(renderer, "assets/images/scalar_button_unpressed.png"); Scalar_Button_Texture1 = IMG_LoadTexture(renderer, "assets/images/scalar_button_pressed.png"); - R_Arrow_Texture = IMG_LoadTexture(renderer, "assets/images/r_arrow_button.png" ); - L_Arrow_Texture = IMG_LoadTexture(renderer, "assets/images/l_arrow_button.png" ); + Circle_Texture = IMG_LoadTexture(renderer,"assets/images/circle.png"); + Circle_rect = (SDL_Rect){.x = 1200, .y = 500, .w=75, .h=75}; Settings_IsInit = true; } @@ -74,20 +72,24 @@ void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) { }else{ IsLock=true; } - // Draw_Slider(renderer, &BV); + Draw_Slider(renderer, &BV); Draw_Slider(renderer, &BS); Draw_Slider(renderer, &BT); - Draw_Stepslider(renderer, &SBT); 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); + SDL_RenderCopy(renderer, Circle_Texture, NULL, &Circle_rect); BALL_DrawTexture(renderer, &Settings_Ball_rect, scenery->ball.TextureIndex); Settings_Return(); - mapping(&x, &BS); scenery->ball.TargetRect.w = x; scenery->ball.TargetRect.h = x; scenery->ball.Size = ((double)x / 2.0f); + int posx=1200,posy=500; + Circle_rect.x=posx-0.5*Circle_rect.w; + Circle_rect.y=posy+0.5*(100-Circle_rect.w); + Circle_rect.w=x; + Circle_rect.h=x; mapping(&x, &BT); x = round(x); scenery->ball.TextureIndex = x; @@ -102,6 +104,7 @@ void Settings_Deinitialize(){ SDL_DestroyTexture(Settings_Skins_Texture); SDL_DestroyTexture(Scalar_Button_Texture0); SDL_DestroyTexture(Scalar_Button_Texture1); + SDL_DestroyTexture(Circle_Texture); Settings_IsInit = false; } } @@ -138,13 +141,6 @@ void Draw_Slider(SDL_Renderer * renderer, Slider * beta){ } } /* Draw_Slider */ -void Draw_Stepslider(SDL_Renderer* renderer,Stepslider* beta){ - SDL_RenderCopy(renderer, Bar_Texture, NULL, &beta->Bar_rect); - SDL_RenderCopy(renderer, Scalar_Button_Texture0, NULL, &beta->Scalar_rect); - SDL_RenderCopy(renderer, L_Arrow_Texture, NULL, &beta->L_Arrow_rect); - SDL_RenderCopy(renderer, R_Arrow_Texture, NULL, &beta->R_Arrow_rect); -} - void mapping(double * x, Slider * beta){ *x = ((beta->max - beta->min) / (beta->Bar_rect.w - (beta->Scalar_rect.w))) * (beta->Slider_value - beta->Bar_rect.x - beta->Scalar_rect.w / 2) + beta->min; } @@ -157,16 +153,6 @@ void Initialize_Slider(int x, int y, int sw, int bw, int h, double min, double m beta->Slider_value = (defaultvalue-min)/(max-min)*(bw-sw/2)+x; } -void Initialize_Stepslider(int x,int y,int sw,int bw,int h,double min,double max,Stepslider* beta,double defaultvalue){ - beta->Scalar_rect = (SDL_Rect) {.x = (defaultvalue-min)/(max-min)*(bw-sw/2)+x, .y = y, .w = sw, .h = h }; - beta->Bar_rect = (SDL_Rect) {.x = x, .y = y, .w = bw, .h = h }; - beta->L_Arrow_rect = (SDL_Rect) {.x = x-30-h, .y = y, .w = h, .h = h }; - beta->R_Arrow_rect = (SDL_Rect) {.x = x+bw+30, .y = y, .w = h, .h = h }; - beta->max = max; - beta->min = min; - beta->Slider_value = (defaultvalue-min)/(max-min)*(bw-sw/2)+x; -} - void Settings_Return(){ if(!IsLock){ int x,y; diff --git a/settings.h b/settings.h index c8bef88..57542bb 100644 --- a/settings.h +++ b/settings.h @@ -18,28 +18,14 @@ typedef struct sliderstruct { double Slider_value,min,max; } Slider; -typedef struct stepsliderstruct { - SDL_Rect Bar_rect; - SDL_Rect Scalar_rect; - SDL_Rect L_Arrow_rect; - SDL_Rect R_Arrow_rect; - bool IsLock; - double Slider_value,min,max; -} Stepslider; - - void Settings_Draw (SDL_Renderer* renderer,Scenery* scenery); void Draw_Slider(SDL_Renderer* renderer,Slider* beta); -void Draw_Stepslider(SDL_Renderer* renderer,Stepslider* beta); - void Settings_Initialize (SDL_Renderer* renderer,Scenery* scenery); void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta,double defaultvalue); -void Initialize_Stepslider(int x,int y,int sw,int bw,int h,double min,double max,Stepslider* beta,double defaultvalue); - void Settings_Deinitialize(); void mapping(double *x,Slider* beta);