From c03f5db6ddb7286950a4ff53f47b3acab1918251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=B2sweg?= Date: Sun, 21 May 2017 20:30:17 +0200 Subject: [PATCH] Better collisions and entity handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Pòsweg --- block.cpp | 16 +--------------- core.cpp | 41 +++++++++++++++++++++++++++++------------ core.h | 4 ++++ main | Bin 24052 -> 23972 bytes player.cpp | 4 +--- powerup.cpp | 17 ++++------------- powerup.h | 3 +-- texture.cpp | 0 8 files changed, 40 insertions(+), 45 deletions(-) mode change 100755 => 100644 texture.cpp diff --git a/block.cpp b/block.cpp index c8150cf..a3fa7cd 100644 --- a/block.cpp +++ b/block.cpp @@ -7,7 +7,6 @@ Block::Block(int x, int y, int w, int h,SDL_Renderer** render, Player* player, i //Set the renderer pointer renderer = render; - posu = player; type = 1; //New SDL_Rect to make the objects follow the camera @@ -18,18 +17,5 @@ Block::Block(int x, int y, int w, int h,SDL_Renderer** render, Player* player, i SDL_SetRenderDrawColor(*renderer,0,0xFF,0,0xFF); SDL_RenderFillRect(*renderer,&cameraFix); - posu->check(rect,type); + player->check(rect,type); } - -/* -void Block::print(int cameraX){ - //New SDL_Rect to make the objects follow the camera - SDL_Rect cameraFix = rect; - cameraFix.x -= cameraX; - - //Set render color and render the rectangle - SDL_SetRenderDrawColor(*renderer,0,0xFF,0,0xFF); - SDL_RenderFillRect(*renderer,&cameraFix); - - posu->check(rect,type); -};*/ diff --git a/core.cpp b/core.cpp index e7223c2..4df2d03 100644 --- a/core.cpp +++ b/core.cpp @@ -26,36 +26,53 @@ int Core::coreInit(){ bool quit = false; SDL_Event e; - - Player posweg(&gRenderer); - - Powerup powerup(13*sz,SCREEN_HEIGHT-sz*4,&gRenderer,&posweg); - while(!quit){ while(SDL_PollEvent(&e)!=0){ if(e.type == SDL_QUIT){ quit = true; } } - - Camera camera(36*sz,SCREEN_WIDTH); - SDL_SetRenderDrawColor(gRenderer,0,0,100,0xFF); SDL_RenderClear(gRenderer); + + SDL_RenderPresent(gRenderer); + } + map1(); + + close(); + return 0; +}; + +void Core::map1(){ + Player posweg(&gRenderer); + + bool quit = false; + SDL_Event e; + + while(quit == false){ + while(SDL_PollEvent(&e)!=0){ + if(e.type == SDL_QUIT){ + quit = true; + } + } + SDL_SetRenderDrawColor(gRenderer,0,0,100,0xFF); + SDL_RenderClear(gRenderer); + + Camera camera(36*sz,SCREEN_WIDTH); + posweg.print(100,100,camera.getPosX()); + camera.update(posweg.getRectangle().x,posweg.getRectangle().y); Block wallA(8*sz,7*sz,sz*2,sz*2,&gRenderer,&posweg,camera.getPosX()); Block wallB(4*sz,9*sz,sz,sz*2,&gRenderer,&posweg,camera.getPosX()); Block wallC(6*sz,9*sz,sz,sz*2,&gRenderer,&posweg,camera.getPosX()); Block ground(0,11*sz,16*sz,sz,&gRenderer,&posweg,camera.getPosX()); Block ground2(sz*20,sz*11,sz*16,sz,&gRenderer,&posweg,camera.getPosX()); + Powerup powerup(13*sz,8*sz,&gRenderer,&posweg,camera.getPosX()); - camera.update(posweg.getRectangle().x,posweg.getRectangle().y); SDL_RenderPresent(gRenderer); } - close(); - return 0; + }; - diff --git a/core.h b/core.h index 66ca716..19a462a 100644 --- a/core.h +++ b/core.h @@ -17,6 +17,8 @@ class Core{ private: void init(); void close(); + + void map1(); const int SCREEN_WIDTH = 640; const int SCREEN_HEIGHT = 480; @@ -24,6 +26,8 @@ class Core{ SDL_Window* gWindow = NULL; SDL_Renderer* gRenderer = NULL; + + //Player posweg(&gRenderer); }; #endif diff --git a/main b/main index e6d1a22e93f6cbc70919f0969662a9444bb1923f..c3ea9f8573deb7e43a02b3b837c1faaff4f8c0de 100755 GIT binary patch delta 9570 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 delta 9627 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 diff --git a/player.cpp b/player.cpp index 2ef6244..eb11190 100644 --- a/player.cpp +++ b/player.cpp @@ -24,7 +24,6 @@ void Player::print(int x,int y,int cameraX){ ply.render(&cameraFix,&plyRun); power--; } - if(ifRunning or power > 0)ply.render(&cameraFix,&plyFrame[1]); move(); @@ -41,6 +40,7 @@ Player::Player(SDL_Renderer** render){ ply.setRenderer(renderer); loadMedia(); + //first = true; }; void Player::loadMedia(){ @@ -163,8 +163,6 @@ int Player::check(SDL_Rect rectA, int type){ and ((movY > bY and movY < b2Y) or (movY + szH > bY and movY + szH < b2Y) or (movY < bY and movY + szH > b2Y))){ - //movX += cos(angle) / 2; - //movY += sin(angle) / 2; movX -= (posX - oldPosX)/2; movY -= (posY - oldPosY)/2; collision = 1; diff --git a/powerup.cpp b/powerup.cpp index efc8ace..d0b6b9b 100644 --- a/powerup.cpp +++ b/powerup.cpp @@ -2,28 +2,19 @@ #include"powerup.h" -Powerup::Powerup(int x, int y, SDL_Renderer** render,Player* player){ - posX = x; - posY = y; - szW = 20; - szH = 20; - - type = 2; - - rect = {posX, posY, szW, szH}; +Powerup::Powerup(int x, int y, SDL_Renderer** render,Player* player, int cameraX){ + rect = {x,y,20,20}; renderer = render; - posu = player; -}; + type = 2; -void Powerup::print(int cameraX){ //New SDL_Rect to make the objects follow the camera SDL_Rect cameraFix = rect; cameraFix.x -= cameraX; //Set render color and render the rectangle - if(posu->check(rect,type)==0){ + if(player->check(rect,type)==0){ SDL_SetRenderDrawColor(*renderer,0xFF,0xFF,0,0xFF); SDL_RenderFillRect(*renderer,&cameraFix); } diff --git a/powerup.h b/powerup.h index bebcb7c..41187c0 100644 --- a/powerup.h +++ b/powerup.h @@ -12,8 +12,7 @@ class Entity; class Powerup: public Entity{ public: - Powerup(int x, int y, SDL_Renderer** render, Player* player); - void print(int cameraX); + Powerup(int x, int y, SDL_Renderer** render, Player* player,int); protected: Player* posu; }; diff --git a/texture.cpp b/texture.cpp old mode 100755 new mode 100644