vylion/WaveGGJ17
vylion/WaveGGJ17
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wave files

Browse source
This commit is contained in:
marti.lloveras 2017-01-21 18:23:57 +01:00
parent c07c2a422e
commit f986d6cb2d
5 changed files with 83 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
VaporWaveWars/VaporWaveWars.pro
View file

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

20
VaporWaveWars/wave.cpp Normal file
View file

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

26
VaporWaveWars/wave.hpp Normal file
View file

@ -0,0 +1,26 @@
#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;
float timestamp;
public:
Wave();
Wave(bool dir);
void update(float deltaTime);
};
#endif // WAVE_HPP

45
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Makefile
View file

@ -60,7 +60,8 @@ SOURCES = ../VaporWaveWars/main.cpp \
../VaporWaveWars/player.cpp \ ../VaporWaveWars/player.cpp \
../VaporWaveWars/iaenemy.cpp \ ../VaporWaveWars/iaenemy.cpp \
../VaporWaveWars/actor.cpp \ ../VaporWaveWars/actor.cpp \
../VaporWaveWars/soundmanager.cpp ../VaporWaveWars/soundmanager.cpp \
../VaporWaveWars/score.cpp
OBJECTS = main.o \ OBJECTS = main.o \
game.o \ game.o \
mygame.o \ mygame.o \
@ -73,7 +74,8 @@ OBJECTS = main.o \
player.o \ player.o \
iaenemy.o \ iaenemy.o \
actor.o \ actor.o \
soundmanager.o soundmanager.o \
score.o
DIST = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \ 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/unix.conf \
../../../Qt/5.7/gcc_64/mkspecs/common/linux.conf \ ../../../Qt/5.7/gcc_64/mkspecs/common/linux.conf \
@ -229,7 +231,8 @@ DIST = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
player.hpp \ player.hpp \
iaenemy.hpp \ iaenemy.hpp \
actor.hpp \ actor.hpp \
soundmanager.hpp ../VaporWaveWars/main.cpp \ soundmanager.hpp \
score.hpp ../VaporWaveWars/main.cpp \
../VaporWaveWars/game.cpp \ ../VaporWaveWars/game.cpp \
../VaporWaveWars/mygame.cpp \ ../VaporWaveWars/mygame.cpp \
../VaporWaveWars/button.cpp \ ../VaporWaveWars/button.cpp \
@ -241,7 +244,8 @@ DIST = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
../VaporWaveWars/player.cpp \ ../VaporWaveWars/player.cpp \
../VaporWaveWars/iaenemy.cpp \ ../VaporWaveWars/iaenemy.cpp \
../VaporWaveWars/actor.cpp \ ../VaporWaveWars/actor.cpp \
../VaporWaveWars/soundmanager.cpp ../VaporWaveWars/soundmanager.cpp \
../VaporWaveWars/score.cpp
QMAKE_TARGET = VaporWaveWars QMAKE_TARGET = VaporWaveWars
DESTDIR = DESTDIR =
TARGET = VaporWaveWars TARGET = VaporWaveWars
@ -588,6 +592,7 @@ compiler_clean:
main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \ main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/game.hpp \ ../VaporWaveWars/game.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/menu.hpp \ ../VaporWaveWars/menu.hpp \
../VaporWaveWars/scene.hpp \ ../VaporWaveWars/scene.hpp \
../VaporWaveWars/button.hpp \ ../VaporWaveWars/button.hpp \
@ -597,16 +602,18 @@ main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp \ ../VaporWaveWars/iaenemy.hpp \
../VaporWaveWars/soundmanager.hpp ../VaporWaveWars/score.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../VaporWaveWars/main.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../VaporWaveWars/main.cpp
game.o: ../VaporWaveWars/game.cpp ../VaporWaveWars/game.hpp \ 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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o game.o ../VaporWaveWars/game.cpp
mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \ mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/game.hpp \ ../VaporWaveWars/game.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/menu.hpp \ ../VaporWaveWars/menu.hpp \
../VaporWaveWars/scene.hpp \ ../VaporWaveWars/scene.hpp \
../VaporWaveWars/button.hpp \ ../VaporWaveWars/button.hpp \
@ -616,28 +623,33 @@ mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp \ ../VaporWaveWars/iaenemy.hpp \
../VaporWaveWars/soundmanager.hpp ../VaporWaveWars/score.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygame.o ../VaporWaveWars/mygame.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygame.o ../VaporWaveWars/mygame.cpp
button.o: ../VaporWaveWars/button.cpp ../VaporWaveWars/button.hpp \ 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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o button.o ../VaporWaveWars/button.cpp
character.o: ../VaporWaveWars/character.cpp ../VaporWaveWars/character.hpp \ 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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o character.o ../VaporWaveWars/character.cpp
compas.o: ../VaporWaveWars/compas.cpp ../VaporWaveWars/compas.hpp \ 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 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o compas.o ../VaporWaveWars/compas.cpp
scene.o: ../VaporWaveWars/scene.cpp ../VaporWaveWars/scene.hpp \ scene.o: ../VaporWaveWars/scene.cpp ../VaporWaveWars/scene.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/game.hpp ../VaporWaveWars/game.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o scene.o ../VaporWaveWars/scene.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o scene.o ../VaporWaveWars/scene.cpp
menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \ menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/scene.hpp \ ../VaporWaveWars/scene.hpp \
../VaporWaveWars/game.hpp \ ../VaporWaveWars/game.hpp \
../VaporWaveWars/button.hpp \ ../VaporWaveWars/button.hpp \
@ -648,11 +660,12 @@ menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp \ ../VaporWaveWars/iaenemy.hpp \
../VaporWaveWars/soundmanager.hpp ../VaporWaveWars/score.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o menu.o ../VaporWaveWars/menu.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o menu.o ../VaporWaveWars/menu.cpp
combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \ combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/scene.hpp \ ../VaporWaveWars/scene.hpp \
../VaporWaveWars/game.hpp \ ../VaporWaveWars/game.hpp \
@ -660,11 +673,12 @@ combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp \ ../VaporWaveWars/iaenemy.hpp \
../VaporWaveWars/soundmanager.hpp ../VaporWaveWars/score.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o combat.o ../VaporWaveWars/combat.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o combat.o ../VaporWaveWars/combat.cpp
player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \ player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp ../VaporWaveWars/character.hpp
@ -673,12 +687,14 @@ player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \
iaenemy.o: ../VaporWaveWars/iaenemy.cpp ../VaporWaveWars/iaenemy.hpp \ iaenemy.o: ../VaporWaveWars/iaenemy.cpp ../VaporWaveWars/iaenemy.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/compas.hpp ../VaporWaveWars/compas.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o iaenemy.o ../VaporWaveWars/iaenemy.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o iaenemy.o ../VaporWaveWars/iaenemy.cpp
actor.o: ../VaporWaveWars/actor.cpp ../VaporWaveWars/actor.hpp \ actor.o: ../VaporWaveWars/actor.cpp ../VaporWaveWars/actor.hpp \
../VaporWaveWars/commons.hpp \ ../VaporWaveWars/commons.hpp \
../VaporWaveWars/soundmanager.hpp \
../VaporWaveWars/character.hpp \ ../VaporWaveWars/character.hpp \
../VaporWaveWars/compas.hpp ../VaporWaveWars/compas.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o actor.o ../VaporWaveWars/actor.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o actor.o ../VaporWaveWars/actor.cpp
@ -687,6 +703,11 @@ soundmanager.o: ../VaporWaveWars/soundmanager.cpp ../VaporWaveWars/soundmanager.
../VaporWaveWars/commons.hpp ../VaporWaveWars/commons.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o soundmanager.o ../VaporWaveWars/soundmanager.cpp $(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
####### Install ####### Install
install: FORCE install: FORCE

BIN
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/VaporWaveWars
View file

Binary file not shown.