diff --git a/tools/editor/main.cpp b/tools/editor/main.cpp index 45b8f05b..75864978 100644 --- a/tools/editor/main.cpp +++ b/tools/editor/main.cpp @@ -556,6 +556,8 @@ static void printUsage(const char* argv0) { std::printf(" Cobblestone street pattern: irregular packed stones (default stone=24px, seed 1)\n"); std::printf(" --gen-texture-marble [seed] [veinSharpness] [W H]\n"); std::printf(" Marble pattern with sinusoidal veining (default seed 1, sharpness 8)\n"); + std::printf(" --gen-texture-metal [seed] [orientation] [W H]\n"); + std::printf(" Brushed metal: directional anisotropic noise (orientation: horizontal|vertical)\n"); std::printf(" --add-texture-to-zone [renameTo]\n"); std::printf(" Copy an existing PNG into (optionally renaming it on the way in)\n"); std::printf(" --gen-mesh [size]\n"); @@ -1135,7 +1137,7 @@ int main(int argc, char* argv[]) { "--gen-texture-radial", "--gen-texture-stripes", "--gen-texture-dots", "--gen-texture-rings", "--gen-texture-checker", "--gen-texture-brick", "--gen-texture-wood", "--gen-texture-grass", "--gen-texture-fabric", - "--gen-texture-cobble", "--gen-texture-marble", + "--gen-texture-cobble", "--gen-texture-marble", "--gen-texture-metal", "--validate-glb", "--info-glb", "--info-glb-tree", "--info-glb-bytes", "--validate-jsondbc", "--check-glb-bounds", "--validate-stl", "--validate-png", "--validate-blp", @@ -20895,6 +20897,147 @@ int main(int argc, char* argv[]) { std::printf(" sharpness : %.1f\n", sharpness); std::printf(" seed : %u\n", seed); return 0; + } else if (std::strcmp(argv[i], "--gen-texture-metal") == 0 && i + 2 < argc) { + // Brushed-metal pattern. We generate per-pixel white + // noise then box-blur it heavily along one axis (the + // brush direction) and lightly along the other. Result: + // long thin streaks of varying brightness, the visual + // signature of brushed steel/aluminum/iron. Apply that + // streaky shade as a multiplicative tint on the base + // metal color. + std::string outPath = argv[++i]; + std::string baseHex = argv[++i]; + uint32_t seed = 1; + std::string orientation = "horizontal"; + int W = 256, H = 256; + if (i + 1 < argc && argv[i + 1][0] != '-') { + try { seed = static_cast(std::stoul(argv[++i])); } catch (...) {} + } + if (i + 1 < argc && argv[i + 1][0] != '-') { + orientation = argv[++i]; + } + 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) { + std::fprintf(stderr, + "gen-texture-metal: invalid dims (W/H 1..8192)\n"); + return 1; + } + if (orientation != "horizontal" && orientation != "vertical") { + std::fprintf(stderr, + "gen-texture-metal: orientation must be horizontal|vertical\n"); + return 1; + } + auto parseHex = [](std::string hex, + uint8_t& r, uint8_t& g, uint8_t& b) -> bool { + std::transform(hex.begin(), hex.end(), hex.begin(), + [](unsigned char c) { return std::tolower(c); }); + if (!hex.empty() && hex[0] == '#') hex.erase(0, 1); + auto fromHexC = [](char c) -> int { + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'a' && c <= 'f') return 10 + c - 'a'; + return -1; + }; + int v[6]; + if (hex.size() == 6) { + for (int k = 0; k < 6; ++k) { + v[k] = fromHexC(hex[k]); + if (v[k] < 0) return false; + } + r = static_cast((v[0] << 4) | v[1]); + g = static_cast((v[2] << 4) | v[3]); + b = static_cast((v[4] << 4) | v[5]); + return true; + } + if (hex.size() == 3) { + for (int k = 0; k < 3; ++k) { + v[k] = fromHexC(hex[k]); + if (v[k] < 0) return false; + } + r = static_cast((v[0] << 4) | v[0]); + g = static_cast((v[1] << 4) | v[1]); + b = static_cast((v[2] << 4) | v[2]); + return true; + } + return false; + }; + uint8_t mr, mg, mb; + if (!parseHex(baseHex, mr, mg, mb)) { + std::fprintf(stderr, + "gen-texture-metal: '%s' is not a valid hex color\n", + baseHex.c_str()); + return 1; + } + uint32_t state = seed ? seed : 1u; + auto next01 = [&state]() -> float { + state = state * 1664525u + 1013904223u; + return (state >> 8) * (1.0f / 16777216.0f); + }; + // Step 1: per-pixel white noise. + std::vector noise(static_cast(W) * H); + for (auto& v : noise) v = next01(); + // Step 2: directional blur. For horizontal orientation, + // blur strongly in X (long brush strokes) and lightly + // in Y (thin variation across strokes). Vertical + // orientation flips X and Y. + std::vector blurred(noise.size(), 0.0f); + int rxLong = (orientation == "horizontal") ? 24 : 2; + int ryLong = (orientation == "horizontal") ? 2 : 24; + for (int y = 0; y < H; ++y) { + for (int x = 0; x < W; ++x) { + float sum = 0.0f; + int n = 0; + for (int dy = -ryLong; dy <= ryLong; ++dy) { + int py = y + dy; + if (py < 0 || py >= H) continue; + for (int dx = -rxLong; dx <= rxLong; ++dx) { + int px = x + dx; + if (px < 0 || px >= W) continue; + sum += noise[static_cast(py) * W + px]; + n++; + } + } + blurred[static_cast(y) * W + x] = sum / n; + } + } + // Step 3: stretch contrast back out so the streaks + // are visible (blurring narrows the range). + float minV = 1.0f, maxV = 0.0f; + for (float v : blurred) { minV = std::min(minV, v); maxV = std::max(maxV, v); } + float range = std::max(maxV - minV, 1e-6f); + std::vector pixels(static_cast(W) * H * 3, 0); + for (int y = 0; y < H; ++y) { + for (int x = 0; x < W; ++x) { + float t = (blurred[static_cast(y) * W + x] - minV) / range; + // Map noise to a multiplicative shade in [0.7, 1.1] + // so the metal looks polished but not flat. + float shade = 0.7f + t * 0.4f; + size_t i2 = (static_cast(y) * W + x) * 3; + pixels[i2 + 0] = static_cast( + std::clamp(mr * shade, 0.0f, 255.0f)); + pixels[i2 + 1] = static_cast( + std::clamp(mg * shade, 0.0f, 255.0f)); + pixels[i2 + 2] = static_cast( + std::clamp(mb * shade, 0.0f, 255.0f)); + } + } + if (!stbi_write_png(outPath.c_str(), W, H, 3, + pixels.data(), W * 3)) { + std::fprintf(stderr, + "gen-texture-metal: 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(" base color : %s\n", baseHex.c_str()); + std::printf(" orientation : %s\n", orientation.c_str()); + std::printf(" seed : %u\n", seed); + return 0; } else if (std::strcmp(argv[i], "--gen-mesh") == 0 && i + 2 < argc) { // Synthesize a procedural primitive WOM. Generates proper // per-face normals, planar UVs, a bounding box, and a