Deux Ex Machina

This commit is contained in:
Bram Verhulst
2024-06-09 23:23:55 +02:00
parent 5f1dcd5788
commit caabb12838
17 changed files with 151 additions and 77 deletions

View File

@@ -0,0 +1,31 @@
#include "pch.h"
#include "GameOverScreen.h"
#include "colors.h"
#include "utils.h"
GameOverScreen::GameOverScreen(const std::string& filePath, Vector2f pos, Vector2f size, TextureManager* manager): Screen(filePath, pos, size, manager){
m_SkullTexture = manager->GetTexture("gui/gameover/skull.png");
GuiText* text = new GuiText(Vector2f{360, 150}, "Press Space To Quit", "fonts/Arial.ttf", 20, Colors::YELLOW);
AddElement(text);
}
GameOverScreen::~GameOverScreen() {
}
void GameOverScreen::Draw() const {
Screen::Draw();
//1230 x 1087
m_SkullTexture->Draw(Rectf{ 350, 200, 1230 / 5, 1087 / 5 });
}
void GameOverScreen::Update(float elapsedSecs) {
Screen::Update(elapsedSecs);
if(utils::isKeyDown(SDL_SCANCODE_SPACE)){
SDL_Event quitEvent;
quitEvent.type = SDL_QUIT;
SDL_PushEvent(&quitEvent);
}
}
void GameOverScreen::MarkDirty() {
}
void GameOverScreen::SellAll() {
}

View File

@@ -0,0 +1,19 @@
#pragma once
#include "../../Screen.h"
#include "Gui/GuiText.h"
class GameOverScreen final : public Screen {
public:
GameOverScreen(const std::string& filePath, Vector2f pos, Vector2f size, TextureManager* manager);
virtual ~GameOverScreen() override;
virtual void Draw() const override;
virtual void Update(float elapsedSecs) override;
void MarkDirty();
void SellAll();
private:
Texture* m_SkullTexture{ nullptr };
};

View File

@@ -4,10 +4,12 @@
#include "FuelScreen/FuelScreen.h"
#include "SellScreen/SellScreen.h"
#include "utils.h"
#include "GameOver/GameOverScreen.h"
ScreenManager* ScreenManager::m_pInstance = nullptr;
Screen* ScreenManager::m_FuelScreen { nullptr };
Screen* ScreenManager::m_SellScreen { nullptr };
Screen* ScreenManager::m_GameOverScreen { nullptr };
ScreenManager * ScreenManager::GetInstance() {
@@ -44,6 +46,7 @@ bool ScreenManager::IsScreenOpen() const {
ScreenManager::~ScreenManager() {
delete m_FuelScreen;
delete m_SellScreen;
delete m_GameOverScreen;
}
void ScreenManager::InitializeScreens() {
Vector2f fuelScreenSize = Vector2f { 492, 396 };
@@ -54,5 +57,9 @@ void ScreenManager::InitializeScreens() {
Vector2f sellScreenCenter = Vector2f { utils::GetViewport().x / 2 - sellScreenSize.x / 2, utils::GetViewport().y / 2 - sellScreenSize.y / 2 };
m_SellScreen = new SellScreen { "gui/sell/background.png", sellScreenCenter, sellScreenSize, TextureManager::GetInstance() };
Vector2f gameOverScreenSize = Vector2f { 533, 398 };
Vector2f gameOverScreenCenter = Vector2f { utils::GetViewport().x / 2 - gameOverScreenSize.x / 2, utils::GetViewport().y / 2 - gameOverScreenSize.y / 2 };
m_GameOverScreen = new GameOverScreen { "", gameOverScreenCenter, gameOverScreenSize, TextureManager::GetInstance() };
//m_Button = Button { "gui/close.png", closeButtonPos, closeButtonSize, TextureManager::GetInstance() };
}

View File

@@ -21,6 +21,7 @@ public:
static Screen* m_FuelScreen;
static Screen* m_SellScreen;
static Screen* m_GameOverScreen;
private:
ScreenManager() = default;

View File

@@ -12,6 +12,7 @@ SellScreen::SellScreen(const std::string& filePath, Vector2f pos, Vector2f size,
const Vector2f ScreenCenter = Vector2f { utils::GetViewport().x / 2, utils::GetViewport().y / 2 };
const Vector2f sellScreenCenter = ScreenCenter - sellScreenSize / 2;
m_BuySound = new SoundEffect { "sound/buy.wav" };
const Vector2f closeButtonOffset = Vector2f { 460, 396 - 14 };
Vector2f closeButtonPos = sellScreenCenter + closeButtonOffset;
@@ -36,6 +37,7 @@ SellScreen::SellScreen(const std::string& filePath, Vector2f pos, Vector2f size,
sellAllButton->SetOnClick([this]()
{
this->SellAll();
m_BuySound->Play(0);
});
this->AddElement(sellAllButton);
@@ -48,6 +50,7 @@ SellScreen::~SellScreen() {
for (SellSreenRow* row : m_Rows) {
delete row;
}
delete m_BuySound;
}
void SellScreen::Draw() const {
Screen::Draw();

View File

@@ -3,6 +3,8 @@
#include "../../Screen.h"
#include "Gui/GuiText.h"
class SoundEffect;
class SellScreen final : public Screen {
public:
SellScreen(const std::string& filePath, Vector2f pos, Vector2f size, TextureManager* manager);
@@ -20,4 +22,7 @@ private:
std::vector<SellSreenRow *> m_Rows;
bool m_AreRowsDirty { true };
SoundEffect* m_BuySound { nullptr };
};

View File

@@ -26,8 +26,8 @@ void SellSreenRow::Draw() const {
Vector2f amountPos { namePos.x + 100, m_Pos.y + 8 };
m_CalculationText->Draw(amountPos);
utils::SetColor(Colors::GREEN);
utils::DrawRect(Rectf { m_Pos, m_Size });
// utils::SetColor(Colors::GREEN);
// utils::DrawRect(Rectf { m_Pos, m_Size });
}
void SellSreenRow::Update(float elapsedSecs) {
// m_NameText->ChangeText("EXAMPLE");