X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_sfd.h;h=e79fbbca30430fd5c190f5397b15546da1f12a48;hb=HEAD;hp=3fbbe949482a775ebba620a53b71e25b36f86c50;hpb=aa4c26eae2208872824e0eb5b71bc05c16d43242;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_sfd.h b/world_sfd.h
index 3fbbe94..e79fbbc 100644
--- a/world_sfd.h
+++ b/world_sfd.h
@@ -1,232 +1,37 @@
 /*
- * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ * Copyright (C) 2021-2024 Mt.ZERO Software, Harry Godden - All Rights Reserved
  */
-
-#ifndef SFD_H
-#define SFD_H
-
+#pragma once
 #include "world.h"
+#include "world_routes.h"
+#include "scene.h"
 
-#if 0
-#include "shaders/scoretext.h"
-#include "shaders/vblend.h"
-#endif
-
-vg_tex2d tex_scoretext = { .path = "textures/scoretext.qoi",
-                           .flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST };
-
-/* 
- * TODO: utf-8 -> ascii
- */
-
-float sfd_encode_glyph( char c )
-{
-   int value = 0;
-   if( c >= 'a' && c <= 'z' )
-      value = c-'a'+11;
-   else if( c >= '0' && c <= '9' )
-      value = c-'0'+1;
-   else if( c >= 'A' && c <= 'Z' )
-      value = c-'A'+11;
-   else if( c >= '\x01' && c <= '\x01'+10 )
-      value = 63-c;
-   else
-   {
-      int base = 11+26;
-
-      switch( c )
-      {
-         case '!': value=base+0; break;
-         case '?': value=base+1; break;
-         case ',': value=base+2; break;
-         case '.': value=base+3; break;
-         case '#': value=base+4; break;
-         case '$': value=base+5; break;
-         case '%': value=base+6; break;
-         case '*': value=base+7; break;
-         case '+': value=base+8; break;
-         case '-': value=base+9; break;
-         case '/': value=base+10; break;
-         case ':': value=base+11; break;
-         default: value=0; break;
-      }
-   }
-
-   return (float)value;
-}
-
-VG_STATIC void sfd_encode( u32 row, const char *str )
-{
-   int end=0;
-   u32 row_h = world.sfd.h -1 -row;
-
-   for( int i=0; i<world.sfd.w; i++ )
-   {
-      u32 idx = (world.sfd.w*row_h + i) * 2;
-
-      if( end )
-      {
-         world.sfd.buffer[idx] = 0.0f;
-      }
-      else
-      {
-         if( !str[i] )
-            end = 1;
-
-         world.sfd.buffer[idx] = sfd_encode_glyph( str[i] );
-      }
-   }
-}
-
-VG_STATIC void sfd_init( u32 w, u32 h )
-{
-}
-
-VG_STATIC void sfd_update(void)
-{
-   for( int i=0; i<world.sfd.w*world.sfd.h; i++ )
-   {
-      float *target = &world.sfd.buffer[i*2+0],
-            *cur =    &world.sfd.buffer[i*2+1];
-      
-      float const rate = vg.time_delta * 15.2313131414f;
-      float d1 = *target-*cur;
-      
-      if( fabsf(d1) > rate )
-      {
-         *cur += rate;
-         if( *cur > 60.0f )
-            *cur -= 60.0f;
-      }
-      else
-         *cur = *target;
-   }
-}
-
-VG_STATIC void bind_terrain_noise(void);
-VG_STATIC void sfd_render( camera *cam, m4x3f transform )
-{
-#if 0
-   mesh_bind( &world.sfd.mesh_display );
-   shader_scoretext_use();
-   shader_scoretext_uTexGarbage(0);
-   shader_scoretext_uTexGradients(1);
-   shader_link_standard_ub( _shader_scoretext.id, 2 );
-   bind_terrain_noise();
-   vg_tex2d_bind( &tex_scoretext, 1 );
-
-   m4x4f pvm_prev;
-   m4x3_expand( transform, pvm_prev );
-   m4x4_mul( cam->mtx_prev.pv, pvm_prev, pvm_prev );
-
-   shader_scoretext_uPv( cam->mtx.pv );
-   shader_scoretext_uPvmPrev( pvm_prev );
-   shader_scoretext_uMdl( transform );
-   shader_scoretext_uCamera( cam->transform[3] );
+struct world_sfd{
+   GLuint tex_scoretex;
 
-   for( int y=0;y<world.sfd.h; y++ )
-   {
-      for( int x=0; x<world.sfd.w; x++ )
-      {
-         float value = world.sfd.buffer[(y*world.sfd.w+x)*2+1];
-         shader_scoretext_uInfo( (v3f){ x,y, value } );
-         mesh_draw( &world.sfd.mesh_display );
-      }
-   }
+   glmesh mesh_base, mesh_display;
+   mdl_submesh sm_base;
 
-   shader_vblend_use();
-   shader_vblend_uTexGarbage(0);
-   shader_vblend_uTexGradients(1);
-   shader_link_standard_ub( _shader_vblend.id, 2 );
-   bind_terrain_noise();
-   vg_tex2d_bind( &tex_scoretext, 1 );
+   u32 active_route_board;
+   scene_context scene;
 
-   shader_vblend_uPv( cam->mtx.pv );
-   shader_vblend_uPvmPrev( pvm_prev );
+   u32 view_weekly;
 
-   shader_vblend_uMdl( transform );
-   shader_vblend_uCamera( cam->transform[3] );
-   
-   mesh_bind( &world.sfd.mesh_base );
-   mesh_draw( &world.sfd.mesh_base );
-#endif
+   u32 w, h;
+   float *buffer;
 }
-
-VG_STATIC int world_sfd_test( int argc, const char *argv[] )
-{
-   if( argc == 2 )
-   {
-      int row = vg_min( vg_max(atoi(argv[0]),0), world.sfd.h);
-      sfd_encode( row, argv[1] );
-   }
-
-   return 0;
-}
-
-VG_STATIC void world_sfd_init(void)
-{
-   vg_info( "world_sfd_init\n" );
-
-#if 0
-   shader_scoretext_register();
-#endif
-
-	vg_function_push( (struct vg_cmd){
-		.name = "sfd",
-		.function = world_sfd_test
-	});
-
-   vg_linear_clear( vg_mem.scratch );
-   mdl_context *mboard = 
-      mdl_load_full( vg_mem.scratch, "models/rs_scoretext.mdl" );
-
-   scene *sc = scene_init( vg_mem.scratch, 3000, 8000 );
-
-   mdl_node *pn_backer = mdl_node_from_name( mboard, "backer" );
-   mdl_submesh *backer = &mboard->submesh_buffer[ pn_backer->submesh_start ];
-   mdl_node *pn_card = mdl_node_from_name( mboard, "score_card" );
-   mdl_submesh *card = &mboard->submesh_buffer[ pn_card->submesh_start ];
-
-   m4x3f identity;
-   m4x3_identity( identity );
-
-   /* FIXME: dont use scene header for this you fucking idiots */
-   for( int i=4;i<6;i++ )
-   {
-      u32 vert_start = sc->vertex_count;
-      scene_add_mdl_submesh( sc, mboard, card, identity );
-
-#if 0
-      for( int j=0; j<card->vertex_count; j++ )
-      {
-         mdl_vert *vert = &sc->arrvertices[ vert_start+j ];
-
-         float const k_glyph_uvw = 1.0f/64.0f;
-         vert->uv[0] -= k_glyph_uvw * (float)(i-4);
-         vert->colour[0] = 0.0f;
-         vert->colour[1] = i*36;
-      }
-#endif
-   }
-
-   vg_acquire_thread_sync();
-   {
-      scene_upload( sc, &world.sfd.mesh_display );
-      mdl_unpack_submesh( mboard, &world.sfd.mesh_base, backer );
-
-      vg_tex2d_init( (vg_tex2d *[]){ &tex_scoretext }, 1 );
-   }
-   vg_release_thread_sync();
-
-   int w = 27,
-       h = 13;
-
-   world.sfd.w = w;
-   world.sfd.h = h;
-   world.sfd.buffer = vg_linear_alloc( vg_mem.rtmemory, 2*w*h*sizeof(float) );
-
-   for( int i=0; i<w*h*2; i++ )
-      world.sfd.buffer[i] = 0.0f;
-}
-
-#endif /* SFD_H */
+extern world_sfd;
+void world_sfd_init(void);
+
+enum world_sfd_align {
+   k_world_sfd_left,
+   k_world_sfd_right,
+   k_world_sfd_center
+};
+
+void sfd_encode( v2i co, const char *str, enum world_sfd_align align );
+void world_sfd_update( world_instance *world, v3f pos );
+void sfd_render( world_instance *world, vg_camera *cam, m4x3f transform );
+void world_sfd_compile_scores( struct leaderboard_cache *leaderboard,
+                               const char *title );
+void world_sfd_compile_active_scores(void);