X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_sfd.h;h=0f8e3746d567798e10d847fa4adfb4f3d8e7f645;hb=4fe5ceb89da36e746227675b8928e9d74cc18f95;hp=05f191d1d9b9cae9cb9b4aff1b0439cca68c6e4d;hpb=c2d67378dd5c82de50b8fbbbe222ec6be2da4eee;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/world_sfd.h b/world_sfd.h
index 05f191d..0f8e374 100644
--- a/world_sfd.h
+++ b/world_sfd.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
 #ifndef SFD_H
 #define SFD_H
 
@@ -52,18 +56,20 @@ float sfd_encode_glyph( char c )
 static void sfd_encode( struct sfd_instance *display, u32 row, const char *str )
 {
    int end=0;
+   u32 row_h = display->h-1-row;
+
    for( int i=0; i<display->w; i++ )
    {
       if( end )
       {
-         display->buffer[display->w*row + i] = 0.0f;
+         display->buffer[display->w*row_h + i] = 0.0f;
       }
       else
       {
          if( !str[i] )
             end = 1;
 
-         display->buffer[display->w*row + i] = sfd_encode_glyph( str[i] );
+         display->buffer[display->w*row_h + i] = sfd_encode_glyph( str[i] );
       }
    }
 }
@@ -72,7 +78,7 @@ static void sfd_new( struct sfd_instance *display, u32 w, u32 h )
 {
    display->w = w;
    display->h = h;
-   display->buffer = malloc( w*h*sizeof(float)*2 );
+   display->buffer = vg_alloc( w*h*sizeof(float)*2 );
 
    for( int i=0; i<w*h*2; i++ )
       display->buffer[i] = 0.0f;
@@ -85,7 +91,7 @@ static void sfd_update( struct sfd_instance *display )
       float *target = &display->buffer[i],
             *cur = target+display->w*display->h;
       
-      float const rate = ktimestep*15.2313131414f;
+      float const rate = vg.time_delta * 15.2313131414f;
       float d1 = *target-*cur;
       
       if( fabsf(d1) > rate )
@@ -153,7 +159,7 @@ static int world_sfd_test( int argc, const char *argv[] )
    return 0;
 }
 
-static int world_sfd_init(void)
+static void world_sfd_init(void)
 {
    vg_info( "world_sfd_init\n" );
    shader_scoretext_register();
@@ -176,7 +182,7 @@ static int world_sfd_init(void)
    m4x3f identity;
    m4x3_identity( identity );
 
-   for( int i=0;i<8;i++ )
+   for( int i=4;i<6;i++ )
    {
       u32 vert_start = sfd->mesh.vertex_count;
       scene_add_submesh( &sfd->mesh, mboard, card, identity );
@@ -192,33 +198,18 @@ static int world_sfd_init(void)
       }
    }
 
-   if( vg_acquire_thread_sync(1) )
+   vg_acquire_thread_sync();
    {
       vg_tex2d_init( (vg_tex2d *[]){ &tex_scoretext }, 1 );
-      if( !scene_upload( &sfd->mesh ) )
-      {
-         vg_release_thread_sync(1);
-         return 0;
-      }
 
-      if( !mdl_unpack_submesh( mboard, &sfd->temp, backer ) )
-      {
-         vg_release_thread_sync(1);
-         return 0;
-      }
-
-      vg_release_thread_sync(1);
-   }
-   else
-   {
-      free( mboard );
-      return 0;
+      scene_upload( &sfd->mesh );
+      mdl_unpack_submesh( mboard, &sfd->temp, backer );
    }
+   vg_release_thread_sync();
 
    scene_free_offline_buffers( &sfd->mesh );
    sfd_new( &sfd->tester, 27, 13 );
-   free( mboard );
-   return 1;
+   vg_free( mboard );
 }