Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXEL: added new built-in palette for nippon

master
Martin Gerhardy 2022-05-20 20:37:40 +02:00
parent db1cc28364
commit fb5549aa05
5 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/voxel/MaterialColor.cpp
View File

@ -216,7 +216,7 @@ bool initDefaultPalette() {
Palette palette;
const core::String &defaultPalette = core::Var::get(cfg::VoxelPalette, voxel::Palette::getDefaultPaletteName())->strVal();
if (!palette.load(defaultPalette.c_str())) {
if (!palette.magicaVoxel()) {
if (!palette.nippon()) {
return false;
}
}

39
src/modules/voxel/Palette.cpp
View File

@ -279,6 +279,45 @@ bool Palette::magicaVoxel() {
return load((const uint8_t *)palette, sizeof(palette));
}
bool Palette::nippon() {
uint32_t palette[PaletteMaxColors] = {
0xffffffff, 0xffb49fdc, 0xff8c6be1, 0xff4a358e, 0xffcdc3f8, 0xffb9a7f4, 0xff3c3664, 0xffaa96f5, 0xff5b49b5,
0xff907ae8, 0xff6e5ad0, 0xff6d4ddb, 0xffe1dffe, 0xff7a7a9e, 0xff4c10d0, 0xff3a359f, 0xff451bcb, 0xffa9a9ee,
0xff6667bf, 0xff3f4786, 0xff9396b1, 0xff777aeb, 0xff454a95, 0xff6063a9, 0xff4240cb, 0xff3a3bab, 0xffbbc4d7,
0xff404890, 0xff384373, 0xff3a3ec7, 0xff364255, 0xff394699, 0xff8394f1, 0xff3444b5, 0xff7d88b9, 0xff677cf1,
0xff3a4c88, 0xff1530e8, 0xff5554d7, 0xff4c5db5, 0xff364885, 0xff475ea3, 0xff3a54cc, 0xff324872, 0xff2f5cf7,
0xff28406a, 0xff34509a, 0xff4362c4, 0xff3c5faf, 0xff6e96fb, 0xff384972, 0xff5771b4, 0xff718edb, 0xff1c5ef0,
0xff4a78ed, 0xff5378ca, 0xff375cb3, 0xff2e3f56, 0xff6e91e3, 0xff3c5a8f, 0xff86a9f0, 0xff4b67a0, 0xff3c69c1,
0xff6699fb, 0xff6d7a94, 0xff3663a3, 0xff6094e7, 0xff2c537d, 0xff5085c7, 0xff2a5f98, 0xff79a6e1, 0xff325b85,
0xff4d9ffc, 0xff84baff, 0xff2a8be9, 0xff68a3e9, 0xff4478b1, 0xff2e6396, 0xff2c7aca, 0xff1b3443, 0xff8ab8ec,
0xff2b5578, 0xff3677b0, 0xff497296, 0xff3b94e2, 0xff2d80c7, 0xff236e9b, 0xff2f556e, 0xff71b4eb, 0xff8eb9d7,
0xff3a6682, 0xff558eb6, 0xff779fbc, 0xff336687, 0xff268ac1, 0xff1bb1ff, 0xff2698d1, 0xff2da5dd, 0xff3398c9,
0xff45bff9, 0xff79b8dc, 0xff3291ba, 0xff47b6e8, 0xff42c2f7, 0xff466c7d, 0xffa6c9da, 0xff89d6fa, 0xff42abd9,
0xff55c5f6, 0xff08c4ff, 0xff24bbef, 0xff5fadca, 0xff2a748d, 0xff82a5b4, 0xff6c7f87, 0xff557d89, 0xff3e6774,
0xff378ca2, 0xff24606c, 0xff357886, 0xff2c5962, 0xff4ccde9, 0xff4cd9f7, 0xff51e2fb, 0xff90cdd9, 0xff42a1ad,
0xff3bd2dd, 0xff51a0a5, 0xff3fc2be, 0xff2d6a6c, 0xff509693, 0xff2d8a83, 0xff79b4b1, 0xff386161, 0xff2a4e4b,
0xff2e625b, 0xff39514d, 0xff6b9189, 0xff4bb490, 0xff70ad91, 0xffa0cab5, 0xff586a64, 0xff3fa27b, 0xff66c186,
0xff3d594a, 0xff2d6042, 0xff416e51, 0xff93b491, 0xff7c8f80, 0xff3e811b, 0xff81ac5d, 0xff3c5636, 0xff517d22,
0xffb9d8a8, 0xff72836a, 0xff4b6d2d, 0xff4c5d46, 0xff6e9324, 0xff97a686, 0xff6c8900, 0xff486109, 0xff4f6020,
0xff3a4c0f, 0xff6c724f, 0xff90aa00, 0xffacb069, 0xff3d4526, 0xffb7ba66, 0xff858726, 0xff555b40, 0xff565a30,
0xffc4c278, 0xff6d6b37, 0xffe4dea5, 0xff9a9677, 0xffa19966, 0xffd4c781, 0xffb8a633, 0xff42480c, 0xff61560d,
0xffa78900, 0xff746733, 0xff595325, 0xffa8881e, 0xff736c56, 0xff8a7c57, 0xffdcb258, 0xff755f2b, 0xffb78f3a,
0xff6e5c2e, 0xff846200, 0xffdeb97d, 0xffdda851, 0xffdfa92e, 0xff13100b, 0xff40250f, 0xff2d1908, 0xffaf5c00,
0xff6e340b, 0xffd2907b, 0xffa4756e, 0xff471e26, 0xff853211, 0xff974f4e, 0xff551e21, 0xffc3818b, 0xff9a6470,
0xffc2909b, 0xffbe6b8a, 0xff9c4c6a, 0xffb5778f, 0xff5b3d53, 0xffce8fb2, 0xffb26d98, 0xff8d4277, 0xff412f3c,
0xff5d224a, 0xff7c3266, 0xff632c59, 0xff81336f, 0xff574c57, 0xffbb81b4, 0xff362b3f, 0xff3f2a57, 0xff503d5e,
0xff6e6372, 0xff542962, 0xff5b2e6d, 0xff8e32c1, 0xff7a49a8, 0xff372e56, 0xff8a3ce0, 0xff3e3760, 0xfff2fafc,
0xfffbffff, 0xffbac0bd, 0xff9f9891, 0xff7b7d78, 0xff747c70, 0xff656765, 0xff535953, 0xff484f4f, 0xff3d4352,
0xff383c37, 0xff26323a, 0xffeeeeee, 0xffdddddd, 0xffbbbbbb, 0xffaaaaaa, 0xff888888, 0xff777777, 0xff555555,
0xff444444, 0xff222222, 0xff111111, 0xff000000
};
uint32_t *swapBuf = palette;
for (int i = 0; i < lengthof(palette); ++i) {
swapBuf[i] = SDL_SwapLE32(swapBuf[i]);
}
return load((const uint8_t *)palette, sizeof(palette));
}
core::String Palette::extractPaletteName(const core::String &file) {
if (!core::string::startsWith(file, "palette-")) {
return "";

1
src/modules/voxel/Palette.h
View File

@ -45,6 +45,7 @@ public:
bool minecraft();
bool magicaVoxel();
bool nippon();
void markDirty();
inline bool isDirty() const {

4
src/modules/voxelformat/private/PaletteLookup.h
View File

@ -18,11 +18,11 @@ private:
public:
PaletteLookup(const voxel::Palette &palette, int maxSize = 32768) : _palette(palette), _paletteMap(maxSize) {
if (_palette.colorCount <= 0) {
_palette.magicaVoxel();
_palette.nippon();
}
}
PaletteLookup(int maxSize = 32768) : _paletteMap(maxSize) {
_palette.magicaVoxel();
_palette.nippon();
}
inline const voxel::Palette &palette() const {

4
src/tools/voxedit/modules/voxedit-ui/PalettePanel.cpp
View File

@ -161,7 +161,7 @@ void PalettePanel::update(const char *title, command::CommandExecutionListener &
ImGui::OpenPopup(POPUP_TITLE_LOAD_PALETTE);
}
static const char *builtIn[] = {"built-in:minecraft", "built-in:magicavoxel"};
static const char *builtIn[] = {"built-in:minecraft", "built-in:magicavoxel", "built-in:nippon"};
if (ImGui::BeginPopupModal(POPUP_TITLE_LOAD_PALETTE, nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
ImGui::TextUnformatted("Select the palette");
ImGui::Separator();
@ -183,6 +183,8 @@ void PalettePanel::update(const char *title, command::CommandExecutionListener &
palette.minecraft();
} else if (_currentSelectedPalette == builtIn[1]) {
palette.magicaVoxel();
} else if (_currentSelectedPalette == builtIn[2]) {
palette.nippon();
} else {
sceneMgr().loadPalette(_currentSelectedPalette);
}