X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=gui.h;h=18b3dbd5eac91d28b4cd5e8cbf36ecab56710571;hb=ce0205fd929e5fb1446f8c52fcab344884d82569;hp=238d0fba76507c0c501f88b0f570e321039e5393;hpb=219e917c414052ad3adbb4e9a652b55757a7b6a9;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/gui.h b/gui.h
index 238d0fb..18b3dbd 100644
--- a/gui.h
+++ b/gui.h
@@ -5,6 +5,16 @@
 #include "input.h"
 #include "player.h"
 
+enum gui_icon {
+   k_gui_icon_tick    = 0,
+   k_gui_icon_exclaim,
+   k_gui_icon_board,
+   k_gui_icon_world,
+   k_gui_icon_rift,
+
+   k_gui_icon_count,
+};
+
 struct{
    struct gui_helper{
       const char *bindstr, *text;
@@ -12,6 +22,13 @@ struct{
    helpers[4];
    u32 helper_count;
 
+   struct icon_call {
+      enum gui_icon icon;
+      v4f location;
+   }
+   icon_draw_buffer[32];
+   u32 icon_draw_count;
+
    char location[64];
    f64  location_time;
 
@@ -28,10 +45,16 @@ struct{
       k_guitrick_type_isc
    }
    trick_type;
+
+   mdl_context model_icons;
+   GLuint icons_texture;
+   glmesh icons_mesh;
+
+   mdl_submesh *icons[ k_gui_icon_count ];
 }
 static gui;
 
-VG_STATIC 
+static 
 void gui_helper_action( const char *bindstr, const char *text ){
    if( gui.helper_count >= vg_list_size(gui.helpers) ){
       vg_error( "Too many helpers\n" );
@@ -43,7 +66,7 @@ void gui_helper_action( const char *bindstr, const char *text ){
    helper->text = text;
 }
 
-VG_STATIC
+static
 void gui_draw(void)
 {
    if( v3_dist2(localplayer.rb.co,gui.trick_co) > 2.0f ){
@@ -89,8 +112,39 @@ void gui_draw(void)
    m4x4_mul( ortho.mtx.p, ortho.mtx.v, ortho.mtx.pv );   /* HACK */
    camera_finalize( &ortho );
 
+
+
+
+
+   /* icons */
+   font3d_bind( &gui.font, &ortho );
+   m4x3f mmdl;
+   m4x3_identity( mmdl );
+   shader_model_font_uMdl( mmdl );
+
+   mesh_bind( &gui.icons_mesh );
+   shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
+   glActiveTexture( GL_TEXTURE0 );
+   glBindTexture( GL_TEXTURE_2D, gui.icons_texture );
+   shader_model_font_uTexMain( 0 );
+
+   for( u32 i=0; i<gui.icon_draw_count; i++ ){
+      struct icon_call *call = &gui.icon_draw_buffer[i];
+      shader_model_font_uOffset( call->location );
+
+      mdl_submesh *sm = gui.icons[ call->icon ];
+      if( sm )
+         mdl_draw_submesh( sm );
+   }
+
+   gui.icon_draw_count = 0;
+
+
+
+
+
    gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
-                           vg.time_delta*2.0f );
+                           vg.time_frame_delta*2.0f );
 
    if( gui.factive > 0.01f ){
       /* draw bottom bar */
@@ -104,7 +158,7 @@ void gui_draw(void)
       render_fsquad1();
    }
 
-   f64 loc_t = (vg.time - gui.location_time) / 5.0;
+   f64 loc_t = (vg.time_real - gui.location_time) / 5.0;
    if( (loc_t < 1.0) && (gui.location_time != 0.0) ){
       /* yep this code is a mess, i dont care anymore */
       glEnable(GL_BLEND);
@@ -122,7 +176,6 @@ void gui_draw(void)
       f32 dy    = ft/0.79f,
          scale = dy*0x1p-4f*0.5f;
 
-      m4x3f mmdl;
       m3x3_identity( mmdl );
       m3x3_scale( mmdl, (v3f){scale,scale,scale} );
       v3_zero( mmdl[3] );
@@ -135,7 +188,8 @@ void gui_draw(void)
 
       font3d_bind( &gui.font, &ortho );
       shader_model_font_uColour( (v4f){1.2f,1.2f,1.2f,o} );
-      font3d_simple_draw( &gui.font, 2, gui.location, &ortho, mmdl );
+      font3d_simple_draw( &gui.font, 2, k_font_shader_default,
+                           gui.location, &ortho, mmdl );
    }
 
    font3d_bind( &gui.font, &ortho );
@@ -143,7 +197,6 @@ void gui_draw(void)
    float dy    = ft/0.79f,
          scale = dy*0x1p-4f*0.75f;
 
-   m4x3f mmdl;
    m3x3_identity( mmdl );
    m3x3_scale( mmdl, (v3f){scale,scale,scale} );
    v3_zero( mmdl[3] );
@@ -157,10 +210,12 @@ void gui_draw(void)
 
       shader_model_font_uColour( (v4f){1.0f,1.0f,1.0f,1.0f} );
 
-      struct font3d_render render;
-      font3d_begin( &gui.font, 2, &ortho, mmdl, &render );
-
-      render.u8pch = (u8*)helper->bindstr;
+      struct font3d_render render = {
+         .font = &gui.font,
+         .variant_id = 2,
+         .shader = k_font_shader_default
+      };
+      font3d_begin( helper->bindstr, &ortho, mmdl, &render );
       font3d_draw( &render );
 
       const char *make_smaller = "\x02\xaf\x03 ";
@@ -177,7 +232,7 @@ void gui_draw(void)
    gui.helper_count = 0;
 }
 
-VG_STATIC
+static
 int gui_location_print_ccmd( int argc, const char *argv[] ){
    if( argc > 0 ){
       char new_loc[64];
@@ -189,12 +244,12 @@ int gui_location_print_ccmd( int argc, const char *argv[] ){
       }
       if( !strcmp(gui.location,new_loc) ) return 0;
       vg_strncpy( new_loc, gui.location, 64, k_strncpy_always_add_null );
-      gui.location_time = vg.time;
+      gui.location_time = vg.time_real;
    }
    return 0;
 }
 
-VG_STATIC int gui_showtrick_ccmd( int argc, const char *argv[] ){
+static int gui_showtrick_ccmd( int argc, const char *argv[] ){
    if( argc == 1 ){
       enum guitrick_type type = k_guitrick_type_none;
            if( !strcmp( argv[0], "pump" ) )  type = k_guitrick_type_pump;
@@ -210,11 +265,58 @@ VG_STATIC int gui_showtrick_ccmd( int argc, const char *argv[] ){
    return 1;
 }
 
-VG_STATIC void gui_init(void)
-{
+static void gui_draw_icon( enum gui_icon icon, v2f co, f32 size ){
+   if( gui.icon_draw_count == vg_list_size(gui.icon_draw_buffer) )
+      return;
+
+   struct icon_call *call = &gui.icon_draw_buffer[ gui.icon_draw_count ++ ];
+
+   call->icon = icon;
+   call->location[0] = co[0] * (f32)vg.window_x;
+   call->location[1] = co[1] * (f32)vg.window_y;
+   call->location[2] = 0.0f;
+   call->location[3] = size * (f32)vg.window_x;
+}
+
+static mdl_submesh *gui_find_icon( const char *name ){
+   mdl_mesh *mesh = mdl_find_mesh( &gui.model_icons, name );
+   if( mesh ){
+      if( mesh->submesh_count ){
+         return mdl_arritm( &gui.model_icons.submeshs, mesh->submesh_start );
+      }
+   }
+
+   return NULL;
+}
+
+static void gui_init(void){
    font3d_load( &gui.font, "models/rs_font.mdl", vg_mem.rtmemory );
    vg_console_reg_cmd( "gui_location", gui_location_print_ccmd, NULL );
    vg_console_reg_cmd( "showtrick", gui_showtrick_ccmd, NULL );
+
+   /* load icons */
+   void *alloc = vg_mem.rtmemory;
+   mdl_open( &gui.model_icons, "models/rs_icons.mdl", alloc );
+   mdl_load_metadata_block( &gui.model_icons, alloc );
+
+   gui.icons[ k_gui_icon_tick ] = gui_find_icon( "icon_tick" );
+   gui.icons[ k_gui_icon_exclaim ] = gui_find_icon( "icon_exclaim" );
+   gui.icons[ k_gui_icon_board ] = gui_find_icon( "icon_board" );
+   gui.icons[ k_gui_icon_world ] = gui_find_icon( "icon_world" );
+   gui.icons[ k_gui_icon_rift ] = gui_find_icon( "icon_rift" );
+
+   vg_linear_clear( vg_mem.scratch );
+   if( !mdl_arrcount( &gui.model_icons.textures ) )
+      vg_fatal_error( "No texture in menu file" );
+   mdl_texture *tex0 = mdl_arritm( &gui.model_icons.textures, 0 );
+   void *data = vg_linear_alloc( vg_mem.scratch, tex0->file.pack_size );
+   mdl_fread_pack_file( &gui.model_icons, &tex0->file, data );
+   vg_tex2d_load_qoi_async( data, tex0->file.pack_size, 
+                            VG_TEX2D_LINEAR|VG_TEX2D_CLAMP,
+                            &gui.icons_texture );
+
+   mdl_async_load_glmesh( &gui.model_icons, &gui.icons_mesh );
+   mdl_close( &gui.model_icons );
 }
 
 #endif /* GUI_H */