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

renamed stuff

Browse source
This commit is contained in:
Ralusama19 2017-01-21 01:30:46 +01:00
parent 98506b1121
commit 9319bbf783
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
VaporWaveWars/button.cpp
View file

@ -25,7 +25,7 @@ int Button::getClicks(){
int c = _clicks; int c = _clicks;
//cout << "popping clicks " << c << endl; //cout << "popping clicks " << c << endl;
_clicks = 0; _clicks = 0;
if (_clicks > 0) std::cout << "popclicks = " << _clicks << std::endl; //if (_clicks > 0) std::cout << "popclicks = " << _clicks << std::endl;
return c; return c;
} }
@ -51,14 +51,14 @@ void Button::handleMouseEvent(sf::Event& event){
switch (event.type){ switch (event.type){
case (sf::Event::MouseButtonPressed): case (sf::Event::MouseButtonPressed):
if(_state == ButtonState::active) _state = ButtonState::pressed; if(_state == ButtonState::active) _state = ButtonState::pressed;
std::cout << "pressed!" << _clicks << std::endl; //std::cout << "pressed!" << _clicks << std::endl;
break; break;
case (sf::Event::MouseButtonReleased): case (sf::Event::MouseButtonReleased):
if(_state == ButtonState::pressed){ if(_state == ButtonState::pressed){
_state = ButtonState::active; _state = ButtonState::active;
++_clicks; ++_clicks;
std::cout << "released!" << _clicks << std::endl; //std::cout << "released!" << _clicks << std::endl;
} }
break; break;

2
VaporWaveWars/menu.cpp
View file

@ -25,7 +25,7 @@ void Menu::draw(sf::RenderWindow* window){
} }
} }
void Menu::updateButtons(sf::Event e){ void Menu::updateEvents(sf::Event e){
// std::cout << "update menu buttons" << std::endl; // std::cout << "update menu buttons" << std::endl;
for(unsigned int i = 0; i < _buttons.size(); ++i){ for(unsigned int i = 0; i < _buttons.size(); ++i){
_buttons[i]->handleMouseEvent(e); _buttons[i]->handleMouseEvent(e);

2
VaporWaveWars/menu.hpp
View file

@ -12,7 +12,7 @@ class Menu : public Scene{
Menu& operator=(Menu&& m) = delete; Menu& operator=(Menu&& m) = delete;
void update(float deltaTime, sf::RenderWindow *window) final override; void update(float deltaTime, sf::RenderWindow *window) final override;
void draw(sf::RenderWindow *window) final override; void draw(sf::RenderWindow *window) final override;
void updateButtons(sf::Event e) final override; void updateEvents(sf::Event e) final override;
private: private:
Button _start = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl.png"); Button _start = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl.png");
Button _exit = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl2.png"); Button _exit = Button("/home/raluca/Projects/WaveGGJ17/build-VaporWaveWars-Desktop-Debug/Resources/buttontejempl2.png");

2
VaporWaveWars/mygame.cpp
View file

@ -36,7 +36,7 @@ void MyGame::update(float deltaTime, sf::RenderWindow*window) {
case (sf::Event::MouseButtonPressed): case (sf::Event::MouseButtonPressed):
case (sf::Event::MouseButtonReleased): case (sf::Event::MouseButtonReleased):
_scenes[_scene]->updateButtons(event); _scenes[_scene]->updateEvents(event);
switch(_scene){ switch(_scene){
case(GameScene::menu): case(GameScene::menu):
//std::cout << "still in menu" << std::endl; //std::cout << "still in menu" << std::endl;

2
VaporWaveWars/scene.hpp
View file

@ -10,7 +10,7 @@ class Scene
virtual ~Scene(); virtual ~Scene();
virtual void update(float deltaTime, sf::RenderWindow *window) = 0; virtual void update(float deltaTime, sf::RenderWindow *window) = 0;
virtual void draw(sf::RenderWindow *window) = 0; virtual void draw(sf::RenderWindow *window) = 0;
virtual void updateButtons(sf::Event) = 0; virtual void updateEvents(sf::Event) = 0;
protected: protected:
Game* parent; Game* parent;
}; };