From 3a7865b9135187eaeaf376cce4ab1478da815e3a Mon Sep 17 00:00:00 2001 From: Andre Schweiger Date: Sun, 27 Dec 2015 17:59:41 +0100 Subject: [PATCH] More Colors loaded from Texture(pack) --- data/icons2.png | Bin 16876 -> 16928 bytes source/Globals.c | 24 ++++++++++++++++++++++++ source/Globals.h | 9 +++++++++ source/Menu.c | 22 +++++++++------------- source/MenuTutorial.c | 22 +++++++++++----------- source/Render.c | 28 ++++++++++++++-------------- source/main.c | 9 ++------- source/texturepack.c | 13 +++---------- 8 files changed, 72 insertions(+), 55 deletions(-) diff --git a/data/icons2.png b/data/icons2.png index fb1eff6d25afc21d19eef3bfc92c82c5502065e8..d1036781f310d928d40320b175616142e9e9fab8 100644 GIT binary patch literal 16928 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 literal 16876 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 NH8#Ima@pnK{{{5M1hD`B diff --git a/source/Globals.c b/source/Globals.c index 8c003ff..abfa1c5 100644 --- a/source/Globals.c +++ b/source/Globals.c @@ -1403,3 +1403,27 @@ bool isSwimming(){ return getTile(player.x>>4,player.y>>4)==TILE_WATER; } +void reloadColors() { + dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); + dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); + dirtColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 2)); + dirtColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 3)); + dirtColor[4] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 4)); + + grassColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 17, 0)); + grassColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 17, 1)); + + sandColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 18, 0)); + sandColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 18, 1)); + + waterColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 19, 0)); + waterColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 19, 1)); + + lavaColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 20, 0)); + lavaColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 20, 1)); + + rockColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 21, 0)); + rockColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 21, 1)); + rockColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 21, 2)); + rockColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 21, 3)); +} \ No newline at end of file diff --git a/source/Globals.h b/source/Globals.h index e2d83ab..9b6fe51 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -76,7 +76,14 @@ u8 data[5][128*128]; u8 treeTable[256]; u16 rockTable[256]; u16 grassTable[16]; + u32 dirtColor[5]; +u32 grassColor[2]; +u32 sandColor[2]; +u32 waterColor[2]; +u32 lavaColor[2]; +u32 rockColor[4]; + char currentFileName[256]; extern u8 currentMenu; extern char fpsstr[]; @@ -122,3 +129,5 @@ bool playerUseEnergy(int amount); void playerHurtTile(int tile, int xt, int yt, int damage, int dir); bool playerIntersectsEntity(Entity* e); void playerEntityInteract(Entity* e); + +void reloadColors(); \ No newline at end of file diff --git a/source/Menu.c b/source/Menu.c index 2b7ed08..df0166e 100644 --- a/source/Menu.c +++ b/source/Menu.c @@ -564,11 +564,7 @@ void tickMenu(int menu){ isLoadingTP = 4; } else { icons = sfil_load_PNG_buffer(icons2_png, SF2D_PLACE_RAM); - dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); - dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); - dirtColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 2)); - dirtColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 3)); - dirtColor[4] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 4)); + reloadColors(); font = sfil_load_PNG_buffer(Font_png, SF2D_PLACE_RAM); bottombg = sfil_load_PNG_buffer(bottombg_png, SF2D_PLACE_RAM); currentMenu = MENU_SETTINGS; @@ -1233,10 +1229,10 @@ void renderMenu(int menu,int xscr,int yscr){ render16(startX,startY+12,0,128,0);//Player(Carrying) render16(startX,startY,128,128,0);//Workbench startX = 120;startY = 20; - render16b(startX,startY,16,96,0,0xFFC11D00);// water pit - render16b(startX+16,startY,32,96,0,0xFFC11D00); - render16b(startX,startY+16,48,96,0,0xFFC11D00); - render16b(startX+16,startY+16,64,96,0,0xFFC11D00); + render16b(startX,startY,16,96,0,waterColor[0]);// water pit + render16b(startX+16,startY,32,96,0,waterColor[0]); + render16b(startX,startY+16,48,96,0,waterColor[0]); + render16b(startX+16,startY+16,64,96,0,waterColor[0]); renderc (startX+8,startY+12,48,160,16,8,0);//Waves renderc (startX+8,startY+8,0,112,16,8,0);//Player (Top-Half) startX = 110;startY = 76; @@ -1250,10 +1246,10 @@ void renderMenu(int menu,int xscr,int yscr){ renderc (startX+14,startY,32,160,8,16,0);//Slash render (startX+12,startY+4,104,144,1);//Sword startX = 64;startY = 40; - render16b(startX,startY,16,80,0,0xFF69B569);// grass pit - render16b(startX+16,startY,32,80,0,0xFF69B569); - render16b(startX,startY+16,48,80,0,0xFF69B569); - render16b(startX+16,startY+16,64,80,0,0xFF69B569); + render16b(startX,startY,16,80,0,grassColor[0]);// grass pit + render16b(startX+16,startY,32,80,0,grassColor[0]); + render16b(startX,startY+16,48,80,0,grassColor[0]); + render16b(startX+16,startY+16,64,80,0,grassColor[0]); render16 (startX+8,startY+4,0,16,0);//Tree render (startX+1,startY+14,80,152,0);// Apple render16 (startX+9,startY+18,16,112,0);//Player diff --git a/source/MenuTutorial.c b/source/MenuTutorial.c index f3a4c98..34681e5 100644 --- a/source/MenuTutorial.c +++ b/source/MenuTutorial.c @@ -114,19 +114,19 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(k_attack.input & -k_attack.input, 80, 56, 2); renderc(60,68,16,160,16,8,2);//Slash - render16b(12,20,16,80,0,0xFF69B569);// grass pit - render16b(12+16,20,32,80,0,0xFF69B569); - render16b(12,20+16,48,80,0,0xFF69B569); - render16b(12+16,20+16,64,80,0,0xFF69B569); + render16b(12,20,16,80,0,grassColor[0]);// grass pit + render16b(12+16,20,32,80,0,grassColor[0]); + render16b(12,20+16,48,80,0,grassColor[0]); + render16b(12+16,20+16,64,80,0,grassColor[0]); render16(12+8,20+4,0,16,0);//Tree renderc(12+9,20+14,16,160,16,8,0);//Slash render(12+9+4,20+14,192,144,0);//Axe render16(12+9,20+18,16,112,0);//Player-up - render16b(122,62,16,80,0,0xFF7BF7F7);// sand pit - render16b(122+16,62,32,80,0,0xFF7BF7F7); - render16b(122,62+16,48,80,0,0xFF7BF7F7); - render16b(122+16,62+16,64,80,0,0xFF7BF7F7); + render16b(122,62,16,80,0,sandColor[0]);// sand pit + render16b(122+16,62,32,80,0,sandColor[0]); + render16b(122,62+16,48,80,0,sandColor[0]); + render16b(122+16,62+16,64,80,0,sandColor[0]); render16b(130,70,0,96,0,0xFF383838);// hole render16(116,70,48,112,0);//Player-right renderb(136,76,16,152,0,0xFF8197AF);// Dirt item @@ -147,7 +147,7 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(biasedCirclePad(k_down.input), 44, 125, 1); break; case 3: // Furniture - sf2d_draw_rectangle(64, 48, 192, 32, 0xFF69B569); + sf2d_draw_rectangle(64, 48, 192, 32, grassColor[0]); renderc(32,24,64,128,96,16,0);//Furniture entities renderFurniture(ITEM_WORKBENCH, 50,60); @@ -186,14 +186,14 @@ void renderTutorialPage(bool topScreen){ render(76,48,40,152,0); // Seeds sf2d_draw_rectangle(216, 80, 32, 32, dirtColor[1]); // Dirt color for grass - render16b(108, 40, 0, 80, 0, 0xFF69B569); // Grass + render16b(108, 40, 0, 80, 0, grassColor[0]); // Grass render16(124, 40,144,0,0); // Farm Tile render16(108,54,16,112,0); // Player (Up) renderc(108,50,16,160,16,8,0); // Slash (Up) render(112,48,72,144,0); // Gem Hoe sf2d_draw_rectangle(112, 156, 32, 32, dirtColor[1]); // Dirt color for grass - render16b(56, 78, 0, 80, 0, 0xFF69B569); // Grass + render16b(56, 78, 0, 80, 0, grassColor[0]); // Grass sf2d_draw_rectangle(80, 156, 32, 32, dirtColor[1]); // Dirt color render16b(40, 78, 0, 0, 0, 0xFF8F8FA8); // Dirt Dots render(44, 82, 40,152,0); // Seeds diff --git a/source/Render.c b/source/Render.c index 5d4bc9d..f8cf80b 100644 --- a/source/Render.c +++ b/source/Render.c @@ -538,8 +538,8 @@ void renderTile(int i, int x, int y) { | checkSurrTiles4(x >> 4, y >> 4, TILE_TREE) | checkSurrTiles4(x >> 4, y >> 4, TILE_FLOWER) | checkSurrTiles4(x >> 4, y >> 4, TILE_SAPLING_TREE); - render16b(x, y, grassTable[v], 80, 0, 0xFF69B569); - renderDotsWithColor(v, x, y, 0, 0xFF8ED38E); + render16b(x, y, grassTable[v], 80, 0, grassColor[0]); + renderDotsWithColor(v, x, y, 0, grassColor[1]); break; case TILE_TREE: renderTile(TILE_GRASS, x, y); @@ -548,13 +548,13 @@ void renderTile(int i, int x, int y) { break; case TILE_ROCK: v = checkSurrTiles8(x >> 4, y >> 4, TILE_ROCK); - render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFFFFF); - renderRockDotsWithColor(rockTable[v], x, y, 0xFF949494); + render16s(x, y, rockTable[v] + 8192, 0, rockColor[0]); + renderRockDotsWithColor(rockTable[v], x, y, rockColor[1]); break; case TILE_HARDROCK: v = checkSurrTiles8(x >> 4, y >> 4, TILE_HARDROCK); - render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFCFCF); - renderRockDotsWithColor(rockTable[v], x, y, 0xFFFF9494); + render16s(x, y, rockTable[v] + 8192, 0, rockColor[2]); + renderRockDotsWithColor(rockTable[v], x, y, rockColor[3]); break; case TILE_DIRT: // render dots. if (currentLevel > 1) @@ -566,22 +566,22 @@ void renderTile(int i, int x, int y) { v = checkSurrTiles4(x >> 4, y >> 4, TILE_SAND) | checkSurrTiles4(x >> 4, y >> 4, TILE_CACTUS) | checkSurrTiles4(x >> 4, y >> 4, TILE_SAPLING_CACTUS); - render16b(x, y, grassTable[v], 80, 0, 0xFF7BF7F7); - renderDotsWithColor(v, x, y, 0, 0xFF5BB7B7); + render16b(x, y, grassTable[v], 80, 0, sandColor[0]); + renderDotsWithColor(v, x, y, 0, sandColor[1]); break; case TILE_WATER: v = checkSurrTiles4(x >> 4, y >> 4, TILE_WATER) | checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE); - render16b(x, y, grassTable[v], 96, 0, 0xFFC11D00); + render16b(x, y, grassTable[v], 96, 0, waterColor[0]); srand((tickCount + (x / 2 - y) * 4311) / 10); - renderDotsWithColor(v, x, y, rand() & 3, 0xFFFF6B6B); + renderDotsWithColor(v, x, y, rand() & 3, waterColor[1]); break; case TILE_LAVA: v = checkSurrTiles4(x >> 4, y >> 4, TILE_LAVA) | checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE); - render16b(x, y, grassTable[v], 96, 0, 0xFF001DC1); + render16b(x, y, grassTable[v], 96, 0, lavaColor[0]); srand((tickCount + (x / 2 - y) * 4311) / 10); - renderDotsWithColor(v, x, y, rand() & 3, 0xFF6B6BFF); + renderDotsWithColor(v, x, y, rand() & 3, lavaColor[1]); break; case TILE_HOLE: render16b(x, y, @@ -1258,10 +1258,10 @@ void renderItemIcon(int itemID, int countLevel, int x, int y) { render(x, y, 8, 152, 0); break; case ITEM_STONE: - renderb(x, y, 16, 152, 0, 0xFFCFCFCF); + renderb(x, y, 16, 152, 0, rockColor[1]); break; case ITEM_SAND: - renderb(x, y, 16, 152, 0, 0xFF7BF7F7); + renderb(x, y, 16, 152, 0, sandColor[0]); break; case ITEM_DIRT: renderb(x, y, 16, 152, 0, 0xFF8197AF); diff --git a/source/main.c b/source/main.c index 2d22cbd..114dd7d 100644 --- a/source/main.c +++ b/source/main.c @@ -187,13 +187,8 @@ int main() { sf2d_texture_tile32(minimap[i]); } - dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); - dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); - dirtColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 2)); - dirtColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 3)); - dirtColor[4] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 4)); - - + reloadColors(); + sf2d_set_vblank_wait(true); sf2d_set_clear_color(0xFF); diff --git a/source/texturepack.c b/source/texturepack.c index 4493faf..a79f47b 100644 --- a/source/texturepack.c +++ b/source/texturepack.c @@ -114,11 +114,8 @@ int loadTexturePack(char * filename){ return 7; } icons = sfil_load_PNG_file(filename, SF2D_PLACE_RAM); - dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); - dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); - dirtColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 2)); - dirtColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 3)); - dirtColor[4] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 4)); + + reloadColors(); useDefaultIcons = false; @@ -158,11 +155,7 @@ int loadTexturePack(char * filename){ if(useDefaultIcons){ icons = sfil_load_PNG_buffer(icons2_png, SF2D_PLACE_RAM); - dirtColor[0] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 0)); - dirtColor[1] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 1)); - dirtColor[2] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 2)); - dirtColor[3] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 3)); - dirtColor[4] = SWAP_UINT32(sf2d_get_pixel(icons, 16, 4)); + reloadColors(); } if(useDefaultFont) font = sfil_load_PNG_buffer(Font_png, SF2D_PLACE_RAM); if(useDefaultBottom) bottombg = sfil_load_PNG_buffer(bottombg_png, SF2D_PLACE_RAM);