projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[fishladder.git]
/
vg
/
vg_ui.h
diff --git
a/vg/vg_ui.h
b/vg/vg_ui.h
index 11728509ae0d9ac7fa03feae4fd5a83c39332cd3..70d30aa64677e985150df3fd2e6b7775b15d6093 100644
(file)
--- a/
vg/vg_ui.h
+++ b/
vg/vg_ui.h
@@
-93,7
+93,7
@@
struct ui_ctx
struct ui_vert
{
ui_px co[2]; //32 4
struct ui_vert
{
ui_px co[2]; //32 4
- u8 uv[2]; //16 2
+ i16 uv[2]; //32 4
u32 colour; //32 4
ui_rect clip; //64 8
}
u32 colour; //32 4
ui_rect clip; //64 8
}
@@
-134,6
+134,18
@@
struct ui_ctx
int image_count;
};
int image_count;
};
+struct ui_sdf_char
+{
+ int x, y, width, height, originX, originY, advance;
+};
+
+struct ui_sdf_font
+{
+ const char *name;
+ int size, width, height;
+ struct ui_sdf_char *characters;
+};
+
// Globals
// ===========================================================================================================
// Globals
// ===========================================================================================================
@@
-185,7
+197,7
@@
static void ui_init_context( ui_ctx *ctx, int index_buffer_size )
glEnableVertexAttribArray( 0 );
// UV
glEnableVertexAttribArray( 0 );
// UV
- glVertexAttribPointer( 1, 2, GL_
UNSIGNED_BYTE
, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
+ glVertexAttribPointer( 1, 2, GL_
SHORT
, GL_FALSE, stride, (void *)offsetof( struct ui_vert, uv ) );
glEnableVertexAttribArray( 1 );
// COLOUR
glEnableVertexAttribArray( 1 );
// COLOUR