From 226a7b76576a2faec14766e0ff98c5faa00aba5c Mon Sep 17 00:00:00 2001 From: serk Date: Sat, 21 Jan 2017 02:32:26 +0100 Subject: [PATCH 1/3] aux commit --- VaporWaveWars/VaporWaveWars.pro | 12 ++++++++++-- VaporWaveWars/combat.cpp | 23 +++++++++++++++++++++++ VaporWaveWars/combat.hpp | 28 ++++++++++++++++++++++++++++ VaporWaveWars/enemy.cpp | 7 +++++++ VaporWaveWars/enemy.hpp | 17 +++++++++++++++++ VaporWaveWars/iaenemy.cpp | 10 ++++++++++ VaporWaveWars/iaenemy.hpp | 13 +++++++++++++ VaporWaveWars/player.cpp | 31 +++++++++++++++++++++++++++++++ VaporWaveWars/player.hpp | 16 ++++++++++++++++ 9 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 VaporWaveWars/combat.cpp create mode 100644 VaporWaveWars/combat.hpp create mode 100644 VaporWaveWars/enemy.cpp create mode 100644 VaporWaveWars/enemy.hpp create mode 100644 VaporWaveWars/iaenemy.cpp create mode 100644 VaporWaveWars/iaenemy.hpp create mode 100644 VaporWaveWars/player.cpp create mode 100644 VaporWaveWars/player.hpp diff --git a/VaporWaveWars/VaporWaveWars.pro b/VaporWaveWars/VaporWaveWars.pro index 8515d27..da4b695 100644 --- a/VaporWaveWars/VaporWaveWars.pro +++ b/VaporWaveWars/VaporWaveWars.pro @@ -11,7 +11,11 @@ SOURCES += main.cpp \ character.cpp \ compas.cpp \ scene.cpp \ - menu.cpp + menu.cpp \ + combat.cpp \ + player.cpp \ + enemy.cpp \ + iaenemy.cpp HEADERS += \ game.hpp \ @@ -21,4 +25,8 @@ HEADERS += \ character.hpp \ compas.hpp \ scene.hpp \ - menu.hpp + menu.hpp \ + combat.hpp \ + player.hpp \ + enemy.hpp \ + iaenemy.hpp diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp new file mode 100644 index 0000000..69cf723 --- /dev/null +++ b/VaporWaveWars/combat.cpp @@ -0,0 +1,23 @@ +#include "combat.hpp" + +Combat::Combat() { + ia = playerOneTurn = true; + enemy = new IaEnemy(); +} + + +void Combat::update(float deltaTime, sf::RenderWindow *window) { + if (playerOneTurn) player.update(deltaTime, window); + else if (ia) playerOneTurn = enemy->update(deltaTime, window); +} + +void Combat::draw(sf::RenderWindow *window) { + player.draw(window); + enemy->draw(window); + //draw background +} + +void Combat::updateButtons(sf::Event e) { + if (playerOneTurn) playerOneTurn = player.event(e); + else if (!ia) playerOneTurn = !enemy->event(e); +} diff --git a/VaporWaveWars/combat.hpp b/VaporWaveWars/combat.hpp new file mode 100644 index 0000000..d940cd7 --- /dev/null +++ b/VaporWaveWars/combat.hpp @@ -0,0 +1,28 @@ +#ifndef COMBAT_H +#define COMBAT_H + +#include "commons.hpp" +#include "compas.hpp" +#include "scene.hpp" +#include "player.hpp" +#include "iaenemy.hpp" +#include "enemy.hpp" + +class Combat : public Scene { +public: + Combat(); + Combat(const Combat& m) = delete; + Combat(const Combat&& m) = delete; + Combat& operator=(Combat& m) = delete; + Combat& operator=(Combat&& m) = delete; + void update(float deltaTime, sf::RenderWindow *window) final override; + void draw(sf::RenderWindow *window) final override; + void updateButtons(sf::Event e) final override; +private: + Compas compas; + bool playerOneTurn, ia; + Player player; + Enemy *enemy; +}; + +#endif // COMBAT_H diff --git a/VaporWaveWars/enemy.cpp b/VaporWaveWars/enemy.cpp new file mode 100644 index 0000000..ef4d0df --- /dev/null +++ b/VaporWaveWars/enemy.cpp @@ -0,0 +1,7 @@ +#include "enemy.hpp" + +Enemy::Enemy() {} + +void Enemy::draw(sf::RenderWindow *window) { + +} diff --git a/VaporWaveWars/enemy.hpp b/VaporWaveWars/enemy.hpp new file mode 100644 index 0000000..e9fdeb2 --- /dev/null +++ b/VaporWaveWars/enemy.hpp @@ -0,0 +1,17 @@ +#ifndef ENEMY_H +#define ENEMY_H + +#include "commons.hpp" + +class Enemy +{ +public: + Enemy(); + virtual bool update(float deltaTime, sf::RenderWindow *window) = 0; + void draw(sf::RenderWindow *window) ; + virtual bool event(sf::Event e) = 0; +protected: + bool animate; +}; + +#endif // ENEMY_H diff --git a/VaporWaveWars/iaenemy.cpp b/VaporWaveWars/iaenemy.cpp new file mode 100644 index 0000000..2b00d8a --- /dev/null +++ b/VaporWaveWars/iaenemy.cpp @@ -0,0 +1,10 @@ +#include "iaenemy.hpp" + +IaEnemy::IaEnemy() {} + +bool IaEnemy::update(float deltaTime, sf::RenderWindow *window) { + //some playe return true + return true; +} + +bool IaEnemy::event(sf::Event e) {return false;} diff --git a/VaporWaveWars/iaenemy.hpp b/VaporWaveWars/iaenemy.hpp new file mode 100644 index 0000000..4e184de --- /dev/null +++ b/VaporWaveWars/iaenemy.hpp @@ -0,0 +1,13 @@ +#ifndef IAENEMY_H +#define IAENEMY_H + +#include "enemy.hpp" + +class IaEnemy : public Enemy { +public: + IaEnemy(); + bool update(float deltaTime, sf::RenderWindow *window) final override; + bool event(sf::Event e) final override; +}; + +#endif // IAENEMY_H diff --git a/VaporWaveWars/player.cpp b/VaporWaveWars/player.cpp new file mode 100644 index 0000000..3a940f8 --- /dev/null +++ b/VaporWaveWars/player.cpp @@ -0,0 +1,31 @@ +#include "player.hpp" + +Player::Player() { + animate = false; +} + +bool Player::update(float deltaTime, sf::RenderWindow *window) { + if (deltaTime > BLACKVALUE) compas.incraeseTime(); + return false; +} + +bool Player::event(sf::Event e) { + switch(e.type) { + case (sf::Event::KeyPressed): + if(e.key.code == sf::Keyboard::C) compas.start(); + if(e.key.code == sf::Keyboard::Space) { + compas.add(); + animate = true; + } + break; + case (sf::Event::KeyReleased): + if (e.key.code == sf::Keyboard::C) { + compas.end(); + return false; + } + break; + default: + break; + } + return true; +} diff --git a/VaporWaveWars/player.hpp b/VaporWaveWars/player.hpp new file mode 100644 index 0000000..0e9cff2 --- /dev/null +++ b/VaporWaveWars/player.hpp @@ -0,0 +1,16 @@ +#ifndef PLAYER_H +#define PLAYER_H + +#include "commons.hpp" +#include "compas.hpp" +#include "enemy.hpp" +class Player : public Enemy { +public: + Player(); + bool update(float deltaTime, sf::RenderWindow *window) final override; + bool event(sf::Event e) final override; +private: + Compas compas; +}; + +#endif // PLAYER_H From 0859b78f94dabc63ebd20bd66792a94fe279a2de Mon Sep 17 00:00:00 2001 From: serk Date: Sat, 21 Jan 2017 03:07:55 +0100 Subject: [PATCH 2/3] merge fix --- VaporWaveWars/combat.cpp | 4 ++-- VaporWaveWars/combat.hpp | 2 +- VaporWaveWars/scene.hpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index 69cf723..a09e6a8 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -14,10 +14,10 @@ void Combat::update(float deltaTime, sf::RenderWindow *window) { void Combat::draw(sf::RenderWindow *window) { player.draw(window); enemy->draw(window); - //draw background + } -void Combat::updateButtons(sf::Event e) { +void Combat::updateEvents(sf::Event e) { if (playerOneTurn) playerOneTurn = player.event(e); else if (!ia) playerOneTurn = !enemy->event(e); } diff --git a/VaporWaveWars/combat.hpp b/VaporWaveWars/combat.hpp index d940cd7..2ae1b52 100644 --- a/VaporWaveWars/combat.hpp +++ b/VaporWaveWars/combat.hpp @@ -17,7 +17,7 @@ public: Combat& operator=(Combat&& m) = delete; void update(float deltaTime, sf::RenderWindow *window) final override; void draw(sf::RenderWindow *window) final override; - void updateButtons(sf::Event e) final override; + void updateEvents(sf::Event e) final override; private: Compas compas; bool playerOneTurn, ia; diff --git a/VaporWaveWars/scene.hpp b/VaporWaveWars/scene.hpp index 2e4de31..ac945a2 100644 --- a/VaporWaveWars/scene.hpp +++ b/VaporWaveWars/scene.hpp @@ -10,7 +10,7 @@ class Scene virtual ~Scene(); virtual void update(float deltaTime, sf::RenderWindow *window) = 0; virtual void draw(sf::RenderWindow *window) = 0; - virtual void updateEvents(sf::Event) = 0; + virtual void updateEvents(sf::Event e) = 0; protected: Game* parent; }; From e5bb93e4893c3c7d36df36c379dfefb9414760c7 Mon Sep 17 00:00:00 2001 From: serk Date: Sat, 21 Jan 2017 03:24:24 +0100 Subject: [PATCH 3/3] fix --- VaporWaveWars/combat.cpp | 6 ++++++ VaporWaveWars/combat.hpp | 1 + 2 files changed, 7 insertions(+) diff --git a/VaporWaveWars/combat.cpp b/VaporWaveWars/combat.cpp index a09e6a8..76e4e53 100644 --- a/VaporWaveWars/combat.cpp +++ b/VaporWaveWars/combat.cpp @@ -5,6 +5,12 @@ Combat::Combat() { enemy = new IaEnemy(); } +Combat::Combat(bool ia) { + this->ia = ia; + playerOneTurn = true; + if (ia) enemy = new IaEnemy(); + else enemy = new Player(); +} void Combat::update(float deltaTime, sf::RenderWindow *window) { if (playerOneTurn) player.update(deltaTime, window); diff --git a/VaporWaveWars/combat.hpp b/VaporWaveWars/combat.hpp index 2ae1b52..cde0fd7 100644 --- a/VaporWaveWars/combat.hpp +++ b/VaporWaveWars/combat.hpp @@ -11,6 +11,7 @@ class Combat : public Scene { public: Combat(); + Combat(bool ia); Combat(const Combat& m) = delete; Combat(const Combat&& m) = delete; Combat& operator=(Combat& m) = delete;