Revive drawing capabilities (new and improved!) by cwervo · Pull Request #261 · FolkComputer/folk

cwervo · 2026-05-07T00:48:38Z

This PR is a little large because it touches a bunch of drawing files. We get back a suite of drawing capabilities. This PR also has an unrelated change to running make remote when working out of a git worktree, happy to splice this into another PR.

Some examples of running the demo code via Wish $this runs demo code from builtin-programs/title.folk (which is a new wish added in this PR):

ppkn · 2026-05-07T01:46:05Z

+    lassign $center cx cy
+    set points [list]
+    for {set i 0} {$i < $sides} {incr i} {
+        set theta [expr {$radians + $i * 2.0 * 3.141592653589793 / $sides - 1.5707963267948966}]


I'm slightly surprised that there's no PI (or TAU) constants. Only slightly surprised though.

Oh yeah, I should definitely just expose PI and Tau globals

ppkn · 2026-05-07T15:34:37Z

I plan to test this out on my system today.

ppkn

This looks good. The drawSpaceLib api feels a little clunky always having to pass poselib and display. I wonder if there is a cleaner way we could do that in the future.

I wrote a small way to preview all of the drawing demos every 2 seconds so I could quickly preview them. It didn't work for shapes.folk though so I had to check that out separately.

When the clock time is /t/ {

    set demos {arc circle curve dashed-line fill image line shapes space text}
    set i $(int($t)/2 % [llength $demos])
    set demo [lindex $demos $i]
    Wish $this runs demo code from builtin-programs/draw/${demo}.folk
}

Wish $this is outlined white

cwervo · 2026-05-29T23:40:38Z

Finally going to merge this, it's looking very stable on folk-convivial:

folk_shapes_may_29_2026.mp4

(Will address bringing back connections.folk and resolving the issues in terminal/terminal-ui.folk in future PRs)

osnr · 2026-05-29T23:42:30Z

Can you hold off on merging until I can review? Way too many deep changes here for me to be comfortable landing it

…

On Fri, May 29, 2026, at 7:41 PM, Andrés Cuervo wrote: *cwervo* left a comment (FolkComputer/folk#261) <#261 (comment)> Finally going to merge this, it's looking very stable on folk-convivial: https://github.com/user-attachments/assets/0cbe158b-4208-4547-999d-ca80ee7ec8ac (Will address bringing back connections.folk and resolving the issues in terminal/terminal-ui.folk in future PRs) — Reply to this email directly, view it on GitHub <#261?email_source=notifications&email_token=AAAXUWKKRDTF5Z6CJLYYEPT45INY3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTINJYGA3DQMJXGY3KM4TFMFZW63VQOJSXM2LFO5PXEZLROVSXG5DFMSSWK5TFNZ2KYZTPN52GK4S7MNWGSY3L#issuecomment-4580681766>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAXUWNUICAOHPQXBHRYCU345INY3AVCNFSM6AAAAACYT3FNYWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHM2DKOBQGY4DCNZWGY>. Triage notifications, keep track of coding agent tasks and review pull requests on the go with GitHub Mobile for iOS <https://github.com/notifications/mobile/ios/AAAXUWIRV363ICFY2SC4PXD45INY3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTINJYGA3DQMJXGY3KM4TFMFZW63VQOJSXM2LFO5PXEZLROVSXG5DFMSSWK5TFNZ2KUZTPN52GK4S7NFXXG> and Android <https://github.com/notifications/mobile/android/AAAXUWKTQBK5J7ZV4MSSUA345INY3A5CNFSNUABFM5UWIORPF5TWS5BNNB2WEL2JONZXKZKDN5WW2ZLOOQXTINJYGA3DQMJXGY3KM4TFMFZW63VQOJSXM2LFO5PXEZLROVSXG5DFMSSWK5TFNZ2K4ZTPN52GK4S7MFXGI4TPNFSA>. Download it today! You are receiving this because your review was requested.Message ID: ***@***.***>

cwervo · 2026-05-29T23:48:44Z

@osnr yes, of course! Happy to wait for your review — thanks!

osnr · 2026-05-30T20:07:03Z

        layer $layer
 }
+
+Hold! -on builtin-programs/draw/apriltags.folk -key draw-apriltags-demo-code \


You should just do Claim $this has demo code ... here -- you definitely shouldn't be using Hold! or spelling out the file path.

(in fact, I don't think you should need to use Hold! at all in this entire PR, since it's all purely functional drawing code?)

(and this comment applies to all the demo code in the PR, none of them should use Hold!)

osnr · 2026-05-30T20:10:31Z

+        width $outlineWidth color $color layer $layer
+}
+
+When /thing/ has resolved geometry /geom/ &\


This stuff is really ugly:

I would rather standardize on one variant (even if we have to break compatibility) and/or add some syntax sugar (maybe so one handler can deal with both with and non-with variants?) than have all of this stuff all over the codebase -- it's very low-information-density and hard to read.

osnr · 2026-05-30T20:10:56Z

    // mostly for debugging:
    char* description;
+
+    // Image-wish cache metadata. Cached textures stay resident after the


What bug is fixed by this?

osnr · 2026-05-30T20:11:33Z

 }
+
+When /someone/ wishes /program/ runs demo code from /filename/ {
+    Hold! -key "active-demo-$program" Claim $program running demo code from $filename


shouldn't need to use Hold! ; also not a proper English sentence

cwervo · 2026-05-30T21:41:42Z

Fair — I’ll strip this PR down to just shapes then and make PR’s of the other batches of work with more proof/documentation. Thanks!

… early return on 3-point/4-point quads

cwervo · 2026-06-02T04:34:14Z

Will remove this from this PR tomorrow, accidentally mixed unrelated work back into this branch, apologies!

osnr · 2026-06-02T14:42:19Z

+            return vec4(0.0);
+        }]]
+
+        When the color map is /colorMap/ &\


Weird indentation here

osnr · 2026-06-02T15:58:07Z

+            set options [dict merge $options [dict get $result options]]
        }
-        set options [dict create x $x y $y scale $defaultScale]
-        # FIXME: support per-label options; right now, this just


We probably still need this FIXME comment?

osnr · 2026-06-02T16:00:00Z

+    When the color map is /colorMap/ &\
+        /p/ has canvas /id/ with /...wiOptions/ &\
+        /p/ has canvas projection /surfaceToClip/ &\
+        the collected results for [list /someone/ wishes to draw a circle onto /canvas/ with /...options/] are /results/ {


why is this a collect and not just a When?

osnr · 2026-06-02T16:01:25Z

+
+                        Wish to draw a polygon onto $page with points $points {*}$fillOpts
+                    }
+


the rest of this file is weird / repetitive

osnr · 2026-06-02T16:02:07Z


        set im [{*}$loadImage "[pwd]/vendor/fonts/$name.png"]
-        Wish the GPU loads image $im as texture
+        Wish the GPU loads image $im as texture with pinned true


does this do anything?

Vestigial, yep, removed

cwervo · 2026-06-02T16:08:45Z

@osnr - a bunch of changes made it through from erroneously merging a previous version of this branch (the source of many of these weird formatting / confusing no-op edits / unnecessary collects). Will go through again this afternoon and fix again, sorry for the mess, I should have waited to re-request review until today.

osnr · 2026-06-12T15:17:27Z

+set ::PI 3.142
+set ::TAU 6.283
+
+proc drawTruthy {value} {


I think we should probably get rid of this function and just fix the shader value coercion to convert all of these to 1?

osnr · 2026-06-12T15:18:00Z

                set maxLength $lineLength
            }
        }
+        if {$maxLength == 0} {


shouldn't we just return early here? also removed the comment for the other set scale

osnr · 2026-06-12T15:19:00Z

+    Wish $p draws a $shape with {*}$options
+}
+
+When /someone/ wishes /p/ draws a rect with width /width/ height /height/ {


mentioned in prev comment but we shouldn't need most of the variants in this file

osnr · 2026-06-15T21:57:41Z

            tailcall "$drawLib $drawLibCmd" {*}$args
        }
    }
+


Does this code do anything / is it actually called? It should already be present in pipelines.folk

Nope, not called anywhere, removed! Annoyingly, I think I kept recovering old branch state and accidentally committing it.

cwervo requested review from osnr and ppkn and removed request for osnr May 7, 2026 00:48

ppkn reviewed May 7, 2026

View reviewed changes

ppkn approved these changes May 8, 2026

View reviewed changes

cwervo force-pushed the ac/drawing-may-2026 branch 2 times, most recently from 23d2434 to e5e18de Compare May 20, 2026 23:58

cwervo force-pushed the ac/drawing-may-2026 branch 14 times, most recently from 7056a3e to 2282866 Compare May 29, 2026 22:33

osnr reviewed May 30, 2026

View reviewed changes

Scope PR down to just shape drawing

ab19c26

cwervo force-pushed the ac/drawing-may-2026 branch from 8cb109e to ab19c26 Compare June 1, 2026 19:45

cwervo added 4 commits June 1, 2026 18:58

Inline label fns

15b5ef6

Scope PR down to just shape drawing

2c20d3d

Fix circle rendering via branchless float bounds shader and fill.folk…

7301724

… early return on 3-point/4-point quads

Merge branch 'split-drawing-pr-refactor' into ac/drawing-may-2026

93f13c6

cwervo requested review from osnr and smj-edison June 2, 2026 04:28

cwervo commented Jun 2, 2026

View reviewed changes

osnr reviewed Jun 2, 2026

View reviewed changes

Fix indendation, weird options hack, label comment

dd1d121

cwervo requested a review from osnr June 11, 2026 16:18

osnr reviewed Jun 12, 2026

View reviewed changes

cwervo added 3 commits June 15, 2026 13:06

Coerce shader values

7816cf2

Early return from empty lines of text

12033dd

Simplify shape wishes, remove errant "with pinned" for text

37cf0f3

cwervo requested a review from osnr June 15, 2026 19:16

cwervo force-pushed the ac/drawing-may-2026 branch 2 times, most recently from bc81cb0 to 6a50807 Compare June 15, 2026 19:30

osnr reviewed Jun 15, 2026

View reviewed changes

Merge main

9c1edde

cwervo force-pushed the ac/drawing-may-2026 branch from 6a50807 to 9c1edde Compare June 15, 2026 22:41


		Wish to draw a polygon onto $page with points $points {*}$fillOpts
		}

Uh oh!

Conversation

cwervo commented May 7, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ppkn commented May 7, 2026

Uh oh!

ppkn left a comment

Choose a reason for hiding this comment

Uh oh!

cwervo commented May 29, 2026

Uh oh!

osnr commented May 29, 2026 via email

Uh oh!

cwervo commented May 29, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cwervo commented May 30, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cwervo Jun 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cwervo commented Jun 2, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

cwervo Jun 15, 2026 •

edited

Loading