Add support to more color formats

- RGBA4444: fully working
- RGBA5551: fully not working
- LA8, LA4: fully working
This commit is contained in:
2026-01-08 18:59:47 +01:00
parent 86461481ae
commit f5a58278db
5 changed files with 137 additions and 13 deletions

View File

@@ -37,7 +37,7 @@ Not all Planned formates are listed here yet
| 3dsx | Basic Loading and Viewing of Meta Data Smdh | |
| bcstm | Loading of almost every Data | Fully done and playable by BCSTM-Player |
| bcwav | Basic Loading (not tested yet) | Not finished yet |
| bclim | Creating A8,RGBA32,RGB565 done | WIP |
| bclim | Creating A4,A8,LA4,LA8,L4,L8,RGB24,RGBA32,RGBA4444,RGB565 done | WIP |
| lz11 | Encoder done, Decoder missing | WIP |
| romfs | Nothing Done yet (Started creating header) | |
| smdh | Almost done | missing safetey checks |

View File

@@ -13,15 +13,15 @@ class CTRFF_API BCLIM : public BinFile {
~BCLIM() {}
enum Format : u32 {
L8, // tested
A8, // tested
LA4,
LA8,
L8, // tested
A8, // tested
LA4, // tested
LA8, // tested
HILO8,
RGB565, // tested
RGB888, // tested
RGBA5551,
RGBA4444,
RGBA4444, // tested
RGBA8888, // tested
ETC1,
ETC1A4,

View File

@@ -9,15 +9,15 @@
namespace ctrff {
namespace Pica {
enum Color : u32 {
L8, // tested
A8, // tested
LA4,
LA8,
L8, // tested
A8, // tested
LA4, // tested
LA8, // tested
HILO8,
RGB565, // tested
RGB888, // tested
RGBA5551,
RGBA4444,
RGBA4444, // tested
RGBA8888, // tested
ETC1,
ETC1A4,

View File

@@ -85,6 +85,64 @@ CTRFF_API void EncodeImage(std::vector<ctrff::u8>& ret,
}
}
break;
case RGBA4444:
ret.resize(w * h * 2);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = (y * w + x) * 4; // basic rgba indexing btw
int dst = ctrff::TileIndex(x, y, w) * 2;
ret[dst + 0] = rgba[src + 3] >> 4;
ret[dst + 0] |= (rgba[src + 2] >> 4) << 4;
ret[dst + 1] = rgba[src + 1] >> 4;
ret[dst + 1] |= (rgba[src + 0] >> 4) << 4;
}
}
break;
case RGBA5551: // not working ???
ret.resize(w * h * 2);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = (y * w + x) * 4; // basic rgba indexing btw
int dst = ctrff::TileIndex(x, y, w) * 2;
ctrff::u16 px = 0;
px |= (rgba[src + 3] < 128 ? 0 : 1) << 15; // A
px |= ((rgba[src + 2] >> 3) & 0x1f) << 10; // BBBBB
px |= ((rgba[src + 1] >> 3) & 0x1f) << 5; // GGGGG
px |= ((rgba[src + 0] >> 3) & 0x1f); // RRRRR
ret[dst] = px & 0xff;
ret[dst + 1] = (px << 8) & 0xff;
}
}
break;
case LA8:
ret.resize(w * h * 2);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = (y * w + x) * 4; // basic rgba indexing btw
int dst = ctrff::TileIndex(x, y, w) * 2;
ret[dst] =
(rgba[src + 0] * 77 + rgba[src + 1] * 150 + rgba[src + 2] * 29) >>
8;
ret[dst + 1] = rgba[src + 3];
}
}
break;
case LA4:
ret.resize(w * h);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = (y * w + x) * 4; // basic rgba indexing btw
int dst = ctrff::TileIndex(x, y, w);
ret[dst] = 0;
ret[dst] |= (((rgba[src + 0] * 77 + rgba[src + 1] * 150 +
rgba[src + 2] * 29) >>
8) >>
4) &
0xf;
ret[dst] |= (((rgba[src + 3] >> 4) & 0xf) << 4) | ret[dst];
}
}
break;
default:
throw std::runtime_error("[ctrff] Pica: Unsupported Color format: " +
@@ -186,6 +244,62 @@ CTRFF_API void DecodeImage(std::vector<ctrff::u8>& ret,
}
}
break;
case RGBA4444:
ret.resize(w * h * 4);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = ctrff::TileIndex(x, y, w) * 2;
int dst = (y * w + x) * 4; // basic rgba indexing btw
ret[dst + 0] = ((pixels[src + 1] >> 4) & 0xf) << 4;
ret[dst + 1] = (pixels[src + 1] & 0xf) << 4;
ret[dst + 2] = ((pixels[src + 0] >> 4) & 0xf) << 4;
ret[dst + 3] = (pixels[src + 0] & 0xf) << 4;
}
}
break;
case RGBA5551: // not working
ret.resize(w * h * 4);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = ctrff::TileIndex(x, y, w) * 2;
int dst = (y * w + x) * 4; // basic rgba indexing btw
ctrff::u16 px = ret[src] | (ret[src + 1] << 8);
ret[dst + 0] = (px & 0x1f) * 0x1f;
ret[dst + 1] = ((px >> 5) & 0x1f) * 0x1f;
ret[dst + 2] = ((px >> 10) & 0x1f) * 0x1f;
ret[dst + 3] = 255; // ((*px >> 15) & 0x1) ? 255 : 0;
}
}
break;
case LA8:
ret.resize(w * h * 4);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = ctrff::TileIndex(x, y, w) * 2;
int dst = (y * w + x) * 4;
ret[dst + 0] = pixels[src];
ret[dst + 1] = pixels[src];
ret[dst + 2] = pixels[src];
ret[dst + 3] = pixels[src + 1];
}
}
break;
case LA4:
ret.resize(w * h * 4);
for (int x = 0; x < w; x++) {
for (int y = 0; y < h; y++) {
int src = ctrff::TileIndex(x, y, w);
int dst = (y * w + x) * 4;
uint8_t l = (pixels[src] & 0xf) * 0x11;
uint8_t a = ((pixels[src] >> 4) & 0xf) * 0x11;
ret[dst + 0] = l;
ret[dst + 1] = l;
ret[dst + 2] = l;
ret[dst + 3] = a;
}
}
break;
default:
throw std::runtime_error("[ctrff] Pica: Unsupported Color format: " +

View File

@@ -474,13 +474,21 @@ void BCLIMMaker(const cf7::command::ArgumentList &data) {
} else if (f == "l4") {
fmt = ctrff::Pica::L4;
} else if (f == "a8") {
fmt = ctrff::Pica::L8;
fmt = ctrff::Pica::A8;
} else if (f == "l8") {
fmt = ctrff::Pica::L8;
} else if (f == "la4") {
fmt = ctrff::Pica::LA4;
} else if (f == "la8") {
fmt = ctrff::Pica::LA8;
} else if (f == "rgb565") {
fmt = ctrff::Pica::RGB565;
} else if (f == "rgb888") {
fmt = ctrff::Pica::RGB888;
} else if (f == "rgba4444") {
fmt = ctrff::Pica::RGBA4444;
} else if (f == "rgba5551") {
fmt = ctrff::Pica::RGBA5551;
} else if (f == "rgba8888") {
fmt = ctrff::Pica::RGBA8888;
}
@@ -555,7 +563,9 @@ int main(int argc, char *argv[]) {
.AddSubEntry(cf7::command::sub("o", "output",
"Output path of .bclim file", true))
.AddSubEntry(cf7::command::sub(
"f", "format", "Image format rgba8888|rgb888|rgb565|a8|l8|a4|l4",
"f", "format",
"Image format "
"rgba8888|rgb888|rgba4444|rgba5551|rgb565|a8|l8|a4|l4|la4|la8",
false))
.SetFunction(BCLIMMaker));
mgr.Execute();