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

Merge branch 'master' into serk

Browse source
This commit is contained in:
serk 2017-01-21 12:41:34 +01:00
commit ac2f53a8a8
11 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
VaporWaveWars/character.cpp
View file

@ -26,16 +26,16 @@ void Character::update(float deltaTime){
timestamp += deltaTime;
if (timestamp >= frameTime){
timestamp = 0;
sf::IntRect rect = sf::IntRect(indexX*width, indexY*height, width, height);
setTextureRect(rect);
//Acabar automaticament la animacio de attack
if (actualState == PlayerState::attacking and indexX >= 3){
setState(PlayerState::idle);
}
else {
indexX = (indexX+1)%4;
}
sf::IntRect rect = sf::IntRect(indexX*width, indexY*height, width, height);
setTextureRect(rect);
}
}

4
VaporWaveWars/character.hpp
View file

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

2
VaporWaveWars/combat.cpp
View file

@ -23,7 +23,7 @@ void Combat::initShader() {
time = 0;
_text.create(W_WIDTH, W_HEIGHT);
_background.setTexture(_text);
_shader.loadFromFile("./Resources/shader.frag", sf::Shader::Fragment);
_shader.loadFromFile(WORK_DIR+"Resources/shader.frag", sf::Shader::Fragment);
_shader.setParameter("resolution", sf::Vector2f(W_WIDTH, W_HEIGHT));
}

3
VaporWaveWars/commons.hpp
View file

@ -5,6 +5,7 @@
#include <SFML/Window.hpp>
#include <SFML/Graphics.hpp>
#include <assert.h>
#include <stdlib.h> /* getenv */
#include <iostream>
#include <string>
@ -14,6 +15,8 @@ const int SCENE_NUM = 4;
#define BLACKVALUE 0.00025f
#define W_WIDTH 800
#define W_HEIGHT 600
const std::string WORK_DIR(getenv("WORK_DIR"));
#define ASSERT(expression) do \
{ \

4
VaporWaveWars/menu.hpp
View file

@ -14,8 +14,8 @@ class Menu : public Scene{
void draw(sf::RenderWindow *window) final override;
void updateEvents(sf::Event e) final override;
private:
Button _start = Button("./Resources/play-spreadsheet.png");
Button _exit = Button("./Resources/exit-spreadsheet.png");
Button _start = Button(WORK_DIR+"Resources/play-spreadsheet.png");
Button _exit = Button(WORK_DIR+"Resources/exit-spreadsheet.png");
std::vector<Button*> _buttons;
};

15
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/.qmake.stash Normal file
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

18
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Makefile
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/linux-g++/qmake.conf \
../../../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/default_pre.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/linux-g++/qmake.conf \
../../../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/default_pre.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/linux-g++/qmake.conf:
../../../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/default_pre.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/player.hpp \
../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp
$(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/player.hpp \
../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp
$(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/player.hpp \
../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp
$(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/player.hpp \
../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp \
../VaporWaveWars/iaenemy.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o combat.o ../VaporWaveWars/combat.cpp
player.o: ../VaporWaveWars/player.cpp ../VaporWaveWars/player.hpp \
../VaporWaveWars/commons.hpp \
../VaporWaveWars/compas.hpp \
../VaporWaveWars/actor.hpp
../VaporWaveWars/actor.hpp \
../VaporWaveWars/character.hpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o player.o ../VaporWaveWars/player.cpp
iaenemy.o: ../VaporWaveWars/iaenemy.cpp ../VaporWaveWars/iaenemy.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
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
####### Install

BIN
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Resources/exit-spreadsheet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Resources/play-spreadsheet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
build-VaporWaveWars-Desktop_Qt_5_7_0_GCC_64bit-Debug/Resources/spreadsheet.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 27 KiB

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

Binary file not shown.