gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import fixes to random image generator

Browse Source
This commit is contained in:
ISSOtm
2022-03-22 18:38:23 +01:00
committed by Eldred Habert
parent 7311fc9ef8
commit 8ed65078da
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/randtilegen.c
View File

@@ -65,13 +65,13 @@ static uint8_t _5to8(uint8_t five) {
} }
static void generate_random_image(png_structp png, png_infop pngInfo) { static void generate_random_image(png_structp png, png_infop pngInfo) {
#define NB_TILES 100 #define NB_TILES 10 * 10
struct { struct {
unsigned char palette; unsigned char palette;
unsigned char nbColors; unsigned char nbColors;
} attributes[NB_TILES]; } attributes[NB_TILES];
uint8_t tileData[NB_TILES][8][8]; uint8_t tileData[NB_TILES][8][8];
// These two are in tiles, not pixels // These two are in tiles, not pixels, and in range [3; 10], hence `NB_TILES` above
// Both width and height are 4-bit values, so nbTiles is 8-bit (OK!) // Both width and height are 4-bit values, so nbTiles is 8-bit (OK!)
uint8_t const width = getRandomBits(3) + 3, height = getRandomBits(3) + 3, uint8_t const width = getRandomBits(3) + 3, height = getRandomBits(3) + 3,
nbTiles = width * height; nbTiles = width * height;
@@ -86,6 +86,7 @@ static void generate_random_image(png_structp png, png_infop pngInfo) {
static uint8_t const popcount[] = {1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, static uint8_t const popcount[] = {1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4}; 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4};
attributes[p].nbColors = popcount[pal - 1]; attributes[p].nbColors = popcount[pal - 1];
// Handle single-color tiles the simple way, without trying to pull more random bits
if (attributes[p].nbColors < 2) { if (attributes[p].nbColors < 2) {
memset(tileData[p], 0, sizeof(tileData[p])); memset(tileData[p], 0, sizeof(tileData[p]));
continue; continue;
@@ -105,6 +106,9 @@ static void generate_random_image(png_structp png, png_infop pngInfo) {
if (attributes[index].nbColors == attributes[p].nbColors) { if (attributes[index].nbColors == attributes[p].nbColors) {
total--; total--;
} }
if (!total) {
index--;
}
} }
} else { } else {
index = p; index = p;