zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-02 18:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: minux/plus inverted

Browse Source
This commit is contained in:
arthur.jamet
2021-06-08 16:00:30 +02:00
parent a21bffb37b
commit 1e5d97f831
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Ray/sources/Window.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ bool RAY::Window::open(void)
}
InitWindow(this->_dimensions.x, this->_dimensions.y, this->_title.c_str());
this->_isOpen = true;
this->setExitKey(Controller::Keyboard::Key::KEY_NULL);
//this->setExitKey(Controller::Keyboard::Key::KEY_M);
return true;
}
sources/Component/Keyboard/KeyboardComponent.hpp
+1 -1
View File
@@ -21,7 +21,7 @@ namespace BBM
//! @brief bomb key
Key keyBomb = KEY_E;
//! @brief pause key
Key keyPause = KEY_ESCAPE;
Key keyPause = KEY_M;
//! @brief move right key
Key keyRight = KEY_A;
//! @brief move left key
sources/Runner/Runner.cpp
+13 -10
View File
@@ -307,7 +307,7 @@ namespace BBM
});
auto &musicUp = scene->addEntity("music up button")
.addComponent<PositionComponent>(1920 / 3, 1080 - 540, 0)
.addComponent<PositionComponent>(1920 / 1.5, 1080 - 540, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_plus.png")
.addComponent<OnClickComponent>()
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
@@ -324,7 +324,7 @@ namespace BBM
});
auto &musicDown = scene->addEntity("music down button")
.addComponent<PositionComponent>(1920 / 1.5, 1080 - 540, 0)
.addComponent<PositionComponent>(1920 / 3, 1080 - 540, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_minus.png")
.addComponent<OnClickComponent>()
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
@@ -354,7 +354,7 @@ namespace BBM
});
auto &soundUp = scene->addEntity("sound up button")
.addComponent<PositionComponent>(1920 / 3, 1080 - 360, 0)
.addComponent<PositionComponent>(1920 / 1.5, 1080 - 360, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_plus.png")
.addComponent<OnClickComponent>()
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
@@ -371,7 +371,7 @@ namespace BBM
});
auto &soundDown = scene->addEntity("sound down button")
.addComponent<PositionComponent>(1920 / 1.5, 1080 - 360, 0)
.addComponent<PositionComponent>(1920 / 3, 1080 - 360, 0)
.addComponent<Drawable2DComponent, RAY::Texture>("assets/buttons/button_minus.png")
.addComponent<OnClickComponent>()
.addComponent<OnIdleComponent>([](WAL::Entity &entity, WAL::Wal &)
@@ -435,12 +435,12 @@ namespace BBM
//music
//sound
music.getComponent<OnClickComponent>().setButtonLinks(&back, &sound, &musicUp, &musicDown);
musicUp.getComponent<OnClickComponent>().setButtonLinks(&debug, &sound, nullptr, &music);
musicDown.getComponent<OnClickComponent>().setButtonLinks(&debug, &sound, &music);
sound.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, &soundUp, &soundDown);
soundUp.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, nullptr, &sound);
soundDown.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, &sound);
music.getComponent<OnClickComponent>().setButtonLinks(&back, &sound, &musicDown, &musicUp);
musicDown.getComponent<OnClickComponent>().setButtonLinks(&debug, &sound, nullptr, &music);
musicUp.getComponent<OnClickComponent>().setButtonLinks(&debug, &sound, &music);
sound.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, &soundDown, &soundUp);
soundDown.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, nullptr, &sound);
soundUp.getComponent<OnClickComponent>().setButtonLinks(&music, &debug, &sound);
debug.getComponent<OnClickComponent>().setButtonLinks(&sound, &back);
back.getComponent<OnClickComponent>().setButtonLinks(&debug, &music);
return scene;
@@ -449,6 +449,9 @@ namespace BBM
std::shared_ptr<WAL::Scene> Runner::loadGameScene()
{
auto scene = std::make_shared<WAL::Scene>();
scene->addEntity("control")
.addComponent<ControllableComponent>()
.addComponent<KeyboardComponent>();
scene->addEntity("player")
.addComponent<PositionComponent>()
.addComponent<Drawable3DComponent, RAY3D::Model>("assets/player/player.iqm", std::make_pair(MAP_DIFFUSE, "assets/player/blue.png"))