projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new font
[fishladder.git]
/
vg
/
vg_ui.h
diff --git
a/vg/vg_ui.h
b/vg/vg_ui.h
index f6693cbcd7e3320be1d4aef22a9a2abae929dc1a..d4fb20bab148ddb058bbef6a1aa756d6255dfb3f 100644
(file)
--- a/
vg/vg_ui.h
+++ b/
vg/vg_ui.h
@@
-17,7
+17,7
@@
SHADER_DEFINE( shader_ui,
"void main()"
"{"
"gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );"
"void main()"
"{"
"gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );"
- "aTexCoords = a_uv * 0.0
1388888888
;"
+ "aTexCoords = a_uv * 0.0
078125
;"
"aColour = a_colour;"
"aWsp = a_co;"
"aColour = a_colour;"
"aWsp = a_co;"
@@
-149,7
+149,7
@@
struct ui_ctx
// Opengl
int ui_glyph_override = 0;
// Opengl
int ui_glyph_override = 0;
-ui_px ui_glyph_spacing_x =
6
;
+ui_px ui_glyph_spacing_x =
9
;
GLuint ui_glyph_texture = 0;
ui_colourset ui_default_colours = {
GLuint ui_glyph_texture = 0;
ui_colourset ui_default_colours = {
@@
-240,10
+240,10
@@
static void ui_default_init(void)
if( !ui_glyph_override )
{
u32 compressed[] = {
if( !ui_glyph_override )
{
u32 compressed[] = {
- #include "
fonts/weiholmir
.h"
+ #include "
vg/vg_pxfont
.h"
};
};
- u32 pixels = 0, total =
72*72
, data = 0;
+ u32 pixels = 0, total =
256*256
, data = 0;
u8 *image = malloc( total );
while( pixels < total )
u8 *image = malloc( total );
while( pixels < total )
@@
-264,7
+264,7
@@
static void ui_default_init(void)
glGenTextures( 1, &ui_glyph_texture );
glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
glGenTextures( 1, &ui_glyph_texture );
glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
- glTexImage2D( GL_TEXTURE_2D, 0, GL_R8,
72, 72
, 0, GL_RED, GL_UNSIGNED_BYTE, image );
+ glTexImage2D( GL_TEXTURE_2D, 0, GL_R8,
256, 256
, 0, GL_RED, GL_UNSIGNED_BYTE, image );
vg_tex2d_clamp();
vg_tex2d_nearest();
vg_tex2d_clamp();
vg_tex2d_nearest();
@@
-567,7
+567,7
@@
static struct ui_vert *ui_fill_rect_uv( ui_ctx *ctx, ui_rect rect, u32 colour, u
static struct ui_vert *ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour )
{
static struct ui_vert *ui_fill_rect( ui_ctx *ctx, ui_rect rect, u32 colour )
{
- return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,
124,4,12
4 } );
+ return ui_fill_rect_uv( ctx, rect, colour, (ui_px[4]){ 4,
4, 4,
4 } );
}
static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
}
static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
@@
-576,8
+576,8
@@
static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
text_cursor[0] = ctx->cursor[0];
text_cursor[1] = ctx->cursor[1];
text_cursor[0] = ctx->cursor[0];
text_cursor[1] = ctx->cursor[1];
- text_cursor[2] =
7
*scale;
- text_cursor[3] =
7
*scale;
+ text_cursor[2] =
8
*scale;
+ text_cursor[3] =
14
*scale;
u32 current_colour = 0x00ffffff;
u32 current_colour = 0x00ffffff;
@@
-587,21
+587,21
@@
static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
{
if( c == '\n' )
{
{
if( c == '\n' )
{
- text_cursor[1] += 1
0
*scale;
+ text_cursor[1] += 1
4
*scale;
text_cursor[0] = ctx->cursor[0];
continue;
}
else if( c >= 33 && c <= 126 )
{
u8 glyph_base[2];
text_cursor[0] = ctx->cursor[0];
continue;
}
else if( c >= 33 && c <= 126 )
{
u8 glyph_base[2];
- u8 glyph_index = c
- 32
;
- glyph_base[0] = glyph_index
%10
;
- glyph_base[1] = (glyph_index-glyph_base[0])
/10
;
+ u8 glyph_index = c;
+ glyph_base[0] = glyph_index
& 0xf
;
+ glyph_base[1] = (glyph_index-glyph_base[0])
>>4
;
- glyph_base[0] *=
7
;
- glyph_base[1] *=
7
;
+ glyph_base[0] *=
8
;
+ glyph_base[1] *=
8
;
- ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0]
,glyph_base[1],glyph_base[0]+7,glyph_base[1]+7
} );
+ ui_fill_rect_uv( ctx, text_cursor, current_colour, (ui_px[4]){glyph_base[0]
+2,glyph_base[1]+1,glyph_base[0]+6,glyph_base[1]+8
} );
}
else if( c == '\x1B' )
{
}
else if( c == '\x1B' )
{
@@
-640,7
+640,7
@@
static void ui_text( ui_ctx *ctx, const char *str, ui_px scale )
}
}
}
}
- text_cursor[0] +=
6
*scale;
+ text_cursor[0] +=
9
*scale;
}
}
}
}