Grow images in the generated trees
`Image` is the only widget in the repository whose size hint is a length in pixels -- everything else hints a share, or nothing -- so it is the only one that exercises a rule beside a hint, a box a widget knows before it is drawn, and the answer the commit before this one changed. The generated trees had none, which is why nothing there could reach that case. `Kind::Image` is a fifth leaf, drawn one time in five, and it steps to a plain rect when the shrinker reduces it: a picture measures nothing either, but its length is its own, so the leaf that takes whatever it is given is the simpler one. The picture is a 64x64 checkerboard of purple and black in 8 px cells, committed at `src/assets/checkerboard.png` beside the generator that draws it -- the way `examples/tabs` keeps its own -- and included rather than opened, so that growing a tree does not depend on a working directory and one seed is one tree whatever anything else does. One upload per tree, however many images it grows: a `TextureHandle` is a counted reference, so the first image in a tree uploads the checkerboard and every one after it clones the handle. Measured: seed 1 at depth 4 grows 13 images and holds 1 texture, seed 6 grows none and holds none, and `a_tree_of_images_uploads_one_texture` asserts it. `Image::new` is what a caller holding a handle needs, since `image` uploads what it is given. A seed names a tree only while the generator draws the same things in the same order, so every seed now grows a different tree. The seed list in `generated.rs` says so: 20 and 86 no longer grow the trees whose defects they once caught, and both of those live on as shrunk fixtures in `unsettled.rs`, which are trees rather than numbers. The seeds those fixtures name are similarly historical, and their file says that too. Format, clippy with and without layout-diagnostics, and the suite (135 + 19 + 13 + 4) are clean. The cold dump is a new baseline of 34,571 boxes over the 400 depth-5 trees, since the trees themselves changed; all three seed scans pass over the new ones -- 400 at depth 5 in 62.79s, 1,000 at depth 6 in 160.20s, 2,000 at depth 4 in 299.58s -- which is what actually checks that images lay out warm the way they do cold. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
b295c8b97a
commit
2dba90bd0f
6 files changed
+72
-10
No files matched your search
Binary file not shown.
|
After Width: | Height: | Size: 191 B |
+29
-3
@@ -190,6 +190,9 @@ pub enum Kind {
|
||||
color: usize,
|
||||
alpha: u8,
|
||||
},
|
||||
/// The one leaf whose own length is a number of pixels it knows before it
|
||||
/// is drawn, which is the hint a rule beside it has to win over.
|
||||
Image,
|
||||
/// Scrolling reads the pixel length of its box, which nothing else here
|
||||
/// does, and gives its child a box longer than its own.
|
||||
Scroll {
|
||||
@@ -443,9 +446,11 @@ impl Kind {
|
||||
}
|
||||
match self {
|
||||
// The one leaf that reads the width it is given, then the one
|
||||
// that does not, then the one that measures nothing at all.
|
||||
// that does not, then the one that measures nothing at all. A
|
||||
// picture measures nothing either, but its length is its own, so
|
||||
// it steps to the leaf that takes whatever it is given.
|
||||
Kind::Wrapped => out.push(Kind::OneLine),
|
||||
Kind::OneLine => out.push(Kind::Rect {
|
||||
Kind::OneLine | Kind::Image => out.push(Kind::Rect {
|
||||
color: 0,
|
||||
alpha: 255,
|
||||
}),
|
||||
@@ -627,9 +632,10 @@ struct Sow<'a> {
|
||||
|
||||
impl Sow<'_> {
|
||||
fn leaf(&mut self) -> Plan {
|
||||
Plan::bare(match self.rng.below(4) {
|
||||
Plan::bare(match self.rng.below(5) {
|
||||
0 => Kind::Wrapped,
|
||||
1 => Kind::OneLine,
|
||||
2 => Kind::Image,
|
||||
_ => {
|
||||
let color = self.rng.below(COLORS.len());
|
||||
let alpha = (self.rng.below(5) * 63) as u8;
|
||||
@@ -793,6 +799,7 @@ pub fn build<Rsc: UiRsc + 'static>(rsc: &mut Rsc, plan: &Plan) -> (StrongWidget,
|
||||
let mut build = Build {
|
||||
rsc,
|
||||
tree: Tree::default(),
|
||||
checkerboard: None,
|
||||
};
|
||||
let root = build.node(plan);
|
||||
(root, build.tree)
|
||||
@@ -801,6 +808,10 @@ pub fn build<Rsc: UiRsc + 'static>(rsc: &mut Rsc, plan: &Plan) -> (StrongWidget,
|
||||
struct Build<'a, Rsc> {
|
||||
rsc: &'a mut Rsc,
|
||||
tree: Tree,
|
||||
/// The checkerboard, uploaded when the first image in this tree is built.
|
||||
/// A handle is a reference to the texture, so every image after that one
|
||||
/// clones this rather than uploading the same picture again.
|
||||
checkerboard: Option<TextureHandle>,
|
||||
}
|
||||
|
||||
impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
|
||||
@@ -826,6 +837,20 @@ impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
|
||||
built
|
||||
}
|
||||
|
||||
/// The one picture the generated trees draw: a 64x64 checkerboard of purple
|
||||
/// and black in 8 px cells. Committed rather than drawn here, so that one
|
||||
/// seed is one tree whatever anything else does, and included rather than
|
||||
/// opened, so that growing a tree does not depend on a working directory.
|
||||
fn checkerboard(&mut self) -> TextureHandle {
|
||||
if self.checkerboard.is_none() {
|
||||
let image = include_bytes!("assets/checkerboard.png")
|
||||
.get_image()
|
||||
.expect("the checkerboard is committed beside this file");
|
||||
self.checkerboard = Some(self.rsc.ui_mut().textures.add(image));
|
||||
}
|
||||
self.checkerboard.clone().unwrap()
|
||||
}
|
||||
|
||||
fn kind(&mut self, kind: &Kind) -> StrongWidget {
|
||||
let id: StrongWidget = match kind {
|
||||
Kind::Wrapped => wtext(WORDS).size(16).wrap(true).add_strong(self.rsc),
|
||||
@@ -834,6 +859,7 @@ impl<Rsc: UiRsc + 'static> Build<'_, Rsc> {
|
||||
.wrap(false)
|
||||
.add_strong(self.rsc),
|
||||
Kind::Rect { color, alpha } => rect(COLORS[*color].alpha(*alpha)).add_strong(self.rsc),
|
||||
Kind::Image => Image::new(self.checkerboard()).add_strong(self.rsc),
|
||||
Kind::Scroll { axis, inner } => {
|
||||
let inner = self.node(inner);
|
||||
let id = Scroll::new(inner, *axis).add(self.rsc);
|
||||
|
||||
@@ -16,6 +16,15 @@ impl Widget for Image {
|
||||
}
|
||||
}
|
||||
|
||||
impl Image {
|
||||
/// One texture already uploaded, for a caller holding its handle: [`image`]
|
||||
/// uploads what it is given, and several widgets showing one picture want
|
||||
/// one upload and one slot between them.
|
||||
pub fn new(handle: TextureHandle) -> Self {
|
||||
Self { handle }
|
||||
}
|
||||
}
|
||||
|
||||
pub fn image<State: UiRsc>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
|
||||
let image = image.get_image().expect("Failed to load image");
|
||||
move |state| Image {
|
||||
|
||||
Reference in new issue
Block a user