Entropie git · main
Entropie festival game; first steps
C 88.5% Markdown 9.1% GLSL 2.3%git clone https://git.christianimmanuel.de/games/Entropie.gitwget https://git.christianimmanuel.de/games/Entropie/archive/Entropie.tar.gzentropie 2.14.1: main building ridge fix
- The left roof's ridge cap stuck out about 4 m past the left gable: the ridge piece running into the right half's roof was turned the wrong way
commit_message.txt | 7 +++---- entropie/Makefile | 2 +- entropie/STATE.md | 6 ++++-- entropie/src/render/shapes.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/commit_message.txt b/commit_message.txt index 3f639fc..e24e125 100644 --- a/commit_message.txt +++ b/commit_message.txt @@ -1,5 +1,4 @@ -entropie 2.14.0: wind follow-ups +entropie 2.14.1: main building ridge fix -- Trees and bushes sway with the wind -- Paper and plastic litter and pullovers lying about get blown along -- Owners run after their tent when the wind blows it about and hold it down +- The left roof's ridge cap stuck out about 4 m past the left gable: the + ridge piece running into the right half's roof was turned the wrong way diff --git a/entropie/Makefile b/entropie/Makefile index f18e08d..9142441 100644 --- a/entropie/Makefile +++ b/entropie/Makefile @@ -1,5 +1,5 @@ APP := entropie -VERSION := 2.14.0 +VERSION := 2.14.1 PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin diff --git a/entropie/STATE.md b/entropie/STATE.md index 06b09cd..f3376c5 100644 --- a/entropie/STATE.md +++ b/entropie/STATE.md @@ -241,6 +241,9 @@ Round 2.14: - Light things blown along (`world.c` windBlows, before the physics step): paper and plastic litter from 5 m/s, a pullover put down from 9 m/s; BLOW_SHOVE 0.9 m/s^2 per m/s over that against the ground's grip; paper spins. - Owners chase their tent (`ai.c` chaseTent, before the rain: idle, wander, at a table, working, fetching): the wind pushed it lately (`tent_blown` 6 s) and it's within 70 m: "Hey - my tent!", over to it and on with it (working on it holds it: it doesn't blow while worked on). +Round 2.14.1: +- The main building's left roof: its ridge cap stuck out about 4 m past the left gable ("the roof peak of the left building is too far left"). The bit of ridge running on into the right half's roof (`Shapes_structure`, roofs with `valley`) was turned with rotate_z(-90 deg), which sends the tube to -X: now +90 deg, it goes on into the roof across. + Unfinished building (Shell_build, at SHELL_AT in the frame's frame): brick shell 6.4 x 4.7, walls 2.9, open front (2 m) to the frame (now only the front half: pillars at z -13.8 / -9.2), window holes, bare floor, tiled roof with slabs. Barn: brick courses on BUILDING_BRICK walls (`addBrickCourses`: mortar a shade lighter, so the ink doesn't trace it), ivy (`Shapes_ivy`, OBJ_STRUCTUREs) on both long sides; the woodpile (OBJ_WOODPILE "Woodpile", WOODPILE_A/B) left of the toilet, everybody's woodpile from the start (`scene.c` Scene_finish). Fireplace tripod: wooden poles, feet TRIPOD_OUT 0.9 m outside the stones, TRIPOD_PAST 0.4 m past the top, a lashing; each pole an OBJ_WALL along it ("Tripod pole"). Gates (FURN_GATE, green boards): in your garages' doorways (GATES: hinge, end), `gate_open` / `gate_t`, `hinge`, `gate_shut` / `gate_out`; Object_swingGate (1.2 s), driven by showProps; a click within 1.2 m opens / shuts both leaves. Props that show (1.89, `world.c` showProps every frame): the tin's mesh is built again when its butts change (`Shapes_ashtray`: up to 12 show, the ash rises, a heap from 14; `shown` = what's built). @@ -389,7 +392,6 @@ Most important first. - Clothing, still to do: more outfits for extra people (only the performance test has any: they all wear trousers); the pullover over a railing NPCs never do on their own - Tents, still to do: NPCs taking theirs down on their own (leaving) - Weather, still to do: a sound for thunder, wind and rain (no sound in the game yet); a hat or anything held blown out of the hands -- Main building: "the left building's roof peak is too far left" - to be clarified **Tools for us** - Optional local AI (llama.cpp, small model) for talking and tasks; the menu stays as fallback @@ -398,4 +400,4 @@ Most important first. - Drawing many figures on a real graphics card: not measured (software GL: 300 people cost 3x the rest of the scene) --- -State of `entropie 2.14.0 (build 11cb1c9)` +State of `entropie 2.14.1 (build 11276d9)` diff --git a/entropie/src/render/shapes.c b/entropie/src/render/shapes.c index 71daad0..744d04e 100644 --- a/entropie/src/render/shapes.c +++ b/entropie/src/render/shapes.c @@ -634,7 +634,7 @@ Mesh Shapes_structure(const ShapeSlab *slabs, int n_slabs, const ShapeOpening *o } size_t cap = b.vertex_count; shapes_addTube(&b, lx, 0.11f, 0.11f, r->valley, 8, vec3_scale(color, 0.75f), true); - transformSince(&b, cap, mat4_mul(mat4_translate(vec3(0.0f, rh + 0.03f, 0.0f)), mat4_rotate_z(-PI_F / 2.0f))); + transformSince(&b, cap, mat4_mul(mat4_translate(vec3(0.0f, rh + 0.03f, 0.0f)), mat4_rotate_z(PI_F / 2.0f))); /* (up the tube -> +X: on into the roof across, not out past the far gable) */ } Mat4 turn = r->across ? mat4_rotate_y(PI_F * 0.5f) : mat4_identity(); /* (ridge along Z) */ transformSince(&b, first, mat4_mul(mat4_translate(vec3(r->center.x, r->wall_top, r->center.z)), turn));