art-dag/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ascii_dual_blend recipe and fix blend/layer effects

Browse Source 
- Add ascii_dual_blend.sexp: blends two ASCII-processed videos synced to audio
- Fix blend.sexp: add require-primitives, fix params syntax
- Fix layer.sexp: add require-primitives
- Use consistent (effect blend ...) syntax instead of special form

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
gilesb
2026-01-20 09:19:40 +00:00
parent d574d5badd
commit e3c6163e2e
3 changed files with 117 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sexp_effects/effects/blend.sexp
View File

@@ -3,17 +3,19 @@
;; Params:
;; mode - blend mode (add, multiply, screen, overlay, difference, lighten, darken, alpha)
;; opacity - blend amount (0-1)
;; resize-mode - how to resize frame-b to match frame-a (fit, crop, stretch)
;; resize_mode - how to resize frame-b to match frame-a (fit, crop, stretch)
;; priority - which dimension takes priority (width, height)
;; pad-color - color for padding in fit mode [r g b]
;; pad_color - color for padding in fit mode [r g b]
(require-primitives "image" "blending")
(define-effect blend
:params (
(mode :type string :default "overlay")
(opacity :type float :default 0.5)
(resize_mode :type string :default "fit")
(priority :type string :default "width")
(list :type string :default 0 0 0)
)
(pad_color :type list :default [0 0 0])
)
(let [a frame-a
a-w (width a)
@@ -24,31 +26,31 @@
;; Calculate scale based on resize mode and priority
scale-w (/ a-w b-w)
scale-h (/ a-h b-h)
scale (if (= resize-mode "stretch")
scale (if (= resize_mode "stretch")
1 ;; Will use explicit dimensions
(if (= resize-mode "crop")
(if (= resize_mode "crop")
(max scale-w scale-h) ;; Scale to cover, then crop
(if (= priority "width")
scale-w
scale-h)))
;; For stretch, use target dimensions directly
new-w (if (= resize-mode "stretch") a-w (round (* b-w scale)))
new-h (if (= resize-mode "stretch") a-h (round (* b-h scale)))
new-w (if (= resize_mode "stretch") a-w (round (* b-w scale)))
new-h (if (= resize_mode "stretch") a-h (round (* b-h scale)))
;; Resize b
b-resized (resize b-raw new-w new-h "linear")
;; Handle fit (pad) or crop to exact size
b (if (= resize-mode "crop")
b (if (= resize_mode "crop")
;; Crop to center
(let [cx (/ (- new-w a-w) 2)
cy (/ (- new-h a-h) 2)]
(crop b-resized cx cy a-w a-h))
(if (and (= resize-mode "fit") (or (!= new-w a-w) (!= new-h a-h)))
(if (and (= resize_mode "fit") (or (!= new-w a-w) (!= new-h a-h)))
;; Pad to center
(let [pad-x (/ (- a-w new-w) 2)
pad-y (/ (- a-h new-h) 2)
canvas (make-image a-w a-h pad-color)]
canvas (make-image a-w a-h pad_color)]
(paste canvas b-resized pad-x pad-y))
b-resized))]
(if (= mode "alpha")
(blend-images a b opacity)
(blend-images a (blend-mode a b mode) opacity)))
(blend-images a (blend-mode a b mode) opacity))))

2
sexp_effects/effects/layer.sexp
View File

@@ -2,6 +2,8 @@
;; Multi-input effect: uses frame-a (background) and frame-b (overlay)
;; Params: x, y (position), opacity (0-1), mode (blend mode)
(require-primitives "image" "blending")
(define-effect layer
:params (
(x :type int :default 0)