diff --git a/README.md b/README.md index d324fa2..7e1e320 100644 --- a/README.md +++ b/README.md @@ -115,21 +115,21 @@ To package the executable manually properly, follow theses steps: | n | Number | Generation | File storing | File retrieving | File size | | -: | -: | :-: | :-: | :-: | -: | -| 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 | +| 1 | 1 | 0s 0.006496ms | 0s 0.18186ms | 0s 0.064298ms | 3 bytes | +| 2 | 1 | 0s 0.003848ms | 0s 0.167537ms | 0s 0.013054ms | 3 bytes | +| 3 | 2 | 0s 0.010133ms | 0s 0.076844ms | 0s 0.011991ms | 6 bytes | +| 4 | 7 | 0s 0.027356ms | 0s 0.050884ms | 0s 0.016362ms | 22 bytes | +| 5 | 18 | 0s 0.082079ms | 0s 0.088215ms | 0s 0.015016ms | 63 bytes | +| 6 | 60 | 0s 0.292599ms | 0s 0.254024ms | 0s 0.034325ms | 201 bytes | +| 7 | 196 | 0s 1.15671ms | 0s 0.424141ms | 0s 0.061736ms | 538 bytes | +| 8 | 704 | 0s 7.32448ms | 0s 2.00197ms | 0s 0.161199ms | 1803 bytes | +| 9 | 2500 | 0s 23.1679ms | 0s 4.30285ms | 0s 0.496256ms | 6291 bytes | +| 10 | 9189 | 0s 76.8277ms | 0s 20.5346ms | 0s 1.99335ms | 22396 bytes | +| 11 | 33896 | 0s 292.303ms | 0s 84.7814ms | 0s 7.11621ms | 79040 bytes | +| 12 | 126759 | 1s 368.505ms | 0s 407.837ms | 0s 33.5164ms | 279497 bytes | +| 13 | 476270 | 5s 963.297ms | 1s 709.14ms | 0s 171.402ms | 1010672 bytes | +| 14 | 1802312 | 25s 319.931ms | 3s 853.451ms | 0s 580.736ms | 3750531 bytes | +| 15 | 6849777 | 102s 886.385ms | 21s 198.445ms | 1s 973.051ms | 14162217 bytes | _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. diff --git a/src/Utils/AssetManager.cpp b/src/Utils/AssetManager.cpp index 2656747..75b2c5d 100644 --- a/src/Utils/AssetManager.cpp +++ b/src/Utils/AssetManager.cpp @@ -10,6 +10,30 @@ static const unsigned char data_fonts_pressstart_prstartk_ttf[] = { #include }; +static const unsigned char data_images_keybinds_Rotate180_png[] = { + #include +}; + +static const unsigned char data_images_keybinds_Rotate0_png[] = { + #include +}; + +static const unsigned char data_images_keybinds_RotateCCW_png[] = { + #include +}; + +static const unsigned char data_images_keybinds_Retry_png[] = { + #include +}; + +static const unsigned char data_images_keybinds_RotateCW_png[] = { + #include +}; + +static const unsigned char data_images_keybinds_Moveright_png[] = { + #include +}; + static const unsigned char data_images_keybinds_Harddrop_png[] = { #include }; @@ -18,36 +42,12 @@ static const unsigned char data_images_keybinds_Moveleft_png[] = { #include }; -static const unsigned char data_images_keybinds_RotateCW_png[] = { - #include -}; - -static const unsigned char data_images_keybinds_RotateCCW_png[] = { - #include -}; - -static const unsigned char data_images_keybinds_Softdrop_png[] = { - #include -}; - -static const unsigned char data_images_keybinds_Moveright_png[] = { - #include -}; - -static const unsigned char data_images_keybinds_Rotate180_png[] = { - #include -}; - static const unsigned char data_images_keybinds_Hold_png[] = { #include }; -static const unsigned char data_images_keybinds_Rotate0_png[] = { - #include -}; - -static const unsigned char data_images_keybinds_Retry_png[] = { - #include +static const unsigned char data_images_keybinds_Softdrop_png[] = { + #include }; static const unsigned char data_images_keybinds_Pause_png[] = { @@ -57,16 +57,16 @@ static const unsigned char data_images_keybinds_Pause_png[] = { 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_Rotate180_png, sizeof(data_images_keybinds_Rotate180_png)}, + {data_images_keybinds_Rotate0_png, sizeof(data_images_keybinds_Rotate0_png)}, + {data_images_keybinds_RotateCCW_png, sizeof(data_images_keybinds_RotateCCW_png)}, + {data_images_keybinds_Retry_png, sizeof(data_images_keybinds_Retry_png)}, + {data_images_keybinds_RotateCW_png, sizeof(data_images_keybinds_RotateCW_png)}, + {data_images_keybinds_Moveright_png, sizeof(data_images_keybinds_Moveright_png)}, {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_Softdrop_png, sizeof(data_images_keybinds_Softdrop_png)}, {data_images_keybinds_Pause_png, sizeof(data_images_keybinds_Pause_png)}, }; @@ -74,16 +74,16 @@ static const Asset assets[] = { static const std::map 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/Rotate180.png", AssetName::data_images_keybinds_Rotate180_png}, + {"data/images/keybinds/Rotate0.png", AssetName::data_images_keybinds_Rotate0_png}, + {"data/images/keybinds/RotateCCW.png", AssetName::data_images_keybinds_RotateCCW_png}, + {"data/images/keybinds/Retry.png", AssetName::data_images_keybinds_Retry_png}, + {"data/images/keybinds/RotateCW.png", AssetName::data_images_keybinds_RotateCW_png}, + {"data/images/keybinds/Moveright.png", AssetName::data_images_keybinds_Moveright_png}, {"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/Softdrop.png", AssetName::data_images_keybinds_Softdrop_png}, {"data/images/keybinds/Pause.png", AssetName::data_images_keybinds_Pause_png}, }; diff --git a/src/Utils/AssetManager.h b/src/Utils/AssetManager.h index 0404d69..e4eacae 100644 --- a/src/Utils/AssetManager.h +++ b/src/Utils/AssetManager.h @@ -11,16 +11,16 @@ struct Asset { enum class AssetName { data_fonts_pressstart_prstart_ttf, data_fonts_pressstart_prstartk_ttf, + data_images_keybinds_Rotate180_png, + data_images_keybinds_Rotate0_png, + data_images_keybinds_RotateCCW_png, + data_images_keybinds_Retry_png, + data_images_keybinds_RotateCW_png, + data_images_keybinds_Moveright_png, 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_Softdrop_png, data_images_keybinds_Pause_png, };