new tutorial level for new mechanic

[fishladder.git] / vg / vg_ui.h

diff --git a/vg/vg_ui.h b/vg/vg_ui.h
index 87821ec107d636662b86b36b06c63a2af1a67fa2..bf9adc85549d761ecbd833c5df438aa1ad1c3b31 100644 (file)
--- a/vg/vg_ui.h
+++ b/vg/vg_ui.h
@@ -476,7 +476,7 @@ static void ui_text( ui_ctx *ctx, const char *str, ui_px scale, int alignment )
                                                switch( colour_id )
                                                {
                                                        case '0': current_colour = 0xffffffff; break;
-                                                       case '3'|'1'<<8: current_colour = 0xff1fee20; break;
+                                                       case '3'|'1'<<8: current_colour = 0xff201fee; break;
                                                        case '3'|'2'<<8: current_colour = 0xff37e420; break;
                                                        case '3'|'3'<<8: current_colour = 0xff0ed8e2; break;
                                                        case '3'|'4'<<8: current_colour = 0xfff15010; break;
@@ -684,6 +684,7 @@ static void ui_test(void)
                
        ui_set_mouse( &ui_global_ctx, vg_mouse[0], vg_mouse[1], mouse_state );
        
+       /*
        static struct ui_window window =
        {
                .transform = { 20, 20, 500, 350 },
@@ -727,13 +728,25 @@ static void ui_test(void)
                ui_end_right( &ui_global_ctx );
        }
        ui_end( &ui_global_ctx );
-
+       */
+       
+       ui_rect rbf;
+       ui_rect_copy( ui_global_ctx.cursor, rbf );
+       
+       ui_global_ctx.cursor[0] = 6;
+       ui_global_ctx.cursor[3] = 21;
+       ui_fill_x( &ui_global_ctx );
+       ui_align_bottom( &ui_global_ctx );
+       ui_text( &ui_global_ctx, "Marble computer build 2 -- development version -- (C) Harry Godden 2021\nAknowledgements: 'credits' in console (`)", 1, 0 );
+       
        ui_resolve( &ui_global_ctx );
        
        m3x3f view = M3X3_IDENTITY;
        m3x3_translate( view, (v3f){ -1.0f, 1.0f, 0.0f } );
        m3x3_scale( view, (v3f){ 1.0f/((float)vg_window_x*0.5f), -1.0f/((float)vg_window_y*0.5f), 1.0f } );
-       vg_lines_drawall( (float*)view );
+       //vg_lines_drawall( (float*)view );
        
        ui_draw( &ui_global_ctx );
+       
+       ui_rect_copy( rbf, ui_global_ctx.cursor );
 }