zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-31 09:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

compoenent for title screen

Browse Source
This commit is contained in:
arthur.jamet
2021-06-07 11:03:47 +02:00
parent 19cd80a3ff
commit e094a7d5d9
4 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/plain_menu_background.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 389 KiB

lib/Ray/sources/Drawables/Image.cpp
+9 -3
View File
@@ -40,16 +40,22 @@ namespace RAY {
drawable.drawOn(*this);
}
void Image::resize(const RAY::Vector2 &dimensions)
{
ImageResize(*this, dimensions.x, dimensions.y);
this->setDimensions(dimensions);
}
void Image::drawOn(RAY::Window &)
{
//Since the image is a shared object, when it is resized, it mush be resized after to its previous dimensions
Vector2 oldDims = Vector2(this->_image->width, this->_image->height);
//Vector2 oldDims = Vector2(this->_image->width, this->_image->height);
ImageResize(*this, this->_dimensions.x, this->_dimensions.y);
//ImageResize(*this, this->_dimensions.x, this->_dimensions.y);
Texture texture(*this);
DrawTexture(texture, this->_position.x, this->_position.y, this->_color);
ImageResize(*this, oldDims.x, oldDims.y);
//ImageResize(*this, oldDims.x, oldDims.y);
}
void Image::drawOn(RAY::Image &image)
lib/Ray/sources/Drawables/Image.hpp
+3 -1
View File
@@ -44,7 +44,9 @@ namespace RAY
//! @brief Draw image on another image
void drawOn(RAY::Image &image) override;
//! @brief Resize image;
void resize(const RAY::Vector2 &dimensions);
private:
//! @brief Image, really, that's just it...
sources/Runner/Runner.cpp
+39 -25
View File
@@ -9,6 +9,7 @@
#include <Model/Model.hpp>
#include <Drawables/3D/Cube.hpp>
#include <Drawables/2D/Rectangle.hpp>
#include <Drawables/2D/Text.hpp>
#include <TraceLog.hpp>
#include <System/Keyboard/KeyboardSystem.hpp>
#include <System/Controllable/ControllableSystem.hpp>
@@ -59,7 +60,7 @@ namespace BBM
void enableRaylib(WAL::Wal &wal)
{
RAY::TraceLog::setLevel(LOG_WARNING);
RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE);
RAY::Window &window = RAY::Window::getInstance(1920, 1080, "Bomberman");
wal.addSystem<AnimationsSystem>()
.addSystem<RenderSystem>(window);
}
@@ -67,10 +68,29 @@ namespace BBM
std::shared_ptr<WAL::Scene> loadTitleScreenScene()
{
auto scene = std::make_shared<WAL::Scene>();
scene->addEntity("control")
.addComponent<ControllableComponent>()
.addComponent<KeyboardComponent>();
scene->addEntity("background")
.addComponent<PositionComponent>()
.addComponent<Drawable2DComponent, RAY::Image>("assets/plain_menu_background.png");
scene->addEntity("logo")
.addComponent<PositionComponent>(320, 180, 0)
.addComponent<Drawable2DComponent, RAY::Image>("assets/logo_big.png");
scene->addEntity("text_prompt")
.addComponent<PositionComponent>(1920 / 5, 1080 - 180, 0)
.addComponent<Drawable2DComponent, RAY2D::Text>("Press any button to continue", 70, RAY::Vector2(), WHITE)
.addComponent<ButtonComponent>([](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(WHITE);
},
[](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(ORANGE);
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
//needed material
//game logo
//plain background
//text "press to play"
//music
//sound
return scene;
@@ -79,9 +99,6 @@ namespace BBM
std::shared_ptr<WAL::Scene> loadMainMenuScene()
{
auto scene = std::make_shared<WAL::Scene>();
scene->addEntity("control")
.addComponent<ControllableComponent>()
.addComponent<KeyboardComponent>();
scene->addEntity("first button")
.addComponent<PositionComponent>(10, 10, 10)
.addComponent<Drawable2DComponent, RAY2D::Rectangle>(RAY::Vector2(0, 0), RAY::Vector2(100, 10), RED)
@@ -96,23 +113,20 @@ namespace BBM
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
scene->addEntity("snd button")
.addComponent<PositionComponent>(10, 50, 50)
.addComponent<Drawable2DComponent, RAY2D::Rectangle>(RAY::Vector2(0, 0), RAY::Vector2(100, 10), RED)
.addComponent<ButtonComponent>(
[](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(RED);
},
[](WAL::Entity &entity)
{
entity.getComponent<Drawable2DComponent>().drawable->setColor(GREEN);
},
ButtonComponent::emptyButtonCallback,
ButtonComponent::emptyButtonCallback);
scene->addEntity("background")
.addComponent<PositionComponent>()
.addComponent<Drawable2DComponent, RAY::Image>("assets/icon.png");
//scene->addEntity("snd button")
// .addComponent<PositionComponent>(10, 50, 50)
// .addComponent<Drawable2DComponent, RAY2D::Rectangle>(RAY::Vector2(0, 0), RAY::Vector2(100, 10), RED)
// .addComponent<ButtonComponent>(
// [](WAL::Entity &entity)
// {
// entity.getComponent<Drawable2DComponent>().drawable->setColor(RED);
// },
// [](WAL::Entity &entity)
// {
// entity.getComponent<Drawable2DComponent>().drawable->setColor(GREEN);
// },
// ButtonComponent::emptyButtonCallback,
// ButtonComponent::emptyButtonCallback);
//needed material
//play button
//play button assets
@@ -191,7 +205,7 @@ namespace BBM
WAL::Wal wal;
addSystems(wal);
enableRaylib(wal);
wal.scene = loadMainMenuScene();
wal.scene = loadTitleScreenScene();
try {
wal.run<GameState>(updateState);