From 9479b5d9e563e0c87f73e1a5ab2f37aa388d8936 Mon Sep 17 00:00:00 2001 From: aleksav013 Date: Wed, 26 May 2021 20:05:33 +0200 Subject: Adding textures and introducing powerups --- main.cpp | 115 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 88 insertions(+), 27 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index c08a2cf..ff326c2 100644 --- a/main.cpp +++ b/main.cpp @@ -1,6 +1,7 @@ #include #include #include +#define seseku(a,b) a.getGlobalBounds().intersects(b.getGlobalBounds()) class Global { public: @@ -12,9 +13,7 @@ class Entity public: float x,y; sf::RectangleShape telo; - Entity() {} - Entity(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja); -}; + Entity() {} Entity(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja); }; Entity::Entity(sf::Vector2f pozicija, sf::Vector2f velicina,sf::Color boja) { telo.setSize(velicina); @@ -22,8 +21,20 @@ Entity::Entity(sf::Vector2f pozicija, sf::Vector2f velicina,sf::Color boja) telo.setOrigin(sf::Vector2f(telo.getSize().x/2,telo.getSize().y/2)); x=pozicija.x; y=pozicija.y; -} -class Enemy:public Entity { +} +class Powerup:public Entity +{ + public: + bool ziv=1; + Powerup():Entity() {} + Powerup(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja); +}; +Powerup::Powerup(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja):Entity(pozicija,velicina,boja) +{ + +} +class Enemy:public Entity +{ public: bool ziv=1; Enemy():Entity() {} @@ -41,7 +52,8 @@ void Enemy::kaigracu(float igracx,float igracy,float dt) x+=dx; y+=dy; } -class Enemy2:public Entity { +class Enemy2:public Entity +{ private: float vx,vy; public: @@ -70,7 +82,8 @@ void Enemy2::izracunajpoz() x+=vx; y+=vy; } -class Enemy3:public Entity { +class Enemy3:public Entity +{ public: float vx,vy; bool ziv=1; @@ -96,6 +109,7 @@ class Player:public Entity Player():Entity() {} Player(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja); + void updatest(float dt); }; Player::Player(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja):Entity(pozicija,velicina,boja) { @@ -103,18 +117,25 @@ Player::Player(sf::Vector2f pozicija,sf::Vector2f velicina,sf::Color boja):Entit stomptime=0; xp=0; } +void Player::updatest(float dt) +{ + if(stomptime>0) stomptime-=dt; + else stomptime=0; +} class Game { private: sf::Font font; + sf::Texture tekstura,neprijatelj; float dt; sf::Clock sat; - float time,time2,time3; + float time,time2,time3,time4; Player igrac; std::vector nep; std::vector nep2; std::vector nep3; + std::vector pow; int visina,sirina; sf::RenderWindow prozor; @@ -122,7 +143,7 @@ class Game sf::CircleShape krug; sf::RectangleShape health,healthblank,stomp,stompblank; - sf::Text healthtext,stomptext; + sf::Text healthtext,stomptext,fps; void events(); void keyboard(); @@ -140,14 +161,16 @@ Game::Game() time=8; time2=14; time3=10; - prozor.create(sf::VideoMode(1024,1024),"RPG igra"); + time4=20; + prozor.create(sf::VideoMode::getFullscreenModes()[0],"RPG igra"); visina=prozor.getSize().y; sirina=prozor.getSize().x; prozor.setFramerateLimit(60); igrac = Player(sf::Vector2f((float)sirina/2,(float)visina/2),sf::Vector2f(100.0f,100.0f),sf::Color::White); for(int i=0;i<20;i++) nep.push_back(Enemy(sf::Vector2f(Global::rng()%sirina,Global::rng()%visina),sf::Vector2f(50.0f,50.0f),sf::Color::Red)); - for(int i=0;i<7;i++) nep2.push_back(Enemy2(sf::Vector2f(Global::rng()%sirina,Global::rng()%visina),sf::Vector2f(50.0f,50.0f),sf::Color::Blue)); + for(int i=0;i<7;i++) nep2.push_back(Enemy2(sf::Vector2f(Global::rng()%sirina,Global::rng()%visina),sf::Vector2f(50.0f,50.0f),sf::Color::Cyan));//(253,106,2))); for(int i=0;i<4;i++) nep3.push_back(Enemy3(sf::Vector2f(Global::rng()%sirina,Global::rng()%visina),sf::Vector2f(50.0f,50.0f),sf::Color::Yellow)); + pow.push_back(Powerup(sf::Vector2f(Global::rng()%sirina,Global::rng()%visina),sf::Vector2f(50.0f,50.0f),sf::Color::White)); igrac.x=(float)prozor.getSize().x/2; igrac.y=(float)prozor.getSize().y/2; @@ -164,10 +187,10 @@ Game::Game() stomp.setSize(sf::Vector2f(sirina/3.0,50.0)); stomp.setFillColor(sf::Color::Blue); - stomp.setPosition(sirina*2.0/3,0); + stomp.setPosition(0,50); stompblank.setSize(sf::Vector2f(sirina/3.0,50.0)); stompblank.setFillColor(sf::Color::White); - stompblank.setPosition(sirina*2.0/3,0); + stompblank.setPosition(0,50); if(!font.loadFromFile("LiberationMono-Regular.ttf")) { @@ -180,13 +203,30 @@ Game::Game() stomptext.setFont(font); stomptext.setString("Stomp"); stomptext.setCharacterSize(24); - stomptext.setPosition(2/3.0*sirina,0); + stomptext.setPosition(0,50); stomptext.setFillColor(sf::Color::Black); + fps.setFont(font); + fps.setCharacterSize(24); + fps.setFillColor(sf::Color::White); + fps.setPosition(sirina*5.0/6,0); + if(!tekstura.loadFromFile("healing.png")) + { + std::cout<<"Texture not found\n"; + } + if(!neprijatelj.loadFromFile("nep.png")) + { + std::cout<<"Texture not found\n"; + } + for(int i=0;i0) igrac.stomptime-=dt; + igrac.updatest(dt); //game over if(igrac.health<=0) @@ -287,6 +329,7 @@ void Game::run() //izracunajpoz for(int i=0;ivisina) nep3[i].vy=-nep3[i].vy; nep3[i].izracunajpoz(); } + //respawn time-=dt; time2-=dt; time3-=dt; + time4-=dt; if(time<0) { time=8; @@ -328,13 +373,24 @@ void Game::run() nep3[i].y=Global::rng()%visina; } } + if(time4<0) + { + time4=20; + for(int i=0;i