adaptions for vg3.000

[carveJwlIkooP6JGAAIwe30JlM.git] / gui.h

diff --git a/gui.h b/gui.h
index c1ce8d71a41ea81120b6c0767e56664c41a10441..a0de270db36cb7f9dbb0991c7b71fb9d70839a15 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -2,7 +2,8 @@
 #include "font.h"
 #include "input.h"
 #include "player.h"
-#include "vg/vg_imgui.h"
+#include "vg/vg_engine.h"
+#include "vg/vg_ui/imgui.h"
 
 #define GUI_COL_DARK   ui_opacity( 0x00000000, 0.7f )
 #define GUI_COL_NORM   ui_opacity( 0x00101010, 0.7f )
@@ -152,7 +153,7 @@ static void gui_draw(void)
                            vg.time_frame_delta*2.0f );
 
    ui_font_face( &vgf_default_title );
-   ui_px height = vg_ui.font->ch + 16;
+   ui_px height = ui_current_font()->ch + 16;
    ui_rect lwr = { 0, vg.window_y - height, vg.window_x, height };
 
    ui_px x = 0;
@@ -180,7 +181,7 @@ static void gui_draw(void)
       u32 w;
       box[0] += 16;
       w = ui_text( box, buf, 1, k_ui_align_middle_left, fg );
-      w *= vg_ui.font->sx;
+      w *= ui_current_font()->sx;
       bg[1].co[0] = x + w + 32;
       bg[2].co[0] = x + w + 32;
       x += w + 32;
@@ -189,15 +190,16 @@ static void gui_draw(void)
       bg = ui_fill( box, ui_opacity( GUI_COL_NORM, opacity*0.7f ) );
       box[0] += 8;
       w = ui_text( box, helper->text, 1, k_ui_align_middle_left, fg );
-      w *= vg_ui.font->sx;
+      w *= ui_current_font()->sx;
       bg[1].co[0] = box[0] + w + 16;
       bg[2].co[0] = box[0] + w + 16;
       x += w + 32;
    }
 
-   vg_ui.frosting = gui.factive*0.015f;
-   ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
-   vg_ui.frosting = 0.0f;
+   ui_context *ctx = ui_current_context();
+   ctx->frosting = gui.factive*0.015f;
+   ui_flush( k_ui_shader_colour );
+   ctx->frosting = 0.0f;
 
 
    f64 loc_t = (vg.time_real - gui.location_time) / 5.0;
@@ -210,11 +212,11 @@ static void gui_draw(void)
       ui_fill( box, ui_opacity( GUI_COL_NORM, 0.5f ) );
       ui_text( box, gui.location, 1, k_ui_align_middle_center, 0 );
 
-      vg_ui.colour[3] = o;
-      ui_flush( k_ui_shader_colour, vg.window_x, vg.window_y );
+      ctx->colour[3] = o;
+      ui_flush( k_ui_shader_colour );
    }
 
-   vg_ui.colour[3] = 1.0f;
+   ctx->colour[3] = 1.0f;
    ui_font_face( &vgf_default_small );
 }