phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-05-10 02:53:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat(editor): add --gen-texture-tile square stone tile pattern

Browse source 
Per-cell pattern: each pixel falls into a tile cell with grout
on every grid edge. Tiles get a stable per-tile shade jitter
(via integer-cell hash) so adjacent tiles look distinct rather
than identical. Grout is the constant separator color.

First new texture added directly to cli_gen_texture.cpp instead
of main.cpp — proves the modular pattern works for new
additions, not just extractions.

Defaults: tilePx=32, groutPx=2. Useful for floors, plaza
paving, dungeon walls. Brings the procedural texture pattern
set to 23.
This commit is contained in:
Kelsi 2026-05-08 22:01:31 -07:00
parent 36cc2ee11d
commit ec9c7898d2
3 changed files with 101 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

98
tools/editor/cli_gen_texture.cpp
View file

@ -1787,6 +1787,101 @@ int handleFabric(int& i, int argc, char** argv) {
return 0;
}
int handleTile(int& i, int argc, char** argv) {
// Square stone tile pattern: each cell is one tile face,
// separated by grout lines on every grid edge. Tiles get
// small per-tile shade jitter so the surface doesn't read
// as a flat regular grid; grout is the constant separator
// color. Floors, plaza paving, dungeon walls.
std::string outPath = argv[++i];
std::string tileHex = argv[++i];
std::string groutHex = argv[++i];
int tilePx = 32;
int groutPx = 2;
int W = 256, H = 256;
if (i + 1 < argc && argv[i + 1][0] != '-') {
try { tilePx = std::stoi(argv[++i]); } catch (...) {}
}
if (i + 1 < argc && argv[i + 1][0] != '-') {
try { groutPx = std::stoi(argv[++i]); } catch (...) {}
}
if (i + 1 < argc && argv[i + 1][0] != '-') {
try { W = std::stoi(argv[++i]); } catch (...) {}
}
if (i + 1 < argc && argv[i + 1][0] != '-') {
try { H = std::stoi(argv[++i]); } catch (...) {}
}
if (W < 1 || H < 1 || W > 8192 || H > 8192 ||
tilePx < 4 || tilePx > 1024 ||
groutPx < 0 || groutPx > tilePx / 2) {
std::fprintf(stderr,
"gen-texture-tile: invalid dims (W/H 1..8192, tile 4..1024, grout < tile/2)\n");
return 1;
}
uint8_t tr, tg, tb, gr, gg, gb;
if (!parseHex(tileHex, tr, tg, tb)) {
std::fprintf(stderr,
"gen-texture-tile: '%s' is not a valid hex color\n",
tileHex.c_str());
return 1;
}
if (!parseHex(groutHex, gr, gg, gb)) {
std::fprintf(stderr,
"gen-texture-tile: '%s' is not a valid hex color\n",
groutHex.c_str());
return 1;
}
// Per-tile shade jitter. Hash the integer cell coords for
// a stable shade per tile so adjacent tiles look distinct.
auto cellShade = [](int cx, int cy) -> float {
uint32_t h = static_cast<uint32_t>(cx) * 374761393u +
static_cast<uint32_t>(cy) * 668265263u;
h = (h ^ (h >> 13)) * 1274126177u;
h = h ^ (h >> 16);
float n = (h >> 8) * (1.0f / 16777216.0f); // 0..1
return 0.92f + 0.16f * n; // 0.92..1.08
};
std::vector<uint8_t> pixels(static_cast<size_t>(W) * H * 3, 0);
for (int y = 0; y < H; ++y) {
int cy = y / tilePx;
int yInCell = y % tilePx;
bool yGrout = (yInCell < groutPx);
for (int x = 0; x < W; ++x) {
int cx = x / tilePx;
int xInCell = x % tilePx;
bool xGrout = (xInCell < groutPx);
size_t i2 = (static_cast<size_t>(y) * W + x) * 3;
if (xGrout || yGrout) {
pixels[i2 + 0] = gr;
pixels[i2 + 1] = gg;
pixels[i2 + 2] = gb;
} else {
float shade = cellShade(cx, cy);
pixels[i2 + 0] = static_cast<uint8_t>(
std::clamp(tr * shade, 0.0f, 255.0f));
pixels[i2 + 1] = static_cast<uint8_t>(
std::clamp(tg * shade, 0.0f, 255.0f));
pixels[i2 + 2] = static_cast<uint8_t>(
std::clamp(tb * shade, 0.0f, 255.0f));
}
}
}
if (!stbi_write_png(outPath.c_str(), W, H, 3,
pixels.data(), W * 3)) {
std::fprintf(stderr,
"gen-texture-tile: stbi_write_png failed for %s\n",
outPath.c_str());
return 1;
}
std::printf("Wrote %s\n", outPath.c_str());
std::printf(" size : %dx%d\n", W, H);
std::printf(" tile/grout : %s / %s\n",
tileHex.c_str(), groutHex.c_str());
std::printf(" tile px : %d\n", tilePx);
std::printf(" grout px : %d\n", groutPx);
return 0;
}
} // namespace
bool handleGenTexture(int& i, int argc, char** argv, int& outRc) {
@ -1849,6 +1944,9 @@ bool handleGenTexture(int& i, int argc, char** argv, int& outRc) {
if (std::strcmp(argv[i], "--gen-texture-lava") == 0 && i + 3 < argc) {
outRc = handleLava(i, argc, argv); return true;
}
if (std::strcmp(argv[i], "--gen-texture-tile") == 0 && i + 3 < argc) {
outRc = handleTile(i, argc, argv); return true;
}
return false;
}

2
tools/editor/cli_help.cpp
View file

@ -73,6 +73,8 @@ void printUsage(const char* argv0) {
std::printf(" Snow: soft cool-white base + scattered bright sparkle pixels (default density=0.005)\n");
std::printf(" --gen-texture-lava <out.png> <darkHex> <hotHex> [seed] [crackScale] [W H]\n");
std::printf(" Lava: dark cooled crust with bright glowing cracks via Worley cell boundaries\n");
std::printf(" --gen-texture-tile <out.png> <tileHex> <groutHex> [tilePx] [groutPx] [W H]\n");
std::printf(" Square stone tiles with grout grid (default 32px tiles, 2px grout)\n");
std::printf(" --add-texture-to-zone <zoneDir> <png-path> [renameTo]\n");
std::printf(" Copy an existing PNG into <zoneDir> (optionally renaming it on the way in)\n");
std::printf(" --gen-mesh <wom-base> <cube|plane|sphere|cylinder|torus|cone|ramp> [size]\n");

2
tools/editor/main.cpp
View file

@ -569,7 +569,7 @@ int main(int argc, char* argv[]) {
"--gen-texture-wood", "--gen-texture-grass", "--gen-texture-fabric",
"--gen-texture-cobble", "--gen-texture-marble", "--gen-texture-metal",
"--gen-texture-leather", "--gen-texture-sand", "--gen-texture-snow",
"--gen-texture-lava",
"--gen-texture-lava", "--gen-texture-tile",
"--validate-glb", "--info-glb", "--info-glb-tree", "--info-glb-bytes",
"--validate-jsondbc", "--check-glb-bounds", "--validate-stl",
"--validate-png", "--validate-blp",