another try for better mt support
This commit is contained in:
vurtun
parent
db695a6e62
commit
e73df5399d
84
zahnrad.c
84
zahnrad.c
@ -2203,28 +2203,13 @@ zr_command_queue_next(struct zr_command_queue *queue, const struct zr_command *c
|
||||
*
|
||||
* ===============================================================*/
|
||||
#if ZR_COMPILE_WITH_VERTEX_BUFFER
|
||||
static struct zr_vec2 zr_circle_vtx[12];
|
||||
static int zr_circle_vtx_builds = zr_false;
|
||||
static const int zr_circle_vtx_count = ZR_LEN(zr_circle_vtx);
|
||||
|
||||
void
|
||||
zr_draw_list_setup(zr_sin_f sine, zr_cos_f cosine)
|
||||
{
|
||||
int i = 0;
|
||||
for (i = 0; i < zr_circle_vtx_count; ++i) {
|
||||
const float a = ((float)i / (float)zr_circle_vtx_count) * 2 * ZR_PI;
|
||||
zr_circle_vtx[i].x = cosine(a);
|
||||
zr_circle_vtx[i].y = sine(a);
|
||||
}
|
||||
zr_circle_vtx_builds = zr_true;
|
||||
}
|
||||
|
||||
void
|
||||
zr_draw_list_init(struct zr_draw_list *list, struct zr_buffer *cmds,
|
||||
struct zr_buffer *vertexes, struct zr_buffer *elements,
|
||||
zr_sin_f sine, zr_cos_f cosine, struct zr_draw_null_texture null,
|
||||
enum zr_anti_aliasing AA)
|
||||
{
|
||||
zr_size i = 0;
|
||||
zr_zero(list, sizeof(*list));
|
||||
list->sin = sine;
|
||||
list->cos = cosine;
|
||||
@ -2234,6 +2219,11 @@ zr_draw_list_init(struct zr_draw_list *list, struct zr_buffer *cmds,
|
||||
list->elements = elements;
|
||||
list->buffer = cmds;
|
||||
list->AA = AA;
|
||||
for (i = 0; i < ZR_LEN(list->circle_vtx); ++i) {
|
||||
const float a = ((float)i / (float)ZR_LEN(list->circle_vtx)) * 2 * ZR_PI;
|
||||
list->circle_vtx[i].x = cosine(a);
|
||||
list->circle_vtx[i].y = sine(a);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@ -3086,13 +3076,10 @@ zr_draw_list_path_arc_to_fast(struct zr_draw_list *list, struct zr_vec2 center,
|
||||
{
|
||||
ZR_ASSERT(list);
|
||||
if (!list) return;
|
||||
if (!zr_circle_vtx_builds)
|
||||
zr_draw_list_setup(list->sin, list->cos);
|
||||
|
||||
if (a_min <= a_max) {
|
||||
int a = 0;
|
||||
for (a = a_min; a <= a_max; a++) {
|
||||
const struct zr_vec2 c = zr_circle_vtx[a % zr_circle_vtx_count];
|
||||
const struct zr_vec2 c = list->circle_vtx[(zr_size)a % ZR_LEN(list->circle_vtx)];
|
||||
const float x = center.x + c.x * radius;
|
||||
const float y = center.y + c.y * radius;
|
||||
zr_draw_list_path_line_to(list, zr_vec2(x, y));
|
||||
@ -3343,63 +3330,6 @@ zr_font_korean_glyph_ranges(void)
|
||||
return ranges;
|
||||
}
|
||||
|
||||
const zr_rune*
|
||||
zr_font_japanese_glyph_range(void)
|
||||
{
|
||||
static const short offsets_from_0x4E00[] = {
|
||||
-1,0,1,3,0,0,0,0,1,0,5,1,1,0,7,4,6,10,0,1,9,9,7,1,3,19,1,10,7,1,0,1,0,5,1,0,6,4,2,6,0,0,12,6,8,0,3,5,0,1,0,9,0,0,8,1,1,3,4,5,13,0,0,8,2,17,
|
||||
4,3,1,1,9,6,0,0,0,2,1,3,2,22,1,9,11,1,13,1,3,12,0,5,9,2,0,6,12,5,3,12,4,1,2,16,1,1,4,6,5,3,0,6,13,15,5,12,8,14,0,0,6,15,3,6,0,18,8,1,6,14,1,
|
||||
5,4,12,24,3,13,12,10,24,0,0,0,1,0,1,1,2,9,10,2,2,0,0,3,3,1,0,3,8,0,3,2,4,4,1,6,11,10,14,6,15,3,4,15,1,0,0,5,2,2,0,0,1,6,5,5,6,0,3,6,5,0,0,1,0,
|
||||
11,2,2,8,4,7,0,10,0,1,2,17,19,3,0,2,5,0,6,2,4,4,6,1,1,11,2,0,3,1,2,1,2,10,7,6,3,16,0,8,24,0,0,3,1,1,3,0,1,6,0,0,0,2,0,1,5,15,0,1,0,0,2,11,19,
|
||||
1,4,19,7,6,5,1,0,0,0,0,5,1,0,1,9,0,0,5,0,2,0,1,0,3,0,11,3,0,2,0,0,0,0,0,9,3,6,4,12,0,14,0,0,29,10,8,0,14,37,13,0,31,16,19,0,8,30,1,20,8,3,48,
|
||||
21,1,0,12,0,10,44,34,42,54,11,18,82,0,2,1,2,12,1,0,6,2,17,2,12,7,0,7,17,4,2,6,24,23,8,23,39,2,16,23,1,0,5,1,2,15,14,5,6,2,11,0,8,6,2,2,2,14,
|
||||
20,4,15,3,4,11,10,10,2,5,2,1,30,2,1,0,0,22,5,5,0,3,1,5,4,1,0,0,2,2,21,1,5,1,2,16,2,1,3,4,0,8,4,0,0,5,14,11,2,16,1,13,1,7,0,22,15,3,1,22,7,14,
|
||||
22,19,11,24,18,46,10,20,64,45,3,2,0,4,5,0,1,4,25,1,0,0,2,10,0,0,0,1,0,1,2,0,0,9,1,2,0,0,0,2,5,2,1,1,5,5,8,1,1,1,5,1,4,9,1,3,0,1,0,1,1,2,0,0,
|
||||
2,0,1,8,22,8,1,0,0,0,0,4,2,1,0,9,8,5,0,9,1,30,24,2,6,4,39,0,14,5,16,6,26,179,0,2,1,1,0,0,0,5,2,9,6,0,2,5,16,7,5,1,1,0,2,4,4,7,15,13,14,0,0,
|
||||
3,0,1,0,0,0,2,1,6,4,5,1,4,9,0,3,1,8,0,0,10,5,0,43,0,2,6,8,4,0,2,0,0,9,6,0,9,3,1,6,20,14,6,1,4,0,7,2,3,0,2,0,5,0,3,1,0,3,9,7,0,3,4,0,4,9,1,6,0,
|
||||
9,0,0,2,3,10,9,28,3,6,2,4,1,2,32,4,1,18,2,0,3,1,5,30,10,0,2,2,2,0,7,9,8,11,10,11,7,2,13,7,5,10,0,3,40,2,0,1,6,12,0,4,5,1,5,11,11,21,4,8,3,7,
|
||||
8,8,33,5,23,0,0,19,8,8,2,3,0,6,1,1,1,5,1,27,4,2,5,0,3,5,6,3,1,0,3,1,12,5,3,3,2,0,7,7,2,1,0,4,0,1,1,2,0,10,10,6,2,5,9,7,5,15,15,21,6,11,5,20,
|
||||
4,3,5,5,2,5,0,2,1,0,1,7,28,0,9,0,5,12,5,5,18,30,0,12,3,3,21,16,25,32,9,3,14,11,24,5,66,9,1,2,0,5,9,1,5,1,8,0,8,3,3,0,1,15,1,4,8,1,2,7,0,7,2,
|
||||
8,3,7,5,3,7,10,2,1,0,0,2,25,0,6,4,0,10,0,4,2,4,1,12,5,38,4,0,4,1,10,5,9,4,0,14,4,2,5,18,20,21,1,3,0,5,0,7,0,3,7,1,3,1,1,8,1,0,0,0,3,2,5,2,11,
|
||||
6,0,13,1,3,9,1,12,0,16,6,2,1,0,2,1,12,6,13,11,2,0,28,1,7,8,14,13,8,13,0,2,0,5,4,8,10,2,37,42,19,6,6,7,4,14,11,18,14,80,7,6,0,4,72,12,36,27,
|
||||
7,7,0,14,17,19,164,27,0,5,10,7,3,13,6,14,0,2,2,5,3,0,6,13,0,0,10,29,0,4,0,3,13,0,3,1,6,51,1,5,28,2,0,8,0,20,2,4,0,25,2,10,13,10,0,16,4,0,1,0,
|
||||
2,1,7,0,1,8,11,0,0,1,2,7,2,23,11,6,6,4,16,2,2,2,0,22,9,3,3,5,2,0,15,16,21,2,9,20,15,15,5,3,9,1,0,0,1,7,7,5,4,2,2,2,38,24,14,0,0,15,5,6,24,14,
|
||||
5,5,11,0,21,12,0,3,8,4,11,1,8,0,11,27,7,2,4,9,21,59,0,1,39,3,60,62,3,0,12,11,0,3,30,11,0,13,88,4,15,5,28,13,1,4,48,17,17,4,28,32,46,0,16,0,
|
||||
18,11,1,8,6,38,11,2,6,11,38,2,0,45,3,11,2,7,8,4,30,14,17,2,1,1,65,18,12,16,4,2,45,123,12,56,33,1,4,3,4,7,0,0,0,3,2,0,16,4,2,4,2,0,7,4,5,2,26,
|
||||
2,25,6,11,6,1,16,2,6,17,77,15,3,35,0,1,0,5,1,0,38,16,6,3,12,3,3,3,0,9,3,1,3,5,2,9,0,18,0,25,1,3,32,1,72,46,6,2,7,1,3,14,17,0,28,1,40,13,0,20,
|
||||
15,40,6,38,24,12,43,1,1,9,0,12,6,0,6,2,4,19,3,7,1,48,0,9,5,0,5,6,9,6,10,15,2,11,19,3,9,2,0,1,10,1,27,8,1,3,6,1,14,0,26,0,27,16,3,4,9,6,2,23,
|
||||
9,10,5,25,2,1,6,1,1,48,15,9,15,14,3,4,26,60,29,13,37,21,1,6,4,0,2,11,22,23,16,16,2,2,1,3,0,5,1,6,4,0,0,4,0,0,8,3,0,2,5,0,7,1,7,3,13,2,4,10,
|
||||
3,0,2,31,0,18,3,0,12,10,4,1,0,7,5,7,0,5,4,12,2,22,10,4,2,15,2,8,9,0,23,2,197,51,3,1,1,4,13,4,3,21,4,19,3,10,5,40,0,4,1,1,10,4,1,27,34,7,21,
|
||||
2,17,2,9,6,4,2,3,0,4,2,7,8,2,5,1,15,21,3,4,4,2,2,17,22,1,5,22,4,26,7,0,32,1,11,42,15,4,1,2,5,0,19,3,1,8,6,0,10,1,9,2,13,30,8,2,24,17,19,1,4,
|
||||
4,25,13,0,10,16,11,39,18,8,5,30,82,1,6,8,18,77,11,13,20,75,11,112,78,33,3,0,0,60,17,84,9,1,1,12,30,10,49,5,32,158,178,5,5,6,3,3,1,3,1,4,7,6,
|
||||
19,31,21,0,2,9,5,6,27,4,9,8,1,76,18,12,1,4,0,3,3,6,3,12,2,8,30,16,2,25,1,5,5,4,3,0,6,10,2,3,1,0,5,1,19,3,0,8,1,5,2,6,0,0,0,19,1,2,0,5,1,2,5,
|
||||
1,3,7,0,4,12,7,3,10,22,0,9,5,1,0,2,20,1,1,3,23,30,3,9,9,1,4,191,14,3,15,6,8,50,0,1,0,0,4,0,0,1,0,2,4,2,0,2,3,0,2,0,2,2,8,7,0,1,1,1,3,3,17,11,
|
||||
91,1,9,3,2,13,4,24,15,41,3,13,3,1,20,4,125,29,30,1,0,4,12,2,21,4,5,5,19,11,0,13,11,86,2,18,0,7,1,8,8,2,2,22,1,2,6,5,2,0,1,2,8,0,2,0,5,2,1,0,
|
||||
2,10,2,0,5,9,2,1,2,0,1,0,4,0,0,10,2,5,3,0,6,1,0,1,4,4,33,3,13,17,3,18,6,4,7,1,5,78,0,4,1,13,7,1,8,1,0,35,27,15,3,0,0,0,1,11,5,41,38,15,22,6,
|
||||
14,14,2,1,11,6,20,63,5,8,27,7,11,2,2,40,58,23,50,54,56,293,8,8,1,5,1,14,0,1,12,37,89,8,8,8,2,10,6,0,0,0,4,5,2,1,0,1,1,2,7,0,3,3,0,4,6,0,3,2,
|
||||
19,3,8,0,0,0,4,4,16,0,4,1,5,1,3,0,3,4,6,2,17,10,10,31,6,4,3,6,10,126,7,3,2,2,0,9,0,0,5,20,13,0,15,0,6,0,2,5,8,64,50,3,2,12,2,9,0,0,11,8,20,
|
||||
109,2,18,23,0,0,9,61,3,0,28,41,77,27,19,17,81,5,2,14,5,83,57,252,14,154,263,14,20,8,13,6,57,39,38,
|
||||
};
|
||||
static int ranges_unpacked;
|
||||
static zr_rune ranges[8 + ZR_LEN(offsets_from_0x4E00)*2 + 1] = {
|
||||
0x0020, 0x00FF, /* Basic Latin + Latin Supplement */
|
||||
0x3000, 0x30FF, /* Punctuations, Hiragana, Katakana */
|
||||
0x31F0, 0x31FF, /* Katakana Phonetic Extensions */
|
||||
0xFF00, 0xFFEF, /* Half-width characters */
|
||||
};
|
||||
if (!ranges_unpacked)
|
||||
{
|
||||
zr_size n = 0;
|
||||
zr_rune codepoint = 0x4e00;
|
||||
zr_rune* dst = &ranges[8];
|
||||
for (n = 0; n < ZR_LEN(offsets_from_0x4E00); n++, dst += 2)
|
||||
dst[0] = dst[1] = (zr_rune)(codepoint += (zr_rune)(offsets_from_0x4E00[n] + 1));
|
||||
dst[0] = 0;
|
||||
ranges_unpacked = 1;
|
||||
}
|
||||
return &ranges[0];
|
||||
}
|
||||
|
||||
void zr_font_bake_memory(zr_size *temp, int *glyph_count,
|
||||
struct zr_font_config *config, int count)
|
||||
{
|
||||
|
||||
@ -1141,6 +1141,8 @@ struct zr_draw_list {
|
||||
/* current number of points inside the path */
|
||||
unsigned int path_offset;
|
||||
/* offset to the first point in the buffer */
|
||||
struct zr_vec2 circle_vtx[12];
|
||||
/* small lookup table for fast circle drawing */
|
||||
};
|
||||
/* ---------------------------------------------------------------
|
||||
* MAIN
|
||||
@ -1491,9 +1493,6 @@ const zr_rune *zr_font_default_glyph_ranges(void);
|
||||
const zr_rune *zr_font_chinese_glyph_ranges(void);
|
||||
const zr_rune *zr_font_cyrillic_glyph_ranges(void);
|
||||
const zr_rune *zr_font_korean_glyph_ranges(void);
|
||||
const zr_rune* zr_font_japanese_glyph_range(void);
|
||||
/* if you want to call zr_font_japanese_glyph_range with multithreading
|
||||
* please call it once without to initialize the internal lookup table */
|
||||
/* ---------------------------------------------------------------
|
||||
* BAKING
|
||||
* ---------------------------------------------------------------*/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user