optimize vector initialization

use bitsets
fix some compiler warnings
2025-07-28 09:51:02 +02:00 · 2025-07-21 16:06:27 +02:00 · 2025-07-20 23:02:45 +02:00 · 2025-07-20 22:32:33 +02:00 · 2025-07-20 21:39:10 +02:00 · 2025-07-20 21:08:36 +02:00
48 changed files with 1569 additions and 455 deletions
--- a/README.md
+++ b/README.md
@@ -2,12 +2,18 @@

 Modern stacker game with every polyominoes from size 1 to 15, made in C++ with [SFML 3](https://www.sfml-dev.org/)!

+- [Download](#download)
+- [How to play](#how-to-play)
+- [Features](#features)
+- [Manual build](#manual-build)
+- [Benchmarks](#benchmarks)
+- [Credits](#credits)
+
 ## Download

-// TODO when the game is finished //
-
-This game has been tested on and built for Windows 11 and WSL2 Ubuntu.  
-If your OS isn't compactible with either of theses two, you can try [manually building the project](#manual-build).  
+You can download the latest release [here](https://git.ale-pri.com/TetrisNerd/jminos/releases)!  
+This game has been tested on Windows 11 and Linux, and releases are provided for theses two systems.  
+If your OS isn't compatible, you can try [manually building the project](#manual-build).  

 ## How to play

@@ -44,22 +50,28 @@ You will find more infos about the Rotation System, the scoring system, or the d
 ### Screenshots

 Pentedecamino jumpscare
-![](./doc/readme/big_piece.png)
+
+![Screenshot1](./doc/readme/big_piece.png)

 Pieces select screen
-![](./doc/readme/pieces_selection.png)
+
+![Screenshot2](./doc/readme/pieces_selection.png)

 AutoRS demonstration
-![](./doc/readme/rotations.gif)
+
+![Video1](./doc/readme/rotations.gif)

 0° spins demonstration
-![](./doc/readme/rotation_0.gif)
+
+![Video2](./doc/readme/rotation_0.gif)

 ## Manual build

 This project uses xmake for compiling, xmake is cross-platform and works in most OS, xmake also automatically install supported librairies.  
 To be able to build this project, you need to [have xmake installed](https://xmake.io) and have a compiler with C++20 compatibility.  

+If you want to contribute or are simply curious, you can check the [wiki](https://git.ale-pri.com/TetrisNerd/jminos/wiki)!  
+
 ### Build the project

 ``cd jminos``
@@ -69,6 +81,9 @@ To be able to build this project, you need to [have xmake installed](https://xma
 If you need to change the toolchain (for example using gcc):  
 ``xmake f --toolchain=gcc``

+If you want to build for another platform (for example with mingw):  
+``xmake f -p mingw``
+
 ### Run the project

 ``xmake run``  
@@ -79,42 +94,50 @@ To switch between debug and release mode:
 ``xmake f -m debug``  
 ``xmake f -m release``

-If for some reasons you wanna run the command line version (not updated):  
+If for some reasons you wanna run the command line version:  
 ``xmake build text``  
 ``xmake run text``  
+The command line version is **not** updated.

 ### Package the project

-// TODO when the game is finished //
+To package the executable manually properly, follow theses steps:  
+
+1. Clone the project into a new folder.
+2. If you already have all 15 pieces files, copy them over to the ``data/pieces`` folder, else you will be generating them at the next step.
+3. Go into release mode (``xmake f -m release``) and run the project once (``xmake`` and ``xmake run``). This is to generate the default config files, close the game immediately after it started.
+4. Make a new folder named ``jminos`` and copy the executable (should be located somewhere like ``build/linux/x86_64/release/graph``) as well as the ``data/pieces`` and ``data/config`` folders.
+5. Zip the newly created ``jminos`` folder into a file named ``jminos_{platform}``.

 ## Benchmarks

 ### One-sided n-polyominoes

 | n | Number | Generation | File storing | File retrieving | File size |
-| - | - | - | - | - | - |
-| 1 | 1 | 0s 0.005622ms  | 0s 0.750955ms  | 0s 0.014016ms  | 2 bytes |
-| 2 | 1 | 0s 0.005758ms  | 0s 0.181323ms  | 0s 0.012256ms  | 3 bytes |
-| 3 | 2 | 0s 0.017525ms  | 0s 0.054497ms  | 0s 0.006431ms  | 8 bytes |
-| 4 | 7 | 0s 0.050554ms  | 0s 0.067617ms  | 0s 0.010984ms  | 35 bytes |
-| 5 | 18 | 0s 0.191971ms  | 0s 0.109905ms  | 0s 0.021234ms  | 108 bytes |
-| 6 | 60 | 0s 0.651757ms  | 0s 0.327465ms  | 0s 0.04558ms  | 420 bytes |
-| 7 | 196 | 0s 3.38847ms  | 0s 1.94434ms  | 0s 0.258777ms  | 1568 bytes |
-| 8 | 704 | 0s 22.7411ms  | 0s 10.0103ms  | 0s 1.34813ms  | 6336 bytes |
-| 9 | 2500 | 0s 66.2949ms  | 0s 20.6137ms  | 0s 2.56374ms  | 25000 bytes |
-| 10 | 9189 | 0s 194.764ms  | 0s 84.5884ms  | 0s 9.64467ms  | 101079 bytes |
-| 11 | 33896 | 0s 759.182ms  | 0s 378.494ms  | 0s 44.1424ms  | 406752 bytes |
-| 12 | 126759 | 2s 709.277ms  | 1s 530.34ms  | 0s 155ms  | 1647867 bytes |
-| 13 | 476270 | 10s 668.308ms  | 7s 395.512ms  | 0s 765.601ms  | 6667780 bytes |
-| 14 | 1802312 | 45s 606.597ms  | 32s 28.7977ms  | 2s 919.653ms  | 27034680 bytes |
-| 15 | ~6M | ~5mn  | ~5mn  | ~10s  | ~100 MB |
+| -: | -: | :-: | :-: | :-: | -: |
+| 1 | 1 | 0s 0.005471ms  | 0s 0.14436ms  | 0s 0.022223ms  | 3 bytes |
+| 2 | 1 | 0s 0.006979ms  | 0s 0.036624ms  | 0s 0.011424ms  | 4 bytes |
+| 3 | 2 | 0s 0.018718ms  | 0s 0.035885ms  | 0s 0.013246ms  | 9 bytes |
+| 4 | 7 | 0s 0.060544ms  | 0s 0.056277ms  | 0s 0.019395ms  | 36 bytes |
+| 5 | 18 | 0s 0.220348ms  | 0s 0.166593ms  | 0s 0.036526ms  | 76 bytes |
+| 6 | 60 | 0s 0.773924ms  | 0s 0.283423ms  | 0s 0.063492ms  | 186 bytes |
+| 7 | 196 | 0s 3.00331ms  | 0s 0.827344ms  | 0s 0.163653ms  | 546 bytes |
+| 8 | 704 | 0s 13.142ms  | 0s 3.68255ms  | 0s 0.630044ms  | 1 898 bytes |
+| 9 | 2500 | 0s 50.9272ms  | 0s 16.1929ms  | 0s 2.35157ms  | 6889 bytes |
+| 10 | 9189 | 0s 204.031ms  | 0s 87.1819ms  | 0s 10.5841ms  | 25302 bytes |
+| 11 | 33896 | 0s 832.82ms  | 0s 412.466ms  | 0s 57.6399ms  | 93711 bytes |
+| 12 | 126759 | 3s 425.907ms  | 1s 982.715ms  | 0s 226.816ms  | 350325 bytes |
+| 13 | 476270 | 14s 570.595ms  | 9s 945.511ms  | 0s 972.036ms  | 1327156 bytes |
+| 14 | 1802312 | 56s 394.426ms  | 41s 675.672ms  | 4s 79.0436ms  | 5035148 bytes |
+| 15 | 6849777 | 258s 219.666ms  | 223s 386.329ms  | 16s 483.426ms  | 19392417 bytes |

-_File storing includes normalizing and sorting all polyominoes before writing them to the file._  
-If you want to know more details about the generation and storage of polyominoes, [check the documentation](/doc/)!  
+_File storing includes type checking and sorting all polyominoes before writing them to the file._  
+The files are compressed, they used to be about 5x as large.  

 Run it yourself by typing:  
-``xmake build benchmark``  
-``xmake run benchmark``
+``xmake f -m release``  
+``xmake build bmark``  
+``xmake run bmark``  

 ## Credits

@@ -123,3 +146,6 @@ Font used: [Press Start](https://www.zone38.net/font/#pressstart).

 Inspired by other modern stacker games such as Techmino, jstris, tetr.io, etc.  
 This game isn't affiliated with any of them.  
+
+Special thanks to my friend [Simon](https://git.ale-pri.com/Persson-dev) who did most of the outside stuff (github actions, files compression, asset manager, xmake).  
+All the code in src/Common/, src/Utils/ and xmake/ comes from him.  
--- a/doc/diagrams/class_diagramm_graphicalUI.png
+++ b/doc/diagrams/class_diagramm_graphicalUI.png
--- a/doc/diagrams/package_diagramm.png
+++ b/doc/diagrams/package_diagramm.png
--- a/doc/files_format.md
+++ b/doc/files_format.md
@@ -2,11 +2,11 @@

 ## Pieces

-If you don't know what a polyomino is, check [this other file](Pieces_representation.md#what-are-polyominoes).
+_Note: the current algorithm has been adapted to use file compression. There is currently no documentation on how the compression work, but you can check the code in the [src/Common](https://git.ale-pri.com/TetrisNerd/jminos/src/branch/main/src/Common) folder._

 Generating polyominoes of size n is exponential in regard to n. Because of this, we will store the pieces beforehand and load them upon launching the game.

-We want the pieces to be always sorted in the same order, always attributed the same block type, and always set at the same spawn position, no matter how they were generated. We also want them to be separated in 3 categories : convex, not convex but without a hole, and with a hole. Theses problematics are already resolved internally, but will be calculated before storage as to not need extra calculcations upon load (except for the block type which is trivially computed).
+We want the pieces to be always sorted in the same order, always attributed the same block type, and always set at the same spawn position, no matter how they were generated. We also want them to be separated in 3 categories : convex, not convex but without a hole, and with a hole. Theses problematics are already solved internally, but will be calculated before storage as to not need extra calculcations upon load (except for the block type which is trivially computed).

 Pieces are stored in binary files. Each file simply contains every polyomino of one size, one after the other. Since each file contains all polyominoes of the same size, we know how much stuff to read and don't need delimiters. We know we've read all pieces simply when we reach the end of file character.

@@ -55,5 +55,4 @@ The settings file has the following format:
    - For every single piece, use 1 byte for (the size + encoding that it is a single piece),
    and 3 bytes to store the number of the piece (allows number up to 16M, size 15 has 6M pieces).

-The current file format version is 11.
-If the file starts with a number lower than that, it will be regenerated upon launching the game.
+When starting the game, it will verify if the current settings file is in the latest format, if it is not it will be regenerated with default values.
--- a/doc/game_logic.md
+++ b/doc/game_logic.md
@@ -1,7 +1,7 @@
 # Game logic

 This section will detail how the player's action are interpreted into the game.  
-We will only talk about pieces and not polyominoes. In this project, pieces are an abstraction of a polyomino. Though if you want to know more the polyominoes in this project, check [this other file](Pieces_representation.md).
+We will only talk about pieces and not polyominoes. In this project, pieces are an abstraction of a polyomino.

 ## Order of operations

--- a/src/Benchmark/main.cpp
+++ b/src/Benchmark/main.cpp
@@ -0,0 +1,102 @@
+#include "../Pieces/Generator.h"
+#include "../Pieces/PiecesFiles.h"
+
+#include <chrono>
+#include <filesystem>
+#include <cmath>
+
+static const int BENCHMARK_PIECES_SIZE = 15;
+
+void benchmarking(int min_size, int max_size);
+
+
+int main(int argc, char** argv) {
+    std::srand(std::time(NULL));
+
+    #ifdef DEBUG
+        std::cout << "IMPORTANT: You are currently in debug mode, debug mode has lowest optimization settings and thus yields worse benchmarking results, to switch to release mode, type 'xmake f -m debug'." << std::endl;
+    #endif
+
+    benchmarking(1, BENCHMARK_PIECES_SIZE);
+
+    return 0;
+}
+
+
+void benchmarking(int min_size, int max_size) {
+    using std::chrono::high_resolution_clock;
+    using std::chrono::duration_cast;
+    using std::chrono::duration;
+    using std::chrono::milliseconds;
+
+    std::cout << "| n | Number | Generation | File storing | File retrieving | File size |" << std::endl;
+    std::cout << "| -: | -: | :-: | :-: | :-: | -: |" << std::endl;
+
+    Generator gen;
+    PiecesFiles pf;
+
+    auto t1 = high_resolution_clock::now();
+    auto t2 = high_resolution_clock::now();
+    duration<double, std::milli> ms_double;
+    bool ok;
+
+    for (int i = min_size; i <= max_size; i++) {
+        std::cout << "| " << i;
+
+        t1 = high_resolution_clock::now();
+        std::vector<Polyomino> polyominoes = gen.generatePolyominoes(i);
+        t2 = high_resolution_clock::now();
+        ms_double = t2 - t1;
+        std::cout << " | " << polyominoes.size();
+        std::flush(std::cout);
+        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms";
+        std::flush(std::cout);
+
+        t1 = high_resolution_clock::now();
+        ok = pf.savePieces(i, polyominoes);
+        t2 = high_resolution_clock::now();
+        ms_double = t2 - t1;
+        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms";
+        std::flush(std::cout);
+
+        if (!ok) {
+            std::cerr << "\nERROR: Could not save pieces to file." << std::endl;
+            return;
+        }
+
+        polyominoes.clear();
+        polyominoes.shrink_to_fit();
+
+        std::vector<Piece> pieces;
+        std::vector<int> convexPieces;
+        std::vector<int> holelessPieces;
+        std::vector<int> otherPieces;
+
+        t1 = high_resolution_clock::now();
+        ok = pf.loadPieces(i, pieces, convexPieces, holelessPieces, otherPieces);
+        t2 = high_resolution_clock::now();
+        ms_double = t2 - t1;
+        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms";
+        std::flush(std::cout);
+
+        if (!ok) {
+            std::cerr << "\nERROR: Could not load pieces from file." << std::endl;
+            return;
+        }
+
+        pieces.clear();
+        pieces.shrink_to_fit();
+        convexPieces.clear();
+        convexPieces.shrink_to_fit();
+        holelessPieces.clear();
+        holelessPieces.shrink_to_fit();
+        otherPieces.clear();
+        otherPieces.shrink_to_fit();
+
+        std::string filePath;
+        pf.getFilePath(i, filePath);
+        int fileSize = std::filesystem::file_size(filePath);
+        std::cout << " | " << fileSize << " bytes |" << std::endl;
+        std::flush(std::cout);
+    }
+}
--- a/src/Common/Compression.cpp
+++ b/src/Common/Compression.cpp
@@ -0,0 +1,68 @@
+#include "Compression.h"
+
+#include "VarInt.h"
+
+#include <cassert>
+#include <zlib.h>
+
+#define COMPRESSION_THRESHOLD 64
+
+static DataBuffer Inflate(const std::uint8_t* source, std::size_t size, std::size_t uncompressedSize) {
+	DataBuffer result;
+	result.Resize(uncompressedSize);
+
+	uncompress(reinterpret_cast<Bytef*>(result.data()), reinterpret_cast<uLongf*>(&uncompressedSize),
+		reinterpret_cast<const Bytef*>(source), static_cast<uLong>(size));
+
+	assert(result.GetSize() == uncompressedSize);
+	return result;
+}
+
+static DataBuffer Deflate(const std::uint8_t* source, std::size_t size) {
+	DataBuffer result;
+	uLongf compressedSize = size;
+
+	result.Resize(size);  // Resize for the compressed data to fit into
+	compress(
+		reinterpret_cast<Bytef*>(result.data()), &compressedSize, reinterpret_cast<const Bytef*>(source), static_cast<uLong>(size));
+	result.Resize(compressedSize);	// Resize to cut useless data
+
+	return result;
+}
+
+DataBuffer Compress(const DataBuffer& buffer) {
+	DataBuffer packet;
+
+	if (buffer.GetSize() < COMPRESSION_THRESHOLD) {
+		// Don't compress since it's a small packet
+		VarInt compressedDataLength = 0;
+		packet << compressedDataLength;
+		packet << buffer;
+		return packet;
+	}
+
+	DataBuffer compressedData = Deflate(buffer.data(), buffer.GetSize());
+
+	VarInt uncompressedDataLength = buffer.GetSize();
+	packet << uncompressedDataLength;
+	packet.WriteSome(compressedData.data(), compressedData.GetSize());
+	return packet;
+}
+
+DataBuffer Decompress(DataBuffer& buffer, std::uint64_t packetLength) {
+	VarInt uncompressedLength;
+	buffer >> uncompressedLength;
+
+	std::uint64_t compressedLength = packetLength - uncompressedLength.GetSerializedLength();
+
+	if (uncompressedLength.GetValue() == 0) {
+		// Data already uncompressed. Nothing to do
+		DataBuffer ret;
+		buffer.ReadSome(ret, compressedLength);
+		return ret;
+	}
+
+	assert(buffer.GetReadOffset() + compressedLength <= buffer.GetSize());
+
+	return Inflate(buffer.data() + buffer.GetReadOffset(), compressedLength, uncompressedLength.GetValue());
+}
--- a/src/Common/Compression.h
+++ b/src/Common/Compression.h
@@ -0,0 +1,23 @@
+#pragma once
+
+/**
+ * \file Compression.h
+ * \brief File containing compress utilities
+ */
+
+#include "DataBuffer.h"
+
+/**
+ * \brief Compress some data
+ * \param buffer the data to compress
+ * \return the compressed data
+ */
+DataBuffer Compress(const DataBuffer& buffer);
+
+/**
+ * \brief Uncompress some data
+ * \param buffer the data to uncompress
+ * \param packetLength lenght of data
+ * \return the uncompressed data
+ */
+DataBuffer Decompress(DataBuffer& buffer, std::uint64_t packetLength);
--- a/src/Common/DataBuffer.cpp
+++ b/src/Common/DataBuffer.cpp
@@ -0,0 +1,98 @@
+#include "DataBuffer.h"
+
+#include <fstream>
+#include <iomanip>
+#include <sstream>
+#include <iostream>
+
+DataBuffer::DataBuffer(std::size_t initalCapacity) : m_ReadOffset(0) {
+	m_Buffer.reserve(initalCapacity);
+}
+
+DataBuffer::DataBuffer() : m_ReadOffset(0) {}
+
+DataBuffer::DataBuffer(const DataBuffer& other) : m_Buffer(other.m_Buffer), m_ReadOffset(other.m_ReadOffset) {}
+
+DataBuffer::DataBuffer(DataBuffer&& other) : m_Buffer(std::move(other.m_Buffer)), m_ReadOffset(std::move(other.m_ReadOffset)) {}
+
+DataBuffer::DataBuffer(const std::string& str) : m_Buffer(str.begin(), str.end()), m_ReadOffset(0) {}
+
+DataBuffer::DataBuffer(const DataBuffer& other, Data::difference_type offset) : m_ReadOffset(0) {
+	m_Buffer.reserve(other.GetSize() - static_cast<std::size_t>(offset));
+	std::copy(other.m_Buffer.begin() + offset, other.m_Buffer.end(), std::back_inserter(m_Buffer));
+}
+
+DataBuffer& DataBuffer::operator=(const DataBuffer& other) {
+	m_Buffer = other.m_Buffer;
+	m_ReadOffset = other.m_ReadOffset;
+	return *this;
+}
+
+DataBuffer& DataBuffer::operator=(DataBuffer&& other) {
+	m_Buffer = std::move(other.m_Buffer);
+	m_ReadOffset = std::move(other.m_ReadOffset);
+	return *this;
+}
+
+void DataBuffer::SetReadOffset(std::size_t pos) {
+	assert(pos <= GetSize());
+	m_ReadOffset = pos;
+}
+
+std::size_t DataBuffer::GetSize() const {
+	return m_Buffer.size();
+}
+
+std::size_t DataBuffer::GetRemaining() const {
+	return m_Buffer.size() - m_ReadOffset;
+}
+
+DataBuffer::iterator DataBuffer::begin() {
+	return m_Buffer.begin();
+}
+
+DataBuffer::iterator DataBuffer::end() {
+	return m_Buffer.end();
+}
+
+DataBuffer::const_iterator DataBuffer::begin() const {
+	return m_Buffer.begin();
+}
+
+DataBuffer::const_iterator DataBuffer::end() const {
+	return m_Buffer.end();
+}
+
+std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer) {
+	for (unsigned char u : buffer)
+		os << std::hex << std::setfill('0') << std::setw(2) << static_cast<int>(u) << " ";
+	os << std::dec;
+	return os;
+}
+
+bool DataBuffer::ReadFile(const std::string& fileName) {
+	try {
+		std::ifstream file(fileName, std::istream::binary);
+		std::ostringstream ss;
+		ss << file.rdbuf();
+		const std::string& s = ss.str();
+		m_Buffer = DataBuffer::Data(s.begin(), s.end());
+		m_ReadOffset = 0;
+	} catch (std::exception& e) {
+		std::cerr << "Failed to read file : " << e.what() << std::endl;
+		return false;
+	}
+	return m_Buffer.size() > 0;
+}
+
+bool DataBuffer::WriteFile(const std::string& fileName) const {
+	try {
+		std::ofstream file(fileName, std::ostream::binary);
+		file.write(reinterpret_cast<const char*>(m_Buffer.data()), static_cast<std::streamsize>(m_Buffer.size()));
+		file.flush();
+	} catch (std::exception& e) {
+		std::cerr << "Failed to write file : " << e.what() << std::endl;
+		return false;
+	}
+	return true;
+}
--- a/src/Common/DataBuffer.h
+++ b/src/Common/DataBuffer.h
@@ -0,0 +1,284 @@
+#pragma once
+
+/**
+ * \file DataBuffer.h
+ * \brief File containing the blitz::DataBuffer class
+ */
+
+#include <algorithm>
+#include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <string>
+#include <vector>
+
+/**
+ * \class DataBuffer
+ * \brief Class used to manipulate memory
+ */
+class DataBuffer {
+  private:
+	typedef std::vector<std::uint8_t> Data;
+	Data m_Buffer;
+	std::size_t m_ReadOffset;
+
+  public:
+	typedef Data::iterator iterator;
+	typedef Data::const_iterator const_iterator;
+	typedef Data::reference reference;
+	typedef Data::const_reference const_reference;
+	typedef Data::difference_type difference_type;
+
+	DataBuffer();
+	DataBuffer(std::size_t initalCapacity);
+	DataBuffer(const DataBuffer& other);
+	DataBuffer(const DataBuffer& other, difference_type offset);
+	DataBuffer(DataBuffer&& other);
+	DataBuffer(const std::string& str);
+
+	DataBuffer& operator=(const DataBuffer& other);
+	DataBuffer& operator=(DataBuffer&& other);
+
+	/**
+	 * \brief Append data to the buffer
+	 */
+	template <typename T>
+	void Append(const T& data) {
+		std::size_t size = sizeof(data);
+		std::size_t end_pos = m_Buffer.size();
+		m_Buffer.resize(m_Buffer.size() + size);
+		std::memcpy(&m_Buffer[end_pos], &data, size);
+	}
+
+	/**
+	 * \brief Append data to the buffer
+	 */
+	template <typename T>
+	DataBuffer& operator<<(const T& data) {
+		Append(data);
+		return *this;
+	}
+
+	/**
+	 * \brief Append a string to the buffer
+	 * \warning Don't use it for binary data !
+	 * \param str The string to append
+	 */
+	DataBuffer& operator<<(const std::string& str) {
+		std::size_t strlen = str.length() + 1;	// including null character
+		Resize(GetSize() + strlen);
+		std::memcpy(m_Buffer.data() + GetSize() - strlen, str.data(), strlen);
+		return *this;
+	}
+
+	/**
+	 * \brief Append data to the buffer from another const buffer
+	 * \param data The buffer to append
+	 */
+	DataBuffer& operator<<(const DataBuffer& data) {
+		m_Buffer.insert(m_Buffer.end(), data.begin(), data.end());
+		return *this;
+	}
+
+	/**
+	 * \brief Read some data from the buffer and assign to desired variable
+	 */
+	template <typename T>
+	DataBuffer& operator>>(T& data) {
+		assert(m_ReadOffset + sizeof(T) <= GetSize());
+		data = *(reinterpret_cast<T*>(&m_Buffer[m_ReadOffset]));
+		m_ReadOffset += sizeof(T);
+		return *this;
+	}
+
+	/**
+	 * \brief Read some data from the buffer and assign to the new buffer
+	 * \param data The buffer to assign
+	 */
+	DataBuffer& operator>>(DataBuffer& data) {
+		data.Resize(GetSize() - m_ReadOffset);
+		std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), m_Buffer.end(), data.begin());
+		m_ReadOffset = m_Buffer.size();
+		return *this;
+	}
+
+	/**
+	 * \brief Read a string from the buffer
+	 * \param str The string to assign in the new buffer
+	 * \warning Don't use it for binary data !
+	 */
+	DataBuffer& operator>>(std::string& str) {
+		std::size_t stringSize =
+			strlen(reinterpret_cast<const char*>(m_Buffer.data()) + m_ReadOffset) + 1;	// including null character
+		str.resize(stringSize);
+		std::copy(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset),
+			m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset + stringSize), str.begin());
+		m_ReadOffset += stringSize;
+		return *this;
+	}
+
+	/**
+	 * \brief Write some data to the buffer
+	 * \param buffer The buffer to write
+	 * \param amount The amount of data to write
+	 */
+	void WriteSome(const char* buffer, std::size_t amount) {
+		std::size_t end_pos = m_Buffer.size();
+		m_Buffer.resize(m_Buffer.size() + amount);
+		std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
+	}
+
+	/**
+	 * \brief Write some data to the buffer
+	 * \param buffer The buffer to write
+	 * \param amount The amount of data to write
+	 */
+	void WriteSome(const std::uint8_t* buffer, std::size_t amount) {
+		std::size_t end_pos = m_Buffer.size();
+		m_Buffer.resize(m_Buffer.size() + amount);
+		std::memcpy(m_Buffer.data() + end_pos, buffer, amount);
+	}
+
+	/**
+	 * \brief Read some data from the buffer
+	 * \param buffer The buffer to Read
+	 * \param amount The amount of data from the buffer
+	 */
+	void ReadSome(char* buffer, std::size_t amount) {
+		assert(m_ReadOffset + amount <= GetSize());
+		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
+		m_ReadOffset += amount;
+	}
+
+	/**
+	 * \brief Read some data from the buffer
+	 * \param buffer The buffer to Read
+	 * \param amount The amount of data from the buffer
+	 */
+	void ReadSome(std::uint8_t* buffer, std::size_t amount) {
+		assert(m_ReadOffset + amount <= GetSize());
+		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer);
+		m_ReadOffset += amount;
+	}
+
+	/**
+	 * \brief Read some data from the buffer
+	 * \param buffer The buffer to Read
+	 * \param amount The amount of data from the buffer
+	 */
+	void ReadSome(DataBuffer& buffer, std::size_t amount) {
+		assert(m_ReadOffset + amount <= GetSize());
+		buffer.Resize(amount);
+		std::copy_n(m_Buffer.begin() + static_cast<difference_type>(m_ReadOffset), amount, buffer.begin());
+		m_ReadOffset += amount;
+	}
+
+	/**
+	 * \brief Resize the buffer
+	 * \param size The new size of the buffer
+	 */
+	void Resize(std::size_t size) {
+		m_Buffer.resize(size);
+	}
+
+	/**
+	 * \brief Reserve some space in the buffer
+	 * \param amount The amount of space to reserve
+	 */
+	void Reserve(std::size_t amount) {
+		m_Buffer.reserve(amount);
+	}
+
+
+	/**
+	 * \brief Clear the buffer
+	 */
+	void Clear() {
+		m_Buffer.clear();
+		m_ReadOffset = 0;
+	}
+
+	/**
+	 * \brief When the buffer has been read entirely
+	 */
+	bool IsFinished() const {
+		return m_ReadOffset >= m_Buffer.size();
+	}
+
+	/**
+	 * \brief Get the buffer data
+	 */
+	std::uint8_t* data() {
+		return m_Buffer.data();
+	}
+
+	/**
+	 * \brief Get the buffer data
+	 */
+	const std::uint8_t* data() const {
+		return m_Buffer.data();
+	}
+
+	/**
+	 * \brief Get the read offset
+	 */
+	std::size_t GetReadOffset() const {
+		return m_ReadOffset;
+	}
+
+	/**
+	 * \brief Set the read offset
+	 * \param pos The new read offset
+	 */
+	void SetReadOffset(std::size_t pos);
+
+	/**
+	 * \brief Get the size of the buffer
+	 */
+	std::size_t GetSize() const;
+
+	/**
+	 * \brief Get the remaining size of the buffer
+	 */
+	std::size_t GetRemaining() const;
+
+	/**
+	 * \brief Read a file into the buffer
+	 * \param fileName The name of the file to read
+	 */
+	bool ReadFile(const std::string& fileName);
+
+	/**
+	 * \brief Write a file into the buffer
+	 * \param fileName The name of the file to write to
+	 */
+	bool WriteFile(const std::string& fileName) const;
+
+	/**
+	 * \brief Allocate the buffer on the heap
+	 * \warning Don't forget to free the data !
+	 */
+	std::uint8_t* HeapAllocatedData() const {
+		std::uint8_t* newBuffer = new std::uint8_t[GetSize()];
+		std::memcpy(newBuffer, data(), GetSize());
+		return newBuffer;
+	}
+
+	/**
+	 * \brief Operator == to compare two DataBuffer
+	 */
+	bool operator==(const DataBuffer& other) const {
+		return m_Buffer == other.m_Buffer;
+	}
+
+	iterator begin();
+	iterator end();
+	const_iterator begin() const;
+	const_iterator end() const;
+};
+
+/**
+ * \brief Operator << to write a DataBuffer to an ostream
+ */
+std::ostream& operator<<(std::ostream& os, const DataBuffer& buffer);
+
--- a/src/Common/VarInt.cpp
+++ b/src/Common/VarInt.cpp
@@ -0,0 +1,48 @@
+#include "VarInt.h"
+
+#include "DataBuffer.h"
+#include <stdexcept>
+
+static constexpr int SEGMENT_BITS = 0x7F;
+static constexpr int CONTINUE_BIT = 0x80;
+
+std::size_t VarInt::GetSerializedLength() const {
+	DataBuffer buffer;
+	buffer << *this;
+	return buffer.GetSize();
+}
+
+DataBuffer& operator<<(DataBuffer& out, const VarInt& var) {
+	std::uint64_t value = var.m_Value;
+	while (true) {
+		if ((value & ~static_cast<std::uint64_t>(SEGMENT_BITS)) == 0) {
+			out << static_cast<std::uint8_t>(value);
+			return out;
+		}
+
+		out << static_cast<std::uint8_t>((value & SEGMENT_BITS) | CONTINUE_BIT);
+
+		value >>= 7;
+	}
+}
+
+DataBuffer& operator>>(DataBuffer& in, VarInt& var) {
+	var.m_Value = 0;
+	unsigned int position = 0;
+	std::uint8_t currentByte;
+
+	while (true) {
+		in.ReadSome(&currentByte, 1);
+		var.m_Value |= static_cast<std::uint64_t>(currentByte & SEGMENT_BITS) << position;
+
+		if ((currentByte & CONTINUE_BIT) == 0)
+			break;
+
+		position += 7;
+
+		if (position >= 8 * sizeof(var.m_Value))
+			throw std::runtime_error("VarInt is too big");
+	}
+
+	return in;
+}
--- a/src/Common/VarInt.h
+++ b/src/Common/VarInt.h
@@ -0,0 +1,54 @@
+#pragma once
+
+/**
+ * \file VarInt.h
+ * \brief File containing the blitz::VarInt class
+ */
+
+#include <cstddef>
+#include <cstdint>
+
+class DataBuffer;
+
+/**
+ * \class VarInt
+ * \brief Variable-length format such that smaller numbers use fewer bytes.
+ */
+class VarInt {
+  private:
+	std::uint64_t m_Value;
+
+  public:
+	VarInt() : m_Value(0) {}
+	/**
+	 * \brief Construct a variable integer from a value
+	 * \param value The value of the variable integer
+	 */
+	VarInt(std::uint64_t value) : m_Value(value) {}
+
+	/**
+	 * \brief Get the value of the variable integer
+	 */
+	std::uint64_t GetValue() const {
+		return m_Value;
+	}
+
+	/**
+	 * \brief Get the length of the serialized variable integer
+	 */
+	std::size_t GetSerializedLength() const;
+
+	/**
+	 * \brief Serialize the variable integer
+	 * \param out The buffer to write the serialized variable integer to
+	 * \param var The variable integer to serialize
+	 */
+	friend DataBuffer& operator<<(DataBuffer& out, const VarInt& var);
+
+	/**
+	 * \brief Deserialize the variable integer
+	 * \param in The buffer to read the serialized variable integer from
+	 * \param var The variable integer to deserialize
+	 */
+	friend DataBuffer& operator>>(DataBuffer& in, VarInt& var);
+};
--- a/src/Core/Bag.cpp
+++ b/src/Core/Bag.cpp
@@ -35,7 +35,7 @@ Bag::Bag(const std::shared_ptr<PiecesList>& piecesList) :
        }

        for (const auto& piece : this->selectedPieces) {
-            int pieceSize = this->piecesList->lookAtPiece(piece).getPositions().size();
+            int pieceSize = this->piecesList->lookAtPiece(piece).getPositions().getSize();
            this->currentBags.at(pieceSize).push_back(piece);
        }
    }
--- a/src/Core/Board.cpp
+++ b/src/Core/Board.cpp
@@ -20,10 +20,10 @@ Board::Board(int width, int height) :
 }

 void Board::changeBlock(const Position& position, Block block) {
-    if (position.x < 0 || position.x >= this->width || position.y < 0) return;
+    if (position.x < 0 || static_cast<unsigned>(position.x) >= this->width || position.y < 0) return;

    // resize the grid if needed
-    if (position.y >= this->grid.size()) {
+    if (static_cast<unsigned>(position.y) >= this->grid.size()) {
        for (int j = this->grid.size(); j <= position.y; j++) {
            this->grid.push_back(this->emptyRow);
        }
@@ -34,7 +34,7 @@ void Board::changeBlock(const Position& position, Block block) {

 void Board::insertRow(int height, int holePosition, Block blockType) {
    std::vector<Block> insertedRow;
-    for (int i = 0; i < this->width; i++) {
+    for (unsigned i = 0; i < this->width; i++) {
        if (i == holePosition) {
            insertedRow.push_back(NOTHING);
        }
@@ -51,7 +51,7 @@ int Board::clearRows() {
    int clearedLines = 0;
    for (int j = this->grid.size() - 1; j >= 0; j--) {
        bool lineIsFull = true;
-        int i = 0;
+        unsigned i = 0;
        while (lineIsFull && (i < width)) {
            if (this->grid.at(j).at(i) == NOTHING) {
                lineIsFull = false;
--- a/src/Core/Board.h
+++ b/src/Core/Board.h
@@ -13,8 +13,8 @@ class Board {
    private:
        std::vector<std::vector<Block>> grid; // the grid, (0,0) is downleft
        std::vector<Block> emptyRow;          // an empty row of blocks
-        int width;                            // the width of the grid
-        int height;                           // the base height of the grid, which can extend indefinitely
+        unsigned width;                            // the width of the grid
+        unsigned height;                           // the base height of the grid, which can extend indefinitely

    public:
        /**
--- a/src/Core/Game.cpp
+++ b/src/Core/Game.cpp
@@ -297,8 +297,8 @@ void Game::lockPiece() {

        /* clearing one more line is worth 2x more
            clearing with a spin is worth as much as clearing 2x more lines */
-        long int clearScore = LINE_CLEAR_BASE_SCORE;
-        clearScore = clearScore << (clear.lines << (clear.isSpin));
+        long int clearScore = LINE_CLEAR_BASE_SCORE / 2;
+        clearScore = clearScore << (clear.lines << clear.isSpin);

        if (this->B2BChain && B2BConditionsAreMet) {
            clearScore *= B2B_SCORE_MULTIPLIER;
--- a/src/Core/GameBoard.cpp
+++ b/src/Core/GameBoard.cpp
@@ -44,7 +44,7 @@ void GameBoard::initialize() {
 bool GameBoard::moveLeft() {
    this->movedLeftLast = true;

-    if (this->activePieceInWall(Position{-1, 0})) {
+    if (this->activePieceInWall(Position(-1, 0))) {
        return false;
    }
    else {
@@ -57,7 +57,7 @@ bool GameBoard::moveLeft() {
 bool GameBoard::moveRight() {
    this->movedLeftLast = false;

-    if (this->activePieceInWall(Position{1, 0})) {
+    if (this->activePieceInWall(Position(1, 0))) {
        return false;
    }
    else {
@@ -68,7 +68,7 @@ bool GameBoard::moveRight() {
 }

 bool GameBoard::moveDown() {
-    if (this->activePieceInWall(Position{0, -1})) {
+    if (this->activePieceInWall(Position(0, -1))) {
        return false;
    }
    else {
@@ -100,10 +100,10 @@ bool GameBoard::rotate(Rotation rotation) {
    for (Position position : stored.getPositions()) {
        Position positionInGrid(position + this->activePiecePosition);
        safePositions.insert(positionInGrid);
-        safePositions.insert(positionInGrid + Position{0, 1});
-        safePositions.insert(positionInGrid + Position{1, 0});
-        safePositions.insert(positionInGrid + Position{0, -1});
-        safePositions.insert(positionInGrid + Position{-1, 0});
+        safePositions.insert(positionInGrid + Position(0, 1));
+        safePositions.insert(positionInGrid + Position(1, 0));
+        safePositions.insert(positionInGrid + Position(0, -1));
+        safePositions.insert(positionInGrid + Position(-1, 0));
    }

    // first try kicking the piece down
@@ -147,18 +147,18 @@ bool GameBoard::tryKicking(bool testingBottom, const std::set<Position>& safePos
            // we first check the side to which the player moved last
            if (movedLeftLast) {
                if (overlapsLeft) {
-                    if (this->tryFittingKickedPiece(safePositions, Position({-i, j}), overlapsLeft)) return true;
+                    if (this->tryFittingKickedPiece(safePositions, Position(-i, j), overlapsLeft)) return true;
                }
                if (overlapsRight) {
-                    if (this->tryFittingKickedPiece(safePositions, Position({+i, j}), overlapsRight)) return true;
+                    if (this->tryFittingKickedPiece(safePositions, Position(+i, j), overlapsRight)) return true;
                }
            }
            else {
                if (overlapsRight) {
-                    if (this->tryFittingKickedPiece(safePositions, Position({+i, j}), overlapsRight)) return true;
+                    if (this->tryFittingKickedPiece(safePositions, Position(+i, j), overlapsRight)) return true;
                }
                if (overlapsLeft) {
-                    if (this->tryFittingKickedPiece(safePositions, Position({-i, j}), overlapsLeft)) return true;
+                    if (this->tryFittingKickedPiece(safePositions, Position(-i, j), overlapsLeft)) return true;
                }
            }

@@ -265,11 +265,11 @@ bool GameBoard::activePieceInWall(const Position& shift) const {
 }

 bool GameBoard::touchesGround() const {
-    return this->activePieceInWall(Position{0, -1});
+    return this->activePieceInWall(Position(0, -1));
 }

 Position GameBoard::lowestPosition() const {
-    Position shift = Position{0, -1};
+    Position shift = Position(0, -1);
    while (!activePieceInWall(shift)) {
        shift.y -= 1;
    }
@@ -278,8 +278,8 @@ Position GameBoard::lowestPosition() const {
 }

 LineClear GameBoard::lockPiece() {
-    bool isLockedInPlace = (this->activePieceInWall(Position{0, 1}) && this->activePieceInWall(Position{1, 0})
-        && this->activePieceInWall(Position{-1, 0}) && this->activePieceInWall(Position{0, -1}));
+    bool isLockedInPlace = (this->activePieceInWall(Position(0, 1)) && this->activePieceInWall(Position(1, 0))
+        && this->activePieceInWall(Position(-1, 0)) && this->activePieceInWall(Position(0, -1)));

    for (Position position : this->activePiece->getPositions()) {
        this->board.changeBlock(position + this->activePiecePosition, this->activePiece->getBlockType());
@@ -345,7 +345,7 @@ std::ostream& operator<<(std::ostream& os, const GameBoard& gameboard) {
        // print only the position were the active piece is
        for (int y = gameboard.activePiecePosition.y + gameboard.activePiece->getLength() - 1; y >= gameboard.board.getBaseHeight(); y--) {
            for (int x = 0; x < gameboard.board.getWidth(); x++) {
-                bool hasActivePiece = gameboard.activePiece->getPositions().contains(Position{x, y} - gameboard.activePiecePosition);
+                bool hasActivePiece = gameboard.activePiece->containsSquare(Position(x, y) - gameboard.activePiecePosition);
                if (hasActivePiece) {
                    os << "*";
                }
@@ -361,7 +361,7 @@ std::ostream& operator<<(std::ostream& os, const GameBoard& gameboard) {
    Block pieceBlockType = (gameboard.activePiece == nullptr) ? NOTHING : gameboard.activePiece->getBlockType();
    for (int y = gameboard.board.getBaseHeight() - 1; y >= 0; y--) {
        for (int x = 0; x < gameboard.board.getWidth(); x++) {
-            bool hasActivePiece = (gameboard.activePiece == nullptr) ? false : gameboard.activePiece->getPositions().contains(Position{x, y} - gameboard.activePiecePosition);
+            bool hasActivePiece = (gameboard.activePiece == nullptr) ? false : gameboard.activePiece->containsSquare(Position(x, y) - gameboard.activePiecePosition);

            // the active piece takes visual priority over the board
            if (hasActivePiece) {
@@ -369,7 +369,7 @@ std::ostream& operator<<(std::ostream& os, const GameBoard& gameboard) {
                os << "*";
            }
            else {
-                Block block = gameboard.board.getBlock(Position{x, y});
+                Block block = gameboard.board.getBlock(Position(x, y));
                os << getConsoleColorCode(block);
                if (block != NOTHING) {
                    os << "*";
--- a/src/Core/GameBoard.h
+++ b/src/Core/GameBoard.h
@@ -84,7 +84,7 @@ class GameBoard {
         * Check if one of the active piece's positions shifted by a specified position would overlap with a set of positions
         * @return If the shifted active piece overlaps with one of the position
         */
-        bool activePieceOverlaps(const std::set<Position>& safePositions, const Position& shift = Position{0, 0}) const;
+        bool activePieceOverlaps(const std::set<Position>& safePositions, const Position& shift = Position(0, 0)) const;

    public:
        /**
@@ -103,7 +103,7 @@ class GameBoard {
         * Checks if one of the active piece's positions touches a wall in the board
         * @return If the active piece is in a wall
         */
-        bool activePieceInWall(const Position& shift = Position{0, 0}) const;
+        bool activePieceInWall(const Position& shift = Position(0, 0)) const;

        /**
         * Checks is the active piece as a wall directly below one of its position
--- a/src/Core/PiecesList.cpp
+++ b/src/Core/PiecesList.cpp
@@ -27,13 +27,12 @@ PiecesList::PiecesList() {
    this->pushBackEmptyVectors();
 }

-bool PiecesList::loadPieces(int size) {
-    if (size < 1) return false;
-    if (size <= this->highestLoadedSize) return true;
+bool PiecesList::loadPieces(unsigned max_size) {
+    if (max_size < 1) return false;
+    if (max_size <= this->highestLoadedSize) return true;

    PiecesFiles piecesFiles;
-    for (int i = this->highestLoadedSize + 1; i <= size; i++) {
-
+    for (unsigned i = this->highestLoadedSize + 1; i <= max_size; i++) {
        if (!piecesFiles.loadPieces(i, this->loadedPieces.at(i), this->convexPieces.at(i), this->holelessPieces.at(i), this->otherPieces.at(i))) {
            return false;
        }
@@ -46,14 +45,14 @@ bool PiecesList::loadPieces(int size) {
    return true;
 }

-bool PiecesList::selectPiece(int size, int number) {
+bool PiecesList::selectPiece(unsigned size, unsigned number) {
    if (size < 1 || size > this->highestLoadedSize || number >= this->loadedPieces.at(size).size()) return false;

    this->selectedPieces.push_back(std::pair<int, int>(size, number));
    return true;
 }

-bool PiecesList::selectAllPieces(int size) {
+bool PiecesList::selectAllPieces(unsigned size) {
    if (size < 1 || size > this->highestLoadedSize) return false;

    for (int i = 0; i < this->loadedPieces.at(size).size(); i++) {
--- a/src/Core/PiecesList.h
+++ b/src/Core/PiecesList.h
@@ -13,7 +13,7 @@
 */
 class PiecesList {
    private:
-        int highestLoadedSize;                           // the highest size of pieces currently loaded
+        unsigned highestLoadedSize;                           // the highest size of pieces currently loaded
        std::vector<std::vector<Piece>> loadedPieces;    // every loaded pieces by size
        std::vector<std::vector<int>> convexPieces;      // the list of convex loaded pieces by size
        std::vector<std::vector<int>> holelessPieces;    // the list of holeless loaded pieces by size
@@ -30,22 +30,22 @@ class PiecesList {
        PiecesList();

        /**
-         * Makes the list load all pieces of the specified size
-         * @return If it sucessfully loaded the pieces
+         * Makes the list load all pieces up to the specified size
+         * @return If all pieces up to the specified size are correctly loaded
         */
-        bool loadPieces(int size);
+        [[nodiscard]] bool loadPieces(unsigned max_size);

        /**
         * Selects the specified piece
         * @return If the piece could be selected
         */
-        bool selectPiece(int size, int number);
+        bool selectPiece(unsigned size, unsigned number);

        /**
         * Selects all pieces of the specified size
         * @return If the pieces could be selected
         */
-        bool selectAllPieces(int size);
+        bool selectAllPieces(unsigned size);

        /**
         * Selects all convex pieces of the specified size
--- a/src/GraphicalUI/AppMenus/AppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/AppMenu.cpp
@@ -0,0 +1,72 @@
+#include "AppMenu.h"
+
+#include "../Settings.h"
+#include "../PlayerCursor.h"
+#include "../../Utils/AssetManager.h"
+
+#include <stack>
+#include <memory>
+#include <optional>
+#include <SFML/Graphics.hpp>
+
+
+AppMenu::AppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
+	menuStack(menuStack),
+	settings(settings),
+	renderWindow(renderWindow) {
+
+	const Asset& file = getResource(AssetName::data_fonts_pressstart_prstartk_ttf);
+
+	this->pressStartFont = sf::Font(file.data, file.size);
+}
+
+void AppMenu::updateMetaBinds() {
+	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Enter)) {
+		this->enterPressed = true;
+		this->enterReleased = false;
+	}
+	else {
+		this->enterReleased = this->enterPressed;
+		this->enterPressed = false;
+	}
+
+	if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Escape)) {
+		this->escPressed = true;
+		this->escReleased = false;
+	}
+	else {
+		this->escReleased = this->escPressed;
+		this->escPressed = false;
+	}
+}
+
+void AppMenu::placeText(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float xPos, float yPos, const std::optional<sf::Vector2u>& cursorPos) const {
+	float sizeMultiplier = this->settings->getWindowSizeMultiplier();
+
+	text.setString(string);
+	if (playerCursor.has_value() && cursorPos.has_value()) {
+		text.setOutlineThickness((playerCursor.value().getPosition() == cursorPos.value()) ? (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);
+}
+
+void AppMenu::placeTitle(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float yPos, const std::optional<sf::Vector2u>& cursorPos) const {
+	float sizeMultiplier = this->settings->getWindowSizeMultiplier();
+
+	text.setString(string);
+	if (playerCursor.has_value() && cursorPos.has_value()) {
+		text.setOutlineThickness((playerCursor.value().getPosition() == cursorPos.value()) ? (sizeMultiplier / 2) : 0);
+	}
+	text.setOrigin({text.getLocalBounds().getCenter().x, text.getLocalBounds().size.y / 2});
+	text.setPosition(sf::Vector2f({sizeMultiplier * 40.f, sizeMultiplier * yPos}));
+	this->renderWindow->draw(text);
+}
+
+sf::Color AppMenu::getColorOfBlock(Block block, int luminosityShift) const {
+	Color rgbColor = BLOCKS_COLOR[block];
+	return sf::Color(std::clamp(rgbColor.red + luminosityShift, 0, 255),
+						std::clamp(rgbColor.green + luminosityShift, 0, 255),
+						std::clamp(rgbColor.blue + luminosityShift, 0, 255));
+}
--- a/src/GraphicalUI/AppMenus/AppMenu.h
+++ b/src/GraphicalUI/AppMenus/AppMenu.h
@@ -21,70 +21,21 @@ class AppMenu {
        bool enterReleased = false;
        bool escPressed = false;
        bool escReleased = false;
-        sf::Font pressStartFont = sf::Font("data/fonts/pressstart/prstartk.ttf");
+        sf::Font pressStartFont;
    
    public:
-        AppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
-            menuStack(menuStack),
-            settings(settings),
-            renderWindow(renderWindow)
-            {
-
-        }
+        AppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow);

        virtual void computeFrame() = 0;

        virtual void drawFrame() const = 0; 

    protected:
-        void updateMetaBinds() {
-            if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Enter)) {
-                enterPressed = true;
-                enterReleased = false;
-            }
-            else {
-                enterReleased = enterPressed;
-                enterPressed = false;
-            }
+        void updateMetaBinds();

-            if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::Escape)) {
-                escPressed = true;
-                escReleased = false;
-            }
-            else {
-                escReleased = escPressed;
-                escPressed = false;
-            }
-        }
+        void placeText(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float xPos, float yPos, const std::optional<sf::Vector2u>& cursorPos) const;

-        void placeText(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float xPos, float yPos, const std::optional<sf::Vector2u>& cursorPos) const {
-            float sizeMultiplier = this->settings->getWindowSizeMultiplier();
+        void placeTitle(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float yPos, const std::optional<sf::Vector2u>& cursorPos) const;

-            text.setString(string);
-            if (playerCursor.has_value() && cursorPos.has_value()) {
-                text.setOutlineThickness((playerCursor.value().getPosition() == cursorPos.value()) ? (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);
-        }
-
-        void placeTitle(sf::Text& text, const std::optional<PlayerCursor>& playerCursor, const sf::String& string, float yPos, const std::optional<sf::Vector2u>& cursorPos) const {
-            float sizeMultiplier = this->settings->getWindowSizeMultiplier();
-
-            text.setString(string);
-            if (playerCursor.has_value() && cursorPos.has_value()) {
-                text.setOutlineThickness((playerCursor.value().getPosition() == cursorPos.value()) ? (sizeMultiplier / 2) : 0);
-            }
-            text.setOrigin({text.getLocalBounds().getCenter().x, text.getLocalBounds().size.y / 2});
-            text.setPosition(sf::Vector2f({sizeMultiplier * 40.f, sizeMultiplier * yPos}));
-            this->renderWindow->draw(text);
-        }
-
-        sf::Color getColorOfBlock(Block block, int luminosityShift) const {
-            Color rgbColor = BLOCKS_COLOR[block];
-            return sf::Color(std::clamp(rgbColor.red + luminosityShift, 0, 255),
-                             std::clamp(rgbColor.green + luminosityShift, 0, 255),
-                             std::clamp(rgbColor.blue + luminosityShift, 0, 255));
-        }
+        sf::Color getColorOfBlock(Block block, int luminosityShift) const;
 };
--- a/src/GraphicalUI/AppMenus/GameDistributionAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/GameDistributionAppMenu.cpp
@@ -12,7 +12,7 @@ GameDistributionAppMenu::GameDistributionAppMenu(std::shared_ptr<MenuStack> menu
    AppMenu(menuStack, settings, renderWindow),
    playerCursor({1}) {

-    for (int i = 1; i <= this->settings->getMaximumPiecesSize(); i++) {
+    for (int i = 1; i <= this->settings->getLoadablePiecesSize(); i++) {
        this->playerCursor.addRow(i, 1);
    }
 }
@@ -65,7 +65,7 @@ void GameDistributionAppMenu::drawFrame() const {
    const DistributionMode distributionMode = this->settings->getMenu().readPiecesList().getDistributionMode();
    const std::vector<int>& distributions = this->settings->getDistributions();

-    int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 1, 0, this->settings->getMaximumPiecesSize() - 3);
+    int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 1, 0, this->settings->getLoadablePiecesSize() - 3);
    if (firstElem == 0) {
        this->placeText(text, this->playerCursor, "< DISTRIBUTION MODE: " + getPiecesDistributionName(distributionMode) + " >", 5.f, 15.f, sf::Vector2u{0, 0});
    }
--- a/src/GraphicalUI/AppMenus/GamePiecesAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/GamePiecesAppMenu.cpp
@@ -13,12 +13,12 @@ GamePiecesAppMenu::GamePiecesAppMenu(std::shared_ptr<MenuStack> menuStack, std::
    AppMenu(menuStack, settings, renderWindow),
    playerCursor({1, (unsigned int) this->settings->getSelectedPieces().size() + 1u}) {
    
-    for (int i = 1; i <= this->settings->getMaximumPiecesSize(); i++) {
+    for (int i = 1; i <= this->settings->getLoadablePiecesSize(); i++) {
        this->playerCursor.addRow(i + 1, this->settings->getMenu().readPiecesList().getNumberOfPieces(i) + 4);
    }

-    if (this->settings->getMaximumPiecesSize() < MAXIMUM_PIECES_SIZE) {
-        this->playerCursor.addRow(this->settings->getMaximumPiecesSize() + 2, 1);
+    if (this->settings->getLoadablePiecesSize() < MAXIMUM_PIECES_SIZE) {
+        this->playerCursor.addRow(this->settings->getLoadablePiecesSize() + 2, 1);
    }
 }

@@ -35,8 +35,8 @@ void GamePiecesAppMenu::computeFrame() {
            this->menuStack->push(std::make_shared<GameDistributionAppMenu>(this->menuStack, this->settings, this->renderWindow));
        }

-        if (this->playerCursor.getPosition().y == (this->settings->getMaximumPiecesSize() + 2)) {
-            int newMaxSize = this->settings->getMaximumPiecesSize() + 1;
+        if (this->playerCursor.getPosition().y == (this->settings->getLoadablePiecesSize() + 2)) {
+            int newMaxSize = this->settings->getLoadablePiecesSize() + 1;
            this->settings->loadPieces(newMaxSize);

            this->playerCursor.removeRow(newMaxSize + 1);
@@ -95,8 +95,8 @@ void GamePiecesAppMenu::drawFrame() const {
        this->drawSelectedPiecesRow(15.f);

        bool drawFromFirstElem = (this->playerCursor.getPosition().y == 1);
-        bool addExtraLine = (this->settings->getMaximumPiecesSize() < MAXIMUM_PIECES_SIZE);
-        int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 2, 1, this->settings->getMaximumPiecesSize() - 2 + (addExtraLine ? 1 : 0));
+        bool addExtraLine = (this->settings->getLoadablePiecesSize() < MAXIMUM_PIECES_SIZE);
+        int firstElem = std::clamp(((int) this->playerCursor.getPosition().y) - 2, 1, this->settings->getLoadablePiecesSize() - 2 + (addExtraLine ? 1 : 0));
        this->drawRow(firstElem, 25.f, drawFromFirstElem);
        this->drawRow(firstElem + 1, 35.f, drawFromFirstElem);
        this->drawRow(firstElem + 2, 45.f, drawFromFirstElem);
@@ -130,7 +130,7 @@ void GamePiecesAppMenu::drawSelectedPiecesRow(float yPos) const {

        int pieceSize = getSizeOfPieces(pieceType);
        if (pieceSize > 0) {
-            if (!(pieceSize > this->settings->getMaximumPiecesSize())) {
+            if (!(pieceSize > this->settings->getLoadablePiecesSize())) {
                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());
@@ -143,7 +143,7 @@ void GamePiecesAppMenu::drawSelectedPiecesRow(float yPos) const {
            }
        }
        else {
-            if (!(value > this->settings->getMaximumPiecesSize())) {
+            if (!(value > this->settings->getLoadablePiecesSize())) {
                this->placeText(text, {}, ((first) ? "" : " ") + getPiecesTypeName(pieceType) + "_" + std::to_string(value), xProgress, yPos, {});
                xProgress += (1.f + (text.getGlobalBounds().size.x / this->settings->getWindowSizeMultiplier()));
            }
@@ -158,7 +158,7 @@ void GamePiecesAppMenu::drawSelectedPiecesRow(float yPos) const {
 }

 void GamePiecesAppMenu::drawRow(int piecesSize, float yPos, bool drawFromFirstElem) const {
-    if (piecesSize > this->settings->getMaximumPiecesSize()) {
+    if (piecesSize > this->settings->getLoadablePiecesSize()) {
        sf::Text text(this->pressStartFont, "", this->settings->getWindowSizeMultiplier() * 2);
        text.setOutlineThickness(this->settings->getWindowSizeMultiplier() / 2);
        if (this->playerCursor.getPosition().y == (piecesSize + 1)) {
--- a/src/GraphicalUI/AppMenus/GamePlayingAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/GamePlayingAppMenu.cpp
@@ -117,7 +117,7 @@ void GamePlayingAppMenu::drawFrame() const {
    // board
    for (int y = this->game.getBoard().getBaseHeight() + 9; y >= 0; y--) {
        for (int x = 0; x < this->game.getBoard().getWidth(); x++) {
-            Block block = this->game.getBoard().getBlock(Position{x, y});
+            Block block = this->game.getBoard().getBlock(Position(x, y));
            if (isBoardInvisible) block = NOTHING;

            sf::RectangleShape cell(cellSize);
@@ -196,7 +196,7 @@ void GamePlayingAppMenu::drawFrame() const {
        for (int y = 0; y < this->game.getNextPieces().at(i).getLength(); y++) {
            for (int x = 0; x < this->game.getNextPieces().at(i).getLength(); x++) {
                sf::RectangleShape cell(nextCellSize);
-                if (this->game.getNextPieces().at(i).getPositions().contains(Position{x, y})) {
+                if (this->game.getNextPieces().at(i).containsSquare(Position(x, y))) {
                    cell.setFillColor(pieceColor);
                    lowestRank = y;
                }
@@ -223,7 +223,7 @@ void GamePlayingAppMenu::drawFrame() const {
        for (int y = 0; y < this->game.getHeldPiece()->getLength(); y++) {
            for (int x = 0; x < this->game.getHeldPiece()->getLength(); x++) {
                sf::RectangleShape cell(holdCellSize);
-                if (this->game.getHeldPiece()->getPositions().contains(Position{x, y})) {
+                if (this->game.getHeldPiece()->containsSquare(Position(x, y))) {
                    cell.setFillColor(color);
                }
                else {
--- a/src/GraphicalUI/AppMenus/InfoAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/InfoAppMenu.cpp
@@ -11,14 +11,14 @@
 InfoAppMenu::InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow) :
    AppMenu(menuStack, settings, renderWindow),
    playerCursor({INFO_SECTIONS_COUNT}),
-    sectionsName(
+    sectionsName({
        "< ABOUT >",
        "< PIECES TYPES >",
        "< 0 DEGREES ROTATIONS >",
        "< ROTATION SYSTEM >",
        "< SCORING >"
-    ),
-    sectionsContent(
+    }),
+    sectionsContent({
        "This game is written in C++,\n"
        "using SFML 3 for the GUI.\n"
        "It has been inspired by other\n"
@@ -67,7 +67,7 @@ InfoAppMenu::InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<S
        "A spin is detected when the piece is\n"
        "locked in place, a mini-spin simply\n"
        "when the last move was a kick."
-    ) {
+    }) {

 }

--- a/src/GraphicalUI/AppMenus/InfoAppMenu.h
+++ b/src/GraphicalUI/AppMenus/InfoAppMenu.h
@@ -9,12 +9,11 @@

 static const int INFO_SECTIONS_COUNT = 5;

-
 class InfoAppMenu : public AppMenu {
    private:
        PlayerCursor playerCursor;
-        sf::String sectionsName[INFO_SECTIONS_COUNT];
-        sf::String sectionsContent[INFO_SECTIONS_COUNT];
+        std::array<std::string, INFO_SECTIONS_COUNT> sectionsName;
+        std::array<std::string, INFO_SECTIONS_COUNT> sectionsContent;

    public:
        InfoAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared_ptr<Settings> settings, std::shared_ptr<sf::RenderWindow> renderWindow);
--- a/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/SettingsKeybindsAppMenu.cpp
@@ -2,6 +2,7 @@

 #include "AppMenu.h"
 #include "../PlayerCursor.h"
+#include "../../Utils/AssetManager.h"

 #include <stack>
 #include <memory>
@@ -22,8 +23,9 @@ SettingsKeybindsAppMenu::SettingsKeybindsAppMenu(std::shared_ptr<MenuStack> menu
        std::string textureName = ACTION_NAMES[action];
        textureName = std::regex_replace(textureName, std::regex(" "), "");

-        std::filesystem::path texturePath("data/images/keybinds/" + textureName + ".png");
-        this->iconTextures[action] = sf::Texture(texturePath, false, {{0, 0}, {16, 16}});
+        const Asset& textureData = getResource("data/images/keybinds/" + textureName + ".png");
+
+        this->iconTextures[action] = sf::Texture(textureData.data, textureData.size, false, {{0, 0}, {16, 16}});
    }
 }

--- a/src/GraphicalUI/AppMenus/StartUpAppMenu.cpp
+++ b/src/GraphicalUI/AppMenus/StartUpAppMenu.cpp
@@ -14,7 +14,7 @@ StartUpAppMenu::StartUpAppMenu(std::shared_ptr<MenuStack> menuStack, std::shared
    AppMenu(menuStack, settings, renderWindow),
    playerCursor({MAXIMUM_PIECES_SIZE + 1}) {

-    this->playerCursor.goToPosition({(unsigned int) std::clamp(this->settings->getMaximumPiecesSize(), MINIMUM_PIECES_SIZE, MAXIMUM_PIECES_SIZE), 0u});
+    this->playerCursor.goToPosition({(unsigned int) std::clamp(this->settings->getLoadablePiecesSize(), MINIMUM_PIECES_SIZE, MAXIMUM_PIECES_SIZE), 0u});
 }

 void StartUpAppMenu::computeFrame() {
--- a/src/GraphicalUI/Settings.cpp
+++ b/src/GraphicalUI/Settings.cpp
@@ -27,41 +27,41 @@ Settings::Settings(bool loadPieces) {
    this->loadSettingsFromFile(loadPieces, {});
 }

-void Settings::loadPieces(int maximumPiecesSizeRequest) {
-    if (maximumPiecesSizeRequest < MINIMUM_PIECES_SIZE) { 
-        maximumPiecesSizeRequest = MINIMUM_PIECES_SIZE;
+void Settings::loadPieces(int loadablePiecesSizeRequest) {
+    if (loadablePiecesSizeRequest < MINIMUM_PIECES_SIZE) { 
+        loadablePiecesSizeRequest = MINIMUM_PIECES_SIZE;
    }
-    else if (maximumPiecesSizeRequest > MAXIMUM_PIECES_SIZE) {
-        maximumPiecesSizeRequest = MAXIMUM_PIECES_SIZE;
+    else if (loadablePiecesSizeRequest > MAXIMUM_PIECES_SIZE) {
+        loadablePiecesSizeRequest = MAXIMUM_PIECES_SIZE;
    }

    bool succeeded = true;
    int i = 1;
-    while (succeeded && (i <= maximumPiecesSizeRequest)) {
+    while (succeeded && (i <= loadablePiecesSizeRequest)) {
        succeeded = this->menu.getPiecesList().loadPieces(i);
        i++;
    }

    if (succeeded) {
-        this->maximumPiecesSize = maximumPiecesSizeRequest;
+        this->loadablePiecesSize = loadablePiecesSizeRequest;
    }
    this->loadedPieces = succeeded;
 }

-void Settings::loadSettingsFromFile(bool loadPieces, std::optional<int> maximumPiecesSizeRequest) {
+void Settings::loadSettingsFromFile(bool loadPieces, std::optional<int> loadablePiecesSizeRequest) {
    std::ifstream settingsFile("data/config/settings.bin", std::ios::binary);
    char byte;

    // file format version
    settingsFile.get(byte);

-    // maximum pieces size
+    // loadable pieces size
    settingsFile.get(byte);
-    this->maximumPiecesSize = byte;
+    this->loadablePiecesSize = byte;

    if (loadPieces) {
-        if (maximumPiecesSizeRequest.has_value()) {
-            this->loadPieces(maximumPiecesSizeRequest.value());
+        if (loadablePiecesSizeRequest.has_value()) {
+            this->loadPieces(loadablePiecesSizeRequest.value());
        }
        else {
            this->loadPieces(byte);
@@ -165,8 +165,8 @@ void Settings::saveSettingsToFile() const {
    byte = CURRENT_FILE_FORMAT_VERSION;
    settingsFile.write(&byte, 1);

-    // maximum pieces size
-    byte = this->maximumPiecesSize;
+    // loadable pieces size
+    byte = this->loadablePiecesSize;
    settingsFile.write(&byte, 1);

    // keybind layout
@@ -321,7 +321,7 @@ void Settings::confirmSelectedPieces() {
        int size = getSizeOfPieces(type);

        if (size == 0) {
-            if (!(value > this->maximumPiecesSize)) {
+            if (!(value > this->loadablePiecesSize)) {
                switch (type) {
                    case CONVEX_PIECES : {this->menu.getPiecesList().selectConvexPieces(value); break;}
                    case HOLELESS_PIECES : {this->menu.getPiecesList().selectHolelessPieces(value); break;}
@@ -332,7 +332,7 @@ void Settings::confirmSelectedPieces() {
            }
        }
        else {
-            if (!(getSizeOfPieces(type) > this->maximumPiecesSize)) {
+            if (!(getSizeOfPieces(type) > this->loadablePiecesSize)) {
                this->menu.getPiecesList().selectPiece(size, value);
                selectedNone = false;
            }
@@ -347,7 +347,7 @@ void Settings::confirmSelectedPieces() {

 bool Settings::increaseDistribution(int size) {
    if (!this->loadedPieces) return false;
-    if (size < 1 || size > this->maximumPiecesSize) return false;
+    if (size < 1 || size > this->loadablePiecesSize) return false;

    if (this->distributions.at(size) < DISTRIBUTION_MAX) {
        this->distributions.at(size)++;
@@ -358,7 +358,7 @@ bool Settings::increaseDistribution(int size) {

 bool Settings::decreaseDistribution(int size) {
    if (!this->loadedPieces) return false;
-    if (size < 1 || size > this->maximumPiecesSize) return false;
+    if (size < 1 || size > this->loadablePiecesSize) return false;

    if (this->distributions.at(size) > 0) {
        this->distributions.at(size)--;
@@ -383,8 +383,8 @@ Keybinds& Settings::getKeybinds() {
    return this->keybinds.at(this->chosenKeybinds);
 }

-int Settings::getMaximumPiecesSize() const {
-    return this->maximumPiecesSize;
+int Settings::getLoadablePiecesSize() const {
+    return this->loadablePiecesSize;
 }

 bool Settings::hasLoadedPieces() const {
--- a/src/GraphicalUI/Settings.h
+++ b/src/GraphicalUI/Settings.h
@@ -29,7 +29,7 @@ static const std::pair<PiecesType, int> DEFAULT_SELECTION = {ALL_PIECES, MINIMUM
 class Settings {
    private:
        Menu menu;
-        int maximumPiecesSize;
+        int loadablePiecesSize;
        bool loadedPieces;
        std::vector<Keybinds> keybinds;
        int chosenKeybinds;
@@ -42,9 +42,9 @@ class Settings {
    public:
        Settings(bool loadPieces);

-        void loadPieces(int maximumPiecesSizeRequest);
+        void loadPieces(int loadablePiecesSizeRequest);

-        void loadSettingsFromFile(bool loadPieces, std::optional<int> maximumPiecesSizeRequest);
+        void loadSettingsFromFile(bool loadPieces, std::optional<int> loadablePiecesSizeRequest);

        void saveSettingsToFile() const;

@@ -82,7 +82,7 @@ class Settings {

        Keybinds& getKeybinds();

-        int getMaximumPiecesSize() const;
+        int getLoadablePiecesSize() const;

        bool hasLoadedPieces() const;

--- a/src/GraphicalUI/main.cpp
+++ b/src/GraphicalUI/main.cpp
@@ -4,42 +4,69 @@
 #include <filesystem>
 #include <fstream>

-
-void resetSettingsFile();
-void resetKeybindFile(int layout);
+[[nodiscard]] bool resetSettingsFile();
+[[nodiscard]] bool resetKeybindFile(int layout);


 int main() {
    std::srand(std::time(NULL));

+    bool everythingIsOK = true;
+
+    // CHECK PIECES FILES
+
    PiecesFiles pf;
+    bool warned = false;
    for (int i = 1; i <= MAXIMUM_PIECES_SIZE; i++) {
        if (!std::filesystem::exists("data/pieces/" + std::to_string(i) + "minos.bin")) {
-            #ifdef NDEBUG
+            #ifndef DEBUG
+                if (!warned && i > DEBUG_PIECES_SIZE) {
                    std::cout << "IMPORTANT: You are currently in release mode, if you do not wish to generate big pieces (can take several minutes), type 'xmake f -m debug'." << std::endl;
+                    warned = true;
+                }
            #endif

            std::cout << "INFO: Pieces files for size " << i << " not found, generating..." << std::endl;
-            pf.savePieces(i);
+            everythingIsOK &= pf.savePieces(i);
        }
    }
-    #ifndef NDEBUG
-        std::cout << "IMPORTANT: you are currently in debug mode, if you wish to use bigger pieces, type 'xmake f -m release'." << std::endl;

-        bool everythingGenerated = true;
-        for (int i = DEBUG_PIECES_SIZE; i <= RELEASE_PIECES_SIZE; i++) {
+    #ifdef DEBUG
+        std::cout << "IMPORTANT: You are currently in debug mode, if you wish to use bigger pieces, type 'xmake f -m release'." << std::endl;
+    
+        bool releasePiecesGenerated = true;
+        for (int i = DEBUG_PIECES_SIZE + 1; i <= RELEASE_PIECES_SIZE; i++) {
            if (!std::filesystem::exists("data/pieces/" + std::to_string(i) + "minos.bin")) {
-                everythingGenerated = false;
+                releasePiecesGenerated = false;
            }
        }
-        if (!everythingGenerated) {
-            std::cout << "NOTE : you do not have all pieces generated, generating can take several minutes." << std::endl;
+        if (!releasePiecesGenerated) {
+            std::cout << "NOTE: You do not have all pieces generated, generating can take several minutes." << std::endl;
        }
    #endif

+    bool everythingGenerated = true;
+    for (int i = 1; i <= MAXIMUM_PIECES_SIZE; i++) {
+        std::string filePath = "data/pieces/" + std::to_string(i) + "minos.bin";
+
+        if (!std::filesystem::exists(filePath)) {
+            std::cout << "ERROR: Could not open file " + filePath << std::endl;
+            everythingIsOK &= false;
+        }
+    }
+
+    // CHECK CONFIG FILES
+
    if (!std::filesystem::exists("data/config/settings.bin")) {
        std::cout << "INFO: Settings file not found, generating..." << std::endl;
-        resetSettingsFile();
+        everythingIsOK &= resetSettingsFile();
+
+        for (int i = 0; i < NUMBER_OF_KEYBINDS; i++) {
+            if (!std::filesystem::exists("data/config/keybinds/layout" + std::to_string(i) + ".bin")) {
+                std::cout << "INFO: Keybind file number " << (i + 1) << "/" << NUMBER_OF_KEYBINDS << " not found, generating..." << std::endl;
+                everythingIsOK &= resetKeybindFile(i);
+            }
+        }
    }
    else {
        std::ifstream settingsFile("data/config/settings.bin", std::ios::binary);
@@ -48,38 +75,49 @@ int main() {
        settingsFile.get(byte);
        if ((unsigned char) byte < CURRENT_FILE_FORMAT_VERSION) {
            std::cout << "INFO: Files format changed, regenerating..." << std::endl;
-            resetSettingsFile();
+            everythingIsOK &= resetSettingsFile();
            for (int i = 0; i < NUMBER_OF_KEYBINDS; i++) {
-                resetKeybindFile(i);
+                everythingIsOK &= resetKeybindFile(i);
            }
        }
    }

-    for (int i = 0; i < NUMBER_OF_KEYBINDS; i++) {
-        if (!std::filesystem::exists("data/config/keybinds/layout" + std::to_string(i) + ".bin")) {
-            std::cout << "INFO: Keybind file n°" << (i + 1) << "/" << NUMBER_OF_KEYBINDS << " not found, generating..." << std::endl;
-            resetKeybindFile(i);
-        }
-    }
+    // LAUNCH APP

+    if (everythingIsOK) {
        GraphApp UI;
        UI.run();
+    }
+    else {
+        std::cout << "ERROR: The game could not launch properly." << std::endl;
+        std::cout << "Press enter to quit. ";
+        std::cin.get();
+    }

    return 0;
 }


-void resetSettingsFile() {
-    std::ofstream settingsFile("data/config/settings.bin", std::ios::trunc | std::ios::binary);
-    char byte;
+bool resetSettingsFile() {
+    if (!std::filesystem::exists("data/config")) {
+        std::filesystem::create_directories("data/config");
+    }
    
+    std::string filePath ="data/config/settings.bin";
+    std::ofstream settingsFile(filePath, std::ios::trunc | std::ios::binary);
+    if (!settingsFile.good()) {
+        std::cerr << "ERROR: Could not open file " + filePath << std::endl;
+        return false;
+    }
+
+    char byte;
    Menu menu;

    // file format version
    byte = CURRENT_FILE_FORMAT_VERSION;
    settingsFile.write(&byte, 1);

-    // maximum pieces size
+    // loadable pieces size
    byte = MINIMUM_PIECES_SIZE;
    settingsFile.write(&byte, 1);

@@ -128,16 +166,35 @@ void resetSettingsFile() {
    }

    // selected pieces
-    byte = ALL_PIECES;
+    byte = DEFAULT_SELECTION.first;
    settingsFile.write(&byte, 1);
-    byte = 4;
+    byte = DEFAULT_SELECTION.second;
    settingsFile.write(&byte, 1);
+
+    return true;
 }

-void resetKeybindFile(int layout) {
-    if (layout < 0 || layout > 4) return;
+bool resetKeybindFile(int layout) {
+    if (layout < 0 || layout > NUMBER_OF_KEYBINDS) {
+        std::cerr << "ERROR: Trying to create keybind layout number " << layout << " which is outside of range (" << NUMBER_OF_KEYBINDS << ")." << std::endl;
+        return false;
+    }
+
+    if (!std::filesystem::exists("data/config/keybinds")) {
+        std::filesystem::create_directories("data/config/keybinds");
+    }
+
+    std::string filePath = "data/config/keybinds/layout" + std::to_string(layout) + ".bin";
+    std::ofstream layoutFile(filePath, std::ios::trunc | std::ios::binary);
+    if (!layoutFile.good()) {
+        std::cerr << "ERROR: Could not open file " + filePath << std::endl;
+        return false;
+    }
+
+    if (layout == NUMBER_OF_KEYBINDS) {
+        return true;
+    }

-    std::ofstream layoutFile("data/config/keybinds/layout" + std::to_string(layout) + ".bin", std::ios::trunc | std::ios::binary);
    std::map<Action, sfKey> keybinds;

    if (layout != 4) {
@@ -203,4 +260,6 @@ void resetKeybindFile(int layout) {
        byte = 0xFF;
        layoutFile.write(&byte, 1);
    }
+
+    return true;
 }
--- a/src/Pieces/Generator.cpp
+++ b/src/Pieces/Generator.cpp
@@ -11,25 +11,25 @@
 Generator::Generator() {
 }

-std::vector<Polyomino> Generator::generatePolyominoes(int polyominoSize) {
+std::vector<Polyomino>&& Generator::generatePolyominoes(int polyominoSize) {
    this->validPolyominoes.clear();
    this->currentTestedShape.clear();

    // a polyomino has at least 1 square
-    if (polyominoSize < 1) return this->validPolyominoes;
+    if (polyominoSize < 1) return std::move(this->validPolyominoes);

    // always place the first cell at (0, 0)
-    this->currentTestedShape.insert(Position{0, 0});
+    this->currentTestedShape.insert(Position(0, 0));
    
    std::map<Position, int> candidatePositions;
    this->generate(polyominoSize, 0, 1, candidatePositions);
-    return this->validPolyominoes;
+    return std::move(this->validPolyominoes);
 }

-void Generator::generate(int polyominoSize, int lastAddedPositionNumber, int nextAvaibleNumber, std::map<Position, int> candidatePositions) {
+void Generator::generate(unsigned polyominoSize, int lastAddedPositionNumber, int nextAvaibleNumber, std::map<Position, int> candidatePositions) {
    // recursion stop
    if (polyominoSize == this->currentTestedShape.size()) {
-        Polyomino candidate(this->currentTestedShape);
+        Polyomino candidate(std::move(this->currentTestedShape));

        // we sort the rotations of the polyominoes
        std::vector<Polyomino> candidateRotations;
@@ -50,15 +50,15 @@ void Generator::generate(int polyominoSize, int lastAddedPositionNumber, int nex
    }

    // generate the list of candidate positions
-    for (Position position : this->currentTestedShape) {
-        this->tryToAddCandidatePosition(Position{position.x, position.y + 1}, nextAvaibleNumber, candidatePositions);
-        this->tryToAddCandidatePosition(Position{position.x + 1, position.y}, nextAvaibleNumber, candidatePositions);
-        this->tryToAddCandidatePosition(Position{position.x, position.y - 1}, nextAvaibleNumber, candidatePositions);
-        this->tryToAddCandidatePosition(Position{position.x - 1, position.y}, nextAvaibleNumber, candidatePositions);
+    for (const Position position : this->currentTestedShape) {
+        this->tryToAddCandidatePosition(Position(position.x, position.y + 1), nextAvaibleNumber, candidatePositions);
+        this->tryToAddCandidatePosition(Position(position.x + 1, position.y), nextAvaibleNumber, candidatePositions);
+        this->tryToAddCandidatePosition(Position(position.x, position.y - 1), nextAvaibleNumber, candidatePositions);
+        this->tryToAddCandidatePosition(Position(position.x - 1, position.y), nextAvaibleNumber, candidatePositions);
    }
    
    // try adding a square only to positions with a higher number than the last one
-    for (auto [key, val] : candidatePositions) {
+    for (const auto& [key, val] : candidatePositions) {
        if (val > lastAddedPositionNumber) {
            this->currentTestedShape.insert(key);
            this->generate(polyominoSize, val, nextAvaibleNumber, (polyominoSize == this->currentTestedShape.size()) ? std::map<Position, int>() : candidatePositions);
--- a/src/Pieces/Generator.h
+++ b/src/Pieces/Generator.h
@@ -25,13 +25,13 @@ class Generator {
         * Generates the list of all one-sided polyominoes of the specified size
         * @return The list of polyominoes
         */
-        std::vector<Polyomino> generatePolyominoes(int polyominoSize);
+        std::vector<Polyomino>&& generatePolyominoes(int polyominoSize);

    private:
        /**
         * Generates all one-sided polyominoes of the specified size using the current tested shape
         */
-        void generate(int polyominoSize, int lastAddedPositionNumber, int nextAvaibleNumber, std::map<Position, int> candidatePositions);
+        void generate(unsigned polyominoSize, int lastAddedPositionNumber, int nextAvaibleNumber, std::map<Position, int> candidatePositions);

        /**
         * Checks wheter a candidate position can be added to the current tested shape
--- a/src/Pieces/Piece.cpp
+++ b/src/Pieces/Piece.cpp
@@ -9,11 +9,10 @@
 #include <string>


-Piece::Piece(const Polyomino& polyomino, Block blockType) :
+Piece::Piece(Polyomino&& polyomino, Block blockType) :
    polyomino(polyomino),
-    blockType(blockType) {
-
-    this->rotationState = NONE;
+    blockType(blockType),
+    rotationState(NONE) {
 }

 void Piece::rotate(Rotation rotation) {
@@ -38,8 +37,8 @@ void Piece::defaultRotation() {
    this->rotationState = NONE;
 }

-const std::set<Position>& Piece::getPositions() const {
-    return this->polyomino.getPositions();
+const Polyomino& Piece::getPositions() const {
+    return this->polyomino;
 }

 int Piece::getLength() const {
@@ -54,3 +53,7 @@ std::ostream& operator<<(std::ostream& os, const Piece& piece) {
    os << getConsoleColorCode(piece.blockType) << piece.polyomino << getResetConsoleColorCode();
    return os;
 }
+
+bool Piece::containsSquare(const Position& position) const {
+    return polyomino.contains(position);
+}
--- a/src/Pieces/Piece.h
+++ b/src/Pieces/Piece.h
@@ -21,7 +21,7 @@ class Piece {
        /**
         * Creates a piece with a specified shape and block type
         */
-        Piece(const Polyomino& piece, Block blockType);
+        Piece(Polyomino&& piece, Block blockType);

        /**
         * Rotates the piece in the specified direction
@@ -36,7 +36,13 @@ class Piece {
        /**
         * @return The list of positions of the piece
         */
-        const std::set<Position>& getPositions() const;
+        const Polyomino& getPositions() const;
+
+        /**
+         * @param the position of the square
+         * @return false if there is a hole
+         */
+        bool containsSquare(const Position& position) const;

        /**
         * @return The length of the piece
--- a/src/Pieces/PiecesFiles.cpp
+++ b/src/Pieces/PiecesFiles.cpp
@@ -10,6 +10,8 @@
 #include <filesystem>
 #include <algorithm>

+#include "../Common/Compression.h"
+

 PiecesFiles::PiecesFiles() {
 }
@@ -19,10 +21,6 @@ bool PiecesFiles::savePieces(int polyominoSize) const {
    if (!this->getFilePath(polyominoSize, filePath)) {
        return false;
    }
-    std::ofstream piecesFile(filePath, std::ios::trunc | std::ios::binary);
-    if (!piecesFile.good()) {
-        return false;
-    }

    Generator generator;
    std::vector<Polyomino> polyominoes = generator.generatePolyominoes(polyominoSize);
@@ -35,10 +33,9 @@ bool PiecesFiles::savePieces(int polyominoSize, std::vector<Polyomino>& polyomin
    if (!this->getFilePath(polyominoSize, filePath)) {
        return false;
    }
-    std::ofstream piecesFile(filePath, std::ios::trunc | std::ios::binary);
-    if (!piecesFile.good()) {
-        return false;
-    }
+
+    constexpr std::size_t INITIAL_CAPACITY = 2048;
+    DataBuffer buffer(INITIAL_CAPACITY);

    // sorting the polyominoes is done after setting spawn position to ensure the order is always the same
    for (Polyomino& nMino : polyominoes) {
@@ -48,18 +45,29 @@ bool PiecesFiles::savePieces(int polyominoSize, std::vector<Polyomino>& polyomin

    for (const Polyomino& polyomino : polyominoes) {
        // write the characteristics of the piece
-        char infoByte = (polyomino.isConvex() << 7) + (polyomino.hasHole() << 6) + polyomino.getLength();
-        piecesFile.write(&infoByte, 1);
+        bool isConvex = polyomino.isConvex();
+        bool hasHole = (isConvex) ? false : polyomino.hasHole();
+        std::uint8_t infoByte = (isConvex << 7) + (hasHole << 6) + polyomino.getLength();
+        buffer << infoByte;
+
+        const int bitsNeeded = polyomino.getLength() * polyomino.getLength();
+        const int bytesNeeded = bitsNeeded / 8 + 1;
+
+        static const Polyomino::PolyominoData byteMask = 0xFF;
+        const Polyomino::PolyominoData& polyominoData = polyomino.getPositionsData();

        // write the positions of the piece
-        char positionByte;
-        for (const Position position : polyomino.getPositions()) {
-            positionByte = (position.x << 4) + position.y;
-            piecesFile.write(&positionByte, 1);
+        for (int i = 0; i < bytesNeeded; i++) {
+            Polyomino::PolyominoData pData = polyominoData >> (i * 8);
+            unsigned long data = 
+                (pData & byteMask).to_ulong();
+            buffer << static_cast<std::uint8_t>(data);
        }
    }

-    return true;
+    DataBuffer compressed = Compress(buffer);
+
+    return compressed.WriteFile(filePath);
 }

 bool PiecesFiles::loadPieces(int polyominoSize, std::vector<Piece>& pieces, std::vector<int>& convexPieces, std::vector<int>& holelessPieces, std::vector<int>& otherPieces) const {
@@ -67,6 +75,13 @@ bool PiecesFiles::loadPieces(int polyominoSize, std::vector<Piece>& pieces, std:
    if (!this->getFilePath(polyominoSize, filePath)) {
        return false;
    }
+
+    DataBuffer compressed;
+    if(!compressed.ReadFile(filePath))
+        return false;
+
+    DataBuffer buffer = Decompress(compressed, compressed.GetSize());
+        
    std::ifstream piecesFile(filePath, std::ios::binary);
    if (!piecesFile.good()) {
        return false;
@@ -83,37 +98,38 @@ bool PiecesFiles::loadPieces(int polyominoSize, std::vector<Piece>& pieces, std:
        nextPieceBlockType(pieceBlock);
    }

-    char convexMask = 0b1000'0000;
-    char holeMask = 0b0100'0000;
-    char lengthMask = 0b0011'1111;
-    char xMask = 0b1111'0000;
-    char yMask = 0b0000'1111;
+    constexpr char convexMask = 0b1000'0000;
+    constexpr char holeMask = 0b0100'0000;
+    constexpr char lengthMask = 0b0011'1111;

-    char infoByte;
+    std::uint8_t infoByte;
+    std::uint8_t positionByte;
    int i = 0;
-    while (piecesFile.get(infoByte)) {
-        if (piecesFile.eof()) break;
+    while (!buffer.IsFinished()) {
+        // if (piecesFile.eof()) break;
+        buffer >> infoByte;

        // read piece infos
        bool isConvex = (infoByte & convexMask) >> 7;
        bool hasHole = (infoByte & holeMask) >> 6;
        int length = (infoByte & lengthMask);

+        const int bitsNeeded = length * length;
+        const int bytesNeeded = bitsNeeded / 8 + 1;
+
        // read positions
-        std::set<Position> piecePositions;
-        char positionByte;
-        for (int i = 0; i < polyominoSize; i++) {
-            piecesFile.get(positionByte);
-            int x = ((unsigned char) positionByte & xMask) >> 4;
-            int y = positionByte & yMask;
-            piecePositions.insert(Position{x, y});
+        Polyomino::PolyominoData polyominoData{};
+
+        for (int j = 0; j < bytesNeeded; j++) {
+            buffer >> positionByte;
+            Polyomino::PolyominoData tempByte(positionByte);
+            polyominoData |= (tempByte << (j * 8));
        }

-        // create piece
-        Piece readPiece(Polyomino(piecePositions, length), pieceBlock);
+        pieces.emplace_back(Polyomino(std::move(polyominoData), length), pieceBlock);
+
        nextPieceBlockType(pieceBlock);

-        pieces.push_back(readPiece);
        if (isConvex) {
            convexPieces.push_back(i);
        }
@@ -132,6 +148,11 @@ bool PiecesFiles::loadPieces(int polyominoSize, std::vector<Piece>& pieces, std:

 bool PiecesFiles::getFilePath(int polyominoSize, std::string& filePath) const {
    std::string dataFolderPath = "data/pieces/";
+
+    if (!std::filesystem::exists(dataFolderPath)) {
+        std::filesystem::create_directories(dataFolderPath);
+    }
+
    if (!std::filesystem::is_directory(dataFolderPath)) {
        return false;
    }
--- a/src/Pieces/PiecesFiles.h
+++ b/src/Pieces/PiecesFiles.h
@@ -18,21 +18,21 @@ class PiecesFiles {

        /**
         * Generate a file containing all the pieces of the specified size
-         * @return If the file could be created
+         * @return If the pieces are saved correctly
         */
-        bool savePieces(int polyominoSize) const;
+        [[nodiscard]] bool savePieces(int polyominoSize) const;

        /**
         * Generate a file containing all the pieces of the specified size, assuming they have been correctly generated
-         * @return If the file could be created
+         * @return If the piece are saved correctly
         */
-        bool savePieces(int polyominoSize, std::vector<Polyomino>& polyominoes) const;
+        [[nodiscard]] bool savePieces(int polyominoSize, std::vector<Polyomino>& polyominoes) const;

        /**
-         * Replace the content of the vectors by the pieces of the specified size, if the file wasn't found the vectors stays untouched
-         * @return If the file was found
+         * Replace the content of the vectors by the pieces of the specified size, if the pieces can't be loaded correctly the vectors stays untouched
+         * @return If the pieces could be loaded correctly
         */
-        bool loadPieces(int polyominoSize, std::vector<Piece>& pieces, std::vector<int>& convexPieces, std::vector<int>& holelessPieces, std::vector<int>& otherPieces) const;
+        [[nodiscard]] bool loadPieces(int polyominoSize, std::vector<Piece>& pieces, std::vector<int>& convexPieces, std::vector<int>& holelessPieces, std::vector<int>& otherPieces) const;
    
        /**
         * Puts the path to the piece file of the specified size in order, if the data folder wasn't found the string stays untouched
--- a/src/Pieces/Polyomino.cpp
+++ b/src/Pieces/Polyomino.cpp
@@ -8,14 +8,14 @@
 #include <climits>
 #include <algorithm>
 #include <utility>
+#include <cassert>

-
-Polyomino::Polyomino(const std::set<Position>& positions) {
+Polyomino::Polyomino(std::set<Position>&& positions) : positions(0) {
    int minX = INT_MAX;
    int maxX = INT_MIN;
    int minY = INT_MAX;
    int maxY = INT_MIN;
-    for (Position position : positions) {
+    for (const Position position : positions) {
        if (position.x < minX) minX = position.x;
        if (position.x > maxX) maxX = position.x;
        if (position.y < minY) minY = position.y;
@@ -25,71 +25,64 @@ Polyomino::Polyomino(const std::set<Position>& positions) {
    this->length = std::max(maxX - minX + 1, maxY - minY + 1);

    // we normalize here instead of calling this->normalize() to reduce the number of calculations for the generation algorithm
-    std::set<Position> newPositions;
+    Polyomino newPolyomino({}, this->length);
    for (Position position : positions) {
-        newPositions.insert(Position{position.x - minX, position.y - minY});
+        newPolyomino.insert(Position(position.x - minX, position.y - minY));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(newPolyomino.positions);
 }

-Polyomino::Polyomino(const std::set<Position>& positions, int length) :
-    positions(positions),
+Polyomino::Polyomino(PolyominoData&& positions, std::int8_t length) :
+    positions(std::move(positions)),
    length(length) {
 }

 void Polyomino::normalize() {
    int minX = INT_MAX;
    int minY = INT_MAX;
-    for (Position position : this->positions) {
+    for (const Position position : *this) {
        if (position.x < minX) minX = position.x;
        if (position.y < minY) minY = position.y;
    }

-    std::set<Position> newPositions;
-    for (Position position : this->positions) {
-        newPositions.insert(Position{position.x - minX, position.y - minY});
+    Polyomino newPolyomino({}, this->length);
+    for (const Position position : *this) {
+        newPolyomino.insert(Position(position.x - minX, position.y - minY));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(newPolyomino.positions);
 }

 void Polyomino::rotateCW() {
-    std::set<Position> newPositions;
-    for (Position position : this->positions) {
-        newPositions.insert(Position{position.y, (length - 1) - (position.x)});
+    Polyomino temp({}, this->length);
+    for (const Position position : *this) {
+        temp.insert(Position(position.y, (length - 1) - (position.x)));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(temp.positions);
 }

 void Polyomino::rotate180() {
-    std::set<Position> newPositions;
-    for (Position position : this->positions) {
-        newPositions.insert(Position{(length - 1) - (position.x), (length - 1) - (position.y)});
+    Polyomino temp({}, this->length);
+    for (const Position position : *this) {
+        temp.insert(Position((length - 1) - (position.x), (length - 1) - (position.y)));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(temp.positions);
 }

 void Polyomino::rotateCCW() {
-    std::set<Position> newPositions;
-    for (Position position : this->positions) {
-        newPositions.insert(Position{(length - 1) - (position.y), position.x});
+    Polyomino temp({}, this->length);
+    for (const Position position : *this) {
+        temp.insert(Position((length - 1) - (position.y), position.x));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(temp.positions);
 }

 void Polyomino::goToSpawnPosition() {
    // initialize array
-    std::vector<std::vector<int>> linesCompleteness;
-    linesCompleteness.reserve(4);
-    std::vector<int> empty;
-    for (int j = 0; j < this->length; j++) {
-        empty.push_back(0);
-    }
-    for (int i = 0; i < 4; i++) {
-        linesCompleteness.push_back(empty);
-    }
+    std::vector<int> empty(this->length, 0);
+    std::vector<std::vector<int>> linesCompleteness(4, empty);

    // calculates amount of squares per rows and columns
-    for (Position position : this->positions) {
+    for (const Position position : *this) {
        linesCompleteness.at(0).at(position.y) += 1;                // 0 = bottom to top = no rotation
        linesCompleteness.at(1).at((length - 1) - position.x) += 1; // 1 = right to left = CW
        linesCompleteness.at(2).at((length - 1) - position.y) += 1; // 2 = top to bottom = 180
@@ -156,19 +149,20 @@ void Polyomino::goToSpawnPosition() {
        std::swap(verticalEmptyLines, horizontalEmptyLines);
    }

+    
    int minX = INT_MAX;
    int minY = INT_MAX;
-    for (Position position : this->positions) {
+    for (const Position position : *this) {
        if (position.x < minX) minX = position.x;
        if (position.y < minY) minY = position.y;
    }

    // center the piece with an up bias
-    std::set<Position> newPositions;
-    for (Position position : positions) {
-        newPositions.insert(Position{(position.x - minX) + (verticalEmptyLines / 2), (position.y - minY) + ((horizontalEmptyLines + 1) / 2)});
+    Polyomino temp({}, this->length);
+    for (const Position position : *this) {
+        temp.insert(Position((position.x - minX) + (verticalEmptyLines / 2), (position.y - minY) + ((horizontalEmptyLines + 1) / 2)));
    }
-    this->positions = std::move(newPositions);
+    this->positions = std::move(temp.positions);
 }

 void Polyomino::checkForFlattestSide(const std::vector<std::vector<int>>& linesCompleteness, bool currentFlattestSides[4], int& sideToBeOn, bool checkLeftSide) const {
@@ -216,7 +210,7 @@ bool Polyomino::isConvex() const {
        bool startedColumn = false;
        bool completedColumn = false;
        for (int i = 0; i < this->length; i++) {
-            if (this->positions.contains(Position{i, j})) {
+            if (this->contains(Position(i, j))) {
                if (completedLine) return false;
                else startedLine = true;
            }
@@ -224,7 +218,7 @@ bool Polyomino::isConvex() const {
                if (startedLine) completedLine = true;
            }

-            if (this->positions.contains(Position{j, i})) {
+            if (this->contains(Position(j, i))) {
                if (completedColumn) return false;
                else startedColumn = true;
            }
@@ -238,31 +232,31 @@ bool Polyomino::isConvex() const {

 bool Polyomino::hasHole() const {
    // add every empty square on the outer of the box containing the polyomino
-    std::set<Position> emptyPositions;
+    Polyomino temp({}, this->length);
    for (int i = 0; i < this->length - 1; i++) {
-        this->tryToInsertPosition(emptyPositions, Position{i, 0});                                   // up row
-        this->tryToInsertPosition(emptyPositions, Position{this->length - 1, i});                    // rigth column
-        this->tryToInsertPosition(emptyPositions, Position{this->length - 1 - i, this->length - 1}); // bottom row
-        this->tryToInsertPosition(emptyPositions, Position{0, this->length - 1 - i});                // left column
+        this->tryToInsertPosition(temp, Position(i, 0));                                   // up row
+        this->tryToInsertPosition(temp, Position(this->length - 1, i));                    // rigth column
+        this->tryToInsertPosition(temp, Position(this->length - 1 - i, this->length - 1)); // bottom row
+        this->tryToInsertPosition(temp, Position(0, this->length - 1 - i));                // left column
    }

    // if we didn't reached all empty squares in the box then there was some contained within the polyomino, i.e. there was a hole
-    return (emptyPositions.size() < (this->length * this->length) - this->positions.size());
+    return (temp.getSize() < (this->length * this->length) - this->positions.size());
 }

-void Polyomino::tryToInsertPosition(std::set<Position>& emptyPositions, const Position& candidate) const {
+void Polyomino::tryToInsertPosition(Polyomino& emptyPositions, const Position& candidate) const {
    if (candidate.x >= this->length || candidate.x < 0 || candidate.y >= this->length || candidate.y < 0) return;
-    if (this->positions.contains(candidate) || emptyPositions.contains(candidate)) return;
+    if (this->contains(candidate) || emptyPositions.contains(candidate)) return;

    // if it's a new empty square, try its neighbors
    emptyPositions.insert(candidate);
-    tryToInsertPosition(emptyPositions, Position{candidate.x, candidate.y + 1});
-    tryToInsertPosition(emptyPositions, Position{candidate.x + 1, candidate.y});
-    tryToInsertPosition(emptyPositions, Position{candidate.x, candidate.y - 1});
-    tryToInsertPosition(emptyPositions, Position{candidate.x - 1, candidate.y});
+    tryToInsertPosition(emptyPositions, Position(candidate.x, candidate.y + 1));
+    tryToInsertPosition(emptyPositions, Position(candidate.x + 1, candidate.y));
+    tryToInsertPosition(emptyPositions, Position(candidate.x, candidate.y - 1));
+    tryToInsertPosition(emptyPositions, Position(candidate.x - 1, candidate.y));
 }

-const std::set<Position>& Polyomino::getPositions() const {
+const Polyomino::PolyominoData& Polyomino::getPositionsData() const {
    return this->positions;
 }

@@ -277,13 +271,19 @@ int Polyomino::getPolyominoSize() const {
 bool Polyomino::operator<(const Polyomino& other) const {
    if (this->length != other.length) return this->length < other.length;

-    for (int y = this->length - 1; y >= 0; y--) {
-        for (int x = 0; x < this->length; x++) {
-            bool hasThisPosition = this->positions.contains(Position{x, y});
-            bool hasOtherPosition = other.positions.contains(Position{x, y});
-            if (hasThisPosition != hasOtherPosition) return hasThisPosition;
+    assert(other.positions.any() && "The other polyomino is empty !");
+
+    static const PolyominoData longMask = 0xFFFFFFFFFFFFFFFF;
+    const int longsNeeded = this->length * this->length / 64 + 1;
+
+    for (int i = 0; i < longsNeeded; i++) {
+        unsigned long l1 = (this->positions >> (i * sizeof(std::uint64_t)) & longMask).to_ulong();
+        unsigned long l2 = (other.positions >> (i * sizeof(std::uint64_t)) & longMask).to_ulong();
+        if (l1 != l2) {
+            return l1 < l2;
        }
    }
+
    return false;
 }

@@ -294,7 +294,7 @@ bool Polyomino::operator==(const Polyomino& other) const {
 std::ostream& operator<<(std::ostream& os, const Polyomino& polyomino) {
    for (int y = polyomino.length - 1; y >= 0; y--) {
        for (int x = 0; x < polyomino.length; x++) {
-            if (polyomino.positions.contains(Position{x, y})) {
+            if (polyomino.contains(Position(x, y))) {
                os << "*";
            }
            else {
@@ -305,3 +305,31 @@ std::ostream& operator<<(std::ostream& os, const Polyomino& polyomino) {
    }
    return os;
 }
+
+int Polyomino::getSize() const {
+    return positions.count();
+}
+
+bool Polyomino::contains(const Position& position) const {
+    return this->positions[getBitIndex(position)];
+}
+
+void Polyomino::insert(const Position& position) {
+    this->positions.set(getBitIndex(position), true);
+}
+
+void Polyomino::erase(const Position& position) {
+    this->positions.set(getBitIndex(position), false);
+}
+
+std::size_t Polyomino::getBitIndex(const Position& position) const {
+    return position.y * this->length + position.x;
+}
+
+Polyomino::ConstIterator Polyomino::begin() const {
+    return ConstIterator(*this, positions._Find_first());
+}
+
+Polyomino::ConstIterator Polyomino::end() const {
+    return ConstIterator(*this, positions.size());
+}
--- a/src/Pieces/Polyomino.h
+++ b/src/Pieces/Polyomino.h
@@ -5,26 +5,68 @@
 #include <vector>
 #include <set>
 #include <iostream>
+#include <array>
+#include <bitset>


 /**
 * A mathematical object consisting of touching squares on a 2D grid
 */
 class Polyomino {
+    public:
+        static const std::size_t MAX_LENGTH = 16;
+        using PolyominoData = std::bitset<MAX_LENGTH * MAX_LENGTH>;
+
+        class ConstIterator {
+            public:
+                using iterator_category = std::forward_iterator_tag;
+                using difference_type   = std::ptrdiff_t;
+                using value_type        = Position;
+                using const_pointer     = const Position*;  // or also value_type*
+                using const_reference   = const Position&;  // or also value_type&
+            public:
+                ConstIterator(const Polyomino& polyomino, std::size_t index) : m_Polyomino(polyomino), m_Index(index) {
+                    updatePosition();
+                }
+
+                const_reference operator*() const { return m_Position; }
+                const_pointer operator->() { return &m_Position; }
+
+                // Prefix increment
+                ConstIterator& operator++() { 
+                    m_Index = m_Polyomino.getPositionsData()._Find_next(m_Index);
+                    updatePosition();
+                    return *this; 
+                }  
+
+
+                friend bool operator== (const ConstIterator& a, const ConstIterator& b) { return a.m_Index == b.m_Index; };
+                friend bool operator!= (const ConstIterator& a, const ConstIterator& b) { return a.m_Index != b.m_Index; };  
+
            private:
-        std::set<Position> positions; // the squares composing the polyomino, (0,0) is downleft
-        int length;                   // the size of the smallest square box in which the polyomino can fit on any rotation
+                void updatePosition() {
+                    m_Position = Position(m_Index % m_Polyomino.getLength(), m_Index / m_Polyomino.getLength());
+                }
+
+                const Polyomino& m_Polyomino;
+                std::size_t m_Index;
+                Position m_Position;
+        };
+
+    private:
+        PolyominoData positions; // the squares composing the polyomino, stored in binary. MSB is downleft
+        std::int8_t length;      // the size of the smallest square box in which the polyomino can fit on any rotation
    
    public:
-        /**
-         * Creates a polyomino with the specified positions and normalizes it, wheter it is actually a polyonimo is not checked
-         */
-        Polyomino(const std::set<Position>& positions);
-
        /**
         * Creates a polyomino with the specified positions and length, wheter it is actually a polyonimo of this length is not checked
         */
-        Polyomino(const std::set<Position>& positions, int length);
+        Polyomino(PolyominoData&& positions, std::int8_t length);
+
+        /**
+         * Creates a polyomino with the specified positions and normalizes it, wheter it is actually a polyonimo is not checked
+         */
+        Polyomino(std::set<Position>&& positions);

        /**
         * Translates the polyomino to the lowest unsigned values (lower row on y = 0, and left-most column on x = 0)
@@ -74,19 +116,29 @@ class Polyomino {
        /**
         * Auxiliary method of hasHole()
         */
-        void tryToInsertPosition(std::set<Position>& emptypositions, const Position& candidate) const;
+        void tryToInsertPosition(Polyomino& emptypositions, const Position& candidate) const;

    public:
        /**
-         * @return The positions of the polyomino
+         * @return The positions data of the polyomino
         */
-        const std::set<Position>& getPositions() const;
+        const PolyominoData& getPositionsData() const;

        /**
         * @return The length of the polyomino
         */
        int getLength() const;

+        /**
+         * 
+         */
+        int getSize() const;
+
+        /**
+         * 
+         */
+        std::size_t getBitIndex(const Position& position) const;
+
        /**
         * @return The number of squares in the polyomino
         */
@@ -110,4 +162,23 @@ class Polyomino {
         * @return A reference to the output stream
         */
        friend std::ostream& operator<<(std::ostream& os, const Polyomino& polyomino);
+
+        /**
+         * @return True if it contains the position
+         */
+        bool contains(const Position& position) const;
+
+        /**
+         * @brief Insert a square at the position
+         */
+        void insert(const Position& position);
+
+        /**
+         * @brief Removes a square at the position
+         */
+        void erase(const Position& position);
+
+        ConstIterator begin() const;
+
+        ConstIterator end() const;
 };
--- a/src/Pieces/Position.h
+++ b/src/Pieces/Position.h
@@ -1,14 +1,14 @@
 #pragma once

 #include <iostream>
-
+#include <cstdint>

 /**
 * A position on a 2D grid
 */
 struct Position {
-    int x; // x position
-    int y; // y position
+    std::int8_t x; // x position
+    std::int8_t y; // y position
 };


@@ -17,7 +17,7 @@ struct Position {
 * @return The sums of the coordinates of both positions
 */
 inline Position operator+(const Position& left, const Position& right) {
-    return Position{left.x + right.x, left.y + right.y};
+    return Position(left.x + right.x, left.y + right.y);
 }

 /**
@@ -34,7 +34,7 @@ inline Position& operator+=(Position& left, const Position& right) {
 * @return The difference of the coordinate between the left and right position
 */
 inline Position operator-(const Position& left, const Position& right) {
-    return Position{left.x - right.x, left.y - right.y};
+    return Position(left.x - right.x, left.y - right.y);
 }

 /**
--- a/src/TextUI/TextApp.cpp
+++ b/src/TextUI/TextApp.cpp
@@ -250,9 +250,9 @@ void TextApp::printGame(const Game& game) const {
    for (int y = maxHeight; y >= 0; y--) {
        for (int x = 0; x < game.getBoard().getWidth(); x++) {
            /* BOARD PRINTING */
-            bool isActivePieceHere = (game.getActivePiece() != nullptr) && (game.getActivePiece()->getPositions().contains(Position{x, y} - game.getActivePiecePosition()));
-            bool isGhostPieceHere = (game.getActivePiece() != nullptr) && (game.getActivePiece()->getPositions().contains(Position{x, y} - game.getGhostPiecePosition()));
-            Block block = (isActivePieceHere || isGhostPieceHere) ? game.getActivePiece()->getBlockType() : game.getBoard().getBlock(Position{x, y});
+            bool isActivePieceHere = (game.getActivePiece() != nullptr) && (game.getActivePiece()->getPositions().contains(Position(x, y) - game.getActivePiecePosition()));
+            bool isGhostPieceHere = (game.getActivePiece() != nullptr) && (game.getActivePiece()->getPositions().contains(Position(x, y) - game.getGhostPiecePosition()));
+            Block block = (isActivePieceHere || isGhostPieceHere) ? game.getActivePiece()->getBlockType() : game.getBoard().getBlock(Position(x, y));

            if (isActivePieceHere || isGhostPieceHere) {
                std::cout << getConsoleColorCode(block);
@@ -294,7 +294,7 @@ void TextApp::printGame(const Game& game) const {
                }
                else {
                    for (int i = 0; i < game.getHeldPiece()->getLength(); i++) {
-                        if (game.getHeldPiece()->getPositions().contains(Position{i, printedPieceLineHeight})) {
+                        if (game.getHeldPiece()->getPositions().contains(Position(i, printedPieceLineHeight))) {
                            std::cout << getConsoleColorCode(game.getHeldPiece()->getBlockType()) << "*";
                        }
                        else {
@@ -316,7 +316,7 @@ void TextApp::printGame(const Game& game) const {
                }
                else {
                    for (int i = 0; i < game.getNextPieces().at(nextQueuePrintedPiece).getLength(); i++) {
-                        if (game.getNextPieces().at(nextQueuePrintedPiece).getPositions().contains(Position{i, printedPieceLineHeight})) {
+                        if (game.getNextPieces().at(nextQueuePrintedPiece).getPositions().contains(Position(i, printedPieceLineHeight))) {
                            std::cout << getConsoleColorCode(game.getNextPieces().at(nextQueuePrintedPiece).getBlockType()) << "*";
                        }
                        else {
--- a/src/TextUI/main.cpp
+++ b/src/TextUI/main.cpp
@@ -7,37 +7,35 @@
 #include <cmath>

 static const int MAXIMUM_PIECES_SIZE = 10;
-static const int BENCHMARK_PIECES_SIZE = 15;
-

 void testGeneratorForAllSizes(int max_size);
 void testGeneratorForOneSize(int size);
 void printPiecesByTypesForOneSize(int size);
 void readStatsFromFilesForAllSizes(int max_size);

-void benchmarking(int min_size, int max_size);
-

 int main(int argc, char** argv) {
    std::srand(std::time(NULL));

-    #ifdef BENCHMARK
-        benchmarking(1, BENCHMARK_PIECES_SIZE);
-    #else
-        // dev: generate files if it hasn't been done before, UI will NOT generate the files
-        //generateFilesForAllSizes(10);
+    // CHECK PIECES FILES

    PiecesFiles pf;
+    bool warned = false;
    for (int i = 1; i <= MAXIMUM_PIECES_SIZE; i++) {
        if (!std::filesystem::exists("data/pieces/" + std::to_string(i) + "minos.bin")) {
+            if (!warned) {
                std::cout << "INFO: Pieces files for size " << i << " not found, generating..." << std::endl;
+                warned = true;
+            }
+            
            pf.savePieces(i);
        }
    }

+    // LAUNCH APP
+    
    TextApp UI;
    UI.run();
-    #endif

    return 0;
 }
@@ -118,66 +116,3 @@ void readStatsFromFilesForAllSizes(int max_size) {
        std::cout << "Others " << i << "-minos : " << otherPieces.size() << std::endl;
    }
 }
-
-void benchmarking(int min_size, int max_size) {
-    using std::chrono::high_resolution_clock;
-    using std::chrono::duration_cast;
-    using std::chrono::duration;
-    using std::chrono::milliseconds;
-
-    std::cout << "| n | Number | Generation | File storing | File retrieving | File size |" << std::endl;
-    std::cout << "| - | - | - | - | - | - |" << std::endl;
-
-    Generator gen;
-    PiecesFiles pf;
-
-    for (int i = min_size; i <= max_size; i++) {
-        std::cout << "| " << i;
-
-        auto t1 = high_resolution_clock::now();
-        std::vector<Polyomino> polyominoes = gen.generatePolyominoes(i);
-        auto t2 = high_resolution_clock::now();
-        duration<double, std::milli> ms_double = t2 - t1;
-        std::cout << " | " << polyominoes.size();
-        std::flush(std::cout);
-        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms ";
-        std::flush(std::cout);
-
-        t1 = high_resolution_clock::now();
-        pf.savePieces(i, polyominoes);
-        t2 = high_resolution_clock::now();
-        ms_double = t2 - t1;
-        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms ";
-        std::flush(std::cout);
-
-        polyominoes.clear();
-        polyominoes.shrink_to_fit();
-
-        std::vector<Piece> pieces;
-        std::vector<int> convexPieces;
-        std::vector<int> holelessPieces;
-        std::vector<int> otherPieces;
-
-        t1 = high_resolution_clock::now();
-        pf.loadPieces(i, pieces, convexPieces, holelessPieces, otherPieces);
-        t2 = high_resolution_clock::now();
-        ms_double = t2 - t1;
-        std::cout << " | " << (int) ms_double.count() / 1000 << "s " << std::fmod(ms_double.count(), 1000) << "ms ";
-        std::flush(std::cout);
-
-        pieces.clear();
-        pieces.shrink_to_fit();
-        convexPieces.clear();
-        convexPieces.shrink_to_fit();
-        holelessPieces.clear();
-        holelessPieces.shrink_to_fit();
-        otherPieces.clear();
-        otherPieces.shrink_to_fit();
-
-        std::string filePath;
-        pf.getFilePath(i, filePath);
-        int fileSize = std::filesystem::file_size(filePath);
-        std::cout << " | " << fileSize << " bytes |" << std::endl;
-        std::flush(std::cout);
-    }
-}
--- a/src/Utils/AssetManager.cpp
+++ b/src/Utils/AssetManager.cpp
@@ -0,0 +1,97 @@
+#include "./AssetManager.h"
+
+#include <map>
+
+static const unsigned char data_fonts_pressstart_prstart_ttf[] = {
+	#include <data/fonts/pressstart/prstart.ttf.h>
+};
+
+static const unsigned char data_fonts_pressstart_prstartk_ttf[] = {
+	#include <data/fonts/pressstart/prstartk.ttf.h>
+};
+
+static const unsigned char data_images_keybinds_Harddrop_png[] = {
+	#include <data/images/keybinds/Harddrop.png.h>
+};
+
+static const unsigned char data_images_keybinds_Moveleft_png[] = {
+	#include <data/images/keybinds/Moveleft.png.h>
+};
+
+static const unsigned char data_images_keybinds_RotateCW_png[] = {
+	#include <data/images/keybinds/RotateCW.png.h>
+};
+
+static const unsigned char data_images_keybinds_RotateCCW_png[] = {
+	#include <data/images/keybinds/RotateCCW.png.h>
+};
+
+static const unsigned char data_images_keybinds_Softdrop_png[] = {
+	#include <data/images/keybinds/Softdrop.png.h>
+};
+
+static const unsigned char data_images_keybinds_Moveright_png[] = {
+	#include <data/images/keybinds/Moveright.png.h>
+};
+
+static const unsigned char data_images_keybinds_Rotate180_png[] = {
+	#include <data/images/keybinds/Rotate180.png.h>
+};
+
+static const unsigned char data_images_keybinds_Hold_png[] = {
+	#include <data/images/keybinds/Hold.png.h>
+};
+
+static const unsigned char data_images_keybinds_Rotate0_png[] = {
+	#include <data/images/keybinds/Rotate0.png.h>
+};
+
+static const unsigned char data_images_keybinds_Retry_png[] = {
+	#include <data/images/keybinds/Retry.png.h>
+};
+
+static const unsigned char data_images_keybinds_Pause_png[] = {
+	#include <data/images/keybinds/Pause.png.h>
+};
+
+static const Asset assets[] = {
+	{data_fonts_pressstart_prstart_ttf, sizeof(data_fonts_pressstart_prstart_ttf)},
+	{data_fonts_pressstart_prstartk_ttf, sizeof(data_fonts_pressstart_prstartk_ttf)},
+	{data_images_keybinds_Harddrop_png, sizeof(data_images_keybinds_Harddrop_png)},
+	{data_images_keybinds_Moveleft_png, sizeof(data_images_keybinds_Moveleft_png)},
+	{data_images_keybinds_RotateCW_png, sizeof(data_images_keybinds_RotateCW_png)},
+	{data_images_keybinds_RotateCCW_png, sizeof(data_images_keybinds_RotateCCW_png)},
+	{data_images_keybinds_Softdrop_png, sizeof(data_images_keybinds_Softdrop_png)},
+	{data_images_keybinds_Moveright_png, sizeof(data_images_keybinds_Moveright_png)},
+	{data_images_keybinds_Rotate180_png, sizeof(data_images_keybinds_Rotate180_png)},
+	{data_images_keybinds_Hold_png, sizeof(data_images_keybinds_Hold_png)},
+	{data_images_keybinds_Rotate0_png, sizeof(data_images_keybinds_Rotate0_png)},
+	{data_images_keybinds_Retry_png, sizeof(data_images_keybinds_Retry_png)},
+	{data_images_keybinds_Pause_png, sizeof(data_images_keybinds_Pause_png)},
+
+};
+
+static const std::map<std::string, AssetName> assetMap = {
+	{"data/fonts/pressstart/prstart.ttf", AssetName::data_fonts_pressstart_prstart_ttf},
+	{"data/fonts/pressstart/prstartk.ttf", AssetName::data_fonts_pressstart_prstartk_ttf},
+	{"data/images/keybinds/Harddrop.png", AssetName::data_images_keybinds_Harddrop_png},
+	{"data/images/keybinds/Moveleft.png", AssetName::data_images_keybinds_Moveleft_png},
+	{"data/images/keybinds/RotateCW.png", AssetName::data_images_keybinds_RotateCW_png},
+	{"data/images/keybinds/RotateCCW.png", AssetName::data_images_keybinds_RotateCCW_png},
+	{"data/images/keybinds/Softdrop.png", AssetName::data_images_keybinds_Softdrop_png},
+	{"data/images/keybinds/Moveright.png", AssetName::data_images_keybinds_Moveright_png},
+	{"data/images/keybinds/Rotate180.png", AssetName::data_images_keybinds_Rotate180_png},
+	{"data/images/keybinds/Hold.png", AssetName::data_images_keybinds_Hold_png},
+	{"data/images/keybinds/Rotate0.png", AssetName::data_images_keybinds_Rotate0_png},
+	{"data/images/keybinds/Retry.png", AssetName::data_images_keybinds_Retry_png},
+	{"data/images/keybinds/Pause.png", AssetName::data_images_keybinds_Pause_png},
+
+};
+
+const Asset& getResource(AssetName fileName) {
+	return assets[static_cast<std::size_t>(fileName)];
+}
+
+const Asset& getResource(const std::string& fileName) {
+	return getResource(assetMap.at(fileName));
+}
--- a/src/Utils/AssetManager.h
+++ b/src/Utils/AssetManager.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+struct Asset {
+	const unsigned char* data;
+	std::size_t size;
+};
+
+enum class AssetName {
+	data_fonts_pressstart_prstart_ttf,
+	data_fonts_pressstart_prstartk_ttf,
+	data_images_keybinds_Harddrop_png,
+	data_images_keybinds_Moveleft_png,
+	data_images_keybinds_RotateCW_png,
+	data_images_keybinds_RotateCCW_png,
+	data_images_keybinds_Softdrop_png,
+	data_images_keybinds_Moveright_png,
+	data_images_keybinds_Rotate180_png,
+	data_images_keybinds_Hold_png,
+	data_images_keybinds_Rotate0_png,
+	data_images_keybinds_Retry_png,
+	data_images_keybinds_Pause_png,
+
+};
+
+const Asset& getResource(AssetName fileName);
+
+const Asset& getResource(const std::string& fileName);
--- a/xmake.lua
+++ b/xmake.lua
@@ -1,6 +1,8 @@
 add_rules("mode.debug", "mode.release")

-add_requires("sfml 3.0.0")
+includes("xmake/bin2c.lua")
+
+add_requires("sfml 3.0.0", "zlib")

 set_languages("c++20")

@@ -8,15 +10,8 @@ set_rundir(".")

 target("core")
    set_kind("$(kind)")
-    add_files("src/Pieces/*.cpp")
-    add_files("src/Core/*.cpp")
-
-target("graph")
-    set_default(true)
-    set_kind("binary")
-    add_files("./src/GraphicalUI/**.cpp")
-    add_deps("core")
-    add_packages("sfml")
+    add_files("src/Pieces/*.cpp", "src/Core/*.cpp", "src/Common/*.cpp")
+    add_packages("zlib")

 target("text")
    set_default(false)
@@ -24,12 +19,32 @@ target("text")
    add_files("./src/TextUI/*.cpp")
    add_deps("core")

-target("benchmark")
+target("bmark")
    set_default(false)
    set_kind("binary")
-    add_files("./src/TextUI/*.cpp")
+    add_files("./src/Benchmark/*.cpp")
    add_deps("core")
-    add_defines("BENCHMARK")
+
+target("graph")
+    set_default(true)
+    add_rules("bin2c", {
+        extensions = {".png", ".ttf"}, 
+        outputSource = {"src/Utils/AssetManager.cpp"},
+        outputHeader = {"src/Utils/AssetManager.h"}
+    })
+    set_kind("binary")
+    add_files("./src/GraphicalUI/**.cpp")
+    add_files("data/fonts/**.ttf", "data/images/**.png")
+    add_deps("core")
+    add_packages("sfml")
+
+if is_mode("debug") then 
+    add_defines("DEBUG")
+end
+
+if is_plat("mingw") then
+    add_ldflags("-static-libstdc++", "-static")
+end


 --
--- a/xmake/bin2c.lua
+++ b/xmake/bin2c.lua
@@ -0,0 +1,124 @@
+rule("bin2c")
+    set_extensions(".bin")
+    
+	on_load(function (target)
+        local headerdir = path.join(target:autogendir(), "rules", "bin2c")
+
+		local outputSource = table.unpack(target:extraconf("rules", "bin2c", "outputSource"))
+        
+		if not os.isdir(headerdir) then
+            os.mkdir(headerdir)
+        end
+
+		target:add("includedirs", headerdir)
+
+		target:add("files", outputSource)
+    end)
+
+    before_buildcmd_files(function (target, batchcmds, sourcebatch, opt)
+		local outputHeader = table.unpack(target:extraconf("rules", "bin2c", "outputHeader"))
+
+		local outputHeaderEnumContent = ""
+
+		for _, filePath in ipairs(sourcebatch.sourcefiles) do
+			local escapedName = string.gsub(filePath, "[/|.]", "_")
+			outputHeaderEnumContent = outputHeaderEnumContent .. "\t" .. escapedName .. ",\n"
+		end
+
+		local outputHeaderContent = string.format([[
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+struct Asset {
+	const unsigned char* data;
+	std::size_t size;
+};
+
+enum class AssetName {
+%s
+};
+
+const Asset& getResource(AssetName fileName);
+
+const Asset& getResource(const std::string& fileName);
+]], outputHeaderEnumContent)
+
+        local outputSource = table.unpack(target:extraconf("rules", "bin2c", "outputSource"))
+
+		local relativePath = path.join(path.relative(path.directory(outputHeader), path.directory(outputSource)), path.filename(outputHeader))
+		
+		local outputSourceContent = string.format([[
+#include "%s"
+
+#include <map>
+
+]], relativePath)
+
+
+		local outputSourceArrayVars = ""
+		local outputSourceMapVars = ""
+		
+		for _, filePath in ipairs(sourcebatch.sourcefiles) do
+			local escapedName = string.gsub(filePath, "[/|.]", "_")
+			local varDecl = string.format("static const unsigned char %s[] = {\n\t#include <%s>\n};\n\n", escapedName, filePath .. ".h")
+			outputSourceContent = outputSourceContent .. varDecl
+			outputSourceArrayVars = outputSourceArrayVars .. string.format("\t{%s, sizeof(%s)},\n", escapedName, escapedName)
+			outputSourceMapVars = outputSourceMapVars .. string.format("\t{\"%s\", AssetName::%s},\n", filePath, escapedName)
+		end
+
+		outputSourceContent = outputSourceContent .. string.format([[
+static const Asset assets[] = {
+%s
+};
+
+static const std::map<std::string, AssetName> assetMap = {
+%s
+};
+
+]], outputSourceArrayVars, outputSourceMapVars)
+
+		outputSourceContent = outputSourceContent .. [[
+const Asset& getResource(AssetName fileName) {
+	return assets[static_cast<std::size_t>(fileName)];
+}
+
+const Asset& getResource(const std::string& fileName) {
+	return getResource(assetMap.at(fileName));
+}
+]]
+
+		for _, sourcefile_bin in ipairs(sourcebatch.sourcefiles) do
+			-- get header file
+			local headerdir = path.join(target:autogendir(), "rules", "bin2c")
+			local headerfile = path.join(headerdir, sourcefile_bin .. ".h")
+			target:add("includedirs", headerdir)
+
+			-- add commands
+			batchcmds:show_progress(opt.progress, "${color.build.object}generating.bin2c %s", sourcefile_bin)
+			batchcmds:mkdir(headerdir)
+			local argv = {"lua", "private.utils.bin2c", "-i", path(sourcefile_bin), "-o", path(headerfile)}
+			local linewidth = target:extraconf("rules", "bin2c", "linewidth")
+			if linewidth then
+				table.insert(argv, "-w")
+				table.insert(argv, tostring(linewidth))
+			end
+			local nozeroend = target:extraconf("rules", "bin2c", "nozeroend")
+			if nozeroend then
+				table.insert(argv, "--nozeroend")
+			end
+			batchcmds:vrunv(os.programfile(), argv, {envs = {XMAKE_SKIP_HISTORY = "y"}})
+
+			-- add deps
+			batchcmds:add_depfiles(sourcefile_bin)
+			batchcmds:set_depmtime(os.mtime(headerfile))
+			batchcmds:set_depcache(target:dependfile(headerfile))
+
+		end
+
+		batchcmds:show_progress(opt.progress, "${color.build.object}generating.bin2c %s", outputHeader)
+		io.writefile(outputHeader, outputHeaderContent)
+		batchcmds:show_progress(opt.progress, "${color.build.object}generating.bin2c %s", outputSource)
+		io.writefile(outputSource, outputSourceContent)
+    end)
Author	SHA1	Message	Date
Persson-dev	de63cd22b6	optimize vector initialization All checks were successful Linux arm64 / Build (push) Successful in 2m13s Details	2025-07-28 09:51:02 +02:00
Persson-dev	07ba9619ed	use bitsets All checks were successful Linux arm64 / Build (push) Successful in 2m13s Details	2025-07-21 16:06:27 +02:00
Persson-dev	4095103843	fix some compiler warnings All checks were successful Linux arm64 / Build (push) Successful in 2m27s Details	2025-07-20 23:02:45 +02:00
Persson-dev	ecc035c972	fix polyominos All checks were successful Linux arm64 / Build (push) Successful in 2m29s Details	2025-07-20 22:32:33 +02:00
Persson-dev	dd6da58642	decrease file size All checks were successful Linux arm64 / Build (push) Successful in 2m27s Details	2025-07-20 21:39:10 +02:00
Persson-dev	a3ef52c7a1	decrease file retrieving time All checks were successful Linux arm64 / Build (push) Successful in 2m29s Details	2025-07-20 21:08:36 +02:00
Persson-dev	72e9f420ab	add missing include All checks were successful Linux arm64 / Build (push) Successful in 2m32s Details	2025-07-19 23:53:27 +02:00
Persson-dev	46b9b8dd65	begin optimize Generator Some checks failed Linux arm64 / Build (push) Failing after 2m4s Details	2025-07-19 23:39:22 +02:00
Persson-dev	d5b51213c8	change Position and Polynomio structs (less memory usage) Some checks failed Linux arm64 / Build (push) Failing after 2m9s Details	2025-07-19 20:50:36 +02:00
zulianc	161c9425ae	add table of contents to readme All checks were successful Linux arm64 / Build (push) Successful in 2m29s Details	2025-07-03 12:56:32 +02:00
zulianc	561b6d76b8	add diagrams All checks were successful Linux arm64 / Build (push) Successful in 3m51s Details	2025-07-02 17:43:35 +02:00
zulianc	b276213794	add diagrams	2025-07-02 17:43:28 +02:00
zulianc	7b5801e630	readme completed	2025-07-02 16:40:41 +02:00
zulianc	e676cd19f6	fixed line scoring All checks were successful Linux arm64 / Build (push) Successful in 12m32s Details	2025-06-21 16:53:24 +02:00
zulianc	8342bf3969	petits [[nodiscard]] pour le fun All checks were successful Linux arm64 / Build (push) Successful in 12m30s Details	2025-06-19 22:31:41 +02:00
zulianc	34d781fcfe	better main All checks were successful Linux arm64 / Build (push) Successful in 12m32s Details	2025-06-19 19:13:43 +02:00
zulianc	b17a40fda5	benchmark de simon All checks were successful Linux arm64 / Build (push) Successful in 3m14s Details	2025-06-19 15:55:15 +02:00
Persson-dev	17459c4026	use VarInt All checks were successful Linux arm64 / Build (push) Successful in 12m53s Details	2025-06-12 21:38:47 +02:00
Persson-dev	3e40ff7252	add compression All checks were successful Linux arm64 / Build (push) Successful in 1m58s Details	2025-06-12 21:28:46 +02:00
zulianc	dd8314f76c	ff windaube veut toujours pas All checks were successful Linux arm64 / Build (push) Successful in 2m45s Details	2025-06-12 17:35:39 +02:00
Persson-dev	d7f52239f0	and again All checks were successful Linux arm64 / Build (push) Successful in 1m57s Details	2025-06-03 12:03:59 +02:00
Persson-dev	72f4ea75ff	fix again	2025-06-03 12:03:47 +02:00
Persson-dev	b1b7277666	fix array initialization Some checks failed Linux arm64 / Build (push) Failing after 1m53s Details	2025-06-03 11:55:12 +02:00
zulianc	fd6bdc2b09	Merge branch 'assets' All checks were successful Linux arm64 / Build (push) Successful in 2m0s Details	2025-05-28 19:24:49 +02:00
zulianc	69b91d6497	simon PR review	2025-05-28 19:24:36 +02:00
Persson-dev	d50714ef8c	working asset manager ! All checks were successful Linux arm64 / Build (push) Successful in 1m58s Details	2025-05-27 21:29:56 +02:00
Persson-dev	3d1feb6295	start asset manager Some checks failed Linux arm64 / Build (push) Failing after 1m58s Details	2025-05-27 17:09:36 +02:00