aboutsummaryrefslogtreecommitdiff
path: root/src/room_sim_3d.c
diff options
context:
space:
mode:
authormusil <tmusil@users.sourceforge.net>2011-08-03 23:57:15 +0000
committermusil <tmusil@users.sourceforge.net>2011-08-03 23:57:15 +0000
commitd0076cf63e92a3ae669c56d4875cd8c985988033 (patch)
treeb43d73d32d160f03b1781c2a1459046eed0355ba /src/room_sim_3d.c
parentf2b14584f1aed4f835b8c03db4e64842889320ea (diff)
changed sys_vgui('%x') to sys_vgui('%lx')
svn path=/trunk/externals/iem/iemgui/; revision=15196
Diffstat (limited to 'src/room_sim_3d.c')
-rw-r--r--src/room_sim_3d.c75
1 files changed, 37 insertions, 38 deletions
diff --git a/src/room_sim_3d.c b/src/room_sim_3d.c
index ba9d838..455e6ee 100644
--- a/src/room_sim_3d.c
+++ b/src/room_sim_3d.c
@@ -94,7 +94,7 @@ static void room_sim_3d_draw_update(t_room_sim_3d *x, t_glist *glist)
dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
}
@@ -112,7 +112,7 @@ void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist)
int fsi, fs=x->x_fontsize;
t_canvas *canvas=glist_getcanvas(glist);
- sys_vgui(".x%x.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %xBASE\n",
+ sys_vgui(".x%lx.c create rectangle %d %d %d %d -fill #%6.6x -outline #%6.6x -tags %lxBASE\n",
canvas, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h,
x->x_gui.x_bcol, x->x_gui.x_fsf.x_selected?IEM_GUI_COLOR_SELECTED:IEM_GUI_COLOR_NORMAL, x);
for(i=1; i<=n; i++)
@@ -120,26 +120,26 @@ void room_sim_3d_draw_new(t_room_sim_3d *x, t_glist *glist)
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c create text %d %d -text {%d} -anchor c \
- -font {times %d bold} -fill #%6.6x -tags %xSRC%d\n",
+ sys_vgui(".x%lx.c create text %d %d -text {%d} -anchor c \
+ -font {times %d bold} -fill #%6.6x -tags %lxSRC%d\n",
canvas, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i], i, fsi,
x->x_col_src[i], x, i);
}
- sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD\n",
+ sys_vgui(".x%lx.c create oval %d %d %d %d -outline #%6.6x -tags %lxHEAD\n",
canvas, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1,
x->x_gui.x_fcol, x);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= x->x_pix_rad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c create oval %d %d %d %d -outline #%6.6x -tags %xHEAD2\n",
+ sys_vgui(".x%lx.c create oval %d %d %d %d -outline #%6.6x -tags %lxHEAD2\n",
canvas, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1,
x->x_gui.x_fcol, x);
dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %xNOSE\n",
+ sys_vgui(".x%lx.c create line %d %d %d %d -width 3 -fill #%6.6x -tags %lxNOSE\n",
canvas, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy,
x->x_gui.x_fcol, x);
@@ -157,7 +157,7 @@ void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist)
int fsi, fs=x->x_fontsize;
t_canvas *canvas=glist_getcanvas(glist);
- sys_vgui(".x%x.c coords %xBASE %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxBASE %d %d %d %d\n",
canvas, x, xpos, ypos, xpos + x->x_gui.x_w, ypos + x->x_gui.x_h);
n = x->x_nr_src;
for(i=1; i<=n; i++)
@@ -165,23 +165,23 @@ void room_sim_3d_draw_move(t_room_sim_3d *x, t_glist *glist)
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n",
canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
}
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-x->x_pix_rad, ypos+x->x_pix_src_y[0]-x->x_pix_rad,
xpos+x->x_pix_src_x[0]+x->x_pix_rad-1, ypos+x->x_pix_src_y[0]+x->x_pix_rad-1);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= x->x_pix_rad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
dx = -(int)((t_float)x->x_pix_rad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
dy = -(int)((t_float)x->x_pix_rad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+dx, ypos+x->x_pix_src_y[0]+dy);
}
@@ -191,15 +191,15 @@ void room_sim_3d_draw_erase(t_room_sim_3d* x, t_glist* glist)
int i, n;
t_canvas *canvas=glist_getcanvas(glist);
- sys_vgui(".x%x.c delete %xBASE\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
n = x->x_nr_src;
for(i=1; i<=n; i++)
{
- sys_vgui(".x%x.c delete %xSRC%d\n", canvas, x, i);
+ sys_vgui(".x%lx.c delete %lxSRC%d\n", canvas, x, i);
}
- sys_vgui(".x%x.c delete %xHEAD\n", canvas, x);
- sys_vgui(".x%x.c delete %xHEAD2\n", canvas, x);
- sys_vgui(".x%x.c delete %xNOSE\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxHEAD\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxHEAD2\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxNOSE\n", canvas, x);
}
void room_sim_3d_draw_select(t_room_sim_3d* x, t_glist* glist)
@@ -211,11 +211,11 @@ void room_sim_3d_draw_select(t_room_sim_3d* x, t_glist* glist)
int xpos=text_xpix(&x->x_gui.x_obj, glist);
int ypos=text_ypix(&x->x_gui.x_obj, glist);
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
+ sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_SELECTED);
}
else
{
- sys_vgui(".x%x.c itemconfigure %xBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL);
+ sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, IEM_GUI_COLOR_NORMAL);
}
}
@@ -329,18 +329,18 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
x->x_pix_src_y[0] = x->x_gui.x_h;
}
room_sim_3d_out_para(x);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= x->x_pix_rad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
}
@@ -358,7 +358,7 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
}
else
{
@@ -380,9 +380,9 @@ static void room_sim_3d_motion(t_room_sim_3d *x, t_floatarg dx, t_floatarg dy)
fsi = H2 + (H + 2 * x->x_pix_src_z[sel]) * x->x_pix_src_z[sel];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n",
canvas, x, sel, xpos+x->x_pix_src_x[sel], ypos+x->x_pix_src_y[sel]);
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, sel, fsi);
}
}
}
@@ -511,7 +511,7 @@ static void room_sim_3d_src_font(t_room_sim_3d *x, t_floatarg ff)
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
}
}
@@ -577,9 +577,9 @@ static void room_sim_3d_set_src_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_a
fsi = H2 + (H + 2 * x->x_pix_src_z[i]) * x->x_pix_src_z[i];
fsi *= fs;
fsi /= 2*H2;
- sys_vgui(".x%x.c coords %xSRC%d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxSRC%d %d %d\n",
canvas, x, i, xpos+x->x_pix_src_x[i], ypos+x->x_pix_src_y[i]);
- sys_vgui(".x%x.c itemconfigure %xSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -font {times %d bold}\n", canvas, x, i, fsi);
}
}
@@ -626,18 +626,18 @@ static void room_sim_3d_set_head_xyz(t_room_sim_3d *x, t_symbol *s, int argc, t_
x->x_pix_src_y[0] = x->x_gui.x_h/2 - (int)(x->x_cnvrt_roomlx2pixh * yh + 0.49999f);
x->x_pix_src_z[0] = (int)(x->x_cnvrt_roomlx2pixh * zh + 0.49999f);
- sys_vgui(".x%x.c coords %xHEAD %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-pixrad, ypos+x->x_pix_src_y[0]-pixrad,
xpos+x->x_pix_src_x[0]+pixrad-1, ypos+x->x_pix_src_y[0]+pixrad-1);
rad2 = H2 + (H + 2 * x->x_pix_src_z[0]) * x->x_pix_src_z[0];
rad2 *= pixrad;
rad2 /= 8*H2;
- sys_vgui(".x%x.c coords %xHEAD2 %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxHEAD2 %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0]-rad2, ypos+x->x_pix_src_y[0]-rad2,
xpos+x->x_pix_src_x[0]+rad2-1, ypos+x->x_pix_src_y[0]+rad2-1);
ddx = -(int)((t_float)pixrad*(t_float)sin(x->x_rho_head*0.0174533f) + 0.49999f);
ddy = -(int)((t_float)pixrad*(t_float)cos(x->x_rho_head*0.0174533f) + 0.49999f);
- sys_vgui(".x%x.c coords %xNOSE %d %d %d %d\n",
+ sys_vgui(".x%lx.c coords %lxNOSE %d %d %d %d\n",
canvas, x, xpos+x->x_pix_src_x[0], ypos+x->x_pix_src_y[0],
xpos+x->x_pix_src_x[0]+ddx, ypos+x->x_pix_src_y[0]+ddy);
}
@@ -705,7 +705,7 @@ static void room_sim_3d_room_col(t_room_sim_3d *x, t_floatarg fcol)
col = 29;
x->x_gui.x_bcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
+ sys_vgui(".x%lx.c itemconfigure %lxBASE -fill #%6.6x\n", canvas, x, x->x_gui.x_bcol);
}
static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol)
@@ -725,9 +725,9 @@ static void room_sim_3d_head_col(t_room_sim_3d *x, t_floatarg fcol)
col = 29;
x->x_gui.x_fcol = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
- sys_vgui(".x%x.c itemconfigure %xHEAD2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
- sys_vgui(".x%x.c itemconfigure %xNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ sys_vgui(".x%lx.c itemconfigure %lxHEAD -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ sys_vgui(".x%lx.c itemconfigure %lxHEAD2 -outline #%6.6x\n", canvas, x, x->x_gui.x_fcol);
+ sys_vgui(".x%lx.c itemconfigure %lxNOSE -fill #%6.6x\n", canvas, x, x->x_gui.x_fcol);
}
static void room_sim_3d_src_col(t_room_sim_3d *x, t_symbol *s, int argc, t_atom *argv)
@@ -753,7 +753,7 @@ static void room_sim_3d_src_col(t_room_sim_3d *x, t_symbol *s, int argc, t_atom
col = 29;
x->x_col_src[j] = my_iemgui_color_hex[col];
}
- sys_vgui(".x%x.c itemconfigure %xSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
+ sys_vgui(".x%lx.c itemconfigure %lxSRC%d -fill #%6.6x\n", canvas, x, j, x->x_col_src[j]);
}
}
}
@@ -927,7 +927,6 @@ void room_sim_3d_setup(void)
{
room_sim_3d_class = class_new(gensym("room_sim_3d"), (t_newmethod)room_sim_3d_new,
(t_method)room_sim_3d_ff, sizeof(t_room_sim_3d), 0, A_GIMME, 0);
-// class_addcreator((t_newmethod)room_sim_3d_new, gensym("room_sim_3d"), A_GIMME, 0);
class_addmethod(room_sim_3d_class, (t_method)room_sim_3d_click, gensym("click"),
A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
class_addmethod(room_sim_3d_class, (t_method)room_sim_3d_motion, gensym("motion"),