Animacio més rapida

This commit is contained in:
marti.lloveras 2017-01-21 11:58:15 +01:00
parent 770739c352
commit e90d2dd3f1
4 changed files with 28 additions and 7 deletions

View file

@ -5,7 +5,7 @@
class Character : public sf::Sprite{ class Character : public sf::Sprite{
private: private:
//CONFIG //CONFIG
const double frameTime = 0.2; const double frameTime = 0.15;
const int numFrames = 4; const int numFrames = 4;
const std::string spriteFile = "./Resources/spreadsheet.png"; const std::string spriteFile = "./Resources/spreadsheet.png";
//POSICIO PLAYER 1 //POSICIO PLAYER 1

View file

@ -0,0 +1,15 @@
QMAKE_DEFAULT_INCDIRS = \
/usr/include/c++/6 \
/usr/include/x86_64-linux-gnu/c++/6 \
/usr/include/c++/6/backward \
/usr/lib/gcc/x86_64-linux-gnu/6/include \
/usr/local/include \
/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed \
/usr/include/x86_64-linux-gnu \
/usr/include
QMAKE_DEFAULT_LIBDIRS = \
/usr/lib/gcc/x86_64-linux-gnu/6 \
/usr/lib/x86_64-linux-gnu \
/usr/lib \
/lib/x86_64-linux-gnu \
/lib

View file

@ -203,7 +203,6 @@ DIST = ../../../Qt/5.7/gcc_64/mkspecs/features/spec_pre.prf \
../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf \
../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf \ ../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf \
../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf \
../VaporWaveWars/.qmake.stash \
../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf \
../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf \
../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf \
@ -380,7 +379,6 @@ Makefile: ../VaporWaveWars/VaporWaveWars.pro ../../../Qt/5.7/gcc_64/mkspecs/linu
../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf \
../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf \ ../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf \
../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf \
.qmake.stash \
../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf \
../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf \
../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf \ ../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf \
@ -525,7 +523,6 @@ Makefile: ../VaporWaveWars/VaporWaveWars.pro ../../../Qt/5.7/gcc_64/mkspecs/linu
../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf: ../../../Qt/5.7/gcc_64/mkspecs/features/qt_config.prf:
../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf: ../../../Qt/5.7/gcc_64/mkspecs/linux-g++/qmake.conf:
../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf: ../../../Qt/5.7/gcc_64/mkspecs/features/spec_post.prf:
.qmake.stash:
../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf: ../../../Qt/5.7/gcc_64/mkspecs/features/exclusive_builds.prf:
../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf: ../../../Qt/5.7/gcc_64/mkspecs/features/default_pre.prf:
../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf: ../../../Qt/5.7/gcc_64/mkspecs/features/resolve_config.prf:
@ -591,6 +588,7 @@ main.o: ../VaporWaveWars/main.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/player.hpp \ ../VaporWaveWars/player.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp ../VaporWaveWars/iaenemy.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../VaporWaveWars/main.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o ../VaporWaveWars/main.cpp
@ -608,6 +606,7 @@ mygame.o: ../VaporWaveWars/mygame.cpp ../VaporWaveWars/mygame.hpp \
../VaporWaveWars/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/player.hpp \ ../VaporWaveWars/player.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp ../VaporWaveWars/iaenemy.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygame.o ../VaporWaveWars/mygame.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mygame.o ../VaporWaveWars/mygame.cpp
@ -638,6 +637,7 @@ menu.o: ../VaporWaveWars/menu.cpp ../VaporWaveWars/menu.hpp \
../VaporWaveWars/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/player.hpp \ ../VaporWaveWars/player.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp ../VaporWaveWars/iaenemy.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o menu.o ../VaporWaveWars/menu.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o menu.o ../VaporWaveWars/menu.cpp
@ -648,22 +648,28 @@ combat.o: ../VaporWaveWars/combat.cpp ../VaporWaveWars/combat.hpp \
../VaporWaveWars/game.hpp \ ../VaporWaveWars/game.hpp \
../VaporWaveWars/player.hpp \ ../VaporWaveWars/player.hpp \
../VaporWaveWars/actor.hpp \ ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp ../VaporWaveWars/iaenemy.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/compas.hpp \ ../VaporWaveWars/compas.hpp \
../VaporWaveWars/actor.hpp ../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o player.o ../VaporWaveWars/player.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o player.o ../VaporWaveWars/player.cpp
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/character.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/character.hpp \
../VaporWaveWars/compas.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o actor.o ../VaporWaveWars/actor.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o actor.o ../VaporWaveWars/actor.cpp
####### Install ####### Install