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-camo woodland-disruption pattern

Browse source 
59th procedural texture: 2-octave bilinear value noise
thresholded into hard bg/fg blobs. Sharp edges read as
real military camouflage rather than the smooth gradient
--gen-texture-noise-color produces.

Two octaves combined at 0.7/0.3 weights:
  • low frequency at cellSize lattice → large dominant blobs
  • high frequency at cellSize/4 lattice → finer mottling
    overlay so blob edges aren't perfectly smooth

Threshold parameter shifts the bg/fg balance — lower values
expose more accent color (good for leaf-pattern), higher
values keep the dominant color dominant (good for rock/sand).

Useful for guard cloaks, military uniforms, ghillie suits,
druid robes, hunter blinds, scout cloaks. First procedural
texture to use the new savePngOrError helper from
cli_png_emit.hpp.
This commit is contained in:
Kelsi 2026-05-09 12:01:11 -07:00
parent d073f6f608
commit 5b24b54d09
3 changed files with 91 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/editor/cli_arg_required.cpp
View file

@ -92,6 +92,7 @@ const char* const kArgRequired[] = {
"--gen-texture-starburst", "--gen-texture-studs",
"--gen-texture-moss", "--gen-texture-woodgrain",
"--gen-texture-carbon", "--gen-texture-pinstripe",
"--gen-texture-camo",
"--validate-glb", "--info-glb", "--info-glb-tree", "--info-glb-bytes",
"--validate-jsondbc", "--check-glb-bounds", "--validate-stl",
"--validate-png", "--validate-blp",

88
tools/editor/cli_gen_texture.cpp
View file

@ -3954,6 +3954,93 @@ int handleKnit(int& i, int argc, char** argv) {
return 0;
}
int handleCamo(int& i, int argc, char** argv) {
// Camouflage: 2-octave value noise thresholded into hard
// bg/fg blobs. Distinct from --gen-texture-noise-color (which
// smoothly lerps between the two colors): camo uses sharp
// edges to read as a real woodland-disruption pattern, like
// ghillie suits and military uniforms. Larger features come
// from the low-frequency octave; finer mottling from the
// higher octave.
std::string outPath = argv[++i];
std::string aHex = argv[++i]; // dominant color
std::string bHex = argv[++i]; // accent blob color
int cellSize = 32; // low-frequency lattice in px
float threshold = 0.5f;
uint32_t seed = 1;
int W = 256, H = 256;
parseOptInt(i, argc, argv, cellSize);
parseOptFloat(i, argc, argv, threshold);
parseOptUint(i, argc, argv, seed);
parseOptInt(i, argc, argv, W);
parseOptInt(i, argc, argv, H);
if (W < 1 || H < 1 || W > 8192 || H > 8192 ||
cellSize < 4 || cellSize > 1024 ||
threshold <= 0.0f || threshold >= 1.0f) {
std::fprintf(stderr,
"gen-texture-camo: invalid dims (W/H 1..8192, "
"cellSize 4..1024, threshold (0,1))\n");
return 1;
}
uint8_t ar, ag, ab, br_, bg_, bb_;
if (!parseHex(aHex, ar, ag, ab) ||
!parseHex(bHex, br_, bg_, bb_)) {
std::fprintf(stderr,
"gen-texture-camo: hex color is invalid\n");
return 1;
}
auto hash32 = [](uint32_t x) -> uint32_t {
x ^= x >> 16; x *= 0x7feb352d;
x ^= x >> 15; x *= 0x846ca68b;
x ^= x >> 16; return x;
};
auto latticeNoise = [&](int x, int y, int cell, uint32_t s) -> float {
// Sample bilinear value noise on a `cell`-pixel lattice.
int lx = x / cell, ly = y / cell;
float fx = (x - lx * cell) / static_cast<float>(cell);
float fy = (y - ly * cell) / static_cast<float>(cell);
auto sample = [&](int gx, int gy) {
uint32_t h = hash32(static_cast<uint32_t>(gx) * 0x9E3779B1u
^ static_cast<uint32_t>(gy) * 0x85EBCA77u
^ s);
return (h % 1000) / 999.0f;
};
float v00 = sample(lx, ly);
float v10 = sample(lx + 1, ly);
float v01 = sample(lx, ly + 1);
float v11 = sample(lx + 1, ly + 1);
// Smoothstep weights for natural-looking blobs.
float u = fx * fx * (3.0f - 2.0f * fx);
float v = fy * fy * (3.0f - 2.0f * fy);
return (v00 * (1 - u) + v10 * u) * (1 - v) +
(v01 * (1 - u) + v11 * u) * v;
};
std::vector<uint8_t> pixels(static_cast<size_t>(W) * H * 3, 0);
const int fineCell = std::max(2, cellSize / 4);
for (int y = 0; y < H; ++y) {
for (int x = 0; x < W; ++x) {
// Sum the two octaves: large blobs at full weight,
// fine mottling at 0.4× weight.
float v = 0.7f * latticeNoise(x, y, cellSize, seed)
+ 0.3f * latticeNoise(x, y, fineCell, seed ^ 0xA5A5A5A5u);
uint8_t r, g, b;
if (v >= threshold) { r = br_; g = bg_; b = bb_; }
else { r = ar; g = ag; b = ab; }
size_t idx = (static_cast<size_t>(y) * W + x) * 3;
pixels[idx + 0] = r;
pixels[idx + 1] = g;
pixels[idx + 2] = b;
}
}
if (!savePngOrError(outPath, W, H, pixels, "gen-texture-camo")) return 1;
std::printf("Wrote %s\n", outPath.c_str());
std::printf(" size : %dx%d\n", W, H);
std::printf(" a / b : %s / %s\n", aHex.c_str(), bHex.c_str());
std::printf(" blobs : cell=%d, threshold=%.2f, seed=%u\n",
cellSize, threshold, seed);
return 0;
}
int handlePinstripe(int& i, int argc, char** argv) {
// Pinstripe: thin vertical lines at every `stride` x position,
// with optional thicker "feature" line every Nth stripe so the
@ -4856,6 +4943,7 @@ constexpr TextureEntry kTextureTable[] = {
{"--gen-texture-woodgrain", 3, handleWoodgrain},
{"--gen-texture-carbon", 3, handleCarbon},
{"--gen-texture-pinstripe", 3, handlePinstripe},
{"--gen-texture-camo", 3, handleCamo},
};
} // namespace

2
tools/editor/cli_help.cpp
View file

@ -151,6 +151,8 @@ void printUsage(const char* argv0) {
std::printf(" Carbon-fiber: 2x2 alternating-orientation weave with sin² fiber highlights (sci-fi/tech panels)\n");
std::printf(" --gen-texture-pinstripe <out.png> <bgHex> <lineHex> [stride] [lineW] [featureEvery] [W H]\n");
std::printf(" Pinstripe: thin vertical lines at every stride; every Nth stripe is doubled-thick feature line\n");
std::printf(" --gen-texture-camo <out.png> <aHex> <bHex> [cellSize] [threshold] [seed] [W H]\n");
std::printf(" Camouflage: 2-octave value noise thresholded into hard bg/fg blobs (woodland disruption pattern)\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");