isolate world code

[carveJwlIkooP6JGAAIwe30JlM.git] / world_sfd.h

diff --git a/world_sfd.h b/world_sfd.h
index 3fbbe949482a775ebba620a53b71e25b36f86c50..1b59e5a8c509cb477968473298b327b9d19def2d 100644 (file)
--- a/world_sfd.h
+++ b/world_sfd.h
@@ -58,22 +58,22 @@ float sfd_encode_glyph( char c )
 VG_STATIC void sfd_encode( u32 row, const char *str )
 {
    int end=0;
-   u32 row_h = world.sfd.h -1 -row;
+   u32 row_h = world_global.sfd.h -1 -row;
 
-   for( int i=0; i<world.sfd.w; i++ )
+   for( int i=0; i<world_global.sfd.w; i++ )
    {
-      u32 idx = (world.sfd.w*row_h + i) * 2;
+      u32 idx = (world_global.sfd.w*row_h + i) * 2;
 
       if( end )
       {
-         world.sfd.buffer[idx] = 0.0f;
+         world_global.sfd.buffer[idx] = 0.0f;
       }
       else
       {
          if( !str[i] )
             end = 1;
 
-         world.sfd.buffer[idx] = sfd_encode_glyph( str[i] );
+         world_global.sfd.buffer[idx] = sfd_encode_glyph( str[i] );
       }
    }
 }
@@ -84,10 +84,10 @@ 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++ )
+   for( int i=0; i<world_global.sfd.w*world_global.sfd.h; i++ )
    {
-      float *target = &world.sfd.buffer[i*2+0],
-            *cur =    &world.sfd.buffer[i*2+1];
+      float *target = &world_global.sfd.buffer[i*2+0],
+            *cur =    &world_global.sfd.buffer[i*2+1];
       
       float const rate = vg.time_delta * 15.2313131414f;
       float d1 = *target-*cur;
@@ -156,7 +156,7 @@ 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);
+      int row = vg_min( vg_max(atoi(argv[0]),0), world_global.sfd.h);
       sfd_encode( row, argv[1] );
    }
 
@@ -211,8 +211,8 @@ VG_STATIC void world_sfd_init(void)
 
    vg_acquire_thread_sync();
    {
-      scene_upload( sc, &world.sfd.mesh_display );
-      mdl_unpack_submesh( mboard, &world.sfd.mesh_base, backer );
+      scene_upload( sc, &world_global.sfd.mesh_display );
+      mdl_unpack_submesh( mboard, &world_global.sfd.mesh_base, backer );
 
       vg_tex2d_init( (vg_tex2d *[]){ &tex_scoretext }, 1 );
    }
@@ -221,12 +221,13 @@ VG_STATIC void world_sfd_init(void)
    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) );
+   world_global.sfd.w = w;
+   world_global.sfd.h = h;
+   world_global.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;
+      world_global.sfd.buffer[i] = 0.0f;
 }
 
 #endif /* SFD_H */