Merge branch 'master' of https://github.com/ralucado/WaveGGJ17

VaporWaveWars/VaporWaveWars.pro

@@ -17,7 +17,8 @@ SOURCES += main.cpp \
     iaenemy.cpp \
     actor.cpp \
     soundmanager.cpp \
-    score.cpp
+    score.cpp \
+    wave.cpp
 
 HEADERS += \
     game.hpp \
@@ -33,4 +34,5 @@ HEADERS += \
     iaenemy.hpp \
     actor.hpp \
     soundmanager.hpp \
-    score.hpp
+    score.hpp \
+    wave.hpp

VaporWaveWars/combat.cpp

@@ -38,7 +38,7 @@ void Combat::initShader() {
 void Combat::update(float deltaTime, sf::RenderWindow *window) {
     player->update(deltaTime, window);
     bool aux = enemy->update(deltaTime, window);
-    if (ia) enemyManager(aux); //end of player two ia ritm
+    if (ia) enemyManager(aux); //end of player two ia rythm
     time += deltaTime;
 
     _shader.setParameter("time", time);
@@ -57,6 +57,7 @@ void Combat::updateEvents(sf::Event e) {
     if (playerOneTurn) {
         bool aux = player->event(e, !attacking);
         if (!aux) { //end of player one ritm
+
             if (!attacking) {
                 if(!player->hitBy(enemy->getAttack())) {
                     scoreEnemy->incrisScore();

VaporWaveWars/menu.cpp

@@ -2,12 +2,15 @@
 #include "mygame.hpp"
 
 Menu::Menu() {
-    _start.setPosition(5,5);
+    _start.setPosition(512-160,200);
-    _exit.setPosition(100,100);
+    _exit.setPosition(512-160,400);
     _start.turnOn();
     _exit.turnOn();
     _buttons.push_back(&_start);
     _buttons.push_back(&_exit);
+    ASSERT(textureBackground.loadFromFile(WORK_DIR+"Resources/background.png"));
+    background.setTexture(textureBackground);
+    background.setPosition(0,0);
 
 }
 
@@ -21,6 +24,7 @@ void Menu::update(float deltaTime, sf::RenderWindow*window){
 }
 
 void Menu::draw(sf::RenderWindow* window){
+    window->draw(background);
     for(unsigned int i = 0; i < _buttons.size(); ++i){
         window->draw(*_buttons[i]);
     }

VaporWaveWars/menu.hpp

@@ -17,6 +17,8 @@ class Menu : public Scene{
         Button _start = Button(WORK_DIR+"Resources/play-spreadsheet.png");
         Button _exit = Button(WORK_DIR+"Resources/exit-spreadsheet.png");
         std::vector<Button*> _buttons;
+        sf::Texture textureBackground;
+        sf::Sprite background;
 };
 
 #endif // MENU_HPP

VaporWaveWars/wave.cpp

@@ -0,0 +1,22 @@
+#include "wave.hpp"
+
+Wave::Wave(bool dir){
+    direction = dir;
+    ASSERT(texture.loadFromFile(spriteFile));
+    setTexture(texture);
+    sf::IntRect rect = sf::IntRect(0, 0, texture.getSize().x, texture.getSize().y);
+    setTextureRect(rect);
+}
+
+void Wave::update(float deltaTime){
+    float pos = getPosition().x;
+    if (direction){
+        pos += 0; // AMOUNT??
+    }
+    else{
+        pos -= 0; // ""
+    }
+    setPosition(pos, getPosition().y);
+}
+
+

VaporWaveWars/wave.hpp

@@ -0,0 +1,25 @@
+#ifndef WAVE_HPP
+#define WAVE_HPP
+#include "commons.hpp"
+
+class Wave : public sf::Sprite{
+private:
+    //CONFIG
+    const std::string spriteFile = WORK_DIR+"Resources/pulsation.png";
+    //POSICIO PLAYER 1
+    float posX1 = W_WIDTH*0.05f, posY1 = W_HEIGHT*0.6f;
+    //POSICIO PLAYER 2
+    float posX2 = W_WIDTH*0.65f, posY2 = W_HEIGHT*0.6f;
+    //END CONFIG
+
+    bool direction; //TRUE => CAP A LA DRETA
+
+    sf::Texture texture;
+
+public:
+    Wave();
+    Wave(bool dir);
+    void update(float deltaTime);
+};
+
+#endif // WAVE_HPP

build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Makefile

@@ -60,7 +60,9 @@ SOURCES       = ../VaporWaveWars/main.cpp \
 		../VaporWaveWars/player.cpp \
 		../VaporWaveWars/iaenemy.cpp \
 		../VaporWaveWars/actor.cpp \
-		../VaporWaveWars/soundmanager.cpp 
+		../VaporWaveWars/soundmanager.cpp \
+		../VaporWaveWars/score.cpp \
+		../VaporWaveWars/wave.cpp 
 OBJECTS       = main.o \
 		game.o \
 		mygame.o \
@@ -73,7 +75,9 @@ OBJECTS       = main.o \
 		player.o \
 		iaenemy.o \
 		actor.o \
-		soundmanager.o
+		soundmanager.o \
+		score.o \
+		wave.o
 DIST          = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
 		../../../Qt/5.7/gcc_64/mkspecs/common/unix.conf \
 		../../../Qt/5.7/gcc_64/mkspecs/common/linux.conf \
@@ -229,7 +233,9 @@ DIST          = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
 		player.hpp \
 		iaenemy.hpp \
 		actor.hpp \
-		soundmanager.hpp ../VaporWaveWars/main.cpp \
+		soundmanager.hpp \
+		score.hpp \
+		wave.hpp ../VaporWaveWars/main.cpp \
 		../VaporWaveWars/game.cpp \
 		../VaporWaveWars/mygame.cpp \
 		../VaporWaveWars/button.cpp \
@@ -241,7 +247,9 @@ DIST          = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
 		../VaporWaveWars/player.cpp \
 		../VaporWaveWars/iaenemy.cpp \
 		../VaporWaveWars/actor.cpp \
-		../VaporWaveWars/soundmanager.cpp
+		../VaporWaveWars/soundmanager.cpp \
+		../VaporWaveWars/score.cpp \
+		../VaporWaveWars/wave.cpp
 QMAKE_TARGET  = VaporWaveWars
 DESTDIR       = 
 TARGET        = VaporWaveWars
@@ -588,6 +596,7 @@ compiler_clean:
 main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \
 		../VaporWaveWars/game.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/menu.hpp \
 		../VaporWaveWars/scene.hpp \
 		../VaporWaveWars/button.hpp \
@@ -597,16 +606,18 @@ main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/iaenemy.hpp \
-		../VaporWaveWars/soundmanager.hpp
+		../VaporWaveWars/score.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../VaporWaveWars/main.cpp
 
 game.o: ../VaporWaveWars/game.cpp ../VaporWaveWars/game.hpp \
-		../VaporWaveWars/commons.hpp
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o game.o ../VaporWaveWars/game.cpp
 
 mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \
 		../VaporWaveWars/game.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/menu.hpp \
 		../VaporWaveWars/scene.hpp \
 		../VaporWaveWars/button.hpp \
@@ -616,28 +627,33 @@ mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/iaenemy.hpp \
-		../VaporWaveWars/soundmanager.hpp
+		../VaporWaveWars/score.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygame.o ../VaporWaveWars/mygame.cpp
 
 button.o: ../VaporWaveWars/button.cpp ../VaporWaveWars/button.hpp \
-		../VaporWaveWars/commons.hpp
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o button.o ../VaporWaveWars/button.cpp
 
 character.o: ../VaporWaveWars/character.cpp ../VaporWaveWars/character.hpp \
-		../VaporWaveWars/commons.hpp
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o character.o ../VaporWaveWars/character.cpp
 
 compas.o: ../VaporWaveWars/compas.cpp ../VaporWaveWars/compas.hpp \
-		../VaporWaveWars/commons.hpp
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o compas.o ../VaporWaveWars/compas.cpp
 
 scene.o: ../VaporWaveWars/scene.cpp ../VaporWaveWars/scene.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/game.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o scene.o ../VaporWaveWars/scene.cpp
 
 menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/scene.hpp \
 		../VaporWaveWars/game.hpp \
 		../VaporWaveWars/button.hpp \
@@ -648,11 +664,12 @@ menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/iaenemy.hpp \
-		../VaporWaveWars/soundmanager.hpp
+		../VaporWaveWars/score.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o menu.o ../VaporWaveWars/menu.cpp
 
 combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/compas.hpp \
 		../VaporWaveWars/scene.hpp \
 		../VaporWaveWars/game.hpp \
@@ -660,11 +677,12 @@ combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/iaenemy.hpp \
-		../VaporWaveWars/soundmanager.hpp
+		../VaporWaveWars/score.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o combat.o ../VaporWaveWars/combat.cpp
 
 player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/compas.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/character.hpp
@@ -673,12 +691,14 @@ player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \
 iaenemy.o: ../VaporWaveWars/iaenemy.cpp ../VaporWaveWars/iaenemy.hpp \
 		../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/compas.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o iaenemy.o ../VaporWaveWars/iaenemy.cpp
 
 actor.o: ../VaporWaveWars/actor.cpp ../VaporWaveWars/actor.hpp \
 		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp \
 		../VaporWaveWars/character.hpp \
 		../VaporWaveWars/compas.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o actor.o ../VaporWaveWars/actor.cpp
@@ -687,6 +707,16 @@ soundmanager.o: ../VaporWaveWars/soundmanager.cpp ../VaporWaveWars/soundmanager.
 		../VaporWaveWars/commons.hpp
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o soundmanager.o ../VaporWaveWars/soundmanager.cpp
 
+score.o: ../VaporWaveWars/score.cpp ../VaporWaveWars/score.hpp \
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o score.o ../VaporWaveWars/score.cpp
+
+wave.o: ../VaporWaveWars/wave.cpp ../VaporWaveWars/wave.hpp \
+		../VaporWaveWars/commons.hpp \
+		../VaporWaveWars/soundmanager.hpp
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o wave.o ../VaporWaveWars/wave.cpp
+
 ####### Install
 
 install:  FORCE