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:
Stefan Neumann
2018-01-25 07:54:04 +01:00
parent a2af143d23 1c227c0dce
commit df535bb7d0
1 changed files with 67 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
settings.c
View File

@@ -22,6 +22,7 @@ Slider BT;
bool Settings_IsInit = false; bool Settings_IsInit = false;
<<<<<<< HEAD
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,10.0f,20.0f,&BS); Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,10.0f,20.0f,&BS);
@@ -31,10 +32,22 @@ void Settings_Initialize (SDL_Renderer* renderer) {
Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png"); Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
Settings_Ball_rect = (SDL_Rect){.x = 1200, .y = 300, .w=100, .h=100}; Settings_Ball_rect = (SDL_Rect){.x = 1200, .y = 300, .w=100, .h=100};
Settings_IsInit = true; Settings_IsInit = true;
=======
void Settings_Initialize(SDL_Renderer * renderer) {
Initialize_Slider(400, 300, Scalar_width, Bar_width, Slider_height, 1, 2, &BV);
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, 0, 8, &BT);
Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png");
Settings_rect = (SDL_Rect) {.x = 800, .y = 180, .w = 313, .h = 100 };
Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
Settings_Ball_rect = (SDL_Rect) {.x = 1200, .y = 300, .w = 100, .h = 100 };
Settings_IsInit = true;
>>>>>>> 1c227c0dce1e898cbd1bdf27149fdf2dcda801f3
} }
void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) { 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);
@@ -67,20 +80,17 @@ void Draw_Slider(SDL_Renderer* renderer,Slider* beta){
if (x > (beta->Bar_rect.x + beta->Bar_rect.w - (beta->Scalar_rect.w) / 2)) { 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->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); beta->Slider_value = (beta->Bar_rect.x + beta->Bar_rect.w - (beta->Scalar_rect.w) / 2);
} } else if (x < beta->Bar_rect.x + (beta->Scalar_rect.w) / 2) {
else if(x<beta->Bar_rect.x+(beta->Scalar_rect.w)/2){
beta->Scalar_rect.x = beta->Bar_rect.x; beta->Scalar_rect.x = beta->Bar_rect.x;
beta->Slider_value = beta->Bar_rect.x + (beta->Scalar_rect.w) / 2; beta->Slider_value = beta->Bar_rect.x + (beta->Scalar_rect.w) / 2;
} } else {
else{
beta->Scalar_rect.x = x - (beta->Scalar_rect.w / 2); beta->Scalar_rect.x = x - (beta->Scalar_rect.w / 2);
beta->Slider_value = x; beta->Slider_value = x;
} }
} } else {
else{
SDL_RenderDrawRect(renderer, &beta->Scalar_rect); SDL_RenderDrawRect(renderer, &beta->Scalar_rect);
} }
} } /* Draw_Slider */
void Draw_Ballstate(SDL_Renderer * renderer, Scenery * scenery){ void Draw_Ballstate(SDL_Renderer * renderer, Scenery * scenery){
BALL_Draw(renderer, &(scenery->ball)); BALL_Draw(renderer, &(scenery->ball));