TetrisNerd/jminos
2
2
Fork 0
Code Issues Pull Requests 2 Actions Projects Releases 1 Wiki Activity

on peut changer les settings wtf

Browse Source
This commit is contained in:
zulianc
2025-03-24 16:20:37 +01:00
parent 8a4c4201fe
commit fd9fd4586a
15 changed files with 200 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/GraphicalUI/AppMenus/AppMenu.h
View File

@@ -51,7 +51,7 @@ class AppMenu {
virtual void computeFrame() = 0;
virtual void drawFrame() const = 0;
virtual void drawFrame() const = 0;
};

36
src/GraphicalUI/AppMenus/GamePlayingAppMenu.cpp
View File

@@ -136,42 +136,6 @@ void GamePlayingAppMenu::drawFrame() const {
}
}
/*
if (this->game.getNextPieces().size() > 0) {
for (int y = 10; y >= 0; y--) {
for (int x = 0; x <= 10; x++) {
Block block = this->game.getNextPieces().at(0).getBlockType();
sf::RectangleShape cell(sf::Vector2f(20.f, 20.f));
cell.setPosition(sf::Vector2f((x + 2 + this->game.getBoard().getWidth())*20, (this->game.getBoard().getBaseHeight() - y)*20));
if (this->game.getNextPieces().at(0).getPositions().contains(Position({x, y}))) {
cell.setFillColor(sf::Color(BLOCKS_COLOR[block].red, BLOCKS_COLOR[block].green, BLOCKS_COLOR[block].blue));
}
else {
cell.setFillColor(sf::Color(0, 0, 0));
}
this->renderWindow->draw(cell);
}
}
}
if (this->game.getHeldPiece() != nullptr) {
for (int y = 10; y >= 0; y--) {
for (int x = 0; x <= 10; x++) {
Block block = this->game.getHeldPiece()->getBlockType();
sf::RectangleShape cell(sf::Vector2f(20.f, 20.f));
cell.setPosition(sf::Vector2f((x + 12 + this->game.getBoard().getWidth())*20, (this->game.getBoard().getBaseHeight() - y)*20));
if (this->game.getHeldPiece()->getPositions().contains(Position({x, y}))) {
cell.setFillColor(sf::Color(BLOCKS_COLOR[block].red, BLOCKS_COLOR[block].green, BLOCKS_COLOR[block].blue));
}
else {
cell.setFillColor(sf::Color(0, 0, 0));
}
this->renderWindow->draw(cell);
}
}
}
*/
this->renderWindow->display();
}

3
src/GraphicalUI/AppMenus/MainAppMenu.cpp
View File

@@ -2,6 +2,7 @@
#include "AppMenu.h"
#include "GameSettingsAppMenu.h"
#include "SettingsMainAppMenu.h"
#include "PlayerCursor.h"
#include <stack>
@@ -25,7 +26,7 @@ void MainAppMenu::computeFrame() {
this->menuStack->push(std::make_shared<GameSettingsAppMenu>(this->menuStack, this->settings, this->renderWindow));
}
if (this->playerCursor.getPosition().y == 1) {
//TODO
this->menuStack->push(std::make_shared<SettingsMainAppMenu>(this->menuStack, this->settings, this->renderWindow));
}
if (this->playerCursor.getPosition().y == 2) {
//TODO

16
src/GraphicalUI/AppMenus/PlayerCursor.cpp
View File

@@ -42,6 +42,22 @@ void PlayerCursor::updatePosition() {
}
}
bool PlayerCursor::movedLeft() const {
return this->shouldMove(this->leftDAS);
}
bool PlayerCursor::movedRight() const {
return this->shouldMove(this->rightDAS);
}
bool PlayerCursor::movedUp() const {
return this->shouldMove(this->upDAS);
}
bool PlayerCursor::movedDown() const {
return this->shouldMove(this->downDAS);
}
void PlayerCursor::goToPosition(const sf::Vector2u& newPosition) {
if (this->rows.size() > newPosition.y) {
if (this->rows.at(newPosition.y) > newPosition.x) {

8
src/GraphicalUI/AppMenus/PlayerCursor.h
View File

@@ -18,6 +18,14 @@ class PlayerCursor {
void updatePosition();
bool movedLeft() const;
bool movedRight() const;
bool movedUp() const;
bool movedDown() const;
void goToPosition(const sf::Vector2u& newPosition);
const sf::Vector2u& getPosition() const;

92
src/GraphicalUI/AppMenus/SettingsMainAppMenu.cpp Normal file
View File

@@ -0,0 +1,92 @@
#include "SettingsMainAppMenu.h"
#include "AppMenu.h"
#include "PlayerCursor.h"
#include <stack>
#include <memory>
#include <vector>
#include <SFML/Graphics.hpp>
SettingsMainAppMenu::SettingsMainAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
AppMenu(menuStack, settings, renderWindow),
playerCursor(std::vector<unsigned int>({1, 1, 1, 1})) {
}
void SettingsMainAppMenu::computeFrame() {
this->updateMetaBinds();
this->playerCursor.updatePosition();
switch (this->playerCursor.getPosition().y) {
case 2 : {
if (this->playerCursor.movedLeft()) {
if (this->settings->shortenWindow()) {
changeVideoMode(*this->renderWindow, this->settings->getVideoMode());
}
}
if (this->playerCursor.movedRight()) {
if (this->settings->widenWindow()) {
changeVideoMode(*this->renderWindow, this->settings->getVideoMode());
}
}
break;
}
case 3 : {
if (this->playerCursor.movedLeft()) {
this->settings->lowerMasterVolume();
}
if (this->playerCursor.movedRight()) {
this->settings->raiseMasterVolume();
}
break;
}
}
if (this->enterReleased) {
if (this->playerCursor.getPosition().y == 0) {
//TODO
}
if (this->playerCursor.getPosition().y == 1) {
//TODO
}
}
if (this->escReleased) {
this->menuStack->pop();
}
}
void SettingsMainAppMenu::drawFrame() const {
this->renderWindow->clear(sf::Color(200, 200, 200));
sf::Font font("data/fonts/pressstart/prstartk.ttf");
sf::Text text(font, "", this->settings->getWindowSizeMultiplier() * 2);
text.setFillColor(sf::Color(0, 0, 0));
text.setOutlineColor(sf::Color(255, 255, 255));
text.setString("SETTINGS");
text.setOrigin(text.getLocalBounds().getCenter());
text.setPosition(sf::Vector2f({(float) this->settings->getWindowSizeMultiplier() * 40, (float) this->settings->getWindowSizeMultiplier() * 5}));
this->renderWindow->draw(text);
sf::Vector2u windowSize = this->renderWindow->getSize();
this->placeText(text, "CHANGE KEYBINDS", 5.f, 15.f, 0, 0);
this->placeText(text, "CHANGE CONTROLS", 5.f, 25.f, 0, 1);
this->placeText(text, "WINDOW SIZE: " + std::to_string(windowSize.x) + "x" + std::to_string(windowSize.y), 5.f, 35.f, 0, 2);
this->placeText(text, "VOLUME: " + std::to_string(this->settings->getMasterVolume()) + "%", 5.f, 45.f, 0, 3);
this->renderWindow->display();
}
void SettingsMainAppMenu::placeText(sf::Text& text, const sf::String& string, float xPos, float yPos, unsigned int xCursorOutline, unsigned int yCursorOutline) const {
float sizeMultiplier = this->settings->getWindowSizeMultiplier();
text.setString(string);
text.setOutlineThickness((this->playerCursor.getPosition().x == xCursorOutline
&& this->playerCursor.getPosition().y == yCursorOutline) ? (sizeMultiplier / 2) : 0);
text.setOrigin(sf::Vector2f({0, text.getLocalBounds().size.y / 2}));
text.setPosition(sf::Vector2f({sizeMultiplier * xPos, sizeMultiplier * yPos}));
this->renderWindow->draw(text);
}

23
src/GraphicalUI/AppMenus/SettingsMainAppMenu.h Normal file
View File

@@ -0,0 +1,23 @@
#pragma once
#include "AppMenu.h"
#include "PlayerCursor.h"
#include <stack>
#include <memory>
#include <SFML/Graphics.hpp>
class SettingsMainAppMenu : public AppMenu {
private:
PlayerCursor playerCursor;
public:
SettingsMainAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow);
void computeFrame() override;
void drawFrame() const override;
void placeText(sf::Text& text, const sf::String& string, float xPos, float yPos, unsigned int xCursorOutline, unsigned int yCursorOutline) const;
};