Cosmic text 0.11 #124

bytemunch · 2024-03-06T10:03:16Z

Updates cosmic-text to 0.11, rips out inbuilt functionality in favour of a more modular design.

Todo before merging:

Clicking in a text box that has been edited without being unfocused places the cursor incorrectly
Fix setting a FocusedWidget before widget instantiation (i.e in Startup)
Configurable cursor, selection colors
Run layout and shaping systems only when needed ~~(And whenever needed, dynamically setting text doesn't update)~~
Update examples with new API
Pass tests

Embrace regression, create modularity
~~- [ ] Reimplement placeholders~~
~~- [ ] Reimplement password fields~~
~~- [ ] Reimplement undo/redo~~
~~- [ ] Check for other regressions~~

i should really put them somewhere else on my machine

Dimchikkk · 2024-03-06T10:06:10Z

src/lib.rs

-#[derive(Component)]
-pub struct CosmicEditor(pub Editor);
+#[derive(Component, Deref, DerefMut)]
+pub struct CosmicEditor(pub Editor<'static>);


bytemunch · 2024-03-07T21:28:14Z

Example basic_ui is where I'm testing these changes, the widget works for editing when defocused (ESC) and then focused again. Still doesn't modify the underlying buffer, borrow checker skill issues lol

Dimchikkk · 2024-03-08T09:50:45Z

Let me try to test basic_ui today ;)

Dimchikkk · 2024-03-08T10:04:52Z

It's white screen for me :) but I see some widget text in console

lots of cloning but seems to be the only way if buffers are in the ECS editor widgets don't relayout when edited, but when unfocused the buffer does

Dimchikkk · 2024-03-14T11:14:15Z

editable banana, nice :D

uhoh it's looking like im using the not a starting point pr as a starting point lol

Dimchikkk · 2024-03-17T11:16:17Z

@bytemunch we need to have some plan how bring this branch into main... what the scope of tasks we have to deliver to make it work, any ideas? :)

bytemunch · 2024-03-17T11:35:39Z

Updated the PR message with a checklist (from the top of my head, I'm sure there'll be more to get done but so far unknown unknowns)

Hopefully most of the work can be easily reimported from the main branch, but with so many code changes already compatibility is uncertain.

Feel free to edit the checklist with anything you can think of that I have missed, lmk if this scope sounds appropriate

Dimchikkk · 2024-03-17T21:47:11Z

What comes to mind...

would be cool to have core module that supports only essential things: like input handling and drawing text and then move everything else (like password, placeholder, auto-height, undo-redo, etc) into separate modules (bevy plugins maybe?). Undo-redo wasn't implemented perfectly for example... there is https://github.com/pop-os/cosmic_undo_2 that we could take inspiration from... if we split undo-redo functionality to another plugin it would be easier to refactor/improve it in this case.

another thing is ab_glyph that used for text rendering in bevy can give position of "text curves" to draw text in 3d... would be cool to know whether cosmic-text can give the same thing....

another thing is trying to marry vello + cosmic-text + bevy to use GPU for text rendering.. if it's not feasible we could think about how we can speed text drawing up... maybe to use rayon to utilise all CPUs for pixel calculation.

bytemunch · 2024-03-18T08:43:52Z

Yeah that sounds like a more maintainable way forward, though I do find the bevy plugin dependency issue pretty difficult to work with. Maybe for now we could use internal plugins in the same crate (lose for binary size but makes plugin interop a non issue), and once bevyengine/bevy#69 is fixed split modules out to their own crates?

Binary size issue can be addressed with feature flags for toggling internal plugins on and off.

Dropping scope to a core module is a great move though, unix philosophy and all that.

Dimchikkk · 2024-03-18T09:57:36Z

Yep, internal plugins sounds good.

adds a util crate for common example systems also removes history tracking structs

MV `bevy_api_testing.rs` > `sprite_and_ui_clickable.rs`

simplifys API and mirrors Bevy's Text functions more closely

Dimchikkk · 2024-03-19T14:05:01Z

so close no matter how far :)

…evy_cosmic_edit into testing_cosmic-text_0.11

bytemunch · 2024-03-19T15:55:28Z

Aah i have duplicate commits from working offline 😆 Just pushed cos I couldn't figure out how to marry them >.<

Dimchikkk · 2024-03-19T16:19:10Z

@bytemunch could you elaborate on "Fix setting a FocusedWidget"?

bytemunch · 2024-03-19T16:25:16Z

@bytemunch could you elaborate on "Fix setting a FocusedWidget"?

Yeah I'm trying to sort it now, it's a systems ordering issue that means that sometimes a widget that should have text in it that is focused at startup appears blank. Currently fixed in all examples by never starting with a focused widget. I don't think it's too important to start up with focus, but I don't know if the issue would persist in a scene change or something similar where auto-focus is desirable.

Now I've written that I realise it's because I'm setting the focus in Update while layout runs in PostUpdate, but explicitly ordering the relevant systems is still giving me buggy behaviour :(

bytemunch · 2024-03-19T16:29:46Z

Got it :) was letting set_widget_size and set_buffer_size run unordered, when they need to be in order

Dimchikkk · 2024-03-19T16:44:45Z

Makes sense.... good job 👍

Just throwing some info at you :D

I made a small check yesterday: it's indeed possible to get outline curves using cosmic-text for the given font... and I know that it's possible to create meshes for each glyph using lyon... I am brainstorming whether it makes sense to adopt this approach in the future... instead of generating pixels using cosmic-text draw calls and replacing bevy asset... do something like this: https://github.com/tigregalis/bevy_text3d but using cosmic-text for obtaining outline commands to draw text.

bytemunch · 2024-03-19T19:42:33Z

Definitely something to look into, could be better for both perf and rendering.

I'll throw some ideas back lol.

If we can somehow make the rendering itself an (internal) plugin then creating a mesh renderer would be simpler. Figuring out how the upcoming internal plugin architecture works should show if and how such a system can work. I'll try implementing placeholders and password fields as plugins after this PR meets goals, that should set the groundwork for a pluggable renderer.
Rambling a bit but I guess I'm saying decoupling rendering and data allows for everything above and more. Plus, a data-only core module could just slot straight into bevy upstream, far as I understand the inner bevy components are essentially plugins themselves.

Dimchikkk · 2024-03-20T09:55:29Z

Yeah, abstracting renderer sounds cool 👍

Then, bevy_cosmit_edit can have multiple renderers...

Dimchikkk · 2024-03-20T10:16:15Z

There is tiny bug: when widget becomes active cursor first jumps to the beginning of buffer then on desired position but I think we can live with that

bytemunch · 2024-03-20T10:30:45Z

There is tiny bug: when widget becomes active cursor first jumps to the beginning of buffer then on desired position but I think we can live with that

Yeah I noticed, will have to time it to find out more, if it's a single frame delay then it could be a systems ordering thing

bytemunch added 2 commits March 6, 2024 09:46

barely got text entry working again

02aa62b

remove local optimizations

4b8a947

i should really put them somewhere else on my machine

Dimchikkk reviewed Mar 6, 2024

View reviewed changes

delete most stuff to get the basics nearly working

08a30d5

editable text

7547399

lots of cloning but seems to be the only way if buffers are in the ECS editor widgets don't relayout when edited, but when unfocused the buffer does

Dima and others added 3 commits March 14, 2024 11:37

fix backspace on native and make basic_ui wasm editable

904e537

fix mid-edit layout

56e1d2f

reimplement text cursor blinking

52a0bfe

uhoh it's looking like im using the not a starting point pr as a starting point lol

bytemunch changed the title ~~Cosmic text 0.11 testing~~ Cosmic text 0.11 Mar 17, 2024

bytemunch added 4 commits March 18, 2024 13:02

update basic_sprite example

656ca6a

adds a util crate for common example systems also removes history tracking structs

image_background+bevy_api_testing examples

7d17559

MV `bevy_api_testing.rs` > `sprite_and_ui_clickable.rs`

remove CosmicText in favor of buffer functions

540e509

simplifys API and mirrors Bevy's Text functions more closely

strip autoheight + example, update other examples

9c11e85

bytemunch and others added 7 commits March 19, 2024 14:34

fix wasm compilation

f29de93

clippy

11c0fe6

fix text

05b601d

fix clippy

6af60b6

fix wasm

c5da0fd

fix import

a7e3e0e

add changelog

96c1d5a

Merge branch 'testing_cosmic-text_0.11' of github.com:StaffEngineer/b…

9228cf4

…evy_cosmic_edit into testing_cosmic-text_0.11

bytemunch added 2 commits March 19, 2024 15:58

fix mouse cursor hover on sprite widget

8794b66

fix editor cursor location when edited

ca605b2

fix blank widget when focused on startup

7ade745

bytemunch added 3 commits March 19, 2024 20:06

configurable cursor/selection colors

80bd39c

run layout functions when needed

8c8df5b

fix ui widget mouse cursor

3825ffb

bytemunch marked this pull request as ready for review March 20, 2024 08:01

fix scale change

708c8d3

Dimchikkk merged commit 696fe6f into main Mar 20, 2024
4 checks passed

Dimchikkk deleted the testing_cosmic-text_0.11 branch March 20, 2024 10:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cosmic text 0.11 #124

Cosmic text 0.11 #124

bytemunch commented Mar 6, 2024 •

edited

Loading

Dimchikkk Mar 6, 2024

bytemunch commented Mar 7, 2024

Dimchikkk commented Mar 8, 2024

Dimchikkk commented Mar 8, 2024

Dimchikkk commented Mar 14, 2024

Dimchikkk commented Mar 17, 2024

bytemunch commented Mar 17, 2024

Dimchikkk commented Mar 17, 2024 •

edited

Loading

bytemunch commented Mar 18, 2024

Dimchikkk commented Mar 18, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 20, 2024

Dimchikkk commented Mar 20, 2024

bytemunch commented Mar 20, 2024

Cosmic text 0.11 #124

Cosmic text 0.11 #124

Conversation

bytemunch commented Mar 6, 2024 • edited Loading

Dimchikkk Mar 6, 2024

Choose a reason for hiding this comment

bytemunch commented Mar 7, 2024

Dimchikkk commented Mar 8, 2024

Dimchikkk commented Mar 8, 2024

Dimchikkk commented Mar 14, 2024

Dimchikkk commented Mar 17, 2024

bytemunch commented Mar 17, 2024

Dimchikkk commented Mar 17, 2024 • edited Loading

bytemunch commented Mar 18, 2024

Dimchikkk commented Mar 18, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 19, 2024

bytemunch commented Mar 19, 2024

Dimchikkk commented Mar 20, 2024

Dimchikkk commented Mar 20, 2024

bytemunch commented Mar 20, 2024

bytemunch commented Mar 6, 2024 •

edited

Loading

Dimchikkk commented Mar 17, 2024 •

edited

Loading