Skip to content

Implement svg rendering for pd-vanilla and plugdata #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timothyschoen wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Implement svg rendering for pd-vanilla and plugdata #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf0cc0e
Implement svg rendering for pd-vanilla and plugdata
timothyschoen Mar 5, 2025
fa1de4e
Make macros consistent, get rid of deprecated sys_vgui, fix a bunch o…
timothyschoen Mar 6, 2025
c76c7db
Add svg rendering demo to helpfile
timothyschoen Mar 6, 2025
4d49c3e
Fix bug when deleting a duplicate svg image
timothyschoen Mar 7, 2025
4d449d3
Update example
timothyschoen Mar 8, 2025
8502dee
Clean up hashing
timothyschoen Mar 8, 2025
f363065
Fix blunder
timothyschoen Mar 8, 2025
96d3cee
Fix warnings, fix potential freeze when rendering very large svg image
timothyschoen Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions pdlua.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ static void pdlua_motion(t_gobj *z, t_floatarg dx, t_floatarg dy,
t_floatarg up)
#endif
{
#if !PLUGDATA
#ifndef PLUGDATA
#ifndef PURR_DATA
if (!up)
#endif
Expand All @@ -806,7 +806,7 @@ static void pdlua_motion(t_gobj *z, t_floatarg dx, t_floatarg dy,

static int pdlua_click(t_gobj *z, t_glist *gl, int xpos, int ypos, int shift, int alt, int dbl, int doit){
t_pdlua *x = (t_pdlua *)z;
#if !PLUGDATA
#ifndef PLUGDATA
if(x->has_gui)
{
int zoom = glist_getzoom(gl);
Expand Down Expand Up @@ -842,13 +842,12 @@ static int pdlua_click(t_gobj *z, t_glist *gl, int xpos, int ypos, int shift, in

static void pdlua_displace(t_gobj *z, t_glist *glist, int dx, int dy){
t_pdlua *x = (t_pdlua *)z;


if(x->has_gui)
{
x->pd.te_xpix += dx, x->pd.te_ypix += dy;
dx *= glist_getzoom(glist), dy *= glist_getzoom(glist);
#if !PLUGDATA
#ifndef PLUGDATA
gfx_displace((t_pdlua*)z, glist, dx, dy);
#endif
}
Expand Down Expand Up @@ -1051,7 +1050,7 @@ static void pdlua_menu_open(t_pdlua *o)
if (nw_gui_vmess)
nw_gui_vmess("open_textfile", "s", pathname);
else
sys_vgui("::pd_menucommands::menu_openfile {%s}\n", pathname);
pdgui_vmess("::pd_menucommands::menu_openfile", "s", pathname);
#endif
} else {
lua_pop(__L(), 2); /* pop name, global "pd"*/
Expand Down Expand Up @@ -1449,7 +1448,7 @@ static int pdlua_object_new(lua_State *L)
o->gfx.width = 80;
o->gfx.height = 80;

#if !PLUGDATA
#ifndef PLUGDATA
// Init graphics state for pd
o->gfx.mouse_drag_x = 0;
o->gfx.mouse_drag_y = 0;
Expand Down
7 changes: 5 additions & 2 deletions pdlua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ typedef struct _pdlua_gfx
int width, height;
void *object;

#if !PLUGDATA
#ifndef PLUGDATA
char object_tag[128]; // Tcl/tk tag that is attached to all drawings
char order_tag[64]; // Tag for invisible line, used to preserve correct object ordering
char current_item_tag[64]; // Tcl/tk tag that is only attached to the current drawing in progress
Expand All @@ -45,7 +45,10 @@ typedef struct _pdlua_gfx
// Variables to keep track of mouse button state and drag position
int mouse_drag_x, mouse_drag_y, mouse_down;
int first_draw;

#ifndef PURR_DATA
uint64_t* images;
int num_images;
#endif
#else
int current_layer;
void(*plugdata_draw_callback)(void*, int, t_symbol*, int, t_atom*); // Callback to perform drawing in plugdata
Expand Down
19 changes: 17 additions & 2 deletions pdlua/hello-gui.pd_lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ function hello:initialize(sel, atoms)
self.mouse_down_pos = {0, 0}
self.rect_down_pos = {0, 0}

self:set_size(630, 230)
self:set_size(720, 230)
return true
end

Expand Down Expand Up @@ -58,7 +58,7 @@ function hello:mouse_drag(x, y)
if dragging_rect == true then
self.draggable_rect_x = self.rect_down_pos[0] + (x - self.mouse_down_pos[0])
self.draggable_rect_y = self.rect_down_pos[1] + (y - self.mouse_down_pos[1])
self.draggable_rect_x = math.clamp(self.draggable_rect_x, 0, 620 - self.draggable_rect_size)
self.draggable_rect_x = math.clamp(self.draggable_rect_x, 0, 710 - self.draggable_rect_size)
self.draggable_rect_y = math.clamp(self.draggable_rect_y, 0, 230 - self.draggable_rect_size)
self:repaint(3)
end
Expand Down Expand Up @@ -153,6 +153,7 @@ function hello:paint(g)
g:draw_text("Bezier Paths", 360, 190, 120, 12)
g:draw_text("Animation", 460, 190, 120, 12)
g:draw_text(" Mouse\nInteraction", 540, 190, 120, 12)
g:draw_text(" SVG\nRendering", 640, 190, 120, 12)
end

function hello:paint_layer_2(g)
Expand All @@ -168,6 +169,20 @@ function hello:paint_layer_3(g)
g:draw_text("Drag\n me!", self.draggable_rect_x + 8, self.draggable_rect_y + 10, self.draggable_rect_size, 12)
end

function hello:paint_layer_4(g)
-- Draggable rectangle
local svg_demo_1 = [[
<svg width="42" height="42" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M12.394 5.925 10.523 4.41A1.842 1.842 0 0 0 9.363 4C7.956 4 7.068 5.514 7.756 6.742l.382.682 3.463-.722c.056-.012.17-.06.294-.21.14-.17.308-.362.499-.567ZM3 20a1 1 0 0 1 1-1h16a1 1 0 1 1 0 2H4a1 1 0 0 1-1-1Z" fill="#FFFFFF"/><path d="M21.547 6.83c-.945-1.084-2.617-2.5-4.855-2.327-.929.071-1.77.549-2.429 1.057a10.429 10.429 0 0 0-1.598 1.57c-.243.293-.546.486-.86.551l-4.663.972-.966-1.771A1.691 1.691 0 0 0 3 7.692v3.69a2.294 2.294 0 0 0 2.727 2.252l3.3-.635-.507 1.234a2.004 2.004 0 0 0 3.456 1.966l3.236-4.315 5.37-1.852a2.141 2.141 0 0 0 1.343-1.32 1.898 1.898 0 0 0-.378-1.883Z" fill="#FFFFFF"/></svg>
]]

local svg_demo_2 = [[
<svg width="42" height="42" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M16 2a6 6 0 0 1 4.396 10.084l-.19.194-8.727 8.727-.053.05-.056.045a3.721 3.721 0 0 1-5.253-5.242l.149-.164.015-.011 7.29-7.304a1 1 0 0 1 1.416 1.413l-7.29 7.304-.012.008a1.721 1.721 0 0 0 2.289 2.553l.122-.1.001.001 8.702-8.7.159-.165a4 4 0 0 0-5.753-5.554l-.155.16-.018.012-9.326 9.33a1 1 0 0 1-1.414-1.415L11.6 3.913l.046-.043A5.985 5.985 0 0 1 16 2Z" fill="#FFFFFF"/></svg>
]]

g:draw_svg(svg_demo_1, 650, 40)
g:draw_svg(svg_demo_2, 650, 120)
end

function hello:tick()
self.circle_y = self.circle_y + self.animation_speed
if self.circle_y > 160 + self.circle_radius then
Expand Down
Loading
Loading