mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-29 01:07:28 +01:00
2660d14565
Today's work on the binary scene format plan (binary-scene-format-plan.md), from the first measurement to a terrain that bakes itself on first run and streams from a thread. The step-by-step history is kept on backup/scene-streaming-format-presquash-0916. Measuring first. -loadprofile times a scenery load by stage and by node kind and reports node counts and resident memory. On l204 terrain is 95% of the bytes and 99.8% of the nodes; on quarkmce2007 vehicles, not models, dominate what is left. The terrain turned out to be a heightfield in all but name, a ribbon covering 12% of its bounding box. The heightfield. scene/heightfieldformat.h is the .ehf layout: Morton-ordered tiles of 128 samples with one shared edge sample, a point-sampled mip chain, zstd per tile, a nodata sentinel, a material palette with a measured tiling per material, and a stamp of the rules that decided what counted as terrain. scene/heightfieldreader.h reads it for the tool, the renderer and the loader alike, and scene/terraincooker.h writes it, shared by the terraincook tool and the engine so a first-run bake is the file the tool would have made. The cooker rasterises every triangle where it is drawn (through scene::place_in_world, the placement the region applies too), keeps an upper surface laid within half a metre over another and the lower of two further apart, and then asks each triangle whether the heightfield shows it: laid, reaching a sample, keeping nearly all it claimed, and with the ground around it drawn at every level out to 2 km. Baking on first run. simulation/terrainbake bakes <scenario>.ehf the first time a scenery is opened, choosing the grid step from the first 200,000 vertices, and on later loads leaves out the triangles its node table says the heightfield shows. Everything else - trees, grass tufts, gantries, bridge decks - is drawn as written, so a bad bake can at worst draw something twice, and the heightfield sits 2 cm under the triangles so the original wins there. Nodes are keyed by file, line, include parameters and placement; an edited file changes its keys and those nodes are drawn again. A bake under older rules, or without its table, is thrown away and redone. A launcher copy named $scenario shares the scenario's files. -nobaketerrain shows the triangles as written. A scenery can still name hand-cooked fields, several at different steps. Drawing and streaming. rendering/terrainclipmap draws resident tiles at the mip level their distance earns, deriving the grid from gl_VertexID and texturing in world space with the scenery's own materials. rendering/terraintileloader reads and decodes tiles on a thread of its own; the renderer rescans what is in range only after moving a quarter of a tile, asks for what is missing nearest first, uploads at most 32 tiles a frame, drops arrivals the camera has moved past, and keeps drawing a tile at the level it has until the right one arrives. The terrain has its own range, terrainrange in the ini and a slider in the debug panel, 20 km by default and independent of basedrawrange; the far plane of an ordinary view is pushed out to it. The debug panel shows the range, tiles in view, on the gpu, wanted and queued, and how many sit at each level. Events. The event queue moved out of the events into a binary heap with a deterministic tie-break, and an event is handed its activator instead of storing it, so basic_event is a definition and nothing else. The logic container. scene/logicformat.h and scene/logiccontainer write a scenery's events, their targets and sibling chains as flat, deterministic arrays with a schema hash that refuses a mismatched build. simulation/logiccook cooks it from the loaded state whenever it is missing, stale or unreadable, reads it straight back to check it, and resolves each target to a position in the registry its event kind searches. -cooklogic forces a cook, -verifylogic only checks. Nothing reads it at load yet. Prefabs. scene/prefab describes a signal by the aspects it can show - lights, speeds, animation channels, a sound - instead of pasting an .inc per variant, and expands an instance to ordinary scenery text. Tried on a light signal and a shape signal. Screenshots without a person present: -shot x,y,z[,yaw[,pitch]], -shotsettle, -shotstay.
58 lines
1.9 KiB
GLSL
58 lines
1.9 KiB
GLSL
// Terrain heightfield, fragment stage.
|
|
//
|
|
// A tile is drawn once per material it contains, with that material's texture bound, and
|
|
// every fragment belonging to a different material is dropped. Texture coordinates are
|
|
// world space divided by the tiling the cooker measured from the source geometry, so the
|
|
// ground keeps the scale the scenery was authored with.
|
|
|
|
in vec4 f_pos;
|
|
in vec3 f_normal;
|
|
in vec2 f_ground;
|
|
in float f_valid;
|
|
flat in uint f_material;
|
|
|
|
#include <common>
|
|
#include <apply_fog.glsl>
|
|
#include <tonemapping.glsl>
|
|
|
|
uniform sampler2D ground;
|
|
uniform float groundscale; // metres of ground covered by one texture repeat
|
|
uniform uint drawnmaterial; // the material this pass is drawing
|
|
uniform bool hastexture; // false when the material has no texture to sample
|
|
uniform vec3 fallback; // colour used in that case
|
|
|
|
layout(location = 0) out vec4 out_color;
|
|
#if MOTIONBLUR_ENABLED
|
|
layout(location = 1) out vec4 out_motion;
|
|
#endif
|
|
|
|
void main()
|
|
{
|
|
// f_valid is 1.0 only where every vertex of this triangle carried terrain, so a
|
|
// triangle reaching into a hole disappears. it erodes the boundary by up to one
|
|
// sample, which is the price of holes being a property of samples, not of triangles
|
|
if( f_valid < 0.999 ) { discard; }
|
|
// this pass belongs to one material; everything else is drawn by another pass
|
|
if( f_material != drawnmaterial ) { discard; }
|
|
|
|
vec3 albedo = (
|
|
hastexture ?
|
|
texture( ground, f_ground / max( groundscale, 0.01 ) ).rgb :
|
|
fallback );
|
|
// a plain lambert term against the first directional light, so that relief reads
|
|
float lambert = 0.35;
|
|
if( lights_count >= 1U && lights[ 0 ].type == LIGHT_DIR ) {
|
|
lambert = 0.35 + 0.65 * max( dot( normalize( f_normal ), normalize( -lights[ 0 ].dir ) ), 0.0 );
|
|
}
|
|
vec3 col = albedo * lambert;
|
|
|
|
#if POSTFX_ENABLED
|
|
out_color = vec4( apply_fog( col ), 1.0 );
|
|
#else
|
|
out_color = tonemap( vec4( apply_fog( col ), 1.0 ) );
|
|
#endif
|
|
#if MOTIONBLUR_ENABLED
|
|
out_motion = vec4( 0.0 );
|
|
#endif
|
|
}
|