walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[draw] Add public move_to/line_to/... API that take a draw-state

This commit is contained in:
Behdad Esfahbod 2022-02-03 13:58:36 -06:00
parent 9f05362d43
commit a9dd9f0bae
5 changed files with 170 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/hb-draw.cc
View File

@ -238,4 +238,55 @@ hb_draw_funcs_is_immutable (hb_draw_funcs_t *funcs)
return hb_object_is_immutable (funcs);
}
void
hb_draw_move_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float to_x, float to_y)
{
funcs->move_to (draw_data, *st,
to_x, to_y);
}
void
hb_draw_line_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float to_x, float to_y)
{
funcs->line_to (draw_data, *st,
to_x, to_y);
}
void
hb_draw_quadratic_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float control_x, float control_y,
float to_x, float to_y)
{
funcs->quadratic_to (draw_data, *st,
control_x, control_y,
to_x, to_y);
}
void
hb_draw_cubic_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float control1_x, float control1_y,
float control2_x, float control2_y,
float to_x, float to_y)
{
funcs->cubic_to (draw_data, *st,
control1_x, control1_y,
control2_x, control2_y,
to_x, to_y);
}
void
hb_draw_close_path (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st)
{
funcs->close_path (draw_data, *st);
}
#endif

31
src/hb-draw.h
View File

@ -65,6 +65,7 @@ typedef struct hb_draw_state_t {
typedef struct hb_draw_funcs_t hb_draw_funcs_t;
typedef void (*hb_draw_move_to_func_t) (hb_draw_funcs_t *dfuncs, void *draw_data,
float to_x, float to_y,
void *user_data);
@ -108,6 +109,7 @@ hb_draw_funcs_set_close_path_func (hb_draw_funcs_t *funcs,
hb_draw_close_path_func_t close_path,
void *user_data, hb_destroy_func_t destroy);
HB_EXTERN hb_draw_funcs_t *
hb_draw_funcs_create (void);
@ -123,6 +125,35 @@ hb_draw_funcs_make_immutable (hb_draw_funcs_t *funcs);
HB_EXTERN hb_bool_t
hb_draw_funcs_is_immutable (hb_draw_funcs_t *funcs);
HB_EXTERN void
hb_draw_move_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float to_x, float to_y);
HB_EXTERN void
hb_draw_line_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float to_x, float to_y);
HB_EXTERN void
hb_draw_quadratic_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float control_x, float control_y,
float to_x, float to_y);
HB_EXTERN void
hb_draw_cubic_to (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st,
float control1_x, float control1_y,
float control2_x, float control2_y,
float to_x, float to_y);
HB_EXTERN void
hb_draw_close_path (hb_draw_funcs_t *funcs, void *draw_data,
hb_draw_state_t *st);
HB_END_DECLS
#endif /* HB_DRAW_H */

102
src/hb-draw.hh
View File

@ -94,40 +94,34 @@ struct hb_draw_funcs_t
/* XXX Remove */
HB_INTERNAL bool quadratic_to_is_set ();
};
DECLARE_NULL_INSTANCE (hb_draw_funcs_t);
struct draw_helper_t
{
draw_helper_t (hb_draw_funcs_t *funcs_, void *draw_data_)
: funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT {}
~draw_helper_t () { end_path (); }
void move_to (float x, float y)
void move_to (void *draw_data, hb_draw_state_t &st,
float to_x, float to_y)
{
if (st.path_open) end_path ();
st.current_x = st.path_start_x = x;
st.current_y = st.path_start_y = y;
if (st.path_open) close_path (draw_data, st);
st.current_x = st.path_start_x = to_x;
st.current_y = st.path_start_y = to_y;
}
void line_to (float x, float y)
void line_to (void *draw_data, hb_draw_state_t &st,
float to_x, float to_y)
{
if (!st.path_open) start_path ();
funcs->emit_line_to (draw_data, x, y);
st.current_x = x;
st.current_y = y;
if (!st.path_open) start_path (draw_data, st);
emit_line_to (draw_data, to_x, to_y);
st.current_x = to_x;
st.current_y = to_y;
}
void
quadratic_to (float control_x, float control_y,
quadratic_to (void *draw_data, hb_draw_state_t &st,
float control_x, float control_y,
float to_x, float to_y)
{
if (!st.path_open) start_path ();
if (funcs->quadratic_to_is_set ())
funcs->emit_quadratic_to (draw_data, control_x, control_y, to_x, to_y);
if (!st.path_open) start_path (draw_data, st);
if (quadratic_to_is_set ())
emit_quadratic_to (draw_data, control_x, control_y, to_x, to_y);
else
funcs->emit_cubic_to (draw_data,
emit_cubic_to (draw_data,
(st.current_x + 2.f * control_x) / 3.f,
(st.current_y + 2.f * control_y) / 3.f,
(to_x + 2.f * control_x) / 3.f,
@ -138,23 +132,25 @@ struct draw_helper_t
}
void
cubic_to (float control1_x, float control1_y,
cubic_to (void *draw_data, hb_draw_state_t &st,
float control1_x, float control1_y,
float control2_x, float control2_y,
float to_x, float to_y)
{
if (!st.path_open) start_path ();
funcs->emit_cubic_to (draw_data, control1_x, control1_y, control2_x, control2_y, to_x, to_y);
if (!st.path_open) start_path (draw_data, st);
emit_cubic_to (draw_data, control1_x, control1_y, control2_x, control2_y, to_x, to_y);
st.current_x = to_x;
st.current_y = to_y;
}
void end_path ()
void
close_path (void *draw_data, hb_draw_state_t &st)
{
if (st.path_open)
{
if ((st.path_start_x != st.current_x) || (st.path_start_y != st.current_y))
funcs->emit_line_to (draw_data, st.path_start_x, st.path_start_y);
funcs->emit_close_path (draw_data);
emit_line_to (draw_data, st.path_start_x, st.path_start_y);
emit_close_path (draw_data);
}
st.path_open = false;
st.path_start_x = st.current_x = st.path_start_y = st.current_y = 0;
@ -162,12 +158,56 @@ struct draw_helper_t
protected:
void start_path ()
void start_path (void *draw_data, hb_draw_state_t &st)
{
assert (!st.path_open);
st.path_open = true;
funcs->emit_move_to (draw_data, st.path_start_x, st.path_start_y);
emit_move_to (draw_data, st.path_start_x, st.path_start_y);
}
};
DECLARE_NULL_INSTANCE (hb_draw_funcs_t);
struct draw_helper_t
{
draw_helper_t (hb_draw_funcs_t *funcs_, void *draw_data_)
: funcs {funcs_}, draw_data {draw_data_}, st HB_DRAW_STATE_DEFAULT {}
~draw_helper_t () { close_path (); }
void move_to (float to_x, float to_y)
{
funcs->move_to (draw_data, st,
to_x, to_y);
}
void line_to (float to_x, float to_y)
{
funcs->line_to (draw_data, st,
to_x, to_y);
}
void
quadratic_to (float control_x, float control_y,
float to_x, float to_y)
{
funcs->quadratic_to (draw_data, st,
control_x, control_y,
to_x, to_y);
}
void
cubic_to (float control1_x, float control1_y,
float control2_x, float control2_y,
float to_x, float to_y)
{
funcs->cubic_to (draw_data, st,
control1_x, control1_y,
control2_x, control2_y,
to_x, to_y);
}
void close_path ()
{
funcs->close_path (draw_data, st);
}
protected:
hb_draw_funcs_t *funcs;
void *draw_data;

2
src/hb-ot-cff1-table.cc
View File

@ -481,7 +481,7 @@ struct cff1_path_param_t
font->em_fscalef_x (point3.x.to_real ()), font->em_fscalef_y (point3.y.to_real ()));
}
void end_path () { draw_helper->end_path (); }
void end_path () { draw_helper->close_path (); }
hb_font_t *font;
draw_helper_t *draw_helper;

2
src/hb-ot-glyf-table.hh
View File

@ -1258,7 +1258,7 @@ struct glyf
/* Getting ready for the next contour */
first_oncurve = first_offcurve = last_offcurve = optional_point_t ();
draw_helper->end_path ();
draw_helper->close_path ();
}
}
void points_end () {}