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

Merge branch 'serk'

Browse source
This commit is contained in:
serk 2017-01-21 18:11:45 +01:00
commit 65e6604673
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Resources/shader.frag
View file

@ -39,5 +39,5 @@ void main(void) {
vec4 color = vec4(255, 120, 153, 255) / 255.; vec4 color = vec4(255, 120, 153, 255) / 255.;
vec4 colorB = vec4(255,255,255,255)/ 255.; vec4 colorB = vec4(255,255,255,255)/ 255.;
gl_FragColor = (grid(fract(uv))) * color; gl_FragColor = (grid(fract(uv))) * color - line(umuv.y, 0., 0.175, 0.025) * color * 2.;
} }

11
VaporWaveWars/actor.cpp
View file

@ -29,10 +29,15 @@ bool Actor::update(float deltaTime, sf::RenderWindow *window) {
return this->updateLogic(deltaTime, window); return this->updateLogic(deltaTime, window);
} }
bool Actor::hitBy(Compas enemy) const { bool Actor::hitBy(Compas enemy) {
if (enemy == compas) std::cout << "dodge" << std::endl; bool hit = enemy == compas;
if (hit) std::cout << "dodge" << std::endl;
else std::cout << "hit" << std::endl; else std::cout << "hit" << std::endl;
return enemy == compas; if (!hit) {
character->setState(PlayerState::hurt);
animate = PlayerState::inMidle;
}
return hit;
} }
Compas Actor::getAttack() const { Compas Actor::getAttack() const {

2
VaporWaveWars/actor.hpp
View file

@ -12,7 +12,7 @@ public:
Actor(int num); Actor(int num);
bool update(float deltaTime, sf::RenderWindow *window); bool update(float deltaTime, sf::RenderWindow *window);
void draw(sf::RenderWindow *window); void draw(sf::RenderWindow *window);
bool hitBy(Compas enemy) const; bool hitBy(Compas enemy);
Compas getAttack() const; Compas getAttack() const;
virtual bool event(sf::Event e, bool def) = 0; virtual bool event(sf::Event e, bool def) = 0;