moved code around a bit
authorhgn <hgodden00@gmail.com>
Fri, 10 Dec 2021 16:27:34 +0000 (16:27 +0000)
committerhgn <hgodden00@gmail.com>
Fri, 10 Dec 2021 16:27:34 +0000 (16:27 +0000)
fishladder.c
vg/vg_m.h

index 13f3623c78bddb084298c5f8627ef9f03f1bed0b..3bb8abafc35f73c92b6cd40fb0e166c1d65c7fcf 100644 (file)
                
 */
 
-const char *level_pack_1[] = { 
-       "level0", 
-       "level1", 
-       "level2", 
-       "level3", 
-       "level4",
-       "level5",
-       "level6",
-       "level7_combine",
-       "xor_small",
-       "sort",
-       "thirds"
+// CONSTANTS
+// ===========================================================================================================
+
+enum cell_type
+{
+       k_cell_type_stub = 0,
+       k_cell_type_ramp_right = 3,
+       k_cell_type_ramp_left = 6,
+       k_cell_type_split = 7,
+       k_cell_type_merge = 13,
+       k_cell_type_con_r = 1,
+       k_cell_type_con_u = 2,
+       k_cell_type_con_l = 4,
+       k_cell_type_con_d = 8
 };
 
-m3x3f m_projection;
-m3x3f m_view;
-m3x3f m_mdl;
+enum e_fish_state
+{
+       k_fish_state_soon_dead = -1,
+       k_fish_state_dead = 0,
+       k_fish_state_alive,
+       k_fish_state_bg,
+       k_fish_state_soon_alive
+};
+
+enum e_world_button
+{
+       k_world_button_none = -1,
+       k_world_button_sim = 0,
+       k_world_button_ff = 1,
+       k_world_button_wire_mode = 2
+};
 
 #define FLAG_CANAL             0x1
 #define FLAG_IS_TRIGGER 0x2
 #define FLAG_RESERVED0         0x4
 #define FLAG_RESERVED1         0x8
 
-#define FLAG_INPUT 0x10
-#define FLAG_OUTPUT 0x20
-#define FLAG_WALL 0x40
+#define FLAG_INPUT             0x10
+#define FLAG_OUTPUT            0x20
+#define FLAG_WALL              0x40
 
-#define FLAG_FLIP_FLOP 0x100
-#define FLAG_TRIGGERED 0x200
+#define FLAG_FLIP_FLOP         0x100
+#define FLAG_TRIGGERED         0x200
 #define FLAG_FLIP_ROTATING 0x400
-#define FLAG_TARGETED 0x800
+#define FLAG_TARGETED  0x800
 
 /*
        0000 0   | 0001 1   | 0010 2   | 0011 3
@@ -85,7 +100,7 @@ m3x3f m_mdl;
                |          |    |     |    |     |    |
 */
 
-struct cell_description
+static struct cell_description
 {
        v2i start;
        v2i end;
@@ -117,19 +132,6 @@ cell_descriptions[] =
        { }
 };
 
-enum cell_type
-{
-       k_cell_type_stub = 0,
-       k_cell_type_ramp_right = 3,
-       k_cell_type_ramp_left = 6,
-       k_cell_type_split = 7,
-       k_cell_type_merge = 13,
-       k_cell_type_con_r = 1,
-       k_cell_type_con_u = 2,
-       k_cell_type_con_l = 4,
-       k_cell_type_con_d = 8
-};
-
 v2f const curve_3[] = {{0.5f,1.0f},{0.5f,0.625f},{0.625f,0.5f},{1.0f,0.5f}};
 v2f const curve_6[] = {{0.5f,1.0f},{0.5f,0.625f},{0.375f,0.5f},{0.0f,0.5f}};
 v2f const curve_9[] = {{1.0f,0.5f},{0.625f,0.5f},{0.5f,0.375f},{0.5f,0.0f}};
@@ -145,28 +147,8 @@ v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},
 
 float const curve_7_linear_section = 0.1562f;
 
-v3f colour_sets[] =
-{ { 1.0f, 0.9f, 0.3f },
-  { 0.2f, 0.9f, 0.14f },
-  { 0.4f, 0.8f, 1.00f },
-  { 0.882f, 0.204f, 0.922f }
-};
-
-static void colour_code_v3( char cc, v3f target )
-{
-       if( cc >= 'a' && cc <= 'z' )
-       {
-               int id = cc - 'a';
-               
-               if( id < vg_list_size( colour_sets ) )
-               {
-                       v3_copy( colour_sets[ id ], target );
-                       return;
-               }
-       }
-       
-       v3_copy( (v3f){0.0f,0.0f,0.0f}, target );
-}
+// Types
+// ===========================================================================================================
 
 struct mesh
 {
@@ -174,55 +156,6 @@ struct mesh
        u32 elements;
 };
 
-static void init_mesh( struct mesh *m, float const *tris, u32 length )
-{
-       m->elements = length/3;
-       glGenVertexArrays( 1, &m->vao );
-       glGenBuffers( 1, &m->vbo );
-       
-       glBindVertexArray( m->vao );
-       glBindBuffer( GL_ARRAY_BUFFER, m->vbo );
-       glBufferData( GL_ARRAY_BUFFER, length*sizeof(float), tris, GL_STATIC_DRAW );
-       
-       glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0 );
-       glEnableVertexAttribArray( 0 );
-       
-       VG_CHECK_GL();
-}
-
-static void free_mesh( struct mesh *m )
-{
-       glDeleteVertexArrays( 1, &m->vao );
-       glDeleteBuffers( 1, &m->vbo );
-}
-
-static void draw_mesh( int const start, int const count )
-{
-       glDrawArrays( GL_TRIANGLES, start*3, count*3 );
-}
-
-static void use_mesh( struct mesh *m )
-{
-       glBindVertexArray( m->vao );
-}
-
-enum e_fish_state
-{
-       k_fish_state_soon_dead = -1,
-       k_fish_state_dead = 0,
-       k_fish_state_alive,
-       k_fish_state_bg,
-       k_fish_state_soon_alive
-};
-
-enum e_world_button
-{
-       k_world_button_none = -1,
-       k_world_button_sim = 0,
-       k_world_button_ff = 1,
-       k_world_button_wire_mode = 2
-};
-
 struct world
 {
 #pragma pack(push,1)
@@ -249,9 +182,6 @@ struct world
        
        struct cell_terminal
        {
-               //char *conditions;
-               //char recv[12];
-               
                struct terminal_run
                {
                        char conditions[8];
@@ -262,8 +192,8 @@ struct world
                runs[8];
                
                int run_count;
-               
-               int id;
+               v2i pos;
+               //int id;
        }
        *io;
        
@@ -312,7 +242,134 @@ struct world
        u32 score;
        u32 completed;
        u32 time;
-} world;
+       
+       u16 id_drag_from;
+       v2f drag_from_co;
+       v2f drag_to_co;
+};
+
+// Forward declerations
+// --------------------
+
+static int console_credits( int argc, char const *argv[] );
+static int console_save_map( int argc, char const *argv[] );
+static int console_load_map( int argc, char const *argv[] );
+static int console_changelevel( int argc, char const *argv[] );
+
+// GLOBALS
+// ===========================================================================================================
+
+m3x3f m_projection;
+m3x3f m_view;
+m3x3f m_mdl;
+
+struct world world;
+
+// UTILITY
+// ===========================================================================================================
+
+static void colour_code_v3( char const cc, v3f target )
+{
+       static v3f colour_sets[] =
+       { { 1.0f, 0.9f, 0.3f },
+         { 0.2f, 0.9f, 0.14f },
+         { 0.4f, 0.8f, 1.00f },
+         { 0.882f, 0.204f, 0.922f }
+       };
+
+       if( cc >= 'a' && cc <= 'z' )
+       {
+               int id = cc - 'a';
+               
+               if( id < vg_list_size( colour_sets ) )
+               {
+                       v3_copy( colour_sets[ id ], target );
+                       return;
+               }
+       }
+       
+       v3_copy( (v3f){0.0f,0.0f,0.0f}, target );
+}
+
+static int hash21i( v2i p, u32 umod )
+{
+       static const int random_noise[] = 
+       {
+       0x46,0xD5,0xB8,0xD3,0xF2,0xE5,0xCC,0x07,0xD0,0xB3,0x7A,0xA2,0xC3,0xDA,0xDC,0x7F,0xE0,0xB7,0x42,0xA0,0xBF,0x41,0x92,0x32,0x6F,0x0D,0x45,0xC7,0x54,0xDB,0x30,0xC2,
+       0xD5,0xDA,0x55,0x09,0xDE,0x74,0x48,0x20,0xE1,0x24,0x5C,0x4D,0x6F,0x36,0xD8,0xE9,0x8D,0x8F,0x54,0x99,0x98,0x51,0xFE,0xDB,0x26,0x04,0x65,0x57,0x56,0xF3,0x53,0x30,
+       0x3D,0x16,0xC0,0xB6,0xF2,0x47,0xCF,0x62,0xB0,0x6C,0x8F,0x4F,0x8C,0x4C,0x17,0xF0,0x19,0x7E,0x2D,0x81,0x8D,0xFB,0x10,0xD3,0x49,0x50,0x60,0xFD,0x38,0x15,0x3B,0xEE,
+       0x05,0xC1,0xCF,0x62,0x97,0x75,0xDF,0x4E,0x4D,0x89,0x5E,0x88,0x5C,0x30,0x8C,0x54,0x1D,0x39,0x41,0xEA,0xA2,0x63,0x12,0x1B,0x8E,0x35,0x22,0x9B,0x98,0xA3,0x7F,0x80,
+       0xD6,0x27,0x94,0x66,0xB5,0x1D,0x7E,0xDF,0x96,0x28,0x38,0x3A,0xA0,0xE8,0x71,0x09,0x62,0x5E,0x9D,0x53,0x58,0x1B,0x7D,0x0D,0x2D,0x99,0x77,0x83,0xC3,0x89,0xC2,0xA2,
+       0xA7,0x1D,0x78,0x80,0x37,0xC1,0x87,0xFF,0x65,0xBF,0x2C,0xF1,0xE5,0xB3,0x09,0xE0,0x25,0x92,0x83,0x0F,0x8A,0x57,0x3C,0x0B,0xC6,0xBC,0x44,0x16,0xE3,0xCE,0xC3,0x0D,
+       0x69,0xD3,0xC6,0x99,0xB8,0x46,0x44,0xC4,0xF3,0x1E,0xBF,0xF5,0xB4,0xDB,0xFB,0x93,0xA1,0x7B,0xC9,0x08,0x77,0x22,0xE5,0x02,0xEF,0x9E,0x90,0x94,0x8A,0xA6,0x3D,0x7E,
+       0xA2,0xA0,0x10,0x82,0x47,0x5C,0xAA,0xF8,0x2F,0x0D,0x9F,0x76,0xDA,0x99,0x0F,0xCB,0xE2,0x02,0x0C,0x75,0xCA,0x35,0x29,0xA6,0x49,0x83,0x6D,0x91,0xB4,0xEC,0x31,0x69,
+       0xBA,0x13,0xF3,0xC7,0x21,0x06,0xC8,0x79,0xEF,0xB1,0x9C,0x6A,0xEE,0x64,0x9A,0xDC,0x1E,0xC6,0x18,0x93,0xA9,0x7E,0x89,0x7D,0x96,0xE5,0x44,0xB8,0x00,0x15,0xAF,0x8C,
+       0x78,0x8F,0xA8,0x05,0xA7,0x07,0x25,0x9A,0xC8,0x5D,0x90,0x1A,0x41,0x53,0x30,0xD3,0x24,0x33,0x71,0xB4,0x50,0x6E,0xE4,0xEA,0x0D,0x2B,0x6D,0xF5,0x17,0x08,0x74,0x49,
+       0x71,0xC2,0xAC,0xF7,0xDC,0xB2,0x7E,0xCC,0xB6,0x1B,0xB8,0xA9,0x52,0xCF,0x6B,0x51,0xD2,0x4E,0xC9,0x43,0xEE,0x2E,0x92,0x24,0xBB,0x47,0x4D,0x0C,0x3E,0x21,0x53,0x19,
+       0xD4,0x82,0xE2,0xC6,0x93,0x85,0x0A,0xF8,0xFA,0x04,0x07,0xD3,0x1D,0xEC,0x03,0x66,0xFD,0xB1,0xFB,0x8F,0xC5,0xDE,0xE8,0x29,0xDF,0x23,0x09,0x9D,0x7C,0x43,0x3D,0x4D,
+       0x89,0xB9,0x6F,0xB4,0x6B,0x4A,0x51,0xC3,0x94,0xF4,0x7C,0x5E,0x19,0x87,0x79,0xC1,0x80,0x0C,0x45,0x12,0xEC,0x95,0xF3,0x31,0x68,0x42,0xE1,0x06,0x57,0x0E,0xA7,0xFB,
+       0x78,0x96,0x87,0x23,0xA5,0x20,0x7A,0x09,0x3A,0x45,0xE6,0xD9,0x5E,0x6A,0xD6,0xAA,0x29,0x50,0x92,0x4E,0xD0,0xB5,0x91,0xC2,0x9A,0xCF,0x07,0xFE,0xB2,0x15,0xEB,0xE4,
+       0x84,0x40,0x14,0x47,0xFA,0x93,0xB9,0x06,0x69,0xDB,0xBD,0x4E,0xEA,0x52,0x9B,0xDE,0x5B,0x50,0x36,0xAB,0xB3,0x1F,0xD2,0xCD,0x9C,0x13,0x07,0x7E,0x8B,0xED,0x72,0x62,
+       0x74,0x77,0x3B,0x88,0xAC,0x5B,0x6A,0xBC,0xDA,0x99,0xE8,0x24,0x90,0x5A,0xCA,0x8D,0x5C,0x2B,0xF8,0xF1,0xE1,0x1D,0x94,0x11,0xEA,0xCC,0x02,0x09,0x1E,0xA2,0x48,0x67,
+       0x87,0x5A,0x7E,0xC6,0xCC,0xA3,0xFB,0xC5,0x36,0xEB,0x5C,0xE1,0xAF,0x1E,0xBE,0xE7,0xD8,0x8F,0x70,0xAE,0x42,0x05,0xF5,0xCD,0x2D,0xA2,0xB0,0xFD,0xEF,0x65,0x2C,0x22,
+       0xCB,0x8C,0x8B,0xAA,0x3D,0x86,0xE2,0xCD,0xBE,0xC3,0x42,0x38,0xE3,0x9C,0x08,0xB5,0xAE,0xBD,0x54,0x73,0x83,0x70,0x24,0x47,0xCA,0x4C,0x04,0xC4,0xE0,0x1D,0x40,0xED,
+       0xF4,0x2B,0x50,0x8E,0x97,0xB3,0xF0,0xA6,0x76,0xDB,0x49,0x30,0xE5,0xD9,0x71,0x07,0xB2,0xF1,0x0F,0xD6,0x77,0xAA,0x72,0xC0,0xAF,0x66,0xD8,0x40,0xC6,0x08,0x19,0x8C,
+       0xD9,0x8F,0x5A,0x75,0xAC,0xBE,0xC2,0x40,0x5B,0xBD,0x0D,0x1D,0x00,0xAF,0x26,0x5E,0x78,0x43,0xAA,0xC6,0x4F,0xF3,0xD8,0xE2,0x7F,0x0C,0x1E,0x77,0x4D,0x35,0x96,0x23,
+       0x32,0x44,0x03,0x8D,0x92,0xE7,0xFD,0x48,0x07,0xD0,0x58,0xFC,0x6D,0xC9,0x91,0x33,0xF0,0x23,0x45,0xA4,0x29,0xB9,0xF5,0xB0,0x68,0x8F,0x7B,0x59,0x15,0x8E,0xA6,0x66,
+       0x15,0xA0,0x76,0x9B,0x69,0xCB,0x38,0xA5,0xF4,0xB4,0x6B,0xDC,0x1F,0xAB,0xAE,0x12,0x77,0xC0,0x8C,0x4A,0x03,0xB9,0x73,0xD3,0x6D,0x52,0xC5,0xF5,0x6E,0x4E,0x4B,0xA3,
+       0x24,0x02,0x58,0xEE,0x5F,0xF9,0xD6,0xD0,0x1D,0xBC,0xF4,0xB8,0x4F,0xFD,0x4B,0x2D,0x34,0x77,0x46,0xE5,0xD4,0x33,0x7B,0x9C,0x35,0xCD,0xB0,0x5D,0x06,0x39,0x99,0xEB,
+       0x0C,0xD0,0x0F,0xF7,0x92,0xB5,0x58,0x5B,0x5E,0x79,0x12,0xF4,0x05,0xF6,0x21,0x07,0x0B,0x49,0x1A,0xFB,0xD4,0x98,0xC4,0xEF,0x7A,0xD6,0xCA,0xA1,0xDA,0xB3,0x51,0x00,
+       0x76,0xEC,0x08,0x48,0x40,0x35,0xD7,0x94,0xBE,0xF5,0x7B,0xA4,0x20,0x81,0x5F,0x82,0xF3,0x6F,0x96,0x24,0x98,0xB6,0x49,0x18,0xC8,0xC5,0x8C,0xD2,0x38,0x7F,0xC4,0xF6,
+       0xAA,0x87,0xDC,0x73,0x5B,0xA1,0xAF,0xE5,0x3D,0x37,0x6B,0x85,0xED,0x38,0x62,0x7D,0x57,0xBD,0xCF,0xB5,0x1B,0xA8,0xBB,0x32,0x33,0xD3,0x34,0x5A,0xC1,0x5D,0xFB,0x28,
+       0x6E,0xE1,0x67,0x51,0xBB,0x31,0x92,0x83,0xAC,0xAA,0x72,0x52,0xFD,0x13,0x4F,0x73,0xD3,0xF0,0x5E,0xFC,0xBA,0xB1,0x3C,0x7B,0x08,0x76,0x03,0x38,0x1E,0xD1,0xCC,0x33,
+       0xA3,0x1E,0xFC,0xE0,0x82,0x30,0x27,0x93,0x71,0x35,0x75,0x77,0xBA,0x78,0x10,0x33,0xCD,0xAB,0xCF,0x8E,0xAD,0xF9,0x32,0xC9,0x15,0x9F,0xD6,0x6D,0xA8,0xAE,0xB1,0x3F,
+       0x90,0xEB,0xD4,0xF9,0x31,0x81,0xA3,0x53,0x99,0x4B,0x3C,0x93,0x3B,0xFE,0x55,0xFF,0x25,0x9F,0xCC,0x07,0xC5,0x2C,0x14,0xA7,0xA4,0x1E,0x6C,0xB6,0x91,0x2A,0xE0,0x3E,
+       0x7F,0x39,0x0A,0xD9,0x24,0x3C,0x01,0xA0,0x30,0x99,0x8E,0xB8,0x1D,0xF9,0xA7,0x78,0x86,0x95,0x35,0x0E,0x21,0xDA,0x7A,0x7B,0xAD,0x9F,0x4E,0xF6,0x63,0x5B,0x96,0xBB,
+       0x87,0x36,0x3F,0xA7,0x1A,0x66,0x91,0xCD,0xB0,0x3B,0xC0,0x4F,0x54,0xD2,0x5F,0xBB,0x38,0x89,0x1C,0x79,0x7E,0xA2,0x02,0xE4,0x80,0x84,0x1E,0x33,0xAB,0x74,0xFA,0xBE,
+       0x31,0x46,0x2E,0xC5,0x15,0xB9,0x12,0xE9,0xD3,0x73,0x43,0xEA,0x74,0x11,0xA7,0xC0,0xD5,0xD8,0x39,0x08,0x9F,0x4F,0xC7,0x71,0x25,0x09,0x51,0x65,0xD6,0xA8,0x02,0x1F
+       };
+
+       return random_noise[ (random_noise[p[1] & 1023] + p[0]) & 1023 ] & umod;
+}
+
+// MESH
+// ===========================================================================================================
+
+static void init_mesh( struct mesh *m, float const *tris, u32 length )
+{
+       m->elements = length/3;
+       glGenVertexArrays( 1, &m->vao );
+       glGenBuffers( 1, &m->vbo );
+       
+       glBindVertexArray( m->vao );
+       glBindBuffer( GL_ARRAY_BUFFER, m->vbo );
+       glBufferData( GL_ARRAY_BUFFER, length*sizeof(float), tris, GL_STATIC_DRAW );
+       
+       glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0 );
+       glEnableVertexAttribArray( 0 );
+       
+       VG_CHECK_GL();
+}
+
+static void free_mesh( struct mesh *m )
+{
+       glDeleteVertexArrays( 1, &m->vao );
+       glDeleteBuffers( 1, &m->vbo );
+}
+
+static void draw_mesh( int const start, int const count )
+{
+       glDrawArrays( GL_TRIANGLES, start*3, count*3 );
+}
+
+static void use_mesh( struct mesh *m )
+{
+       glBindVertexArray( m->vao );
+}
+
+
+
+
 
 static struct cell_button *get_wbutton( enum e_world_button btn )
 {
@@ -321,6 +378,9 @@ static struct cell_button *get_wbutton( enum e_world_button btn )
 
 void leaderboard_set_score( struct cmp_level *cmp_level, u32 score );
 
+// WORLD/MAP
+// ===========================================================================================================
+
 static void map_free(void)
 {      
        arrfree( world.data );
@@ -348,106 +408,156 @@ static void io_reset(void)
        }
 }
 
-int random_noise[] = {
-0x46,0xD5,0xB8,0xD3,0xF2,0xE5,0xCC,0x07,0xD0,0xB3,0x7A,0xA2,0xC3,0xDA,0xDC,0x7F,0xE0,0xB7,0x42,0xA0,0xBF,0x41,0x92,0x32,0x6F,0x0D,0x45,0xC7,0x54,0xDB,0x30,0xC2,
-0xD5,0xDA,0x55,0x09,0xDE,0x74,0x48,0x20,0xE1,0x24,0x5C,0x4D,0x6F,0x36,0xD8,0xE9,0x8D,0x8F,0x54,0x99,0x98,0x51,0xFE,0xDB,0x26,0x04,0x65,0x57,0x56,0xF3,0x53,0x30,
-0x3D,0x16,0xC0,0xB6,0xF2,0x47,0xCF,0x62,0xB0,0x6C,0x8F,0x4F,0x8C,0x4C,0x17,0xF0,0x19,0x7E,0x2D,0x81,0x8D,0xFB,0x10,0xD3,0x49,0x50,0x60,0xFD,0x38,0x15,0x3B,0xEE,
-0x05,0xC1,0xCF,0x62,0x97,0x75,0xDF,0x4E,0x4D,0x89,0x5E,0x88,0x5C,0x30,0x8C,0x54,0x1D,0x39,0x41,0xEA,0xA2,0x63,0x12,0x1B,0x8E,0x35,0x22,0x9B,0x98,0xA3,0x7F,0x80,
-0xD6,0x27,0x94,0x66,0xB5,0x1D,0x7E,0xDF,0x96,0x28,0x38,0x3A,0xA0,0xE8,0x71,0x09,0x62,0x5E,0x9D,0x53,0x58,0x1B,0x7D,0x0D,0x2D,0x99,0x77,0x83,0xC3,0x89,0xC2,0xA2,
-0xA7,0x1D,0x78,0x80,0x37,0xC1,0x87,0xFF,0x65,0xBF,0x2C,0xF1,0xE5,0xB3,0x09,0xE0,0x25,0x92,0x83,0x0F,0x8A,0x57,0x3C,0x0B,0xC6,0xBC,0x44,0x16,0xE3,0xCE,0xC3,0x0D,
-0x69,0xD3,0xC6,0x99,0xB8,0x46,0x44,0xC4,0xF3,0x1E,0xBF,0xF5,0xB4,0xDB,0xFB,0x93,0xA1,0x7B,0xC9,0x08,0x77,0x22,0xE5,0x02,0xEF,0x9E,0x90,0x94,0x8A,0xA6,0x3D,0x7E,
-0xA2,0xA0,0x10,0x82,0x47,0x5C,0xAA,0xF8,0x2F,0x0D,0x9F,0x76,0xDA,0x99,0x0F,0xCB,0xE2,0x02,0x0C,0x75,0xCA,0x35,0x29,0xA6,0x49,0x83,0x6D,0x91,0xB4,0xEC,0x31,0x69,
-0xBA,0x13,0xF3,0xC7,0x21,0x06,0xC8,0x79,0xEF,0xB1,0x9C,0x6A,0xEE,0x64,0x9A,0xDC,0x1E,0xC6,0x18,0x93,0xA9,0x7E,0x89,0x7D,0x96,0xE5,0x44,0xB8,0x00,0x15,0xAF,0x8C,
-0x78,0x8F,0xA8,0x05,0xA7,0x07,0x25,0x9A,0xC8,0x5D,0x90,0x1A,0x41,0x53,0x30,0xD3,0x24,0x33,0x71,0xB4,0x50,0x6E,0xE4,0xEA,0x0D,0x2B,0x6D,0xF5,0x17,0x08,0x74,0x49,
-0x71,0xC2,0xAC,0xF7,0xDC,0xB2,0x7E,0xCC,0xB6,0x1B,0xB8,0xA9,0x52,0xCF,0x6B,0x51,0xD2,0x4E,0xC9,0x43,0xEE,0x2E,0x92,0x24,0xBB,0x47,0x4D,0x0C,0x3E,0x21,0x53,0x19,
-0xD4,0x82,0xE2,0xC6,0x93,0x85,0x0A,0xF8,0xFA,0x04,0x07,0xD3,0x1D,0xEC,0x03,0x66,0xFD,0xB1,0xFB,0x8F,0xC5,0xDE,0xE8,0x29,0xDF,0x23,0x09,0x9D,0x7C,0x43,0x3D,0x4D,
-0x89,0xB9,0x6F,0xB4,0x6B,0x4A,0x51,0xC3,0x94,0xF4,0x7C,0x5E,0x19,0x87,0x79,0xC1,0x80,0x0C,0x45,0x12,0xEC,0x95,0xF3,0x31,0x68,0x42,0xE1,0x06,0x57,0x0E,0xA7,0xFB,
-0x78,0x96,0x87,0x23,0xA5,0x20,0x7A,0x09,0x3A,0x45,0xE6,0xD9,0x5E,0x6A,0xD6,0xAA,0x29,0x50,0x92,0x4E,0xD0,0xB5,0x91,0xC2,0x9A,0xCF,0x07,0xFE,0xB2,0x15,0xEB,0xE4,
-0x84,0x40,0x14,0x47,0xFA,0x93,0xB9,0x06,0x69,0xDB,0xBD,0x4E,0xEA,0x52,0x9B,0xDE,0x5B,0x50,0x36,0xAB,0xB3,0x1F,0xD2,0xCD,0x9C,0x13,0x07,0x7E,0x8B,0xED,0x72,0x62,
-0x74,0x77,0x3B,0x88,0xAC,0x5B,0x6A,0xBC,0xDA,0x99,0xE8,0x24,0x90,0x5A,0xCA,0x8D,0x5C,0x2B,0xF8,0xF1,0xE1,0x1D,0x94,0x11,0xEA,0xCC,0x02,0x09,0x1E,0xA2,0x48,0x67,
-0x87,0x5A,0x7E,0xC6,0xCC,0xA3,0xFB,0xC5,0x36,0xEB,0x5C,0xE1,0xAF,0x1E,0xBE,0xE7,0xD8,0x8F,0x70,0xAE,0x42,0x05,0xF5,0xCD,0x2D,0xA2,0xB0,0xFD,0xEF,0x65,0x2C,0x22,
-0xCB,0x8C,0x8B,0xAA,0x3D,0x86,0xE2,0xCD,0xBE,0xC3,0x42,0x38,0xE3,0x9C,0x08,0xB5,0xAE,0xBD,0x54,0x73,0x83,0x70,0x24,0x47,0xCA,0x4C,0x04,0xC4,0xE0,0x1D,0x40,0xED,
-0xF4,0x2B,0x50,0x8E,0x97,0xB3,0xF0,0xA6,0x76,0xDB,0x49,0x30,0xE5,0xD9,0x71,0x07,0xB2,0xF1,0x0F,0xD6,0x77,0xAA,0x72,0xC0,0xAF,0x66,0xD8,0x40,0xC6,0x08,0x19,0x8C,
-0xD9,0x8F,0x5A,0x75,0xAC,0xBE,0xC2,0x40,0x5B,0xBD,0x0D,0x1D,0x00,0xAF,0x26,0x5E,0x78,0x43,0xAA,0xC6,0x4F,0xF3,0xD8,0xE2,0x7F,0x0C,0x1E,0x77,0x4D,0x35,0x96,0x23,
-0x32,0x44,0x03,0x8D,0x92,0xE7,0xFD,0x48,0x07,0xD0,0x58,0xFC,0x6D,0xC9,0x91,0x33,0xF0,0x23,0x45,0xA4,0x29,0xB9,0xF5,0xB0,0x68,0x8F,0x7B,0x59,0x15,0x8E,0xA6,0x66,
-0x15,0xA0,0x76,0x9B,0x69,0xCB,0x38,0xA5,0xF4,0xB4,0x6B,0xDC,0x1F,0xAB,0xAE,0x12,0x77,0xC0,0x8C,0x4A,0x03,0xB9,0x73,0xD3,0x6D,0x52,0xC5,0xF5,0x6E,0x4E,0x4B,0xA3,
-0x24,0x02,0x58,0xEE,0x5F,0xF9,0xD6,0xD0,0x1D,0xBC,0xF4,0xB8,0x4F,0xFD,0x4B,0x2D,0x34,0x77,0x46,0xE5,0xD4,0x33,0x7B,0x9C,0x35,0xCD,0xB0,0x5D,0x06,0x39,0x99,0xEB,
-0x0C,0xD0,0x0F,0xF7,0x92,0xB5,0x58,0x5B,0x5E,0x79,0x12,0xF4,0x05,0xF6,0x21,0x07,0x0B,0x49,0x1A,0xFB,0xD4,0x98,0xC4,0xEF,0x7A,0xD6,0xCA,0xA1,0xDA,0xB3,0x51,0x00,
-0x76,0xEC,0x08,0x48,0x40,0x35,0xD7,0x94,0xBE,0xF5,0x7B,0xA4,0x20,0x81,0x5F,0x82,0xF3,0x6F,0x96,0x24,0x98,0xB6,0x49,0x18,0xC8,0xC5,0x8C,0xD2,0x38,0x7F,0xC4,0xF6,
-0xAA,0x87,0xDC,0x73,0x5B,0xA1,0xAF,0xE5,0x3D,0x37,0x6B,0x85,0xED,0x38,0x62,0x7D,0x57,0xBD,0xCF,0xB5,0x1B,0xA8,0xBB,0x32,0x33,0xD3,0x34,0x5A,0xC1,0x5D,0xFB,0x28,
-0x6E,0xE1,0x67,0x51,0xBB,0x31,0x92,0x83,0xAC,0xAA,0x72,0x52,0xFD,0x13,0x4F,0x73,0xD3,0xF0,0x5E,0xFC,0xBA,0xB1,0x3C,0x7B,0x08,0x76,0x03,0x38,0x1E,0xD1,0xCC,0x33,
-0xA3,0x1E,0xFC,0xE0,0x82,0x30,0x27,0x93,0x71,0x35,0x75,0x77,0xBA,0x78,0x10,0x33,0xCD,0xAB,0xCF,0x8E,0xAD,0xF9,0x32,0xC9,0x15,0x9F,0xD6,0x6D,0xA8,0xAE,0xB1,0x3F,
-0x90,0xEB,0xD4,0xF9,0x31,0x81,0xA3,0x53,0x99,0x4B,0x3C,0x93,0x3B,0xFE,0x55,0xFF,0x25,0x9F,0xCC,0x07,0xC5,0x2C,0x14,0xA7,0xA4,0x1E,0x6C,0xB6,0x91,0x2A,0xE0,0x3E,
-0x7F,0x39,0x0A,0xD9,0x24,0x3C,0x01,0xA0,0x30,0x99,0x8E,0xB8,0x1D,0xF9,0xA7,0x78,0x86,0x95,0x35,0x0E,0x21,0xDA,0x7A,0x7B,0xAD,0x9F,0x4E,0xF6,0x63,0x5B,0x96,0xBB,
-0x87,0x36,0x3F,0xA7,0x1A,0x66,0x91,0xCD,0xB0,0x3B,0xC0,0x4F,0x54,0xD2,0x5F,0xBB,0x38,0x89,0x1C,0x79,0x7E,0xA2,0x02,0xE4,0x80,0x84,0x1E,0x33,0xAB,0x74,0xFA,0xBE,
-0x31,0x46,0x2E,0xC5,0x15,0xB9,0x12,0xE9,0xD3,0x73,0x43,0xEA,0x74,0x11,0xA7,0xC0,0xD5,0xD8,0x39,0x08,0x9F,0x4F,0xC7,0x71,0x25,0x09,0x51,0x65,0xD6,0xA8,0x02,0x1F
-};
-
-static int hash21i( v2i p, u32 umod )
-{
-       return random_noise[ (random_noise[p[1] & 1023] + p[0]) & 1023 ] & umod;
-}
-
 static struct cell *pcell( v2i pos )
 {
        return &world.data[ pos[1]*world.w + pos[0] ];
 }
 
-static void map_reclassify( v2i start, v2i end, int update_texbuffer );
-static int map_load( const char *str, const char *name )
+static void map_reclassify( v2i start, v2i end, int update_texbuffer )
 {
-       //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data
-       
-       map_free();
-
-       char const *c = str;
+       v2i full_start = { 1,1 };
+       v2i full_end = { world.w-1, world.h-1 };
        
-       // Scan for width
-       for(;; world.w ++)
+       if( !start || !end )
        {
-               if( c[world.w] == ';' )
-                       break;
-               else if( !c[world.w] )
-               {
-                       vg_error( "Unexpected EOF when parsing level\n" );
-                       return 0;
-               }
+               start = full_start;
+               end = full_end;
        }
        
-       struct cell *row = arraddnptr( world.data, world.w );
-       int cx = 0;
-       int reg_start = 0, reg_end = 0;
-       
-       u32 *links_to_make = NULL;
-       int links_satisfied = 0;
+       // Texture data
+       u8 info_buffer[64*64*4];
+       u32 pixel_id = 0;
        
-       char link_id_buffer[32];
-       int link_id_n = 0;
+       int px0 = vg_max( start[0], full_start[0] ),
+                px1 = vg_min( end[0], full_end[0] ),
+                py0 = vg_max( start[1], full_start[1] ),
+                py1 = vg_min( end[1], full_end[1] );
 
-       for(;;)
+       for( int y = py0; y < py1; y ++ )
        {
-               if( !*c )
-                       break;
-       
-               if( *c == '\r' ) { c ++; continue; } // fuck off windows
-       
-               if( *c == ';' )
+               for( int x = px0; x < px1; x ++ )
                {
-                       c ++;
+                       struct cell *cell = pcell((v2i){x,y});
+
+                       v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}};
                        
-                       if( *c == '\r' ) c ++;
+                       u8 height = 0;
+                       u8 config = 0x00;
                        
-                       // Parse attribs
-                       if( *c != '\n' )
+                       if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
                        {
-                               while( *c )
+                               for( int i = 0; i < vg_list_size( dirs ); i ++ )
                                {
-                                       if( *c == '\r' ) { c ++; continue; }
-                                       
-                                       if( reg_start < reg_end )
-                                       {
-                                               struct cell_terminal *terminal = &world.io[ reg_start ];
-                                               struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ];
+                                       struct cell *neighbour = pcell((v2i){x+dirs[i][0], y+dirs[i][1]});
+                                       if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+                                               config |= 0x1 << i;
+                               }
+                               
+                               height = 128;
+                       } 
+                       else 
+                       {
+                               if( cell->state & FLAG_WALL )
+                                       height = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F );
+                               
+                               config = 0xF;
+                       }
+                       
+                       pcell((v2i){x,y})->config = config;
+                       
+                       u8 *info_px = &info_buffer[ (pixel_id ++)*4 ];
+                       info_px[0] = height;
+                       info_px[1] = cell->state & FLAG_WALL? 0: 255;
+                       info_px[2] = 0;
+                       info_px[3] = 0;
+                       
+                       if( 
+                               (
+                                       ((cell->state & FLAG_IS_TRIGGER) && (cell->config == 0xF || cell->config == k_cell_type_split)) || 
+                                       ((cell->state & FLAG_TARGETED) && (cell->config != k_cell_type_split)) 
+                               ) && update_texbuffer
+                       ){
+                               cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
+                               for( u32 i = 0; i < 2; i ++ )
+                               {
+                                       if( cell->links[i] )
+                                       {
+                                               struct cell *other_ptr = &world.data[ cell->links[i] ];
+                                               other_ptr->links[ i ] = 0;
+                                               other_ptr->state &= ~FLAG_IS_TRIGGER;
+                                               
+                                               if( other_ptr->links[ i ^ 0x1 ] == 0 )
+                                                       other_ptr->state &= ~FLAG_TARGETED;
+                                       }
+                               }
+                               
+                               cell->links[0] = 0;
+                               cell->links[1] = 0;
+                       }
+               }
+       }
+       
+       if( update_texbuffer )
+       {
+               glBindTexture( GL_TEXTURE_2D, world.background_data );
+               glTexSubImage2D( GL_TEXTURE_2D, 0, px0 + 16, py0 + 16, px1-px0, py1-py0, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer );
+       }
+}
+
+static int map_load( const char *str, const char *name )
+{
+       //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data
+       
+       map_free();
+
+       char const *c = str;
+       
+       // Scan for width
+       for(;; world.w ++)
+       {
+               if( c[world.w] == ';' )
+                       break;
+               else if( !c[world.w] )
+               {
+                       vg_error( "Unexpected EOF when parsing level\n" );
+                       return 0;
+               }
+       }
+       
+       struct cell *row = arraddnptr( world.data, world.w );
+       int cx = 0;
+       int reg_start = 0, reg_end = 0;
+       
+       u32 *links_to_make = NULL;
+       int links_satisfied = 0;
+       
+       char link_id_buffer[32];
+       int link_id_n = 0;
+
+       for(;;)
+       {
+               if( !*c )
+                       break;
+       
+               if( *c == '\r' ) { c ++; continue; } // fuck off windows
+       
+               if( *c == ';' )
+               {
+                       c ++;
+                       
+                       if( *c == '\r' ) c ++;
+                       
+                       // Parse attribs
+                       if( *c != '\n' )
+                       {
+                               while( *c )
+                               {
+                                       if( *c == '\r' ) { c ++; continue; }
+                                       
+                                       if( reg_start < reg_end )
+                                       {
+                                               struct cell_terminal *terminal = &world.io[ reg_start ];
+                                               struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ];
 
                                                if( *c >= 'a' && *c <= 'z' )
                                                {                                                       
@@ -563,7 +673,9 @@ static int map_load( const char *str, const char *name )
                        if( *c == '+' || *c == '-' )
                        {
                                struct cell_terminal *term = arraddnptr( world.io, 1 );
-                               term->id = cx + world.h*world.w;
+                               term->pos[0] = cx;
+                               term->pos[1] = world.h;
+                               
                                term->run_count = 1;
                                term->runs[0].condition_count = 0;
 
@@ -616,18 +728,16 @@ static int map_load( const char *str, const char *name )
                for( int i = 0; i < arrlen(world.io); i ++ )
                {
                        struct cell_terminal *term = &world.io[ i ];
-                       int posx = term->id % world.w;
-                       int posy = (term->id - posx)/world.w;
                        
                        v2i turtle;
                        v2i turtle_dir;
                        int original_y;
                        
-                       turtle[0] = 16+posx;
-                       turtle[1] = 16+posy;
+                       turtle[0] = 16+term->pos[0];
+                       turtle[1] = 16+term->pos[1];
                        
                        turtle_dir[0] = 0;
-                       turtle_dir[1] = pcell((v2i){ posx,posy })->state & FLAG_INPUT? 1: -1;
+                       turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1;
                        original_y = turtle_dir[1];
                        
                        for( int i = 0; i < 100; i ++ )
@@ -747,7 +857,7 @@ static void map_serialize( FILE *stream )
                        for( int i = 0; i < arrlen( world.io ); i ++ )
                        {
                                struct cell_terminal *term = &world.io[i];
-                               if( term->id == y*world.w+x )
+                               if( v2i_eq( term->pos, (v2i){x,y} ) )
                                {
                                        if( terminal_write_count )
                                                fputc( ',', stream );
@@ -784,281 +894,94 @@ static void map_serialize( FILE *stream )
        }
 }
 
-int main( int argc, char *argv[] )
-{
-       vg_init( argc, argv, "Marble Computing | SPACE: Test | LeftClick: Toggle tile | RightClick: Drag wire" );
-       return 0;
-}
+// CAREER STATE
+// ===========================================================================================================
 
-static int console_credits( int argc, char const *argv[] )
+#pragma pack(push,1)
+struct dcareer_state
 {
-       vg_info( "Aknowledgements:\n" );
-       vg_info( "  GLFW         zlib/libpng  glfw.org\n" );
-       vg_info( "  miniaudio    MIT0         miniaud.io\n" );
-       vg_info( "  QOI          MIT          phoboslab.org\n" );
-       vg_info( "  STB library  MIT          nothings.org\n" );
-       vg_info( "  Weiholmir font            justfredrik.itch.io\n" );
-       return 0;
-}
+       u32 version;
+       i32 in_map;
+       
+       u32 reserved[14];
 
-static int console_save_map( int argc, char const *argv[] )
-{
-       if( !world.initialzed )
+       struct dlevel_state
        {
-               vg_error( "Tried to save uninitialized map!\n" );
-               return 0;
+               i32 score;
+               i32 unlocked;
+               i32 reserved[2];
        }
+       levels[ NUM_CAMPAIGN_LEVELS ];  
+};
+#pragma pack(pop)
 
-       char map_path[ 256 ];
-
-       strcpy( map_path, "sav/" );
-       strcat( map_path, world.map_name );
-       strcat( map_path, ".map" );
+static void career_serialize(void)
+{
+       struct dcareer_state encoded;
+       encoded.version = 2;
+       encoded.in_map = world.pCmpLevel? world.pCmpLevel->serial_id: -1;
+       
+       memset( encoded.reserved, 0, sizeof( encoded.reserved ) );
 
-       FILE *test_writer = fopen( map_path, "wb" );
-       if( test_writer )
+       for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
        {
-               vg_info( "Saving map to '%s'\n", map_path );
-               map_serialize( test_writer );
+               struct serializable_set *set = &career_serializable[i];
                
-               fclose( test_writer );
-               return 1;
-       }
-       else
-       {
-               vg_error( "Unable to open stream for writing\n" );
-               return 0;
+               for( int j = 0; j < set->count; j ++ )
+               {
+                       struct cmp_level *lvl = &set->pack[j];
+                       struct dlevel_state *dest = &encoded.levels[lvl->serial_id];
+                       
+                       dest->score = lvl->completed_score;
+                       dest->unlocked = lvl->unlocked;
+                       dest->reserved[0] = 0;
+                       dest->reserved[1] = 0;
+               }
        }
+
+       vg_asset_write( "sav/game.sv2", &encoded, sizeof( struct dcareer_state ) );
 }
 
-static int console_load_map( int argc, char const *argv[] )
+static void career_unlock_level( struct cmp_level *lvl );
+static void career_unlock_level( struct cmp_level *lvl )
 {
-       char map_path[ 256 ];
+       lvl->unlocked = 1;
+       
+       if( lvl->linked )
+               career_unlock_level( lvl->linked );
+}
 
-       if( argc >= 1 )
+static void career_pass_level( struct cmp_level *lvl, int score, int upload )
+{
+       if( score > 0 )
        {
-               // try from saves
-               strcpy( map_path, "sav/" );
-               strcat( map_path, argv[0] );
-               strcat( map_path, ".map" );
-       
-               char *text_source = vg_textasset_read( map_path );
-               
-               if( !text_source )
+               if( score < lvl->completed_score || lvl->completed_score == 0 )
                {
-                       strcpy( map_path, "maps/" );
-                       strcat( map_path, argv[0] );
-                       strcat( map_path, ".map" );
+                       if( !lvl->is_tutorial && upload )
+                               leaderboard_set_score( lvl, score );
                        
-                       text_source = vg_textasset_read( map_path );
+                       lvl->completed_score = score;
                }
                
-               if( text_source )
-               {
-                       vg_info( "Loading map: '%s'\n", map_path );
-                       world.pCmpLevel = NULL;
-                       
-                       if( !map_load( text_source, argv[0] ) )
-                       {
-                               free( text_source );
-                               return 0;
-                       }
-                       
-                       free( text_source );    
-                       return 1;
-               }
-               else
-               {
-                       vg_error( "Missing maps '%s'\n", argv[0] );
-                       return 0;
-               }
-       }
-       else
-       {
-               vg_error( "Missing argument <map_path>\n" );
-               return 0;
+               if( lvl->unlock ) career_unlock_level( lvl->unlock );
        }
 }
 
-static void simulation_stop(void)
+static void career_reset_level( struct cmp_level *lvl )
 {
-       get_wbutton( k_world_button_sim )->pressed = 0;
-       get_wbutton( k_world_button_ff )->pressed = 0;
-       
-       world.num_fishes = 0;
-       world.sim_frame = 0;
-       world.sim_run = 0;
-       
-       io_reset();
-       
-       sfx_system_fadeout( &audio_system_balls_rolling, 44100 );
-       
-       vg_info( "Stopping simulation!\n" );
+       lvl->unlocked = 0;
+       lvl->completed_score = 0;
 }
 
-static void wbutton_run( enum e_world_button btn_name )
+static void career_load(void)
 {
-       struct cell_button *btn = &world.buttons[btn_name];
-       
-       // Interaction
-       
-       int is_hovering = (world.tile_x == world.w-1 && world.tile_y == world.h-btn_name-2)?1:0;        
-       if( vg_get_button_up( "primary" ) && is_hovering )
-       {
-               // Click event
-               btn->pressed ^= 0x1;
-               
-               if( btn_name == k_world_button_sim )
-               {
-                       if( btn->pressed )
-                       {
-                               vg_success( "Starting simulation!\n" );
-                       
-                               sfx_set_playrnd( &audio_rolls, &audio_system_balls_rolling, 0, 1 );
-                               
-                               world.num_fishes = 0;
-                               world.sim_frame = 0;
-                               world.sim_start = vg_time;
-                               world.sim_run = 0;
-                               world.sim_speed = 2.5f;
-                               
-                               for( int i = 0; i < world.w*world.h; i ++ )
-                                       world.data[ i ].state &= ~FLAG_FLIP_FLOP;
-                               
-                               io_reset();
-                       }
-                       else
-                       {
-                               simulation_stop();
-                       }
-               }
-       }
-       
-       // Drawing
-       if( btn->pressed ) btn->light_target = is_hovering? 0.9f: 0.8f;
-       else btn->light_target = is_hovering? 0.2f: 0.0f;
-
-       if( vg_get_button( "primary" ) && is_hovering )
-               btn->light_target = 1.0f;
-
-       btn->light = vg_lerpf( btn->light, btn->light_target, vg_time_delta*26.0f );
-       
-       glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), 
-               world.w-1, 
-               world.h-btn_name-2, 
-               (float)btn_name, 
-               3.0f 
-       );
-       glUniform4f( SHADER_UNIFORM( shader_buttons, "uColour" ), 0.204f, 0.345f, 0.553f, btn->light );
-       
-       draw_mesh( 0, 2 );
-}
-
-static int console_changelevel( int argc, char const *argv[] )
-{
-       if( argc >= 1 )
-       {
-               // Save current level
-               console_save_map( 0, NULL );
-               if( console_load_map( argc, argv ) )
-               {                               
-                       simulation_stop();
-                       return 1;
-               }
-       }
-       else
-       {
-               vg_error( "Missing argument <map_path>\n" );
-       }
-       
-       return 0;
-}
-
-#pragma pack(push,1)
-struct dcareer_state
-{
-       u32 version;
-       i32 in_map;
-       
-       u32 reserved[14];
-
-       struct dlevel_state
-       {
-               i32 score;
-               i32 unlocked;
-               i32 reserved[2];
-       }
-       levels[ NUM_CAMPAIGN_LEVELS ];  
-};
-#pragma pack(pop)
-
-static void career_serialize(void)
-{
-       struct dcareer_state encoded;
-       encoded.version = 2;
-       encoded.in_map = world.pCmpLevel? world.pCmpLevel->serial_id: -1;
-       
-       memset( encoded.reserved, 0, sizeof( encoded.reserved ) );
-
-       for( int i = 0; i < vg_list_size( career_serializable ); i ++ )
-       {
-               struct serializable_set *set = &career_serializable[i];
-               
-               for( int j = 0; j < set->count; j ++ )
-               {
-                       struct cmp_level *lvl = &set->pack[j];
-                       struct dlevel_state *dest = &encoded.levels[lvl->serial_id];
-                       
-                       dest->score = lvl->completed_score;
-                       dest->unlocked = lvl->unlocked;
-                       dest->reserved[0] = 0;
-                       dest->reserved[1] = 0;
-               }
-       }
-
-       vg_asset_write( "sav/game.sv2", &encoded, sizeof( struct dcareer_state ) );
-}
-
-static void career_unlock_level( struct cmp_level *lvl );
-static void career_unlock_level( struct cmp_level *lvl )
-{
-       lvl->unlocked = 1;
-       
-       if( lvl->linked )
-               career_unlock_level( lvl->linked );
-}
-
-static void career_pass_level( struct cmp_level *lvl, int score, int upload )
-{
-       if( score > 0 )
-       {
-               if( score < lvl->completed_score || lvl->completed_score == 0 )
-               {
-                       if( !lvl->is_tutorial && upload )
-                               leaderboard_set_score( lvl, score );
-                       
-                       lvl->completed_score = score;
-               }
-               
-               if( lvl->unlock ) career_unlock_level( lvl->unlock );
-       }
-}
-
-static void career_reset_level( struct cmp_level *lvl )
-{
-       lvl->unlocked = 0;
-       lvl->completed_score = 0;
-}
-
-static void career_load(void)
-{
-       i64 sz;
-       struct dcareer_state encoded;
-
-       // Blank save state
-       memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) );   
-       encoded.in_map = -1;
-       encoded.levels[0].unlocked = 1;
+       i64 sz;
+       struct dcareer_state encoded;
+
+       // Blank save state
+       memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) );   
+       encoded.in_map = -1;
+       encoded.levels[0].unlocked = 1;
        
        // Load and copy data into encoded
        void *cr = vg_asset_read_s( "sav/game.sv2", &sz );
@@ -1116,190 +1039,32 @@ static void career_load(void)
        }
 }
 
-void leaderboard_found( LeaderboardFindResult_t *pCallback );
-void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback );
-
-void vg_start(void)
+// MAIN GAMEPLAY
+// ===========================================================================================================
+static int is_simulation_running(void)
 {
-       // Steamworks callbacks
-       sw_leaderboard_found = &leaderboard_found;
-       sw_leaderboard_downloaded = &leaderboard_downloaded;
+       return world.buttons[ k_world_button_sim ].pressed;
+}
 
-       vg_function_push( (struct vg_cmd){
-               .name = "_map_write",
-               .function = console_save_map
-       });
+static void simulation_stop(void)
+{
+       world.buttons[ k_world_button_sim ].pressed = 0;
        
-       vg_function_push( (struct vg_cmd){
-               .name = "_map_load",
-               .function = console_load_map
-       });
+       world.num_fishes = 0;
+       world.sim_frame = 0;
+       world.sim_run = 0;
        
-       vg_function_push( (struct vg_cmd){
-               .name = "map",
-               .function = console_changelevel
-       });
+       io_reset();
        
-       vg_function_push( (struct vg_cmd){
-               .name = "credits",
-               .function = console_credits
-       });
+       sfx_system_fadeout( &audio_system_balls_rolling, 44100 );
+       
+       vg_info( "Stopping simulation!\n" );
+}
 
-       // Combined quad, long quad / empty circle / filled circle mesh
-       {
-               float combined_mesh[6*8 + 32*6*3] = {
-                       0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f,
-                       0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f,
-                       
-                       0.0f, 0.0f, 0.0f, 0.2f, 1.0f, 0.2f,
-                       0.0f, 0.0f, 1.0f, 0.2f, 1.0f, 0.0f
-               };
-               
-               float *circle_mesh = combined_mesh + 6*4;
-               int const res = 32;
-
-               for( int i = 0; i < res; i ++ )
-               {
-                       v2f v0 = { sinf( ((float)i/(float)res)*VG_TAUf ), cosf( ((float)i/(float)res)*VG_TAUf ) };
-                       v2f v1 = { sinf( ((float)(i+1)/(float)res)*VG_TAUf ), cosf( ((float)(i+1)/(float)res)*VG_TAUf ) };
-               
-                       circle_mesh[ i*6+0 ] = 0.0f;
-                       circle_mesh[ i*6+1 ] = 0.0f;
-                       
-                       v2_copy( v0, circle_mesh + 32*6 + i*12 );
-                       v2_muls( v0, 0.8f, circle_mesh + 32*6 + i*12+2 );
-                       v2_copy( v1, circle_mesh + 32*6 + i*12+4 );
-                       
-                       v2_copy( v1, circle_mesh + 32*6 + i*12+6 );
-                       v2_muls( v1, 0.8f, circle_mesh + 32*6 + i*12+8 );
-                       v2_muls( v0, 0.8f, circle_mesh + 32*6 + i*12+10 );
-                       
-                       v2_copy( v0, circle_mesh + i*6+4 );
-                       v2_copy( v1, circle_mesh + i*6+2 );
-                       v2_copy( v0, circle_mesh+i*6+4 );
-                       v2_copy( v1, circle_mesh+i*6+2 );
-               }
-               
-               init_mesh( &world.shapes, combined_mesh, vg_list_size( combined_mesh ) );
-       }
-       
-       // Numbers mesh
-       {
-               init_mesh( &world.numbers,
-                       MESH_NUMBERS_BUFFER,
-                       vg_list_size( MESH_NUMBERS_BUFFER )
-               );
-               
-               for( int i = 0; i < 10; i ++ )
-               {
-                       vg_info( "offset: %u, length: %u\n", MESH_NUMBERS_OFFSETS[i][0], MESH_NUMBERS_OFFSETS[i][1] );
-               }
-       }
-       
-       // Create wire mesh
-       {
-               int const num_segments = 64;
-       
-               struct mesh_wire *mw = &world.wire;
-       
-               v2f wire_points[ num_segments * 2 ];
-               u16 wire_indices[ 6*(num_segments-1) ];
-               
-               for( int i = 0; i < num_segments; i ++ )
-               {
-                       float l = (float)i / (float)(num_segments-1);
-                       
-                       v2_copy( (v2f){ l, -0.5f }, wire_points[i*2+0] );
-                       v2_copy( (v2f){ l,  0.5f }, wire_points[i*2+1] );
-                       
-                       if( i < num_segments-1 )
-                       {
-                               wire_indices[ i*6+0 ] = i*2 + 0;
-                               wire_indices[ i*6+1 ] = i*2 + 1;
-                               wire_indices[ i*6+2 ] = i*2 + 3;
-                               wire_indices[ i*6+3 ] = i*2 + 0;
-                               wire_indices[ i*6+4 ] = i*2 + 3;
-                               wire_indices[ i*6+5 ] = i*2 + 2;
-                       }
-               }
-               
-               glGenVertexArrays( 1, &mw->vao );
-               glGenBuffers( 1, &mw->vbo );
-               glGenBuffers( 1, &mw->ebo );
-               glBindVertexArray( mw->vao );
-               
-               glBindBuffer( GL_ARRAY_BUFFER, mw->vbo );
-               
-               glBufferData( GL_ARRAY_BUFFER, sizeof( wire_points ), wire_points, GL_STATIC_DRAW );
-               glBindVertexArray( mw->vao );
-               
-               glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, mw->ebo );
-               glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof( wire_indices ), wire_indices, GL_STATIC_DRAW );
-               
-               // XY
-               glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 );
-               glEnableVertexAttribArray( 0 );
-               
-               VG_CHECK_GL();
-               
-               mw->em = vg_list_size( wire_indices );
-       }
-       
-       // Create info data texture
-       {
-               glGenTextures( 1, &world.background_data );
-               glBindTexture( GL_TEXTURE_2D, world.background_data );
-               glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL );
-               vg_tex2d_nearest();
-       }
-       
-       // Create random smaples texture
-       {
-               u8 *data = malloc(512*512*2);
-               for( int i = 0; i < 512*512*2; i ++ )
-                       data[ i ] = rand()/(RAND_MAX/255);
-               
-               glGenTextures( 1, &world.random_samples );
-               glBindTexture( GL_TEXTURE_2D, world.random_samples );
-               glTexImage2D( GL_TEXTURE_2D, 0, GL_RG, 512, 512, 0, GL_RG, GL_UNSIGNED_BYTE, data );
-               vg_tex2d_linear();
-               vg_tex2d_repeat();
-               
-               free( data );
-       }
-       
-       resource_load_main();
-       
-       // Restore gamestate
-       career_local_data_init();
-       career_load();
-}
-
-void vg_free(void)
-{
-       sw_free_opengl();
-       console_save_map( 0, NULL );
-       career_serialize();
-
-       resource_free_main();
-
-       glDeleteTextures( 1, &world.background_data );
-       glDeleteTextures( 1, &world.random_samples );
-
-       glDeleteVertexArrays( 1, &world.wire.vao );
-       glDeleteBuffers( 1, &world.wire.vbo );
-       glDeleteBuffers( 1, &world.wire.ebo );
-
-       free_mesh( &world.shapes );
-       free_mesh( &world.numbers );
-       
-       map_free();
-}
-
-static int world_check_pos_ok( v2i co )
-{
-       return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
-}
+static int world_check_pos_ok( v2i co )
+{
+       return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
+}
 
 static int cell_interactive( v2i co )
 {
@@ -1386,105 +1151,11 @@ static int cell_interactive( v2i co )
        return 1;
 }
 
-static void map_reclassify( v2i start, v2i end, int update_texbuffer )
-{
-       v2i full_start = { 1,1 };
-       v2i full_end = { world.w-1, world.h-1 };
-       
-       if( !start || !end )
-       {
-               start = full_start;
-               end = full_end;
-       }
-       
-       // Texture data
-       u8 info_buffer[64*64*4];
-       u32 pixel_id = 0;
-       
-       int px0 = vg_max( start[0], full_start[0] ),
-                px1 = vg_min( end[0], full_end[0] ),
-                py0 = vg_max( start[1], full_start[1] ),
-                py1 = vg_min( end[1], full_end[1] );
-
-       for( int y = py0; y < py1; y ++ )
-       {
-               for( int x = px0; x < px1; x ++ )
-               {
-                       struct cell *cell = pcell((v2i){x,y});
-
-                       v2i dirs[] = {{1,0},{0,1},{-1,0},{0,-1}};
-                       
-                       u8 height = 0;
-                       u8 config = 0x00;
-                       
-                       if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
-                       {
-                               for( int i = 0; i < vg_list_size( dirs ); i ++ )
-                               {
-                                       struct cell *neighbour = pcell((v2i){x+dirs[i][0], y+dirs[i][1]});
-                                       if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
-                                               config |= 0x1 << i;
-                               }
-                               
-                               height = 128;
-                       } 
-                       else 
-                       {
-                               if( cell->state & FLAG_WALL )
-                                       height = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F );
-                               
-                               config = 0xF;
-                       }
-                       
-                       pcell((v2i){x,y})->config = config;
-                       
-                       u8 *info_px = &info_buffer[ (pixel_id ++)*4 ];
-                       info_px[0] = height;
-                       info_px[1] = cell->state & FLAG_WALL? 0: 255;
-                       info_px[2] = 0;
-                       info_px[3] = 0;
-                       
-                       if( 
-                               (
-                                       ((cell->state & FLAG_IS_TRIGGER) && (cell->config == 0xF || cell->config == k_cell_type_split)) || 
-                                       ((cell->state & FLAG_TARGETED) && (cell->config != k_cell_type_split)) 
-                               ) && update_texbuffer
-                       ){
-                               cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
-                               for( u32 i = 0; i < 2; i ++ )
-                               {
-                                       if( cell->links[i] )
-                                       {
-                                               struct cell *other_ptr = &world.data[ cell->links[i] ];
-                                               other_ptr->links[ i ] = 0;
-                                               other_ptr->state &= ~FLAG_IS_TRIGGER;
-                                               
-                                               if( other_ptr->links[ i ^ 0x1 ] == 0 )
-                                                       other_ptr->state &= ~FLAG_TARGETED;
-                                       }
-                               }
-                               
-                               cell->links[0] = 0;
-                               cell->links[1] = 0;
-                       }
-               }
-       }
-       
-       if( update_texbuffer )
-       {
-               glBindTexture( GL_TEXTURE_2D, world.background_data );
-               glTexSubImage2D( GL_TEXTURE_2D, 0, px0 + 16, py0 + 16, px1-px0, py1-py0, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer );
-       }
-}
-
-u16 id_drag_from = 0;
-v2f drag_from_co;
-v2f drag_to_co;
-
 void vg_update(void)
 {
-       // Fit within screen
-
+       // Camera
+       // ========================================================================================================
+       
        float r1 = (float)vg_window_y / (float)vg_window_x,
                        r2 = (float)world.h / (float)world.w,
                        size;
@@ -1502,16 +1173,18 @@ void vg_update(void)
        m3x3_mul( m_projection, m_view, vg_pv );
        vg_projection_update();
        
-       // Input stuff
+       // Mouse input
+       // ========================================================================================================
        v2_copy( vg_mouse_ws, world.tile_pos );
        
        world.tile_x = floorf( world.tile_pos[0] );
        world.tile_y = floorf( world.tile_pos[1] );
 
-       // Tilemap editing
-       if( !get_wbutton( k_world_button_sim )->pressed && !gui_want_mouse() )
+       // Tilemap
+       // ========================================================================================================
+       if( !is_simulation_running() && !gui_want_mouse() )
        {
-               v2_copy( vg_mouse_ws, drag_to_co );
+               v2_copy( vg_mouse_ws, world.drag_to_co );
        
                if( cell_interactive( (v2i){ world.tile_x, world.tile_y } ))
                {
@@ -1522,9 +1195,7 @@ void vg_update(void)
                        struct cell *cell_ptr = &world.data[world.selected];
                        
                        if( vg_get_button_down("primary") )
-                       {
                                modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
-                       }
                        
                        if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
                        {
@@ -1551,20 +1222,20 @@ void vg_update(void)
                        
                        if( vg_get_button_down("secondary") && !(cell_ptr->config == k_cell_type_split) )
                        {
-                               id_drag_from = world.selected;
-                               drag_from_co[0] = world.tile_x + 0.5f;
-                               drag_from_co[1] = world.tile_y + 0.5f;
+                               world.id_drag_from = world.selected;
+                               world.drag_from_co[0] = world.tile_x + 0.5f;
+                               world.drag_from_co[1] = world.tile_y + 0.5f;
                        }
                        
-                       if( id_drag_from && (cell_ptr->config == k_cell_type_split) )
+                       if( world.id_drag_from && (cell_ptr->config == k_cell_type_split) )
                        {
                                float local_x = vg_mouse_ws[0] - (float)world.tile_x;
-                               drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
-                               drag_to_co[1] = (float)world.tile_y + 0.25f;
+                               world.drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
+                               world.drag_to_co[1] = (float)world.tile_y + 0.25f;
 
                                if( vg_get_button_up("secondary") )
                                {
-                                       struct cell *drag_ptr = &world.data[id_drag_from];
+                                       struct cell *drag_ptr = &world.data[world.id_drag_from];
                                        u32 link_id = local_x > 0.5f? 1: 0;
                                        
                                        // Cleanup existing connections
@@ -1590,14 +1261,14 @@ void vg_update(void)
                                        }
                                        
                                        // Create the new connection
-                                       vg_success( "Creating connection on link %u (%hu)\n", link_id, id_drag_from );
+                                       vg_success( "Creating connection on link %u (%hu)\n", link_id, world.id_drag_from );
                                                
-                                       cell_ptr->links[ link_id ] = id_drag_from;
+                                       cell_ptr->links[ link_id ] = world.id_drag_from;
                                        drag_ptr->links[ link_id ] = world.selected;
                                        
                                        cell_ptr->state |= FLAG_TARGETED;
                                        drag_ptr->state |= FLAG_IS_TRIGGER;
-                                       id_drag_from = 0;
+                                       world.id_drag_from = 0;
                                }
                        }
                }
@@ -1606,21 +1277,21 @@ void vg_update(void)
                        world.selected = -1;
                }
                        
-               if( !(vg_get_button("secondary") && id_drag_from) )
-                       id_drag_from = 0;
+               if( !(vg_get_button("secondary") && world.id_drag_from) )
+                       world.id_drag_from = 0;
        }
        else
        {
                world.selected = -1;
-               id_drag_from = 0;
+               world.id_drag_from = 0;
        }
        
-       // Fish ticks
-       if( get_wbutton( k_world_button_sim )->pressed )
+       // Marble state updates
+       // ========================================================================================================
+       if( is_simulation_running() )
        {       
                while( world.sim_frame < (int)((vg_time-world.sim_start)*world.sim_speed) )
                {
-                       //vg_info( "frame: %u\n", world.sim_frame );
                        sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 9 );
 
                        // Update splitter deltas
@@ -1662,7 +1333,7 @@ void vg_update(void)
                                                {
                                                        struct cell_terminal *term = &world.io[j];
                                                        
-                                                       if( term->id == fish->pos[1]*world.w + fish->pos[0] )
+                                                       if( v2i_eq( term->pos, fish->pos ) )
                                                        {
                                                                struct terminal_run *run = &term->runs[ world.sim_run ];
                                                                if( run->recv_count < vg_list_size( run->recieved ) )
@@ -1875,17 +1546,15 @@ void vg_update(void)
                        for( int i = 0; i < arrlen( world.io ); i ++ )
                        {
                                struct cell_terminal *term = &world.io[ i ];
-                               int posx = term->id % world.w;
-                               int posy = (term->id - posx)/world.w;
-                               int is_input = world.data[ term->id ].state & FLAG_INPUT;
+                               int is_input = pcell(term->pos)->state & FLAG_INPUT;
                                
                                if( is_input )
                                {
                                        if( world.sim_frame < term->runs[ world.sim_run ].condition_count )
                                        {
                                                struct fish *fish = &world.fishes[ world.num_fishes ];
-                                               fish->pos[0] = posx;
-                                               fish->pos[1] = posy;
+                                               v2i_copy( term->pos, fish->pos );
+                                               
                                                fish->state = k_fish_state_alive;
                                                fish->payload = term->runs[ world.sim_run ].conditions[ world.sim_frame ];
                                                
@@ -1912,7 +1581,7 @@ void vg_update(void)
                                for( int i = 0; i < arrlen( world.io ); i ++ )
                                {
                                        struct cell_terminal *term = &world.io[ i ];
-                                       int is_input = world.data[ term->id ].state & FLAG_INPUT;
+                                       int is_input = pcell(term->pos)->state & FLAG_INPUT;
                                        
                                        if( !is_input )
                                        {
@@ -1986,11 +1655,13 @@ void vg_update(void)
                        world.sim_frame ++;
                }
                
+               // Position update
+               // =====================================================================================================
+               
                float scaled_time = 0.0f;
                scaled_time = (vg_time-world.sim_start)*world.sim_speed;
                world.frame_lerp = scaled_time - (float)world.sim_frame;
                
-               // Update positions
                for( int i = 0; i < world.num_fishes; i ++ )
                {
                        struct fish *fish = &world.fishes[i];
@@ -2068,6 +1739,9 @@ void vg_update(void)
        }
 }
 
+void leaderboard_found( LeaderboardFindResult_t *pCallback );
+void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback );
+
 static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
 {
        v2i full_start = { 0,0 };
@@ -2117,6 +1791,7 @@ static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f cons
        }
 }
 
+/*
 static void draw_numbers( v3f coord, int number )
 {
        v3f pos;
@@ -2135,35 +1810,84 @@ static void draw_numbers( v3f coord, int number )
                draw_mesh( MESH_NUMBERS_OFFSETS[digits[i-j-1]][0], MESH_NUMBERS_OFFSETS[digits[i-j-1]][1] );
                pos[0] += pos[2] * 0.75f;
        }
-}
+}*/
 
-void vg_render(void)
+static void wbutton_run( enum e_world_button btn_name )
 {
-       glViewport( 0,0, vg_window_x, vg_window_y );
-
-       glDisable( GL_DEPTH_TEST );
-       glClearColor( 0.369768f, 0.3654f, 0.42f, 1.0f );
-       glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+       struct cell_button *btn = &world.buttons[btn_name];
        
-       v4f const colour_default = {1.0f, 1.0f, 1.0f, 1.0f};
-       v4f const colour_selected = {0.90f, 0.92f, 1.0f, 1.0f};
-
-       // TILE SET RENDERING 
-       //      todo: just slam everything into a mesh...
-       //          when user modifies a tile the neighbours can be easily uploaded to gpu mem
-       //          in ~3 subBuffers
-       //          Currently we're uploading a fair amount of data every frame anyway.
-       //          NOTE: this is for final optimisations ONLY!
-       // ======================================================================
-
-       use_mesh( &world.shapes );
+       // Interaction
        
-       // Draw background
+       int is_hovering = (world.tile_x == world.w-1 && world.tile_y == world.h-btn_name-2)?1:0;        
+       if( vg_get_button_up( "primary" ) && is_hovering )
+       {
+               // Click event
+               btn->pressed ^= 0x1;
+               
+               if( btn_name == k_world_button_sim )
+               {
+                       if( btn->pressed )
+                       {
+                               vg_success( "Starting simulation!\n" );
+                       
+                               sfx_set_playrnd( &audio_rolls, &audio_system_balls_rolling, 0, 1 );
+                               
+                               world.num_fishes = 0;
+                               world.sim_frame = 0;
+                               world.sim_start = vg_time;
+                               world.sim_run = 0;
+                               world.sim_speed = 2.5f;
+                               
+                               for( int i = 0; i < world.w*world.h; i ++ )
+                                       world.data[ i ].state &= ~FLAG_FLIP_FLOP;
+                               
+                               io_reset();
+                       }
+                       else
+                       {
+                               simulation_stop();
+                       }
+               }
+       }
        
-       if(1){
+       // Drawing
+       if( btn->pressed ) btn->light_target = is_hovering? 0.9f: 0.8f;
+       else btn->light_target = is_hovering? 0.2f: 0.0f;
+
+       if( vg_get_button( "primary" ) && is_hovering )
+               btn->light_target = 1.0f;
+
+       btn->light = vg_lerpf( btn->light, btn->light_target, vg_time_delta*26.0f );
        
-       SHADER_USE( shader_background );
-       glUniformMatrix3fv( SHADER_UNIFORM( shader_background, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+       glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), 
+               world.w-1, 
+               world.h-btn_name-2, 
+               (float)btn_name, 
+               3.0f 
+       );
+       glUniform4f( SHADER_UNIFORM( shader_buttons, "uColour" ), 0.204f, 0.345f, 0.553f, btn->light );
+       
+       draw_mesh( 0, 2 );
+}
+
+void vg_render(void)
+{
+       glViewport( 0,0, vg_window_x, vg_window_y );
+
+       glDisable( GL_DEPTH_TEST );
+       glClearColor( 0.369768f, 0.3654f, 0.42f, 1.0f );
+       glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+       
+       v4f const colour_default = {1.0f, 1.0f, 1.0f, 1.0f};
+       v4f const colour_selected = {0.90f, 0.92f, 1.0f, 1.0f};
+
+       
+       // BACKGROUND
+       // ========================================================================================================
+       use_mesh( &world.shapes );
+       
+       SHADER_USE( shader_background );
+       glUniformMatrix3fv( SHADER_UNIFORM( shader_background, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
        
        glActiveTexture( GL_TEXTURE0 );
        glBindTexture( GL_TEXTURE_2D, world.background_data );
@@ -2177,33 +1901,9 @@ void vg_render(void)
        glUniform1i( SHADER_UNIFORM( shader_background, "uSamplerNoise" ), 1 );
        
        draw_mesh( 0, 2 );
-
-       }
-       
-       
-       // Level title
-       // TODO: Fix this?
-       /*
-       ui_begin( &ui_global_ctx, 512, 256 );
-       
-       ui_global_ctx.override_colour = 0xff9a8a89;
-       //ui_text( &ui_global_ctx, world.map_title, 6, 0 );
-       ui_global_ctx.override_colour = 0xffffffff;
-       
-       ui_resolve( &ui_global_ctx );
-       
-       m3x3f world_text;
-       m3x3_copy( vg_pv, world_text );
-       m3x3_translate( world_text, (v3f){ 1.55f, 1.9f, 0.0f } );
-       m3x3_rotate( world_text, VG_PIf*0.5f );
-       m3x3_scale( world_text, (v3f){0.01f,-0.01f,0.01f} );
-       
-       ui_draw( &ui_global_ctx, world_text );
-       */
-       
-       // Main
-       // =========================================================================================
        
+       // TILESET BACKGROUND LAYER
+       // ========================================================================================================
        use_mesh( &world.shapes );
        SHADER_USE( shader_tile_main );
 
@@ -2227,15 +1927,14 @@ void vg_render(void)
        
        render_tiles( NULL, NULL, colour_default, colour_default );
        
-
-       
+       // MARBLES
+       // ========================================================================================================
        SHADER_USE( shader_ball );
        glUniformMatrix3fv( SHADER_UNIFORM( shader_ball, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
        
        vg_tex2d_bind( &tex_ball_noise, 0 );
        glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 );
        
-       // Draw 'fish'
        if( get_wbutton( k_world_button_sim )->pressed )
        {
                for( int i = 0; i < world.num_fishes; i ++ )
@@ -2258,6 +1957,8 @@ void vg_render(void)
                }
        }
        
+       // TILESET FOREGROUND LAYER
+       // ========================================================================================================
        SHADER_USE( shader_tile_main );
 
        // Bind textures
@@ -2304,15 +2005,21 @@ void vg_render(void)
                                        m2x2_create_rotation( subtransform, rotation );
 
                                        glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );  
-                                       glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, cell->state & FLAG_TARGETED? 3.0f: 0.0f, 0.0f );
+                                       glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), 
+                                               (float)x, 
+                                               (float)y + 0.125f, 
+                                               cell->state & FLAG_TARGETED? 3.0f: 0.0f, 
+                                               0.0f 
+                                       );
                                        draw_mesh( 0, 2 );
                                }
                        }
                }
        }
        
-       // Edit overlay
-       if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) && !id_drag_from )
+       // EDIT OVERLAY
+       // ========================================================================================================
+       if( world.selected != -1 && !(world.data[ world.selected ].state & FLAG_CANAL) && !world.id_drag_from )
        {
                v2i new_begin = { world.tile_x - 2, world.tile_y - 2 };
                v2i new_end = { world.tile_x + 2, world.tile_y + 2 };
@@ -2331,8 +2038,8 @@ void vg_render(void)
                map_reclassify( new_begin, new_end, 0 );
        }
        
-       //glDisable(GL_BLEND);
-       
+       // BUTTONS
+       // ========================================================================================================
        SHADER_USE( shader_buttons );
        glUniformMatrix3fv( SHADER_UNIFORM( shader_buttons, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
        
@@ -2342,8 +2049,8 @@ void vg_render(void)
        wbutton_run( k_world_button_sim );
        wbutton_run( k_world_button_ff );
        
-       
-       // Draw connecting wires
+       // WIRES
+       // ========================================================================================================
        glDisable(GL_BLEND);
 
        SHADER_USE( shader_wire );
@@ -2352,14 +2059,15 @@ void vg_render(void)
        glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
        glUniform4f( SHADER_UNIFORM( shader_wire, "uColour" ), 0.2f, 0.2f, 0.2f, 1.0f );
        
-       if( id_drag_from )
+       if( world.id_drag_from )
        {
                glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
-               glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), drag_from_co[0], drag_from_co[1], 0.06f );
-               glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), drag_to_co[0], drag_to_co[1], 0.06f );
+               glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.06f );
+               glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.06f );
                glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
        }
        
+       // Pulling animation
        float rp_x1 = world.frame_lerp*9.0f;
        float rp_x2 = 1.0f-rp_x1*expf(1.0f-rp_x1)* 0.36f;
        
@@ -2395,7 +2103,10 @@ void vg_render(void)
                        }
                }
        }
-
+       
+       // I/O ARRAYS
+       // ========================================================================================================
+       
        SHADER_USE( shader_tile_colour );
        glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
        use_mesh( &world.shapes );
@@ -2408,37 +2119,38 @@ void vg_render(void)
        
        glEnable(GL_BLEND);
        
-       // Draw i/o arrays
        for( int i = 0; i < arrlen( world.io ); i ++ )
        {
                struct cell_terminal *term = &world.io[ i ];
-               int posx = term->id % world.w;
-               int posy = (term->id - posx)/world.w;
-               int is_input = world.data[ term->id ].state & FLAG_INPUT;
+               int is_input = pcell(term->pos)->state & FLAG_INPUT;
 
                v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
                
                for( int k = 0; k < term->run_count; k ++ )
                {
-                       float y_offset = is_input? 1.2f: -0.2f;
-                       float y_h = (is_input? 0.2f: -0.2f) * (float)k;
-                       float y_row = is_input? 
-                                                               (y_offset + (float)posy + (float)(term->run_count-1)*0.2f) - y_h:
-                                                               (float)posy + y_offset + y_h;
-               
+                       float arr_base   = is_input? 1.2f: -0.2f, 
+                                       run_offset = (is_input? 0.2f: -0.2f) * (float)k, 
+                                       y_position = is_input? 
+                                               (arr_base + (float)term->pos[1] + (float)(term->run_count-1)*0.2f) - run_offset:
+                                               (float)term->pos[1] + arr_base + run_offset;
+                       
                        if( k & 0x1 )
                        {
                                glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1.0f, 1.0f, 1.0f, 0.1f );
-                               glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx, y_row - 0.1f, 1.0f );
+                               glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)term->pos[0], y_position - 0.1f, 1.0f );
                                draw_mesh( 2, 2 );
                        }
-               
+                       
                        for( int j = 0; j < term->runs[k].condition_count; j ++ )
                        {
+                               glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 
+                                       (float)term->pos[0] + 0.2f + 0.2f * (float)j, 
+                                       y_position, 
+                                       0.1f 
+                               );
+                       
                                if( is_input )
                                {
-                                       glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, y_row, 0.1f );
-                               
                                        colour_code_v3( term->runs[k].conditions[j], dot_colour );
                                        glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
                                
@@ -2450,7 +2162,6 @@ void vg_render(void)
                                }
                                else
                                {
-                                       glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)posx + 0.2f + 0.2f * (float)j, y_row, 0.1f );
                                
                                        if( term->runs[k].recv_count > j )
                                        {
@@ -2473,12 +2184,14 @@ void vg_render(void)
        glDisable(GL_BLEND);
        
        // Draw score
+       /*
        float const score_bright = 1.25f;
        glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 
                0.4f*score_bright, 0.39f*score_bright, 0.45f*score_bright, 1.0f );
                
        use_mesh( &world.numbers );
        draw_numbers( (v3f){ 2.0f, (float)world.h-1.875f, 0.3333f }, world.score );
+       */
 }
 
 static ui_colourset flcol_list_a = {
@@ -2954,3 +2667,301 @@ void leaderboard_set_score( struct cmp_level *cmp_level, u32 score )
        else
                sw_find_leaderboard( cmp_level->map_name );
 }
+
+// CONSOLE COMMANDS
+// ===========================================================================================================
+
+static int console_credits( int argc, char const *argv[] )
+{
+       vg_info( "Aknowledgements:\n" );
+       vg_info( "  GLFW         zlib/libpng  glfw.org\n" );
+       vg_info( "  miniaudio    MIT0         miniaud.io\n" );
+       vg_info( "  QOI          MIT          phoboslab.org\n" );
+       vg_info( "  STB library  MIT          nothings.org\n" );
+       return 0;
+}
+
+static int console_save_map( int argc, char const *argv[] )
+{
+       if( !world.initialzed )
+       {
+               vg_error( "Tried to save uninitialized map!\n" );
+               return 0;
+       }
+
+       char map_path[ 256 ];
+
+       strcpy( map_path, "sav/" );
+       strcat( map_path, world.map_name );
+       strcat( map_path, ".map" );
+
+       FILE *test_writer = fopen( map_path, "wb" );
+       if( test_writer )
+       {
+               vg_info( "Saving map to '%s'\n", map_path );
+               map_serialize( test_writer );
+               
+               fclose( test_writer );
+               return 1;
+       }
+       else
+       {
+               vg_error( "Unable to open stream for writing\n" );
+               return 0;
+       }
+}
+
+static int console_load_map( int argc, char const *argv[] )
+{
+       char map_path[ 256 ];
+
+       if( argc >= 1 )
+       {
+               // try from saves
+               strcpy( map_path, "sav/" );
+               strcat( map_path, argv[0] );
+               strcat( map_path, ".map" );
+       
+               char *text_source = vg_textasset_read( map_path );
+               
+               if( !text_source )
+               {
+                       strcpy( map_path, "maps/" );
+                       strcat( map_path, argv[0] );
+                       strcat( map_path, ".map" );
+                       
+                       text_source = vg_textasset_read( map_path );
+               }
+               
+               if( text_source )
+               {
+                       vg_info( "Loading map: '%s'\n", map_path );
+                       world.pCmpLevel = NULL;
+                       
+                       if( !map_load( text_source, argv[0] ) )
+                       {
+                               free( text_source );
+                               return 0;
+                       }
+                       
+                       free( text_source );    
+                       return 1;
+               }
+               else
+               {
+                       vg_error( "Missing maps '%s'\n", argv[0] );
+                       return 0;
+               }
+       }
+       else
+       {
+               vg_error( "Missing argument <map_path>\n" );
+               return 0;
+       }
+}
+
+static int console_changelevel( int argc, char const *argv[] )
+{
+       if( argc >= 1 )
+       {
+               // Save current level
+               console_save_map( 0, NULL );
+               if( console_load_map( argc, argv ) )
+               {                               
+                       simulation_stop();
+                       return 1;
+               }
+       }
+       else
+       {
+               vg_error( "Missing argument <map_path>\n" );
+       }
+       
+       return 0;
+}
+
+// START UP / SHUTDOWN
+// ===========================================================================================================
+
+void vg_start(void)
+{
+       // Steamworks callbacks
+       sw_leaderboard_found = &leaderboard_found;
+       sw_leaderboard_downloaded = &leaderboard_downloaded;
+
+       vg_function_push( (struct vg_cmd){
+               .name = "_map_write",
+               .function = console_save_map
+       });
+       
+       vg_function_push( (struct vg_cmd){
+               .name = "_map_load",
+               .function = console_load_map
+       });
+       
+       vg_function_push( (struct vg_cmd){
+               .name = "map",
+               .function = console_changelevel
+       });
+       
+       vg_function_push( (struct vg_cmd){
+               .name = "credits",
+               .function = console_credits
+       });
+
+       // Combined quad, long quad / empty circle / filled circle mesh
+       {
+               float combined_mesh[6*8 + 32*6*3] = {
+                       0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f,
+                       0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f,
+                       
+                       0.0f, 0.0f, 0.0f, 0.2f, 1.0f, 0.2f,
+                       0.0f, 0.0f, 1.0f, 0.2f, 1.0f, 0.0f
+               };
+               
+               float *circle_mesh = combined_mesh + 6*4;
+               int const res = 32;
+
+               for( int i = 0; i < res; i ++ )
+               {
+                       v2f v0 = { sinf( ((float)i/(float)res)*VG_TAUf ), cosf( ((float)i/(float)res)*VG_TAUf ) };
+                       v2f v1 = { sinf( ((float)(i+1)/(float)res)*VG_TAUf ), cosf( ((float)(i+1)/(float)res)*VG_TAUf ) };
+               
+                       circle_mesh[ i*6+0 ] = 0.0f;
+                       circle_mesh[ i*6+1 ] = 0.0f;
+                       
+                       v2_copy( v0, circle_mesh + 32*6 + i*12 );
+                       v2_muls( v0, 0.8f, circle_mesh + 32*6 + i*12+2 );
+                       v2_copy( v1, circle_mesh + 32*6 + i*12+4 );
+                       
+                       v2_copy( v1, circle_mesh + 32*6 + i*12+6 );
+                       v2_muls( v1, 0.8f, circle_mesh + 32*6 + i*12+8 );
+                       v2_muls( v0, 0.8f, circle_mesh + 32*6 + i*12+10 );
+                       
+                       v2_copy( v0, circle_mesh + i*6+4 );
+                       v2_copy( v1, circle_mesh + i*6+2 );
+                       v2_copy( v0, circle_mesh+i*6+4 );
+                       v2_copy( v1, circle_mesh+i*6+2 );
+               }
+               
+               init_mesh( &world.shapes, combined_mesh, vg_list_size( combined_mesh ) );
+       }
+       
+       // Numbers mesh
+       {
+               init_mesh( &world.numbers,
+                       MESH_NUMBERS_BUFFER,
+                       vg_list_size( MESH_NUMBERS_BUFFER )
+               );
+               
+               for( int i = 0; i < 10; i ++ )
+               {
+                       vg_info( "offset: %u, length: %u\n", MESH_NUMBERS_OFFSETS[i][0], MESH_NUMBERS_OFFSETS[i][1] );
+               }
+       }
+       
+       // Create wire mesh
+       {
+               int const num_segments = 64;
+       
+               struct mesh_wire *mw = &world.wire;
+       
+               v2f wire_points[ num_segments * 2 ];
+               u16 wire_indices[ 6*(num_segments-1) ];
+               
+               for( int i = 0; i < num_segments; i ++ )
+               {
+                       float l = (float)i / (float)(num_segments-1);
+                       
+                       v2_copy( (v2f){ l, -0.5f }, wire_points[i*2+0] );
+                       v2_copy( (v2f){ l,  0.5f }, wire_points[i*2+1] );
+                       
+                       if( i < num_segments-1 )
+                       {
+                               wire_indices[ i*6+0 ] = i*2 + 0;
+                               wire_indices[ i*6+1 ] = i*2 + 1;
+                               wire_indices[ i*6+2 ] = i*2 + 3;
+                               wire_indices[ i*6+3 ] = i*2 + 0;
+                               wire_indices[ i*6+4 ] = i*2 + 3;
+                               wire_indices[ i*6+5 ] = i*2 + 2;
+                       }
+               }
+               
+               glGenVertexArrays( 1, &mw->vao );
+               glGenBuffers( 1, &mw->vbo );
+               glGenBuffers( 1, &mw->ebo );
+               glBindVertexArray( mw->vao );
+               
+               glBindBuffer( GL_ARRAY_BUFFER, mw->vbo );
+               
+               glBufferData( GL_ARRAY_BUFFER, sizeof( wire_points ), wire_points, GL_STATIC_DRAW );
+               glBindVertexArray( mw->vao );
+               
+               glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, mw->ebo );
+               glBufferData( GL_ELEMENT_ARRAY_BUFFER, sizeof( wire_indices ), wire_indices, GL_STATIC_DRAW );
+               
+               // XY
+               glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 );
+               glEnableVertexAttribArray( 0 );
+               
+               VG_CHECK_GL();
+               
+               mw->em = vg_list_size( wire_indices );
+       }
+       
+       // Create info data texture
+       {
+               glGenTextures( 1, &world.background_data );
+               glBindTexture( GL_TEXTURE_2D, world.background_data );
+               glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 64, 64, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL );
+               vg_tex2d_nearest();
+       }
+       
+       // Create random smaples texture
+       {
+               u8 *data = malloc(512*512*2);
+               for( int i = 0; i < 512*512*2; i ++ )
+                       data[ i ] = rand()/(RAND_MAX/255);
+               
+               glGenTextures( 1, &world.random_samples );
+               glBindTexture( GL_TEXTURE_2D, world.random_samples );
+               glTexImage2D( GL_TEXTURE_2D, 0, GL_RG, 512, 512, 0, GL_RG, GL_UNSIGNED_BYTE, data );
+               vg_tex2d_linear();
+               vg_tex2d_repeat();
+               
+               free( data );
+       }
+       
+       resource_load_main();
+       
+       // Restore gamestate
+       career_local_data_init();
+       career_load();
+}
+
+void vg_free(void)
+{
+       sw_free_opengl();
+       console_save_map( 0, NULL );
+       career_serialize();
+
+       resource_free_main();
+
+       glDeleteTextures( 1, &world.background_data );
+       glDeleteTextures( 1, &world.random_samples );
+
+       glDeleteVertexArrays( 1, &world.wire.vao );
+       glDeleteBuffers( 1, &world.wire.vbo );
+       glDeleteBuffers( 1, &world.wire.ebo );
+
+       free_mesh( &world.shapes );
+       free_mesh( &world.numbers );
+       
+       map_free();
+}
+
+int main( int argc, char *argv[] )
+{
+       vg_init( argc, argv, "Marble Computing" );
+       return 0;
+}
index 3b7feb41df774ed3676758df9b01d1720df78589..6276edb814bdb23bb0b83e036698ebf4b9d9513a 100644 (file)
--- a/vg/vg_m.h
+++ b/vg/vg_m.h
@@ -55,6 +55,11 @@ static inline void v2i_copy( v2i a, v2i b )
        b[0] = a[0]; b[1] = a[1];
 }
 
+static inline int v2i_eq( v2i a, v2i b )
+{
+       return ((a[0] == b[0]) && (a[1] == b[1]));
+}
+
 static inline void v2i_add( v2i a, v2i b, v2i d )
 {
        d[0] = a[0]+b[0]; d[1] = a[1]+b[1];