cnml/breakout
cnml/breakout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev

Browse Source
This commit is contained in:
Michael Chen 2018-01-22 23:06:30 +01:00
commit fc805e5c31
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.c
View File

@ -55,7 +55,7 @@ int main(int argc, char * args[]){
HIGHSCORES_Draw(renderer); HIGHSCORES_Draw(renderer);
break; break;
case Settings: case Settings:
Settings_Draw(renderer); Settings_Draw(renderer,&scenery);
break; break;
default: default:
printf("Unknow state was updated: %d\n", gameState); printf("Unknow state was updated: %d\n", gameState);

41
settings.c
View File

@ -9,6 +9,7 @@
#define Slider_height 100 #define Slider_height 100
#define Scalar_width 20 #define Scalar_width 20
#define Bar_width 400 #define Bar_width 400
#define round(x) ((int) ((x) + .5))
SDL_Texture* Settings_Texture; SDL_Texture* Settings_Texture;
SDL_Texture* Settings_Ball_Texture; SDL_Texture* Settings_Ball_Texture;
@ -23,8 +24,8 @@ bool Settings_IsInit=false;
void Settings_Initialize (SDL_Renderer* renderer) { void Settings_Initialize (SDL_Renderer* renderer) {
Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV); Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV);
Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,1,2,&BS); Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,10.0f,20.0f,&BS);
Initialize_Slider(400,700,Scalar_width,Bar_width,Slider_height,1,2,&BT); Initialize_Slider(400,700,Scalar_width,Bar_width,Slider_height,0,1,&BT);
Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png");
Settings_rect = (SDL_Rect){.x = 800, .y = 180, .w=313, .h=100}; Settings_rect = (SDL_Rect){.x = 800, .y = 180, .w=313, .h=100};
Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png"); Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
@ -32,14 +33,19 @@ void Settings_Initialize (SDL_Renderer* renderer) {
Settings_IsInit = true; Settings_IsInit = true;
} }
void Settings_Draw (SDL_Renderer* renderer) { void Settings_Draw (SDL_Renderer* renderer,Scenery* scenery) {
double x; double x;
SDL_RenderCopy(renderer, Settings_Texture, NULL, &Settings_rect); SDL_RenderCopy(renderer, Settings_Texture, NULL, &Settings_rect);
SDL_RenderCopy(renderer, Settings_Ball_Texture, NULL, &Settings_Ball_rect); SDL_RenderCopy(renderer, Settings_Ball_Texture, NULL, &Settings_Ball_rect);
Draw_Slider(renderer,&BV); Draw_Slider(renderer,&BV);
Draw_Slider(renderer,&BS); Draw_Slider(renderer,&BS);
Draw_Slider(renderer,&BT); Draw_Slider(renderer,&BT);
Draw_Ballstate(renderer,scenery);
mapping(&x,&BS);
scenery->ball.Speed=x;
mapping(&x,&BT); mapping(&x,&BT);
x=round(x);
scenery->ball.TextureIndex=x;
} }
void Settings_Deinitialize(){ void Settings_Deinitialize(){
@ -55,19 +61,19 @@ void Draw_Slider(SDL_Renderer* renderer,Slider* beta){
SDL_RenderDrawRect(renderer,&beta->Bar_rect); SDL_RenderDrawRect(renderer,&beta->Bar_rect);
int x,y; int x,y;
Uint32 Mousestate=SDL_GetMouseState(&x,&y); Uint32 Mousestate=SDL_GetMouseState(&x,&y);
if(y<=((beta->y)+(beta->h))&&y>=(beta->y)&&x<=(beta->bw+beta->x)&&x>=(beta->x)&&(Mousestate & SDL_BUTTON(SDL_BUTTON_LEFT))){ 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_RenderFillRect(renderer,&beta->Scalar_rect);
SDL_RenderDrawRect(renderer,&beta->Scalar_rect); SDL_RenderDrawRect(renderer,&beta->Scalar_rect);
if(x>(beta->x+beta->bw-(beta->sw)/2)){ if(x>(beta->Bar_rect.x+beta->Bar_rect.w-(beta->Scalar_rect.w)/2)){
beta->Scalar_rect.x=(beta->x+beta->bw-(beta->sw)); beta->Scalar_rect.x=(beta->Bar_rect.x+beta->Bar_rect.w-(beta->Scalar_rect.w));
beta->Slider_value=(beta->x+beta->bw-(beta->sw)/2); beta->Slider_value=(beta->Bar_rect.x+beta->Bar_rect.w-(beta->Scalar_rect.w)/2);
} }
else if(x<beta->x+(beta->sw)/2){ else if(x<beta->Bar_rect.x+(beta->Scalar_rect.w)/2){
beta->Scalar_rect.x=beta->x; beta->Scalar_rect.x=beta->Bar_rect.x;
beta->Slider_value=beta->x+(beta->sw)/2; beta->Slider_value=beta->Bar_rect.x+(beta->Scalar_rect.w)/2;
} }
else{ else{
beta->Scalar_rect.x=x-(beta->sw/2); beta->Scalar_rect.x=x-(beta->Scalar_rect.w/2);
beta->Slider_value=x; beta->Slider_value=x;
} }
} }
@ -76,19 +82,18 @@ void Draw_Slider(SDL_Renderer* renderer,Slider* beta){
} }
} }
void Draw_Ballstate(SDL_Renderer* renderer,Scenery* scenery){
BALL_Draw(renderer, &(scenery->ball));
}
void mapping(double *x,Slider* beta){ void mapping(double *x,Slider* beta){
*x=((beta->max-beta->min)/(beta->bw-(beta->sw)))*(beta->Slider_value-beta->x-beta->sw/2)+beta->min; *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){ void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta){
beta->Scalar_rect = (SDL_Rect){.x=x,.y=y,.w=sw,.h=h}; beta->Scalar_rect = (SDL_Rect){.x=x,.y=y,.w=sw,.h=h};
beta->Bar_rect = (SDL_Rect){.x=x,.y=y,.w=bw,.h=h}; beta->Bar_rect = (SDL_Rect){.x=x,.y=y,.w=bw,.h=h};
beta->x=x;
beta->y=y;
beta->sw=sw;
beta->bw=bw;
beta->h=h;
beta->max=max; beta->max=max;
beta->min=min; beta->min=min;
beta->Slider_value=x+sw/2; beta->Slider_value=x+beta->Scalar_rect.w/2;
} }

15
settings.h
View File

@ -7,24 +7,27 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_image.h> #include <SDL2/SDL_image.h>
#include <stdbool.h> #include <stdbool.h>
#include "breakout.h"
typedef struct sliderstruct { typedef struct sliderstruct {
SDL_Rect Bar_rect; SDL_Rect Bar_rect;
SDL_Rect Scalar_rect; SDL_Rect Scalar_rect;
int x,y,bw,sw,h;
double Slider_value,min,max; double Slider_value,min,max;
} Slider; } Slider;
void Settings_Initialize (SDL_Renderer* renderer);
void Settings_Draw (SDL_Renderer* renderer); void Settings_Draw (SDL_Renderer* renderer,Scenery* scenery);
void Settings_Deinitialize();
void Draw_Slider(SDL_Renderer* renderer,Slider* beta); void Draw_Slider(SDL_Renderer* renderer,Slider* beta);
void mapping(double *x,Slider* beta); void Draw_Ballstate(SDL_Renderer* renderer,Scenery* scenery);
void Settings_Initialize (SDL_Renderer* renderer);
void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta); void Initialize_Slider(int x,int y,int sw,int bw,int h,double min,double max,Slider* beta);
void Settings_Deinitialize();
void mapping(double *x,Slider* beta);
#endif #endif