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

refactor(editor): extract addVertex helper from 21 cli_gen_mesh sites

Browse source 
After the addBox extraction, 21 procedural mesh primitives
each still open-coded the same 5-line addV vertex-emit lambda.
Add inline addVertex(WoweeModel&, vec3, vec3, vec2) to
cli_box_emitter.hpp (header so the per-vertex hot loop stays
inlineable), plus a per-float overload for the four handlers
(--gen-mesh-stairs, --gen-mesh-tube, --gen-mesh-capsule,
--gen-mesh-arch) that compute pos/normal/uv components inline
rather than building intermediate glm vectors.

Each lambda site collapses from a 5-line body to a 3-line
forwarding wrapper. Output bytes verified identical via
--info-mesh-stats: firepit surface area 2.1100 m² unchanged
across all variants tested (stairs/tube/capsule/arch/
firepit/mushroom).

Sets up the pattern so the next "shared mesh helper" is one
line of include, not another paste-in.
This commit is contained in:
Kelsi 2026-05-09 11:29:52 -07:00
parent 6ff5df41eb
commit 849aaeb7e0
2 changed files with 62 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/editor/cli_box_emitter.hpp
View file

@ -2,11 +2,40 @@
#include "pipeline/wowee_model.hpp"
#include <glm/glm.hpp>
#include <cstdint>
namespace wowee {
namespace editor {
namespace cli {
// Append one vertex (position, normal, UV) to a WoweeModel and
// return its newly-assigned index. Inline because the procedural
// mesh primitives call this thousands of times per build and the
// abstraction shouldn't cost a function-call frame each time.
// Pre-extraction this was the same 5-line lambda copy-pasted into
// 21 different handlers.
inline uint32_t addVertex(wowee::pipeline::WoweeModel& wom,
glm::vec3 p, glm::vec3 n, glm::vec2 uv) {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p;
vtx.normal = n;
vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
}
// Per-float overload used by handlers that compute pos/normal/uv
// components inline rather than building intermediate glm vectors
// (--gen-mesh-stairs, --gen-mesh-tube, --gen-mesh-capsule,
// --gen-mesh-arch). Same semantics as the vec3/vec2 form.
inline uint32_t addVertex(wowee::pipeline::WoweeModel& wom,
float px, float py, float pz,
float nx, float ny, float nz,
float u, float v) {
return addVertex(wom, glm::vec3(px, py, pz), glm::vec3(nx, ny, nz),
glm::vec2(u, v));
}
// Append a flat-shaded axis-aligned box to a WoweeModel. The box
// is centered at (cx, cy, cz) with half-extents (hx, hy, hz). Each
// of the 6 faces emits its own 4 vertices with the face's outward

141
tools/editor/cli_gen_mesh.cpp
View file

@ -219,10 +219,7 @@ int handlePillar(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Shaft side ring at given y. radius modulated by flute count.
auto buildShaftRing = [&](float y) -> uint32_t {
@ -460,10 +457,7 @@ int handleTower(int& i, int argc, char** argv) {
const float pi = 3.14159265358979f;
const int radSegs = std::max(24, battlements * 4);
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Cylinder shaft: side ring at y=0 and y=height.
uint32_t botRing = static_cast<uint32_t>(wom.vertices.size());
@ -610,10 +604,7 @@ int handleHouse(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
float hx = width * 0.5f;
float hz = depth * 0.5f;
@ -729,10 +720,7 @@ int handleFountain(int& i, int argc, char** argv) {
const float pi = 3.14159265358979f;
const int segs = 24;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Cylinder helper: build side ring + caps from y0 to y1
// at given radius. Returns when done; indices appended
@ -834,10 +822,7 @@ int handleStatue(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Pedestal: low square block (24 unique verts).
float pedH = pedSize * 0.4f;
@ -990,10 +975,7 @@ int handleAltar(int& i, int argc, char** argv) {
const float pi = 3.14159265358979f;
const int segs = 24;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Build a cylindrical disc from y0 to y1 at radius r.
// Side ring + top cap (faces +Y). Bottom of each disc
@ -1200,10 +1182,7 @@ int handleArchway(int& i, int argc, char** argv) {
const float pi = 3.14159265358979f;
const int pillarSegs = 16;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Cylindrical pillar at given (cx, cz), from y=0 to y=pillarH.
auto pillar = [&](float cx, float cz) {
@ -1380,10 +1359,7 @@ int handleBarrel(int& i, int argc, char** argv) {
const int segs = 16; // angular subdivisions
const int rings = 12; // vertical slices
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Radius profile: smooth cosine bulge from rim to mid.
// r(t) = topR + (midR - topR) * sin(pi*t) where t in 0..1
@ -1726,15 +1702,10 @@ int handleStairs(int& i, int argc, char** argv) {
wowee::pipeline::WoweeModel wom;
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](float x, float y, float z,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = glm::vec3(x, y, z);
vtx.normal = glm::vec3(nx, ny, nz);
vtx.texCoord = glm::vec2(u, v);
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
auto addV = [&](float px, float py, float pz,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
return addVertex(wom, px, py, pz, nx, ny, nz, u, v);
};
float halfW = width * 0.5f;
// Each step is a box from y=0 to y=(k+1)*stepHeight,
@ -2015,15 +1986,10 @@ int handleTube(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
float h = height * 0.5f;
auto addV = [&](float x, float y, float z,
float nx, float ny, float nz,
float u, float v) {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = glm::vec3(x, y, z);
vtx.normal = glm::vec3(nx, ny, nz);
vtx.texCoord = glm::vec2(u, v);
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
auto addV = [&](float px, float py, float pz,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
return addVertex(wom, px, py, pz, nx, ny, nz, u, v);
};
// Outer wall: 2 rows × (segments+1) verts, normals point
// radially outward.
@ -2194,15 +2160,10 @@ int handleCapsule(int& i, int argc, char** argv) {
wom.version = 3;
float halfBody = cylHeight * 0.5f;
float totalH = cylHeight + 2.0f * radius;
auto addV = [&](float x, float y, float z,
float nx, float ny, float nz,
float u, float v) {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = glm::vec3(x, y, z);
vtx.normal = glm::vec3(nx, ny, nz);
vtx.texCoord = glm::vec2(u, v);
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
auto addV = [&](float px, float py, float pz,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
return addVertex(wom, px, py, pz, nx, ny, nz, u, v);
};
// Top hemisphere: stacks rings from north pole down to
// body top. Vertex layout per ring: (segments+1) verts.
@ -2359,15 +2320,10 @@ int handleArch(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
// Helper to push a vertex.
auto addV = [&](float x, float y, float z,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = glm::vec3(x, y, z);
vtx.normal = glm::vec3(nx, ny, nz);
vtx.texCoord = glm::vec2(u, v);
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
auto addV = [&](float px, float py, float pz,
float nx, float ny, float nz,
float u, float v) -> uint32_t {
return addVertex(wom, px, py, pz, nx, ny, nz, u, v);
};
// Helper to emit an axis-aligned box from min to max.
auto addBox = [&](glm::vec3 lo, glm::vec3 hi) {
@ -2486,12 +2442,7 @@ int handlePyramid(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p;
vtx.normal = n;
vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Build base ring vertices (one per side).
std::vector<glm::vec3> basePts;
@ -2694,12 +2645,7 @@ int handleTree(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p;
vtx.normal = n;
vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Trunk cylinder: 12 segments, side ring + top + bottom.
const int trunkSegs = 12;
@ -3292,10 +3238,7 @@ int handleMushroom(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Stalk: 12-segment cylinder from y=0 to y=stalkH.
const int segs = 12;
@ -3428,10 +3371,7 @@ int handleCart(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
auto addBox = [&](float cx, float cy, float cz,
float hx, float hy, float hz) {
@ -3559,10 +3499,7 @@ int handleBanner(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Pole cylinder (12 segments)
const int poleSegs = 12;
@ -3827,10 +3764,7 @@ int handleShrine(int& i, int argc, char** argv) {
wom.version = 3;
const float pi = 3.14159265358979f;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
auto addBox = [&](float cx, float cy, float cz,
float hx, float hy, float hz) {
@ -6210,10 +6144,7 @@ int handleTent(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
const float L2 = length * 0.5f;
const float W2 = width * 0.5f;
@ -6544,10 +6475,7 @@ int handleHaystack(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
const float pi = 3.14159265358979f;
const float layerH = height / layers;
@ -6814,10 +6742,7 @@ int handleWoodpile(int& i, int argc, char** argv) {
wom.name = std::filesystem::path(womBase).stem().string();
wom.version = 3;
auto addV = [&](glm::vec3 p, glm::vec3 n, glm::vec2 uv) -> uint32_t {
wowee::pipeline::WoweeModel::Vertex vtx;
vtx.position = p; vtx.normal = n; vtx.texCoord = uv;
wom.vertices.push_back(vtx);
return static_cast<uint32_t>(wom.vertices.size() - 1);
return addVertex(wom, p, n, uv);
};
// Add a log: z-axis cylinder centered at (cx, cy, 0) with
// length logLen along Z. Each log gets unique vertices for