The stadium and its surroundings as two fixed views; the surroundings in detail

The camera no longer flies: the stadium view shows stands and facilities, the
surroundings view the fourteen objects of the periphery, each in a shape of its own
(road, bus stop, tram and station by level; parking lots with bays and cars; shopping
centre, arcade, club house, restaurant, snack bars, fan shops in the club's colour).
A part is chosen in the picture or from a list and shown on a card that leads to the
builder's offer. The painted panorama is no longer used.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-15 01:20:39 +01:00
1 parent 20e7497f67
commit 6e3475493f
5 files changed
+274 -98

No files matched your search

+194 -16
View File
@@ -84,7 +84,7 @@ inline void box(Scene &scene, const std::string &part, double x, double y, doubl
}
// Builds the model. `seats` is the club's colour; `paper` selects the light skin's tones.
inline Scene build(const Json &overview, const std::string &seats, bool paper) {
inline Scene build(const Json &overview, const std::string &seats, bool paper, int mode = 0) {
Scene scene;
scene.ink = paper ? "#3d362a" : "#d5dde3";
scene.accent = paper ? "#25617a" : "#9ac7d8";
@@ -93,7 +93,9 @@ inline Scene build(const Json &overview, const std::string &seats, bool paper) {
const auto level_of = [](const Json &row) { return row.value("display_level", row.value("level", 0)); };
const auto building = [](const Json &row) { return row.value("building", false); };
// the plate everything stands on
scene.faces.push_back({{{-350, -262, 0}, {350, -262, 0}, {350, 262, 0}, {-350, 262, 0}}, plate, "", false, false, true, 3, 1, "", {}, -1000});
// inside, the plate runs beyond the picture; around, it is the plot with its edge
const double px = mode == 1 ? 345 : 900, py = mode == 1 ? 268 : 900;
scene.faces.push_back({{{-px, -py, 0}, {px, -py, 0}, {px, py, 0}, {-px, py, 0}}, plate, "", false, false, true, 3, 1, "", {}, -1000});
// the pitch: its colour tells the state of the turf (facility 4)
const auto &facilities = overview.value("facilities", Json::array());
const auto facility = [&](size_t index) -> const Json & { static const Json none = Json::object(); return index < facilities.size() ? facilities[index] : none; };
@@ -214,8 +216,9 @@ inline Scene build(const Json &overview, const std::string &seats, bool paper) {
scene.centres["facility:3"] = {at.x, at.y, 8};
}
// facilities 2, 5, 6, 7 as small houses beside the ground: boiler, kiosks, workshop, gate
const std::array<std::tuple<size_t, double, double, const char *>, 4> houses{{{2, -150, -150, "#c8a58a"}, {5, 150, -150, "#d9c38a"}, {6, -150, 150, "#b9b3a2"}, {7, 150, 150, "#a9b7a0"}}};
const std::array<std::tuple<size_t, double, double, const char *>, 4> houses{{{2, -160, -66, "#c8a58a"}, {5, 140, -92, "#d9c38a"}, {6, -148, 72, "#b9b3a2"}, {7, 160, 82, "#a9b7a0"}}};
for (const auto &[index, x, y, colour] : houses) {
if (mode == 1) break;
if (index >= facilities.size()) continue;
const std::string part = "facility:" + std::to_string(index);
const int level = level_of(facility(index)) - (index == 2 || index == 5 ? 1 : 0);
@@ -224,20 +227,192 @@ inline Scene build(const Json &overview, const std::string &seats, bool paper) {
for (int n = 0; n < std::min(level, 4); ++n) box(scene, part, x + (n - (std::min(level, 4) - 1) / 2.0) * 20, y, 16, 16, 7 + 2 * level, colour);
scene.centres[part] = {x, y, 6};
}
// the periphery on an outer ring: a house per object, growing with its level
const auto &periphery = overview.value("periphery", Json::array());
for (size_t i = 0; i < periphery.size(); ++i) {
const std::string part = "periphery:" + std::to_string(i);
const double a = (360.0 * double(i) / double(std::max<size_t>(1, periphery.size())) + 20) * 3.14159265358979 / 180;
const double x = 292 * std::cos(a), y = 214 * std::sin(a);
const int level = periphery[i].value("level", 0);
static constexpr std::array<const char *, 6> tones{"#c9b48c", "#b7c4a8", "#c8a79a", "#a9bccb", "#d2c08f", "#bfb2c4"};
if (level <= 0) box(scene, part, x, y, 44, 30, 1, wall, true);
else {
box(scene, part, x, y, 30 + 6 * level, 22 + 3 * level, 6 + 5 * level, tones[i % tones.size()]);
if (building(periphery[i])) box(scene, part, x, y, 40 + 6 * level, 30 + 3 * level, 1, gold, true);
// The surroundings (mode 1): every object in its own shape and at its own place, drawn at
// its level. Level 0 is a dashed footprint, a level being built a dashed frame in gold.
if (mode == 1) {
// the ground itself is scenery here
for (auto &face : scene.faces) face.part.clear();
scene.centres.clear();
scene.anchors.clear();
const std::string asphalt = paper ? "#b9b2a4" : "#3c444c", brick = "#c9a58c", plaster = "#efe6cf", tile = "#a8574f", slate = paper ? "#6b747d" : "#20272e",
wood = "#b98d5a", green = "#7fa86b", white = "#f7f4ea";
const auto &periphery = overview.value("periphery", Json::array());
const auto flat = [&](const std::string &part, double x, double y, double w, double d, const std::string &fill, double bias = -500) {
scene.faces.push_back({{{x - w / 2, y - d / 2, 0.2}, {x + w / 2, y - d / 2, 0.2}, {x + w / 2, y + d / 2, 0.2}, {x - w / 2, y + d / 2, 0.2}}, fill, part, false, false, true, 2, 1, "", {}, bias});
};
const auto stripe = [&](double x0, double y0, double x1, double y1, const std::string &ink, bool dashed = false) {
scene.faces.push_back({{{x0, y0, 0.3}, {x1, y1, 0.3}}, "", "", dashed, true, true, 2.2, 1, ink, {}, -450});
};
// a house with a pitched roof; the ridge runs along x
const auto gabled = [&](const std::string &part, double x, double y, double w, double d, double h, double rise, const std::string &walls, const std::string &roofing) {
box(scene, part, x, y, w, d, h, walls);
const Vec a{x - w / 2, y - d / 2, h}, b{x + w / 2, y - d / 2, h}, c{x + w / 2, y + d / 2, h}, e{x - w / 2, y + d / 2, h}, r0{x - w / 2, y, h + rise}, r1{x + w / 2, y, h + rise};
scene.faces.push_back({{a, b, r1, r0}, roofing, part, false, false, false, 2, 1, "", {}, 3});
scene.faces.push_back({{e, c, r1, r0}, roofing, part, false, false, false, 2, 1, "", {}, 3});
scene.faces.push_back({{a, e, r0}, walls, part, false, false, false, 2, 1, "", {}, 3});
scene.faces.push_back({{b, c, r1}, walls, part, false, false, false, 2, 1, "", {}, 3});
};
// windows as lines on the front (the side towards the viewer, lower y)
const auto windows = [&](const std::string &part, double x, double y, double w, double d, double z0, double z1, int count) {
Face glassy{{{x - w / 2 + 2, y - d / 2 - .2, z0}, {x + w / 2 - 2, y - d / 2 - .2, z0}, {x + w / 2 - 2, y - d / 2 - .2, z1}, {x - w / 2 + 2, y - d / 2 - .2, z1}}, glass, part, false, false, true, 1.5, 1, "", {}, 4};
for (int n = 1; n < count; ++n) glassy.lines.push_back({{x - w / 2 + 2 + (w - 4) * n / count, y - d / 2 - .2, z0}, {x - w / 2 + 2 + (w - 4) * n / count, y - d / 2 - .2, z1}});
scene.faces.push_back(glassy);
};
const auto tree = [&](double x, double y) {
scene.faces.push_back({{{x, y, 0}, {x, y, 5}}, "", "", false, true, true, 3, 1, "#6b5335", {}, 2});
box(scene, "", x, y, 7, 7, 8, green, false, 5);
};
const auto car = [&](const std::string &part, double x, double y, int tone) {
static constexpr std::array<const char *, 5> paints{"#c8553d", "#3f6f9f", "#e8e2d2", "#5b6168", "#d9b13b"};
box(scene, part, x, y, 4.2, 8.5, 2.6, paints[size_t(tone) % paints.size()]);
};
const auto level_at = [&](size_t i) { return i < periphery.size() ? periphery[i].value("level", 0) : 0; };
const auto planned = [&](const std::string &part, double x, double y, double w, double d, bool busy) {
box(scene, part, x, y, w, d, 1, wall, true);
if (busy) scene.faces.push_back({{{x - w / 2, y - d / 2, 0}, {x + w / 2, y - d / 2, 0}, {x + w / 2, y - d / 2, 14}, {x - w / 2, y - d / 2, 14}}, gold, part, true, false, true, 3, .25, gold, {}, 4});
};
const auto centre = [&](size_t i, double x, double y, double z) { scene.centres["periphery:" + std::to_string(i)] = {x, y, z}; };
const auto busy_at = [&](size_t i) { return i < periphery.size() && building(periphery[i]); };
// 0 transport: a road, then a bus stop, a tram line, a station
if (!periphery.empty()) {
const std::string part = "periphery:0";
const int level = level_at(0);
if (level <= 0) planned(part, 0, -215, 600, 26, busy_at(0));
else {
flat(part, 0, -215, 680, 24, asphalt);
stripe(-340, -215, 340, -215, white, true);
flat(part, 0, -165, 22, 76, asphalt); // the approach to the ground
if (level >= 2) { // bus stop: shelter and two buses
box(scene, part, -70, -196, 30, 5, 7, glass);
box(scene, part, -120, -212, 26, 7, 8, "#d9b13b");
box(scene, part, 60, -219, 26, 7, 8, "#d9b13b");
}
if (level >= 3) { // tram: rails and a tram
stripe(-340, -238, 340, -238, slate);
stripe(-340, -242, 340, -242, slate);
box(scene, part, 150, -240, 44, 6, 8, "#c8553d");
box(scene, part, 110, -231, 60, 4, 1.5, plaster);
}
if (level >= 4) { // station hall
gabled(part, -230, -238, 90, 30, 16, 10, brick, slate);
windows(part, -230, -238, 90, 30, 4, 12, 9);
}
if (busy_at(0)) planned(part, -230, -238, 96, 36, true);
}
centre(0, level >= 4 ? -230 : -70, -215, 6);
}
scene.centres[part] = {x, y, 6};
// 4 parking: a lot per level, with bays and cars
if (periphery.size() > 4) {
const std::string part = "periphery:4";
const int level = level_at(4), most = std::max(1, periphery[4].value("max_level", 3));
for (int lot = 0; lot < most; ++lot) {
const double x = -262, y = 78 - lot * 78;
if (lot >= level) { planned(part, x, y, 110, 62, lot == level && busy_at(4)); continue; }
flat(part, x, y, 110, 62, asphalt);
for (int bay = 0; bay <= 10; ++bay) { stripe(x - 50 + bay * 10, y - 28, x - 50 + bay * 10, y - 10, white); stripe(x - 50 + bay * 10, y + 10, x - 50 + bay * 10, y + 28, white); }
for (int bay = 0; bay < 10; ++bay) {
if ((bay * 7 + lot * 3) % 4 != 3) car(part, x - 45 + bay * 10, y - 19, bay + lot);
if ((bay * 5 + lot) % 3 != 0) car(part, x - 45 + bay * 10, y + 19, bay * 2 + lot);
}
}
centre(4, -262, 78, 4);
}
// 2 shopping centre: two wings, a glass front, a roof terrace
if (periphery.size() > 2) {
const std::string part = "periphery:2";
if (level_at(2) <= 0) planned(part, 215, 195, 130, 70, busy_at(2));
else {
box(scene, part, 215, 205, 130, 44, 20, plaster);
box(scene, part, 170, 170, 40, 30, 14, brick);
windows(part, 215, 205, 130, 44, 3, 16, 13);
windows(part, 170, 170, 40, 30, 3, 10, 4);
box(scene, part, 245, 205, 30, 16, 5, glass, false, 20);
box(scene, part, 190, 205, 14, 10, 3, slate, false, 20);
for (double x : {232.0, 252.0, 272.0}) tree(x, 168);
}
centre(2, 215, 195, 12);
}
// 1 arcade: a hall with a sign
if (periphery.size() > 1) {
const std::string part = "periphery:1";
if (level_at(1) <= 0) planned(part, -205, 205, 84, 50, busy_at(1));
else {
box(scene, part, -205, 205, 84, 46, 15, "#b9a6c9");
windows(part, -205, 205, 84, 46, 2, 8, 6);
box(scene, part, -205, 184, 46, 3, 7, "#d9b13b", false, 15);
box(scene, part, -180, 215, 16, 16, 4, slate, false, 15);
}
centre(1, -205, 205, 9);
}
// 3 club house: a pitched roof, a terrace, trees
if (periphery.size() > 3) {
const std::string part = "periphery:3";
if (level_at(3) <= 0) planned(part, 0, 215, 70, 44, busy_at(3));
else {
gabled(part, 0, 220, 66, 30, 11, 9, plaster, tile);
windows(part, 0, 220, 66, 30, 3, 8, 6);
flat(part, 0, 197, 66, 14, wood, -400);
for (double x : {-24.0, -8.0, 8.0, 24.0}) box(scene, part, x, 197, 5, 5, 2.4, white);
tree(-46, 214); tree(46, 214);
}
centre(3, 0, 215, 8);
}
// 5 restaurant: a house with an awning and tables
if (periphery.size() > 5) {
const std::string part = "periphery:5";
if (level_at(5) <= 0) planned(part, 262, 70, 60, 44, busy_at(5));
else {
gabled(part, 262, 78, 56, 30, 12, 8, brick, slate);
windows(part, 262, 78, 56, 30, 3, 9, 5);
scene.faces.push_back({{{234, 63, 9}, {290, 63, 9}, {290, 52, 6}, {234, 52, 6}}, "#c8553d", part, false, false, false, 2, 1, "", {}, 5});
for (double x : {242.0, 256.0, 270.0, 284.0}) box(scene, part, x, 46, 5, 5, 2.4, white);
}
centre(5, 262, 70, 8);
}
// 6-9 snack bars: a kiosk with a striped awning
const std::array<std::array<double, 2>, 4> kiosks{{{{-128, -138}}, {{128, -138}}, {{-128, 138}}, {{128, 138}}}};
for (size_t n = 0; n < 4 && 6 + n < periphery.size(); ++n) {
const std::string part = "periphery:" + std::to_string(6 + n);
const double x = kiosks[n][0], y = kiosks[n][1];
if (level_at(6 + n) <= 0) planned(part, x, y, 26, 20, busy_at(6 + n));
else {
box(scene, part, x, y, 32, 20, 12, white);
box(scene, part, x, y, 34, 22, 2, tile, false, 12);
Face awning{{{x - 18, y - 10, 11}, {x + 18, y - 10, 11}, {x + 18, y - 21, 7.5}, {x - 18, y - 21, 7.5}}, "#d9b13b", part, false, false, false, 2, 1, "", {}, 5};
for (int s = 1; s < 8; ++s) awning.lines.push_back({{x - 18 + 36.0 * s / 8, y - 10, 11}, {x - 18 + 36.0 * s / 8, y - 21, 7.5}});
scene.faces.push_back(awning);
for (double dx : {-22.0, -8.0, 8.0, 22.0}) box(scene, part, x + dx, y - 28, 5, 5, 3.4, wood); // standing tables
box(scene, part, x + 22, y + 4, 5, 5, 5, slate); // bins
}
centre(6 + n, x, y, 5);
}
// 10-13 fan shops: a shop in the club's colour with a flag
const std::array<std::array<double, 2>, 4> shops{{{{256, -20}}, {{256, -95}}, {{200, -150}}, {{-200, -150}}}};
for (size_t n = 0; n < 4 && 10 + n < periphery.size(); ++n) {
const std::string part = "periphery:" + std::to_string(10 + n);
const double x = shops[n][0], y = shops[n][1];
if (level_at(10 + n) <= 0) planned(part, x, y, 40, 30, busy_at(10 + n));
else {
box(scene, part, x, y, 48, 30, 13, plaster);
windows(part, x, y, 48, 30, 2, 9, 6);
box(scene, part, x, y, 50, 32, 3, seats, false, 13);
box(scene, part, x - 14, y - 17, 14, 3, 5, seats, false, 9); // the sign over the door
scene.faces.push_back({{{x + 20, y + 10, 16}, {x + 20, y + 10, 34}}, "", part, false, true, true, 3, 1, "", {}, 6});
scene.faces.push_back({{{x + 20, y + 10, 34}, {x + 33, y + 10, 30.5}, {x + 20, y + 10, 27}}, seats, part, false, false, true, 1.5, 1, "", {}, 7});
}
centre(10 + n, x, y, 6);
}
// any further object of a data set: a house that grows with its level
for (size_t i = 14; i < periphery.size(); ++i) {
const std::string part = "periphery:" + std::to_string(i);
const double x = -300 + double(i - 14) * 60, y = -150;
if (level_at(i) <= 0) planned(part, x, y, 40, 30, busy_at(i));
else box(scene, part, x, y, 30 + 6 * level_at(i), 24, 6 + 5 * level_at(i), brick);
centre(i, x, y, 6);
}
for (double x : {-330.0, -300.0, 300.0, 330.0}) tree(x, 245);
for (const auto &[id, at] : scene.centres) scene.anchors.push_back({id, at});
return scene;
}
scene.centres["stadium"] = {0, 0, 0};
for (const auto &[id, centre] : scene.centres)
@@ -321,6 +496,9 @@ inline Drawing draw(const Scene &scene, const Camera &camera, double width, doub
return out;
}
// The camera never moves: one station for the stadium, one for its surroundings.
inline Camera fixed_camera(bool surroundings) { return surroundings ? Camera{28, 42, 0.98, 0, 0} : Camera{28, 44, 1.72, 0, 0}; }
// Where the camera stands for a focus: "" the whole ground with its surroundings, "stadium"
// the bowl, a part id that part, turned so that it lies in front.
inline Camera camera_for(const Scene &scene, const std::string &focus) {