From 51ed1e5860451edebf627cdc45f404ba22786e32 Mon Sep 17 00:00:00 2001 From: Kelsi Date: Sat, 9 May 2026 08:54:27 -0700 Subject: [PATCH] =?UTF-8?q?feat(editor):=20add=20--gen-mesh-cauldron=20?= =?UTF-8?q?=E2=80=94=2050th=20procedural=20mesh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Milestone: 50th procedural mesh primitive. 7-box witch's cauldron — 4 small corner legs at the floor, then three stacked tiers approximating the curved silhouette of a cast-iron pot: narrow bottom (60% of rim width), wider mid (90%), and a still-wider thin rim at the top (100%). Without rotated faces this stacked-tier approximation is the cleanest cast-iron-pot read available. Pairs with --gen-mesh-shrine / --gen-mesh-totem for ritual and alchemy set dressing — witch huts, druid camps, dungeon laboratories. Defaults to 0.80 rim width × 0.70 body height (0.80m total with legs). --- tools/editor/cli_gen_mesh.cpp | 119 ++++++++++++++++++++++++++++++++++ tools/editor/cli_help.cpp | 2 + tools/editor/main.cpp | 2 +- 3 files changed, 122 insertions(+), 1 deletion(-) diff --git a/tools/editor/cli_gen_mesh.cpp b/tools/editor/cli_gen_mesh.cpp index ccdba94b..d958bf27 100644 --- a/tools/editor/cli_gen_mesh.cpp +++ b/tools/editor/cli_gen_mesh.cpp @@ -4655,6 +4655,122 @@ int handleCoffin(int& i, int argc, char** argv) { return 0; } +int handleCauldron(int& i, int argc, char** argv) { + // Cauldron: 7-box witch's pot — 4 small corner legs at the + // floor, narrow bottom-bowl tier, wider mid-bowl tier, and + // a still-wider thin rim at the top. The stacked tiers + // approximate the curved silhouette of a cast-iron pot + // without needing rotated faces. The 50th procedural mesh + // primitive — pairs with --gen-mesh-shrine / --gen-mesh-totem + // for ritual / alchemy set dressing. + std::string womBase = argv[++i]; + float rimWidth = 0.80f; // top-rim extent (widest dim) + float bodyHeight = 0.70f; // total height excluding legs + float legHeight = 0.10f; + if (i + 1 < argc && argv[i + 1][0] != '-') { + try { rimWidth = std::stof(argv[++i]); } catch (...) {} + } + if (i + 1 < argc && argv[i + 1][0] != '-') { + try { bodyHeight = std::stof(argv[++i]); } catch (...) {} + } + if (i + 1 < argc && argv[i + 1][0] != '-') { + try { legHeight = std::stof(argv[++i]); } catch (...) {} + } + if (rimWidth <= 0 || bodyHeight <= 0 || legHeight <= 0) { + std::fprintf(stderr, + "gen-mesh-cauldron: all dims must be > 0\n"); + return 1; + } + if (womBase.size() >= 4 && + womBase.substr(womBase.size() - 4) == ".wom") { + womBase = womBase.substr(0, womBase.size() - 4); + } + wowee::pipeline::WoweeModel wom; + wom.name = std::filesystem::path(womBase).stem().string(); + wom.version = 3; + auto addBox = [&](float cx, float cy, float cz, + float hx, float hy, float hz) { + struct Face { glm::vec3 n, du, dv; }; + Face faces[6] = { + {{0, 1, 0}, {1, 0, 0}, {0, 0, 1}}, + {{0,-1, 0}, {1, 0, 0}, {0, 0,-1}}, + {{1, 0, 0}, {0, 0, 1}, {0, 1, 0}}, + {{-1,0, 0}, {0, 0,-1}, {0, 1, 0}}, + {{0, 0, 1}, {-1,0, 0}, {0, 1, 0}}, + {{0, 0,-1}, {1, 0, 0}, {0, 1, 0}}, + }; + glm::vec3 c(cx, cy, cz); + for (const Face& f : faces) { + glm::vec3 center = c + glm::vec3(f.n.x*hx, f.n.y*hy, f.n.z*hz); + glm::vec3 du = glm::vec3(f.du.x*hx, f.du.y*hy, f.du.z*hz); + glm::vec3 dv = glm::vec3(f.dv.x*hx, f.dv.y*hy, f.dv.z*hz); + uint32_t base = static_cast(wom.vertices.size()); + auto push = [&](glm::vec3 p, float u, float v) { + wowee::pipeline::WoweeModel::Vertex vtx; + vtx.position = p; vtx.normal = f.n; vtx.texCoord = {u, v}; + wom.vertices.push_back(vtx); + }; + push(center - du - dv, 0, 0); + push(center + du - dv, 1, 0); + push(center + du + dv, 1, 1); + push(center - du + dv, 0, 1); + wom.indices.insert(wom.indices.end(), + {base, base + 1, base + 2, base, base + 2, base + 3}); + } + }; + // Tier proportions (bottom → top): 60% / 90% / 100% of rimWidth. + // Heights split: legs / 30% body / 55% body / 15% body (rim). + float bottomW = rimWidth * 0.60f; + float midW = rimWidth * 0.90f; + float bottomH = bodyHeight * 0.30f; + float midH = bodyHeight * 0.55f; + float rimH = bodyHeight * 0.15f; + // 4 legs at corners of a footprint slightly smaller than the + // bottom tier so the legs visually carry the pot's weight. + float legT = bottomW * 0.18f; + float halfLegT = legT * 0.5f; + float legX = bottomW * 0.5f - halfLegT * 1.4f; + float legCY = legHeight * 0.5f; + addBox( legX, legCY, legX, halfLegT, legHeight * 0.5f, halfLegT); + addBox(-legX, legCY, legX, halfLegT, legHeight * 0.5f, halfLegT); + addBox( legX, legCY, -legX, halfLegT, legHeight * 0.5f, halfLegT); + addBox(-legX, legCY, -legX, halfLegT, legHeight * 0.5f, halfLegT); + // Bottom tier (narrow): sits on top of the legs. + float halfBottom = bottomW * 0.5f; + float bottomCY = legHeight + bottomH * 0.5f; + addBox(0, bottomCY, 0, halfBottom, bottomH * 0.5f, halfBottom); + // Middle tier (widest body): main bulge of the pot. + float halfMid = midW * 0.5f; + float midCY = legHeight + bottomH + midH * 0.5f; + addBox(0, midCY, 0, halfMid, midH * 0.5f, halfMid); + // Rim: thin slab capping the body, slightly wider than mid. + float halfRim = rimWidth * 0.5f; + float rimCY = legHeight + bottomH + midH + rimH * 0.5f; + addBox(0, rimCY, 0, halfRim, rimH * 0.5f, halfRim); + wowee::pipeline::WoweeModel::Batch batch; + batch.indexStart = 0; + batch.indexCount = static_cast(wom.indices.size()); + batch.textureIndex = 0; + wom.batches.push_back(batch); + float totalH = legHeight + bodyHeight; + wom.boundMin = glm::vec3(-halfRim, 0.0f, -halfRim); + wom.boundMax = glm::vec3( halfRim, totalH, halfRim); + if (!wowee::pipeline::WoweeModelLoader::save(wom, womBase)) { + std::fprintf(stderr, + "gen-mesh-cauldron: failed to save %s.wom\n", womBase.c_str()); + return 1; + } + std::printf("Wrote %s.wom\n", womBase.c_str()); + std::printf(" rim width : %.3f (widest)\n", rimWidth); + std::printf(" body H : %.3f (legs %.3f tall)\n", bodyHeight, legHeight); + std::printf(" tiers : bottom %.3f / mid %.3f / rim %.3f\n", + bottomW, midW, rimWidth); + std::printf(" total H : %.3f\n", totalH); + std::printf(" vertices : %zu\n", wom.vertices.size()); + std::printf(" triangles : %zu\n", wom.indices.size() / 3); + return 0; +} + int handleStool(int& i, int argc, char** argv) { // Stool: 5-box small backless seat — flat round-ish seat // (square here, since axis-aligned) on 4 short legs at the @@ -6132,6 +6248,9 @@ bool handleGenMesh(int& i, int argc, char** argv, int& outRc) { if (std::strcmp(argv[i], "--gen-mesh-stool") == 0 && i + 1 < argc) { outRc = handleStool(i, argc, argv); return true; } + if (std::strcmp(argv[i], "--gen-mesh-cauldron") == 0 && i + 1 < argc) { + outRc = handleCauldron(i, argc, argv); return true; + } return false; } diff --git a/tools/editor/cli_help.cpp b/tools/editor/cli_help.cpp index ec65372e..0c23fbac 100644 --- a/tools/editor/cli_help.cpp +++ b/tools/editor/cli_help.cpp @@ -210,6 +210,8 @@ void printUsage(const char* argv0) { std::printf(" Crate: cube body + 4 corner reinforcement posts (default 0.80/0.05)\n"); std::printf(" --gen-mesh-stool [seatSize] [seatThick] [legHeight] [legThick]\n"); std::printf(" Stool: small backless seat on 4 corner legs (default 0.36/0.04/0.45/0.04)\n"); + std::printf(" --gen-mesh-cauldron [rimWidth] [bodyHeight] [legHeight]\n"); + std::printf(" Cauldron: 4 legs + narrow bottom + wider mid + widest rim tiers (default 0.80/0.70/0.10)\n"); std::printf(" Procedural tree: cylindrical trunk + spherical foliage (default 0.1/2.0/0.7)\n"); std::printf(" --displace-mesh [scale]\n"); std::printf(" Offset each vertex along its normal by heightmap brightness × scale (default 1.0)\n"); diff --git a/tools/editor/main.cpp b/tools/editor/main.cpp index eabce0ca..dd369371 100644 --- a/tools/editor/main.cpp +++ b/tools/editor/main.cpp @@ -152,7 +152,7 @@ int main(int argc, char* argv[]) { "--gen-mesh-table", "--gen-mesh-lamppost", "--gen-mesh-bed", "--gen-mesh-ladder", "--gen-mesh-well", "--gen-mesh-signpost", "--gen-mesh-mailbox", "--gen-mesh-tombstone", "--gen-mesh-crate", - "--gen-mesh-stool", + "--gen-mesh-stool", "--gen-mesh-cauldron", "--gen-texture-gradient", "--gen-mesh-from-heightmap", "--export-mesh-heightmap", "--displace-mesh",