Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Swap Colors for new Lib Version

Browse source 
TODO - fix minimap colors
TODO - colors created by RGBA8
This commit is contained in:
Andre Schweiger 2015-12-27 15:59:53 +01:00
parent 7254855adb
commit 1d8ac2e6e1
7 changed files with 186 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

66
source/Render.c
View file

@ -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, 0x69B569FF);
renderDotsWithColor(v, x, y, 0, 0x8ED38EFF);
render16b(x, y, grassTable[v], 80, 0, 0xFF69B569);
renderDotsWithColor(v, x, y, 0, 0xFF8ED38E);
break;
case TILE_TREE:
render16(x, y, treeTable[checkSurrTiles8(x >> 4, y >> 4, TILE_TREE)],
@ -548,37 +548,37 @@ void renderTile(int i, int x, int y) {
case TILE_ROCK:
v = checkSurrTiles8(x >> 4, y >> 4, TILE_ROCK);
render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFFFFF);
renderRockDotsWithColor(rockTable[v], x, y, 0x949494FF);
renderRockDotsWithColor(rockTable[v], x, y, 0xFF949494);
break;
case TILE_HARDROCK:
v = checkSurrTiles8(x >> 4, y >> 4, TILE_HARDROCK);
render16s(x, y, rockTable[v] + 8192, 0, 0xCFCFFFFF);
renderRockDotsWithColor(rockTable[v], x, y, 0x9494FFFF);
render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFCFCF);
renderRockDotsWithColor(rockTable[v], x, y, 0xFFFF9494);
break;
case TILE_DIRT: // render dots.
if (currentLevel > 1)
render16b(x, y, 0, 0, 0, 0x383838FF);
render16b(x, y, 0, 0, 0, 0xFF383838);
else
render16b(x, y, 0, 0, 0, 0xA88F8FFF);
render16b(x, y, 0, 0, 0, 0xFF8F8FA8);
break;
case TILE_SAND:
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, 0xF7F77BFF);
renderDotsWithColor(v, x, y, 0, 0xB7B75BFF);
render16b(x, y, grassTable[v], 80, 0, 0xFF7BF7F7);
renderDotsWithColor(v, x, y, 0, 0xFF5BB7B7);
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, 0x001DC1FF);
render16b(x, y, grassTable[v], 96, 0, 0xFFC11D00);
srand((tickCount + (x / 2 - y) * 4311) / 10);
renderDotsWithColor(v, x, y, rand() & 3, 0x6B6BFFFF);
renderDotsWithColor(v, x, y, rand() & 3, 0xFFFF6B6B);
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, 0xC11D00FF);
render16b(x, y, grassTable[v], 96, 0, 0xFF001DC1);
srand((tickCount + (x / 2 - y) * 4311) / 10);
renderDotsWithColor(v, x, y, rand() & 3, 0xFF6B6BFF);
break;
@ -587,7 +587,7 @@ void renderTile(int i, int x, int y) {
grassTable[checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE)
| checkSurrTiles4(x >> 4, y >> 4, TILE_WATER)
| checkSurrTiles4(x >> 4, y >> 4, TILE_LAVA)], 96, 0,
0x383838FF);
0xFF383838);
break;
case TILE_CACTUS:
render16(x, y, 48, 0, 0);
@ -604,13 +604,13 @@ void renderTile(int i, int x, int y) {
render16(x, y, 112, 0, 0);
break;
case TILE_IRONORE:
render16b(x, y, 80, 0, 0, 0xDFC8C8FF);
render16b(x, y, 80, 0, 0, 0xFFC8C8DF);
break;
case TILE_GOLDORE:
render16b(x, y, 80, 0, 0, 0xE5E8B9FF);
render16b(x, y, 80, 0, 0, 0xFFB9E8E5);
break;
case TILE_GEMORE:
render16b(x, y, 80, 0, 0, 0xDF98DEFF);
render16b(x, y, 80, 0, 0, 0xFFDE98DF);
break;
case TILE_CLOUD:
render16b(x, y,
@ -668,8 +668,8 @@ void renderZoomedMap() {
drawText(mapText,224, 214); // "x2"/"x4"/"x6"
render16(142, 2, 72, 208, 0); // Exit button
renderc(126, 102, 40, 208, 32, 16, 0); // Plus/Minus zoom buttons
if(zoomLevel < 3) sf2d_draw_rectangle(258, 210, 26, 20, 0x4F4F4F7F); // gray out minus button
else if(zoomLevel > 5) sf2d_draw_rectangle(284, 210, 26, 20, 0x4F4F4F7F); // gray out minus button
if(zoomLevel < 3) sf2d_draw_rectangle(258, 210, 26, 20, 0x7F4F4F4F); // gray out minus button
else if(zoomLevel > 5) sf2d_draw_rectangle(284, 210, 26, 20, 0x7F4F4F4F); // gray out minus button
}
char scoreT[32];
@ -778,7 +778,7 @@ void renderPlayer() {
}
void renderMenuBackground(int xScroll, int yScroll) {
sf2d_draw_rectangle(0, 0, 400, 240, RGBA8(12, 12, 12, 255)); //You might think "real" black would be better, but it actually looks better that way
sf2d_draw_rectangle(0, 0, 400, 240, 0xFF0C0C0C); //You might think "real" black would be better, but it actually looks better that way
renderLightsToStencil();
renderBackground(xScroll, yScroll);
resetStencilStuff();
@ -788,7 +788,7 @@ void renderBackground(int xScroll, int yScroll) {
if(currentLevel > 0) sf2d_draw_rectangle(0, 0, 400, 240, dirtColor[currentLevel]); // dirt color
else {
sf2d_draw_texture_part_scale(minimap[1], (-xScroll / 3) - 256, (-yScroll / 3) - 32, 0, 0, 128, 128, 12.5, 7.5);
sf2d_draw_rectangle(0, 0, 400, 240, 0xDFDFDFAF);
sf2d_draw_rectangle(0, 0, 400, 240, 0xAFDFDFDF);
}
int xo = xScroll >> 4;
int yo = yScroll >> 4;
@ -1055,7 +1055,7 @@ void renderRecipes(RecipeManager * r, int xo, int yo, int x1, int y1,
if (r->recipes[i + io].canCraft)
col = 0xFFFFFFFF;
else
col = 0x7F7F7FFF;
col = 0xFF7F7F7F;
drawTextColor(
getBasicItemName(r->recipes[i + io].itemResult,
r->recipes[i + io].itemAmountLevel), x + 18, y + 2,
@ -1075,7 +1075,7 @@ void renderItemWithText(Item* item, int x, int y) {
drawText(getItemName(item->id, item->countLevel), x + 18, y + 2);
else
drawTextColorSpecial(getItemName(item->id, item->countLevel), x + 18,
y + 2, 0xD2D2D2FF, 0xFFFFFFFF);
y + 2, 0xFFD2D2D2, 0xFFFFFFFF);
}
void renderItemStuffWithText(int itemID, int itemCL, bool onlyOne, int x, int y) {
@ -1084,7 +1084,7 @@ void renderItemStuffWithText(int itemID, int itemCL, bool onlyOne, int x, int y)
drawText(getItemName(itemID, itemCL), x + 18, y + 2);
else
drawTextColorSpecial(getItemName(itemID, itemCL), x + 18,
y + 2, 0xD2D2D2FF, 0xFFFFFFFF);
y + 2, 0xFFD2D2D2, 0xFFFFFFFF);
}
/* For bottom screen */
@ -1098,7 +1098,7 @@ void renderItemWithTextCentered(Item* item, int width, int y) {
drawText(getItemName(item->id, item->countLevel), x + 18, y + 2);
else
drawTextColorSpecial(getItemName(item->id, item->countLevel), x + 18,
y + 2, 0xD2D2D2FF, 0xFFFFFFFF);
y + 2, 0xFFD2D2D2, 0xFFFFFFFF);
}
void renderItemIcon2(int itemID, int countLevel, int x, int y, int z) {
@ -1256,13 +1256,13 @@ 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, 0xCFCFCFFF);
renderb(x, y, 16, 152, 0, 0xFFCFCFCF);
break;
case ITEM_SAND:
renderb(x, y, 16, 152, 0, 0xF7F77BFF);
renderb(x, y, 16, 152, 0, 0xFF7BF7F7);
break;
case ITEM_DIRT:
renderb(x, y, 16, 152, 0, 0xAF9781FF);
renderb(x, y, 16, 152, 0, 0xFF8197AF);
break;
case ITEM_CLOUD:
renderb(x, y, 16, 152, 0, 0xFFFFFFFF);
@ -1289,22 +1289,22 @@ void renderItemIcon(int itemID, int countLevel, int x, int y) {
render(x, y, 80, 152, 0);
break;
case ITEM_SLIME:
renderb(x, y, 88, 152, 0, 0x4DC04DFF);
renderb(x, y, 88, 152, 0, 0xFF4DC04D);
break;
case ITEM_COAL:
renderb(x, y, 88, 152, 0, 0x383838FF);
renderb(x, y, 88, 152, 0, 0xFF383838);
break;
case ITEM_IRONORE:
renderb(x, y, 88, 152, 0, 0xBC9999FF);
renderb(x, y, 88, 152, 0, 0xFF9999BC);
break;
case ITEM_GOLDORE:
renderb(x, y, 88, 152, 0, 0xCECE77FF);
renderb(x, y, 88, 152, 0, 0xFF77CECE);
break;
case ITEM_IRONINGOT:
renderb(x, y, 96, 152, 0, 0xDFC8C8FF);
renderb(x, y, 96, 152, 0, 0xFFC8C8DF);
break;
case ITEM_GOLDINGOT:
renderb(x, y, 96, 152, 0, 0xEAEABCFF);
renderb(x, y, 96, 152, 0, 0xFFBCEAEA);
break;
case ITEM_GLASS:
render(x, y, 104, 152, 0);