its ot'

[vg.git] / src / vg / vg_ui.h

diff --git a/src/vg/vg_ui.h b/src/vg/vg_ui.h
index f36d3630dc7de62e3abb956df39616c8b995f2a9..5b97133b3b1ceebe096300d0de8a9bdc0563a83d 100644 (file)
--- a/src/vg/vg_ui.h
+++ b/src/vg/vg_ui.h
@@ -3,8 +3,14 @@
 #ifndef VG_UI_H
 #define VG_UI_H
 
-SHADER_DEFINE( shader_ui,
-
+static struct vg_shader _shader_ui =
+{
+   .name = "[vg] ui",
+   .link = NULL,
+   .vs = 
+   {
+      .orig_file = NULL,
+      .static_src = 
        "layout (location=0) in vec2 a_co;"
        "layout (location=1) in vec2 a_uv;"
        "layout (location=2) in vec4 a_colour;"
@@ -25,8 +31,11 @@ SHADER_DEFINE( shader_ui,
                "aWsp = a_co;"
                "aClip = a_clip;"
        "}",
-       
-   /* Fragment */
+   },
+   .fs = 
+   {
+      .orig_file = NULL,
+      .static_src = 
        "uniform sampler2D uTexGlyphs;"
        "out vec4 FragColor;"
        ""
@@ -57,9 +66,8 @@ SHADER_DEFINE( shader_ui,
                
                "FragColor = vec4( aColour.rgb, glyph.a*clip_blend );"
        "}"
-       ,
-       UNIFORMS({ "uPv", "uTexGlyphs" })
-)
+   }
+};
 
 typedef i16                            ui_px;
 typedef u32                            ui_colour;
@@ -260,7 +268,7 @@ static void ui_default_init(void)
    
    free( image );
        
-       SHADER_INIT( shader_ui );
+   vg_shader_register( &_shader_ui );
        ui_init_context( &ui_global_ctx, 20000 );
 }
 
@@ -298,7 +306,7 @@ static void ui_draw( ui_ctx *ctx, m3x3f view_override )
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
        glBlendEquation(GL_FUNC_ADD);
        
-       SHADER_USE( shader_ui );
+   glUseProgram( _shader_ui.id );
        
        m3x3f view = M3X3_IDENTITY;
        
@@ -311,12 +319,13 @@ static void ui_draw( ui_ctx *ctx, m3x3f view_override )
                               -1.0f/((float)vg_window_y*0.5f), 1.0f } );
        }
        
-       glUniformMatrix3fv( SHADER_UNIFORM( shader_ui, "uPv" ), 1, 
+   /* TODO? */
+       glUniformMatrix3fv( glGetUniformLocation( _shader_ui.id, "uPv" ), 1, 
          GL_FALSE, (float *)view_override );
        
        glActiveTexture( GL_TEXTURE0 );
        glBindTexture( GL_TEXTURE_2D, ui_glyph_texture );
-       glUniform1i( SHADER_UNIFORM( shader_ui, "uTexGlyphs" ), 0 );
+       glUniform1i( glGetUniformLocation( _shader_ui.id, "uTexGlyphs" ), 0 );
        
        glDrawElements( GL_TRIANGLES, num_indices_normal, 
          GL_UNSIGNED_SHORT, (void*)(0) );
@@ -826,6 +835,94 @@ static void ui_push_image( ui_ctx *ctx, ui_rect rc, GLuint image )
        img->image = image;
 }
 
+struct ui_slider
+{
+   float *data;
+   float min, max;
+};
+
+struct ui_slider_vector
+{
+   float *data, min, max;
+   struct ui_slider sub[4];
+   u32 len;
+};
+
+struct ui_checkbox
+{
+   int *data;
+};
+
+static void ui_slider( ui_ctx *ctx, struct ui_slider *slider )
+{
+   ui_new_node( ctx );
+
+   ui_px slider_start = ctx->cursor[0];
+
+   float const ftotal = ctx->cursor[2],
+               fwidth = ftotal*0.25f,
+               fmove  = ftotal - fwidth,
+               fstart = fwidth*0.5f,
+               frange = slider->max-slider->min,
+               fpos   = (*slider->data - slider->min) / frange;
+
+   ui_fill_rect( ctx, ctx->cursor, 0xff111111 );
+   ctx->cursor[2] = fwidth;
+   ctx->cursor[0] = slider_start + fpos * fmove;
+   
+   /* TODO.. */
+   u32 uid = (u32)(u64)slider->data;
+   int status = ui_button( ctx, uid );
+   
+   if( ctx->capture_lock && 
+         (ctx->capture_mouse_id == ui_group_id( ctx, uid )))
+   {
+      float ui_new = ctx->mouse[0],
+            local  = ui_new - (slider_start + fstart),
+            zo     = vg_clampf(local / fmove,0.0f,1.0f);
+
+      *slider->data = vg_lerpf( slider->min, slider->max, zo );
+   }
+
+   ctx->cursor[0] += 4;
+   ctx->cursor[1] += 4;
+   
+   char buf[12];
+   snprintf( buf, 12, "%.2f", *slider->data );
+   ui_text( ctx, ctx->cursor, buf, 1, 0 );
+   ui_end_down( ctx );
+
+   ui_end_down( ctx );
+}
+
+static void ui_slider_vector( ui_ctx *ctx, struct ui_slider_vector *slider )
+{
+   for( int i=0; i<slider->len; i++ )
+   {
+      slider->sub[i].data = &slider->data[i];
+      slider->sub[i].min = slider->min;
+      slider->sub[i].max = slider->max;
+      ui_slider( ctx, &slider->sub[i] );
+   }
+}
+
+static void ui_checkbox( ui_ctx *ctx, struct ui_checkbox *cb )
+{
+   u32 uid = (u32)(u64)cb->data;
+   if( ui_button(ctx,uid) == k_button_click )
+      *cb->data ^= 0x1;
+   
+   ui_new_node(ctx);
+   ui_rect_pad( ctx->cursor, 4 );
+   if( *cb->data )
+      ui_fill_rect( ctx, ctx->cursor, 0xff00e052 );
+   else
+      ui_fill_rect( ctx, ctx->cursor, 0xff0052e0 );
+
+   ui_end(ctx);
+   ui_end_down(ctx);
+}
+
 /* Shortnames */
 #define gui_draw(...) ui_draw( &ui_global_ctx, __VA_ARGS__)
 #define gui_current(...) ui_current( &ui_global_ctx, __VA_ARGS__)