omg omg

src/GraphicalUI/AppMenus/GamePiecesAppMenu.cpp

@@ -11,7 +11,7 @@
 
 GamePiecesAppMenu::GamePiecesAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
     AppMenu(menuStack, settings, renderWindow),
-    playerCursor({1, 1}) {
+    playerCursor({1, (unsigned int) this->settings->getSelectedPieces().size() + 1u}) {
     
     for (int i = 1; i <= MAXIMUM_PIECES_SIZE; i++) {
         this->playerCursor.addRow(i + 1, this->settings->getMenu().readPiecesList().getNumberOfPieces(i) + 4);
@@ -22,19 +22,42 @@ void GamePiecesAppMenu::computeFrame() {
     this->updateMetaBinds();
     this->playerCursor.updatePosition();
 
+    if (this->playerCursor.movedDown() && this->playerCursor.getPosition().y == 2) {
+        this->playerCursor.goToPosition({0, 2});
+    }
+
     if (this->enterReleased) {
         if (this->playerCursor.getPosition().y == 0) {
             this->menuStack->push(std::make_shared<GameDistributionAppMenu>(this->menuStack, this->settings, this->renderWindow));
         }
         if (this->playerCursor.getPosition().y > 1) {
-            //TODO
+            if (this->playerCursor.getPosition().x >= 4) {
+                this->settings->selectPieces(createSinglePieceType(this->playerCursor.getPosition().y - 1), this->playerCursor.getPosition().x - 4);
+            }
+            else {
+                switch (this->playerCursor.getPosition().x) {
+                    case 0 : {this->settings->selectPieces(ALL_PIECES, this->playerCursor.getPosition().y - 1); break;}
+                    case 1 : {this->settings->selectPieces(CONVEX_PIECES, this->playerCursor.getPosition().y - 1); break;}
+                    case 2 : {this->settings->selectPieces(HOLELESS_PIECES, this->playerCursor.getPosition().y - 1); break;}
+                    case 3 : {this->settings->selectPieces(OTHER_PIECES, this->playerCursor.getPosition().y - 1); break;}
+                }
+            }
+            this->playerCursor.addPosition(0, 1);
         }
     }
     if (this->escReleased) {
         if (this->playerCursor.getPosition().y == 1) {
-            //TODO
+            if (this->playerCursor.getPosition().x > 0) {
+                this->settings->unselectPieces(this->playerCursor.getPosition().x - 1);
+                this->playerCursor.removePosition(this->playerCursor.getPosition().x - 1, 1);
+            }
         }
         else {
+            if (this->settings->getSelectedPieces().size() == 0) {
+                this->settings->selectPieces(ALL_PIECES, 4);
+            }
+            this->settings->confirmSelectedPieces();
+
             this->menuStack->pop();
         }
     }
@@ -51,55 +74,109 @@ void GamePiecesAppMenu::drawFrame() const {
 
     if (this->playerCursor.getPosition().y == 0) {
         this->placeText(text, this->playerCursor, "PIECES DISTRIBUTION", 5.f, 15.f, sf::Vector2u{0, 0});
-        // draw pieces line
-        this->drawRow(1, 35.f);
-        this->drawRow(2, 45.f);
+        this->drawSelectedPiecesRow(25.f);
+        this->drawRow(1, 35.f, true);
+        this->drawRow(2, 45.f, true);
     }
     else {
-        // draw pieces line
-        int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 2, 1, MAXIMUM_PIECES_SIZE - 1);
-        this->drawRow(firstElem, 25.f);
-        this->drawRow(firstElem + 1, 35.f);
-        this->drawRow(firstElem + 2, 45.f);
-        std::cout << this->playerCursor.getPosition().x << " " << this->playerCursor.getPosition().y << " " << firstElem << std::endl;
+        this->drawSelectedPiecesRow(15.f);
 
+        bool drawFromFirstElem = (this->playerCursor.getPosition().y == 1);
+        int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 2, 1, MAXIMUM_PIECES_SIZE - 2);
+        this->drawRow(firstElem, 25.f, drawFromFirstElem);
+        this->drawRow(firstElem + 1, 35.f, drawFromFirstElem);
+        this->drawRow(firstElem + 2, 45.f, drawFromFirstElem);
     }
 
-
     this->renderWindow->display();
 }
 
-void GamePiecesAppMenu::drawRow(int piecesSize, float yPos) const {
+void GamePiecesAppMenu::drawSelectedPiecesRow(float yPos) const {
+    sf::RectangleShape rect({(float) this->renderWindow->getSize().x, 8.f * this->settings->getWindowSizeMultiplier()});
+    rect.setPosition({0.f, (yPos - 4.f) * this->settings->getWindowSizeMultiplier()});
+    rect.setFillColor({240, 240, 240});
+    this->renderWindow->draw(rect);
+
+    sf::Text text(this->pressStartFont, "", this->settings->getWindowSizeMultiplier());
+    text.setFillColor({0, 0, 0});
+
+    int elem = (this->playerCursor.getPosition().y == 1) ? std::max(((int) this->playerCursor.getPosition().x) - 4, 0) : 0;
+    float xProgress = 1.f;
+
+    bool first = true;
+    while (true) {
+        if ((this->playerCursor.getPosition().y == 1) && (elem == this->playerCursor.getPosition().x)) {
+            this->placeText(text, {}, "|", xProgress, yPos, {});
+            xProgress += (1.f + (text.getGlobalBounds().size.x / this->settings->getWindowSizeMultiplier()));
+        }
+
+        if (elem >= this->settings->getSelectedPieces().size()) return;
+
+        const auto& [pieceType, value] = this->settings->getSelectedPieces().at(elem);
+
+        int pieceSize = getSizeOfPieces(pieceType);
+        if (pieceSize > 0) {
+            const Piece& piece = this->settings->getMenu().readPiecesList().lookAtPiece({pieceSize, value});
+            int cellSize = (8 * this->settings->getWindowSizeMultiplier()) / (piece.getLength());
+            sf::FloatRect piecePosition(sf::Vector2f(xProgress, yPos - 4.f) * (float) this->settings->getWindowSizeMultiplier(), sf::Vector2f(8 , 8) * (float) this->settings->getWindowSizeMultiplier());
+            this->drawPiece(piece, cellSize, piecePosition, false);
+            xProgress += (1.f + 8.f);
+        }
+        else {
+            this->placeText(text, {}, ((first) ? "" : " ") + getPiecesTypeName(pieceType) + "_" + std::to_string(value), xProgress, yPos, {});
+            xProgress += (1.f + (text.getGlobalBounds().size.x / this->settings->getWindowSizeMultiplier()));
+        }
+
+        elem++;
+    }
+}
+
+void GamePiecesAppMenu::drawRow(int piecesSize, float yPos, bool drawFromFirstElem) const {
     int numberOfPieces = this->settings->getMenu().readPiecesList().getNumberOfPieces(piecesSize);
-    int firstElem = std::clamp(((int) this->playerCursor.getPosition().x) - 3, 0, std::max(numberOfPieces - 6, 0));
+    int firstElem = (drawFromFirstElem) ? -4 : std::max(((int) this->playerCursor.getPosition().x) - 7, -4);
+
+    sf::Text text(this->pressStartFont, "", this->settings->getWindowSizeMultiplier());
+    text.setFillColor({0, 0, 0});
+    text.setOutlineColor({255, 255, 255});
+
+    this->placeText(text, {}, "SIZE " + std::to_string(piecesSize), 1.f, yPos, {});
 
     for (int i = 0; i < 7; i++) {
         if (i + firstElem >= numberOfPieces) return;
 
-        const Piece& piece = this->settings->getMenu().readPiecesList().lookAtPiece({piecesSize, firstElem + i});
-        int cellSize = (8 * this->settings->getWindowSizeMultiplier()) / (piece.getLength());
-        sf::FloatRect pos(sf::Vector2f(5.f + (i * 10.f), yPos) * (float) this->settings->getWindowSizeMultiplier(), sf::Vector2f(8 , 8) * (float) this->settings->getWindowSizeMultiplier());
-        this->drawPiece(piece, cellSize, pos, this->playerCursor.getPosition() == sf::Vector2u{i + firstElem + 4, piecesSize + 2});
-    }
-}
-
-void GamePiecesAppMenu::drawPiece(const Piece& piece, int cellSize, const sf::FloatRect& pos, bool selected) const {
-    sf::RectangleShape cell(sf::Vector2f(cellSize, cellSize));
-    sf::Color color = this->getColorOfBlock(piece.getBlockType(), (selected) ? +100 : 0);
-    sf::Color boxColor = sf::Color(180, 180, 180);
-
-    for (int y = 0; y < piece.getLength(); y++) {
-        for (int x = 0; x < piece.getLength(); x++) {
-            if (piece.getPositions().contains(Position{x, y})) {
-                cell.setFillColor(color);
+        if ((i + firstElem) < 0) {
+            switch (i + firstElem) {
+                case -4 : {this->placeText(text, this->playerCursor, "ALL", 10.f + (i * 10.f), yPos, sf::Vector2u{0, piecesSize + 1u}); break;}
+                case -3 : {this->placeText(text, this->playerCursor, "CONVEX", 10.f + (i * 10.f), yPos, sf::Vector2u{1, piecesSize + 1u}); break;}
+                case -2 : {this->placeText(text, this->playerCursor, "HOLELESS", 10.f + (i * 10.f), yPos, sf::Vector2u{2, piecesSize + 1u}); break;}
+                case -1 : {this->placeText(text, this->playerCursor, "OTHER", 10.f + (i * 10.f), yPos, sf::Vector2u{3, piecesSize + 1u}); break;}
             }
-            else {
-                cell.setFillColor(boxColor);
-                
-            }
-            cell.setPosition(sf::Vector2f(pos.position.x + (x * cellSize),
-                                          pos.position.y + ((piece.getLength() - y - 1) * cellSize)));
-            this->renderWindow->draw(cell);
+        }
+        else {
+            const Piece& piece = this->settings->getMenu().readPiecesList().lookAtPiece({piecesSize, firstElem + i});
+            int cellSize = (8 * this->settings->getWindowSizeMultiplier()) / (piece.getLength());
+            sf::FloatRect piecePosition(sf::Vector2f(10.f + (i * 10.f), yPos - 4.f) * (float) this->settings->getWindowSizeMultiplier(), sf::Vector2f(8 , 8) * (float) this->settings->getWindowSizeMultiplier());
+            this->drawPiece(piece, cellSize, piecePosition, this->playerCursor.getPosition() == sf::Vector2u{i + firstElem + 4u, piecesSize + 1u});
         }
     }
 }
+
+void GamePiecesAppMenu::drawPiece(const Piece& piece, int cellSize, const sf::FloatRect& piecePosition, bool selected) const {
+    sf::RectangleShape rect(piecePosition.size);
+    rect.setPosition(piecePosition.position);
+    rect.setFillColor({180, 180, 180});
+    if (selected) {
+        rect.setOutlineColor({0, 0, 0});
+        rect.setOutlineThickness(this->settings->getWindowSizeMultiplier() / 2);
+    }
+    this->renderWindow->draw(rect);
+
+    sf::RectangleShape cell(sf::Vector2f(cellSize, cellSize));
+    cell.setFillColor(this->getColorOfBlock(piece.getBlockType(), 0));
+
+    for (const Position& cellPosition : piece.getPositions()) {
+        cell.setPosition(sf::Vector2f(piecePosition.position.x + (cellPosition.x * cellSize),
+                                      piecePosition.position.y + ((piece.getLength() - cellPosition.y - 1) * cellSize) ));
+        this->renderWindow->draw(cell);
+    }
+}

src/GraphicalUI/AppMenus/GamePiecesAppMenu.h

@@ -21,7 +21,9 @@ class GamePiecesAppMenu : public AppMenu {
         void drawFrame() const override;
     
     private:
-        void drawRow(int piecesSize, float yPos) const;
+        void drawSelectedPiecesRow(float yPos) const;
+
+        void drawRow(int piecesSize, float yPos, bool drawFromFirstElem) const;
 
         void drawPiece(const Piece& piece, int cellSize, const sf::FloatRect& pos, bool selected) const;
 };

src/GraphicalUI/PiecesType.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 
 enum PiecesType {
     CONVEX_PIECES,
@@ -19,3 +21,15 @@ inline int getSizeOfPieces(PiecesType type) {
 inline PiecesType createSinglePieceType(int size) {
     return PiecesType(SINGLE_PIECE + size - 1);
 }
+
+inline std::string getPiecesTypeName(PiecesType piecesType) {
+    static const std::string PIECES_TYPE_NAME[] = {
+        "CONVEX",
+        "HOLELESS",
+        "OTHER",
+        "ALL",
+        "SINGLE"
+    };
+
+    return PIECES_TYPE_NAME[piecesType];
+}

src/GraphicalUI/PlayerCursor.cpp

@@ -71,7 +71,7 @@ bool PlayerCursor::addPosition(unsigned int x, unsigned int y) {
     if (x > this->rows.at(y)) return false;
 
     this->rows.at(y)++;
-    if (x <= this->position.x) {
+    if ((y == this->position.y) && (x <= this->position.x)) {
         this->position.x++;
     }
     return true;
@@ -82,7 +82,7 @@ bool PlayerCursor::removePosition(unsigned int x, unsigned int y) {
     if (x >= this->rows.at(y)) return false;
 
     this->rows.at(y)--;
-    if (x < this->position.x) {
+    if ((y == this->position.y) && (x < this->position.x)) {
         this->position.x--;
     }
     return true;

src/GraphicalUI/Settings.cpp

@@ -271,7 +271,7 @@ bool Settings::decreaseDistribution(int size) {
 
 void Settings::confirmDistribution() {
     for (int i = 1; i <= 15; i++) {
-        this->menu.getPiecesList().changeCustomDistribution(i, (double) this->distributions.at(i) / (DISTRIBUTION_MAX + 0.001));
+        this->menu.getPiecesList().changeCustomDistribution(i, (double) 1 / (this->distributions.at(i) + 0.001));
     }
 }
 

src/Pieces/PiecesFiles.cpp

@@ -91,7 +91,7 @@ bool PiecesFiles::loadPieces(int polyominoSize, std::vector<Piece>& pieces, std:
         char positionByte;
         for (int i = 0; i < polyominoSize; i++) {
             piecesFile.get(positionByte);
-            int x = (positionByte & xMask) >> 4;
+            int x = ((unsigned char) positionByte & xMask) >> 4;
             int y = positionByte & yMask;
             piecePositions.insert(Position{x, y});
         }