X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder.c;h=2a2da7520751101d4ff725de383d1bdd0817622a;hb=ec1dd5de4848534241c8bea3841ef36fe047915b;hp=c3f83a716a00ac11a8a59c9d9f68ad4c6170c7b7;hpb=4a32e355a03254c04b5a2af3cb49db40609f8412;p=fishladder.git

diff --git a/fishladder.c b/fishladder.c
index c3f83a7..2a2da75 100644
--- a/fishladder.c
+++ b/fishladder.c
@@ -65,6 +65,12 @@ enum e_world_button
 	k_world_button_settings = 3
 };
 
+enum e_game_state
+{
+	k_game_state_main,
+	k_game_state_settings
+};
+
 #define FLAG_CANAL 		0x1
 #define FLAG_IS_TRIGGER 0x2
 #define FLAG_RESERVED0 	0x4
@@ -73,6 +79,7 @@ enum e_world_button
 #define FLAG_INPUT 		0x10
 #define FLAG_OUTPUT 		0x20
 #define FLAG_WALL 		0x40
+#define FLAG_EMITTER		0x80
 
 #define FLAG_FLIP_FLOP 	0x100
 #define FLAG_TRIGGERED 	0x200
@@ -185,35 +192,43 @@ struct
 }
 text_buffers;
 
-struct world_static
+static struct world
 {
-	struct world_button buttons[4];
-}
-world_static =
-{
-	.buttons = {
-		{ .mode = k_world_button_mode_toggle },
-		{ .mode = k_world_button_mode_toggle },
-		{ .mode = k_world_button_mode_toggle },
-		{ .mode = k_world_button_mode_toggle }
+	// Things that are 'static', aka, initialized once
+	struct
+	{
+		struct world_button buttons[4];
+		float zoom;
+		enum e_game_state state;
+
+		struct cmp_level *lvl_to_load;
+		float lvl_load_time;
+
+		float world_transition;
 	}
-};
+	st;
 
-struct world
-{
 #pragma pack(push,1)
 	struct cell
 	{
 		u16 state;
 		u16 links[2];
 		u8 config;
-		u8 pad0;
+		char cc;
 	}
 	*data;
 #pragma pack(pop)
+
+	struct render_cmd
+	{
+		struct cell *ptr;
+		v2i pos;
+	} 
+	*cmd_buf_tiles, *cmd_buf_specials;
+
+	u32 tile_count, tile_special_count, max_commands;
 	
 	int initialzed;
-	
 	int sim_run, max_runs;
 
 	int sim_frame, sim_target;
@@ -269,12 +284,11 @@ struct world
 		v2f physics_v;
 		v2f physics_co;
 	}
-	fishes[16];
+	fishes[64];
 	
 	int num_fishes;
 	
 	char map_name[64];
-	//struct career_level *ptr_career_level;
 	struct cmp_level *pCmpLevel;
 	
 	u32 score;
@@ -284,6 +298,16 @@ struct world
 	u16 id_drag_from;
 	v2f drag_from_co;
 	v2f drag_to_co;
+}
+world = 
+{
+	.st = 
+	{
+		.buttons = { { .mode = k_world_button_mode_toggle },
+			{ .mode = k_world_button_mode_toggle },
+			{ .mode = k_world_button_mode_toggle },
+			{ .mode = k_world_button_mode_toggle } }
+	}
 };
 
 // Forward declerations
@@ -311,6 +335,7 @@ static void level_selection_buttons(void);
 static void map_free(void);
 static void io_reset(void);
 static struct cell *pcell( v2i pos );
+static void lcell( int id, v2i pos );
 static void map_reclassify( v2i start, v2i end, int update_texbuffer );
 static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, float size, u32 start );
 static void gen_level_text( struct cmp_level *pLevel );
@@ -331,11 +356,12 @@ static void clear_animation_flags(void);
 // -------------
 static void simulation_stop(void);
 static void simulation_start(void);
-static int world_check_pos_ok( v2i co );
+static int world_check_pos_ok( v2i co, int dist );
 static int cell_interactive( v2i co );
 
 void vg_update(void);
-static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour );
+static void render_tiles( v4f const regular_colour, v4f const selected_colour );
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour );
 
 void vg_render(void);
 void vg_ui(void);
@@ -369,34 +395,58 @@ m3x3f m_projection;
 m3x3f m_view;
 m3x3f m_mdl;
 
-struct world world;
-
 // UTILITY
 // ===========================================================================================================
 
 static int colour_set_id = 0;
+static int world_theme_id = 0;
 
-static void colour_code_v3( char const cc, v3f target )
+static v3f colour_sets[][4] =
 {
-	static v3f colour_sets[][4] =
-	{
-		{ { 1.0f, 0.9f, 0.3f },			// Yellow
-		  { 0.4f, 0.8f, 1.00f },		// Blue
-		  { 0.2f, 0.9f, 0.14f },		// Green
-		  { 0.882f, 0.204f, 0.922f }	// Pink
-		},
-		{ { 1.0f, 0.9f, 0.3f },			// Yellow
-		  { 0.4f, 0.8f, 1.00f },		// Blue
-		  { 0.85f, 0.85f, 0.85f },		// Weiss
-		  { 0.2f, 0.2f, 0.2f }			// Black/Gray
-		},
-		{ { 1.0f, 0.9f, 0.3f },			// Yellow
-		  { 0.827f, 0.373f, 0.718f },	// Pink
-		  { 0.0f, 0.353f, 0.71f },		// Blue
-		  { 0.863f, 0.196f, 0.125f }	// Red
-		},
-	};
+	{ { 1.0f, 0.9f, 0.3f },			// Yellow
+	  { 0.4f, 0.8f, 1.00f },		// Blue
+	  { 0.2f, 0.9f, 0.14f },		// Green
+	  { 0.882f, 0.204f, 0.922f }	// Pink
+	},
+	{ { 1.0f, 0.9f, 0.3f },			// Yellow
+	  { 0.4f, 0.8f, 1.00f },		// Blue
+	  { 0.85f, 0.85f, 0.85f },		// Weiss
+	  { 0.2f, 0.2f, 0.2f }			// Black/Gray
+	},
+	{ { 1.0f, 0.9f, 0.3f },			// Yellow
+	  { 0.827f, 0.373f, 0.718f },	// Pink
+	  { 0.0f, 0.353f, 0.71f },		// Blue
+	  { 0.863f, 0.196f, 0.125f }	// Red
+	},
+};
 
+static struct world_theme
+{
+   const char *name;
+   v3f colour_bg;
+   vg_tex2d *tex_tiles;
+}
+world_themes[] =
+{
+   {
+      "Wood",
+      {},
+      &tex_tiles_wood
+   },
+   {
+      "Minimal",
+      {},
+      &tex_tiles_min
+   },
+   {
+      "Lab",
+      {},
+      &tex_tiles_lab
+   }
+};
+
+static void colour_code_v3( char const cc, v3f target )
+{
 	if( cc >= 'a' && cc <= 'z' )
 	{
 		int id = cc - 'a';
@@ -496,6 +546,8 @@ static void map_free(void)
 {	
 	arrfree( world.data );
 	arrfree( world.io );
+
+	free( world.cmd_buf_tiles );
 	
 	world.w = 0;
 	world.h = 0;
@@ -524,6 +576,12 @@ static struct cell *pcell( v2i pos )
 	return &world.data[ pos[1]*world.w + pos[0] ];
 }
 
+static void lcell( int id, v2i pos )
+{
+	pos[0] = id % world.w;
+	pos[1] = (id - pos[0]) / world.w;
+}
+
 static void map_reclassify( v2i start, v2i end, int update_texbuffer )
 {
 	v2i full_start = { 1,1 };
@@ -555,12 +613,12 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer )
 			u8 height = 0;
 			u8 config = 0x00;
 			
-			if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+			if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
 			{
 				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) )
+					if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
 						config |= 0x1 << i;
 				}
 				
@@ -585,7 +643,7 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer )
 			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)) 
+					((cell->state & FLAG_TARGETED) && ((cell->config != k_cell_type_split) && !(cell->state & FLAG_EMITTER))) 
 				) && update_texbuffer
 			){
 				cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
@@ -870,7 +928,10 @@ static int map_load( const char *str, const char *name )
 			struct cell *cell = &row[ cx ];
 			cell->config = 0xF;
 			
-			if( *c == '+' || *c == '-' )
+			cell->links[0] = 0;
+			cell->links[1] = 0;
+
+			if( *c == '+' || *c == '-' || *c == '*' )
 			{
 				struct cell_terminal *term = arraddnptr( world.io, 1 );
 				term->pos[0] = cx;
@@ -878,8 +939,14 @@ static int map_load( const char *str, const char *name )
 				
 				term->run_count = 1;
 				term->runs[0].condition_count = 0;
+				
+				switch( *c )
+				{
+					case '+': cell->state = FLAG_INPUT; break;
+					case '-': cell->state = FLAG_OUTPUT; break;
+					case '*': cell->state = FLAG_EMITTER; break;
+				}
 
-				cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
 				reg_end ++;
 			}
 			else if( *c == '#' ) cell->state = FLAG_WALL;
@@ -896,8 +963,6 @@ static int map_load( const char *str, const char *name )
 				if( cell->state & FLAG_IS_TRIGGER )
 					arrpush( links_to_make, cx + world.h*world.w );
 				
-				cell->links[0] = 0;
-				cell->links[1] = 0;
 				world.score ++; 
 			}
 			else cell->state = 0x00;
@@ -907,6 +972,18 @@ static int map_load( const char *str, const char *name )
 	
 		c ++;
 	}
+
+	// Fix emitter CC code
+	for( int i = 0; i < arrlen( world.io ); i ++ )
+	{
+		struct cell_terminal *term = &world.io[i];
+		struct cell *cell = pcell( term->pos );
+
+		if( cell->state & FLAG_EMITTER )
+		{
+			cell->cc = term->runs[0].conditions[0];
+		}
+	}
 		
 	// Update data texture to fill out the background
 	{
@@ -917,7 +994,14 @@ static int map_load( const char *str, const char *name )
 			{
 				u8 *px = &info_buffer[((x*64)+y)*4];
 				
-				px[0] = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F );
+				// Fade out edges of world so that there isnt an obvious line
+				int dist_x = 16 - VG_MIN( VG_MIN( x, 16 ), 16-VG_MAX( x-16-world.w, 0 ) );
+				int dist_y = 16 - VG_MIN( VG_MIN( y, 16 ), 16-VG_MAX( y-16-world.h, 0 ) );
+				int dist = VG_MAX( dist_x, dist_y ) * 16;
+
+				int value = VG_MAX( 0, 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ) - dist );
+				
+				px[0] = value;
 				px[1] = 0;
 				px[2] = 0;
 				px[3] = 0;
@@ -959,12 +1043,16 @@ static int map_load( const char *str, const char *name )
 			v2i turtle;
 			v2i turtle_dir;
 			int original_y;
+
+			// Only make breakouts for terminals on the edge
+			if( !(term->pos[1] == 1 || term->pos[1] == world.h-2) )
+				continue;
 			
 			turtle[0] = 16+term->pos[0];
 			turtle[1] = 16+term->pos[1];
 			
 			turtle_dir[0] = 0;
-			turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1;
+			turtle_dir[1] = pcell(term->pos)->state & (FLAG_INPUT|FLAG_EMITTER)? 1: -1;
 			original_y = turtle_dir[1];
 			
 			info_buffer[((turtle[1]*64)+turtle[0])*4] = 0;	
@@ -1018,7 +1106,8 @@ static int map_load( const char *str, const char *name )
 			if( src->links[link_id] <= world.h*world.w )
 			{		
 				struct cell *target = &world.data[ src->links[link_id] ];
-				if( (target->state & FLAG_CANAL) && (target->config == k_cell_type_split) )
+				if( ((target->state & FLAG_CANAL) && (target->config == k_cell_type_split))
+					|| (target->state & FLAG_EMITTER) )
 				{
 					if( target->links[ link_id ] )
 					{
@@ -1054,13 +1143,17 @@ static int map_load( const char *str, const char *name )
 	world.initialzed = 1;
 
 	// Setup world button locations
-	for( int i = 0; i < vg_list_size( world_static.buttons ); i ++ )
+	for( int i = 0; i < vg_list_size( world.st.buttons ); i ++ )
 	{
-		struct world_button *btn = &world_static.buttons[i];
+		struct world_button *btn = &world.st.buttons[i];
 		btn->position[0] = world.w -1;
 		btn->position[1] = world.h -i -2;
 	}
 
+	// Allocate buffers for render commands
+	world.cmd_buf_tiles = malloc( world.w*world.h* sizeof( struct render_cmd ) );
+	world.max_commands = world.w*world.h;
+	
 	return 1;
 	
 IL_REG_ERROR:
@@ -1080,6 +1173,7 @@ static void map_serialize( FILE *stream )
 			if( cell->state & FLAG_WALL ) fputc( '#', stream );
 			else if( cell->state & FLAG_INPUT ) fputc( '+', stream );
 			else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream );
+			else if( cell->state & FLAG_EMITTER ) fputc( '*', stream );
 			else if( cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1) ) 
 			{
 				fputc( (cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1)) + (u32)'A', stream );
@@ -1315,7 +1409,7 @@ static void career_load(void)
 // ===========================================================================================================
 static int is_simulation_running(void)
 {
-	return world_static.buttons[ k_world_button_sim ].state;
+	return world.st.buttons[ k_world_button_sim ].state;
 }
 
 static void clear_animation_flags(void)
@@ -1326,8 +1420,8 @@ static void clear_animation_flags(void)
 
 static void simulation_stop(void)
 {
-	world_static.buttons[ k_world_button_sim ].state = 0;
-	world_static.buttons[ k_world_button_pause ].state = 0;
+	world.st.buttons[ k_world_button_sim ].state = 0;
+	world.st.buttons[ k_world_button_pause ].state = 0;
 	
 	world.num_fishes = 0;
 	world.sim_frame = 0;
@@ -1353,7 +1447,7 @@ static void simulation_start(void)
 	world.sim_frame = 0;
 	world.sim_run = 0;
 	
-	world.sim_delta_speed = world_static.buttons[ k_world_button_speedy ].state? 10.0f: 2.5f;
+	world.sim_delta_speed = world.st.buttons[ k_world_button_speedy ].state? 10.0f: 2.5f;
 	world.sim_delta_ref = vg_time;
 	world.sim_internal_ref = 0.0f;
 	world.sim_internal_time = 0.0f;
@@ -1371,19 +1465,28 @@ static void simulation_start(void)
 	}
 }
 
-static int world_check_pos_ok( v2i co )
+static int world_check_pos_ok( v2i co, int dist )
 {
-	return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
+	return (co[0] < dist || co[0] >= world.w-dist || co[1] < dist || co[1] >= world.h-dist)? 0: 1;
 }
 
 static int cell_interactive( v2i co )
 {
+	struct cell *cell;
+
 	// Bounds check
-	if( !world_check_pos_ok( co ) )
+	if( world_check_pos_ok( co, 1 ) )
+	{
+		cell = pcell( co );
+		if( cell->state & FLAG_EMITTER )
+			return 1;
+	}
+
+	if( !world_check_pos_ok( co, 2 ) )
 		return 0;
 
 	// Flags check
-	if( world.data[ world.w*co[1] + co[0] ].state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
+	if( cell->state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
 		return 0;
 
 	// List of 3x3 configurations that we do not allow
@@ -1440,7 +1543,7 @@ static int cell_interactive( v2i co )
 		{                
 			struct cell *cell = pcell((v2i){x,y});
 
-			if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT)) )
+			if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER)) )
 				blob |= 0x1 << ((y-(co[1]-2))*5 + x-(co[0]-2));
 		}
 
@@ -1463,6 +1566,27 @@ static int cell_interactive( v2i co )
 
 static void vg_update(void)
 {
+	// Async events
+	if( world.st.lvl_to_load )
+	{
+		world.st.world_transition = (world.st.lvl_load_time-vg_time) * 4.0f;
+
+		if( vg_time > world.st.lvl_load_time )
+		{	
+			if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) )
+			{
+				world.pCmpLevel = world.st.lvl_to_load;
+				gen_level_text( world.pCmpLevel );
+			}
+
+			world.st.lvl_to_load = NULL;
+		}
+	}
+	else
+	{
+		world.st.world_transition = vg_minf( 1.0f, (vg_time-world.st.lvl_load_time) * 4.0f );
+	}
+
 	// Camera
 	// ========================================================================================================
 	
@@ -1475,7 +1599,6 @@ static void vg_update(void)
 	static v2f drag_offset = { 0.0f, 0.0f };
 	static v2f view_point = { 0.0f, 0.0f };
 	v2f result_view;
-	static float view_zoom_extra = 0.0f;
 
 	size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f;
 	
@@ -1487,13 +1610,13 @@ static void vg_update(void)
 	
 	// Create and clamp result view
 	v2_add( view_point, drag_offset, result_view );
-	result_view[0] = vg_clampf( result_view[0], -view_zoom_extra, view_zoom_extra );
-	result_view[1] = vg_clampf( result_view[1], -view_zoom_extra*r1, view_zoom_extra*r1 );
+	result_view[0] = vg_clampf( result_view[0], -world.st.zoom, world.st.zoom );
+	result_view[1] = vg_clampf( result_view[1], -world.st.zoom*r1, world.st.zoom*r1 );
 	
 	v2_add( origin, result_view, vt_target );
 
 	// Lerp towards target
-	size_current = vg_lerpf( size_current, size - view_zoom_extra, vg_time_delta * 6.0f );
+	size_current = vg_lerpf( size_current, size - world.st.zoom, vg_time_delta * 6.0f );
 	v2_lerp( origin_current, vt_target, vg_time_delta * 6.0f, origin_current ); 
 	
 	m3x3_projection( m_projection, -size_current, size_current, -size_current*r1, size_current*r1 );
@@ -1537,15 +1660,15 @@ static void vg_update(void)
 		v2f mview_delta;
 		float rsize;
 
-		rsize = size-view_zoom_extra;
+		rsize = size-world.st.zoom;
 
 		v2_div( vg_mouse, (v2f){ vg_window_x*0.5f, vg_window_y*0.5f }, mview_local );
 		v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_cur );
 
-		view_zoom_extra = vg_clampf( view_zoom_extra + vg_mouse_wheel[1], 0.0f, size - 4.0f );
+		world.st.zoom = vg_clampf( world.st.zoom + vg_mouse_wheel[1], 0.0f, size - 4.0f );
 
 		// Recalculate new position
-		rsize = size-view_zoom_extra;
+		rsize = size-world.st.zoom;
 		v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_new );
 
 		// Apply offset
@@ -1564,41 +1687,43 @@ static void vg_update(void)
 			world.selected = world.tile_y * world.w + world.tile_x;
 			
 			static u32 modify_state = 0;
-			
 			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) )
+		
+			if( !(cell_ptr->state & FLAG_EMITTER) )
 			{
-				cell_ptr->state &= ~FLAG_CANAL;
-				cell_ptr->state |= modify_state;
+				if( vg_get_button_down("primary") )
+					modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
 				
-				if( cell_ptr->state & FLAG_CANAL )
+				if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
 				{
-					cell_ptr->links[0] = 0;
-					cell_ptr->links[1] = 0;
+					cell_ptr->state &= ~FLAG_CANAL;
+					cell_ptr->state |= modify_state;
 					
-					sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
-					world.score ++;
-				}
-				else
-				{					
-					sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
-					world.score --;
-				}
+					if( cell_ptr->state & FLAG_CANAL )
+					{
+						cell_ptr->links[0] = 0;
+						cell_ptr->links[1] = 0;
+						
+						sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
+						world.score ++;
+					}
+					else
+					{					
+						sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
+						world.score --;
+					}
 
-				map_reclassify( 	(v2i){ world.tile_x -2, world.tile_y -2 }, 
+					map_reclassify((v2i){ world.tile_x -2, world.tile_y -2 }, 
 										(v2i){ world.tile_x +2, world.tile_y +2 }, 1 );
-			}
-			
-			if( vg_get_button_down("secondary") && (cell_ptr->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
-			{
-				world.id_drag_from = world.selected;
-			
-				struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
-				v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+				}
+				
+				if( vg_get_button_down("secondary") && (cell_ptr->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
+				{
+					world.id_drag_from = world.selected;
+				
+					struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
+					v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+				}
 			}
 			
 			float local_x = vg_mouse_ws[0] - (float)world.tile_x;
@@ -1623,7 +1748,8 @@ static void vg_update(void)
 				world.id_drag_from = 0;
 			}
 			
-			else if( world.id_drag_from && (cell_ptr->state & FLAG_CANAL) && (cell_ptr->config == k_cell_type_split) )
+			else if( world.id_drag_from && (cell_ptr->state & (FLAG_CANAL|FLAG_EMITTER)) && 
+				((cell_ptr->config == k_cell_type_split) || (cell_ptr->state & FLAG_EMITTER)) )
 			{
 				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;
@@ -1642,17 +1768,20 @@ static void vg_update(void)
 						current_connection->state &= ~FLAG_IS_TRIGGER;
 						current_connection->links[ link_id ] = 0;
 					}
-					
-					if( drag_ptr->links[ link_id ^ 0x1 ] )
+				
+					for( u32 i = 0; i < 2; i ++ )
 					{
-						vg_warn( "Destroying alternate link %u (%hu)\n", link_id ^ 0x1, drag_ptr->links[ link_id ^ 0x1 ] );
-						
-						struct cell *current_connection = &world.data[ drag_ptr->links[ link_id ^ 0x1 ]];
-						if( !current_connection->links[ link_id ] )
-							current_connection->state &= ~FLAG_TARGETED;
-						
-						current_connection->links[ link_id ^ 0x1 ] = 0;
-						drag_ptr->links[ link_id ^ 0x1 ] = 0;
+						if( drag_ptr->links[ i ] )
+						{
+							vg_warn( "Destroying link %u (%hu)\n", i, drag_ptr->links[ i ] );
+							
+							struct cell *current_connection = &world.data[ drag_ptr->links[ i ]];
+							if( current_connection->links[ i ^ 0x1 ] == 0 )
+								current_connection->state &= ~FLAG_TARGETED;
+							
+							current_connection->links[ i ] = 0;
+							drag_ptr->links[ i ] = 0;
+						}
 					}
 					
 					// Create the new connection
@@ -1687,7 +1816,7 @@ static void vg_update(void)
 	{	
 		float old_time = world.sim_internal_time;
 	
-		if( !world_static.buttons[ k_world_button_pause ].state )
+		if( !world.st.buttons[ k_world_button_pause ].state )
 			world.sim_internal_time = world.sim_internal_ref + (vg_time-world.sim_delta_ref) * world.sim_delta_speed;
 		else
 			world.sim_internal_time = vg_lerpf( world.sim_internal_time, world.sim_internal_ref + world.pause_offset_target, vg_time_delta*15.0f );
@@ -1710,7 +1839,7 @@ static void vg_update(void)
 				{
 					cell->state &= ~FLAG_FLIP_ROTATING;
 				}
-				if( cell->state & FLAG_IS_TRIGGER )
+				if( cell->state & (FLAG_IS_TRIGGER|FLAG_EMITTER) )
 					cell->state &= ~FLAG_TRIGGERED;
 			}
 			
@@ -1835,7 +1964,7 @@ static void vg_update(void)
 						}
 						else
 						{
-							if( world_check_pos_ok( fish->pos ) )
+							if( world_check_pos_ok( fish->pos, 2 ) )
 								fish->state = k_fish_state_bg;
 							else
 							{
@@ -1851,7 +1980,7 @@ static void vg_update(void)
 				{
 					v2i_add( fish->pos, fish->dir, fish->pos );
 					
-					if( !world_check_pos_ok( fish->pos ) )
+					if( !world_check_pos_ok( fish->pos, 2 ) )
 					{
 						fish->state = k_fish_state_dead;
 						fish->death_time = -1000.0f;
@@ -1897,9 +2026,12 @@ static void vg_update(void)
 			{
 				struct fish *fish = &world.fishes[i];
 				
+				// Apply movement
 				if( fish->state == k_fish_state_alive )
-				{
 					v2i_add( fish->pos, fish->dir, fish->pos );
+
+				if( fish->state == k_fish_state_alive || fish->state == k_fish_state_soon_alive )
+				{
 					struct cell *cell_current = pcell( fish->pos );
 
 					if( cell_current->state & FLAG_IS_TRIGGER )
@@ -1908,12 +2040,34 @@ static void vg_update(void)
 						
 						struct cell *target_peice = &world.data[ cell_current->links[trigger_id] ];
 						
-						cell_current->state |= FLAG_TRIGGERED;
-						
-						if( trigger_id )
-							target_peice->state |= FLAG_FLIP_FLOP;
+						// Spawn new marble
+						if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED))
+						{
+							struct fish *fish = &world.fishes[ world.num_fishes ];
+							lcell( cell_current->links[trigger_id], fish->pos );
+
+							fish->state = k_fish_state_soon_alive;
+							fish->payload = target_peice->cc;
+							
+							if( target_peice->config != k_cell_type_stub )
+							{
+								struct cell_description *desc = &cell_descriptions[ target_peice->config ];
+								v2i_copy( desc->start, fish->dir );
+								fish->flow_reversed = 1;
+
+								world.num_fishes ++;
+								alive_count ++;
+							}
+						}
 						else
-							target_peice->state &= ~FLAG_FLIP_FLOP;
+						{
+							if( trigger_id )
+								target_peice->state |= FLAG_FLIP_FLOP;
+							else
+								target_peice->state &= ~FLAG_FLIP_FLOP;
+						}
+
+						cell_current->state |= FLAG_TRIGGERED;
 					}
 				}
 			}
@@ -2019,9 +2173,8 @@ static void vg_update(void)
 				for( int i = 0; i < arrlen( world.io ); i ++ )
 				{
 					struct cell_terminal *term = &world.io[ i ];
-					int is_input = pcell(term->pos)->state & FLAG_INPUT;
 					
-					if( !is_input )
+					if( pcell(term->pos)->state & FLAG_OUTPUT )
 					{
 						struct terminal_run *run = &term->runs[ world.sim_run ];
 					
@@ -2058,7 +2211,7 @@ static void vg_update(void)
 						world.sim_delta_ref = vg_time;
 						world.sim_internal_ref = 0.0f;
 						
-						if( world_static.buttons[ k_world_button_pause ].state )
+						if( world.st.buttons[ k_world_button_pause ].state )
 							world.pause_offset_target = 0.5f;
 						else
 							world.pause_offset_target = 0.0f;
@@ -2210,7 +2363,42 @@ static void vg_update(void)
 	}
 }
 
-static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
+static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4f const selected_colour )
+{
+	int selected = world.selected == pos[1]*world.w + pos[0];
+	
+	int tile_offsets[][2] =
+	{
+		{2, 0}, {0, 3}, {0, 2}, {2, 2},
+		{1, 0}, {2, 3}, {3, 2}, {1, 3},
+		{3, 1}, {0, 1}, {1, 2}, {2, 1},
+		{1, 1}, {3, 3}, {2, 1}, {2, 1}
+	};
+	
+	int uv[2];
+	
+	uv[0] = tile_offsets[ ptr->config ][0];
+	uv[1] = tile_offsets[ ptr->config ][1];
+	
+	glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), 
+		(float)pos[0], 
+		(float)pos[1], 
+		uv[0], 
+		uv[1] 
+	);
+
+	if( selected )
+	{
+		glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
+		draw_mesh( 0, 2 );
+		glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+	}
+	else			
+		draw_mesh( 0, 2 );
+}
+
+// Renders specific chunk of tiles
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
 {
 	v2i full_start = { 0,0 };
 	v2i full_end = { world.w, world.h };
@@ -2220,41 +2408,44 @@ static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f cons
 		start = full_start;
 		end = full_end;
 	}
-	
-	glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
 
 	for( int y = start[1]; y < end[1]; y ++ )
 	{
 		for( int x = start[0]; x < end[0]; x ++ )
 		{
-			struct cell *cell = pcell((v2i){x,y});
-			int selected = world.selected == y*world.w + x;
-			
-			int tile_offsets[][2] =
-			{
-				{2, 0}, {0, 3}, {0, 2}, {2, 2},
-				{1, 0}, {2, 3}, {3, 2}, {1, 3},
-				{3, 1}, {0, 1}, {1, 2}, {2, 1},
-				{1, 1}, {3, 3}, {2, 1}, {2, 1}
-			};
-			
-			int uv[2] = { 3, 0 };
-			
-			if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
-			{
-				uv[0] = tile_offsets[ cell->config ][0];
-				uv[1] = tile_offsets[ cell->config ][1];
-			} else continue;
-			
-			glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y, uv[0], uv[1] );
-			if( selected )
-			{
-				glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
-				draw_mesh( 0, 2 );
-				glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
-			}
-			else			
-				draw_mesh( 0, 2 );
+			v2i pos = { x, y };
+			struct cell *cell = pcell( pos );
+
+			if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
+				render_tile( pos, cell, regular_colour, selected_colour );
+		}
+	}
+}
+
+// Renders all tiles in the command list
+static void render_tiles( v4f const regular_colour, v4f const selected_colour )
+{
+	glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+
+	struct render_list
+	{
+		struct render_cmd *arr;
+		u32 count;
+	}
+	render_lists[] = { 
+		{ world.cmd_buf_tiles, world.tile_count }, 
+		{ world.cmd_buf_specials, world.tile_special_count } 
+	};
+
+	for( int i = 0; i < vg_list_size( render_lists ); i ++ )
+	{
+		struct render_list *list = &render_lists[i];
+		for( int j = 0; j < list->count; j ++ )
+		{
+			struct render_cmd *cmd = &list->arr[j];
+			struct cell *cell = cmd->ptr;
+
+			render_tile( cmd->pos, cell, regular_colour, selected_colour );
 		}
 	}
 }
@@ -2323,142 +2514,6 @@ static int world_button_exec( struct world_button *btn, v2f texture, v3f colour,
 	return triggered;
 }
 
-/*
-static void wbutton_run( enum e_world_button btn_name, v2f btn_tex )
-{
-	static v3f button_colours[] = {
-		{0.204f, 0.345f, 0.553f},
-		{0.204f, 0.345f, 0.553f},
-		{0.553f, 0.345f, 0.204f},
-		{1.0f, 0.0f, 0.0f}
-	};
-
-	struct cell_button *btn = &world.buttons[btn_name];
-	
-	// Interaction
-	int tex_offset = 0;
-	
-	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
-		if( btn_name == k_world_button_sim )
-		{
-			if( world.buttons[ k_world_button_pause ].pressed )
-			{
-				if( !btn->pressed )
-				{
-					btn->pressed = 1;
-					simulation_start();
-					
-					world.pause_offset_target = 0.5f;
-				}
-				else
-					world.pause_offset_target += 1.0f;
-			}
-			else
-			{
-				btn->pressed ^= 0x1;
-				
-				if( btn->pressed )
-					simulation_start();
-				else
-					simulation_stop();
-			}
-		}
-		else if( btn_name == k_world_button_pause )
-		{
-			btn->pressed ^= 0x1;
-		
-			world.sim_internal_ref = world.sim_internal_time;
-			world.sim_delta_ref = vg_time;
-			
-			if( btn->pressed )
-			{
-				float time_frac = world.sim_internal_time-floorf(world.sim_internal_time);
-				world.pause_offset_target = 0.5f - time_frac;
-			}
-			else
-				world.pause_offset_target = 0.0f;
-		}
-		else if( btn_name == k_world_button_speedy )
-		{
-			btn->pressed ^= 0x1;
-			
-			world.sim_delta_speed = btn->pressed? 10.0f: 2.5f;
-			world.sim_delta_ref = vg_time;
-			world.sim_internal_ref = world.sim_internal_time;
-		}
-		else
-		{
-			btn->pressed ^= 0x1;
-		}
-		
-		sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 );
-	}
-	
-	// Drawing
-	if( btn->pressed ) 
-	{
-		if( is_hovering )
-		{
-			btn->light_target = 0.9f;
-		}
-		else
-		{
-			if( btn_name == k_world_button_sim && world.buttons[ k_world_button_pause ].pressed )
-				btn->light_target = fabsf(sinf( vg_time * 2.0f )) * 0.3f + 0.3f;
-			else
-				btn->light_target = 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 );
-	
-	// Draw
-	if( btn_name == k_world_button_sim && world.buttons[ k_world_button_sim ].pressed )
-	{
-		if( world.buttons[ k_world_button_pause ].pressed )
-			tex_offset = 3;
-		else
-			tex_offset = 2;
-	}
-	
-	v4f final_colour;
-	v3_copy( button_colours[ btn_name ], final_colour );
-	final_colour[3] = btn->light;
-	
-	glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), 
-		world.w-1, 
-		world.h-btn_name-2, 
-		(float)(btn_tex[0]+tex_offset), 
-		btn_tex[1]
-	);
-	glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour );
-	
-	draw_mesh( 0, 2 );
-}
-
-static void wbutton_draw( v2i pos, v2f tex, v4f colour )
-{
-	glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ), 
-		pos[0], 
-		pos[1], 
-		tex[0], 
-		tex[1] 
-	);
-	glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, colour );
-	draw_mesh( 0, 2 );
-}
-*/
-
 static void level_selection_buttons(void)
 {
 	v3f tutorial_colour = { 0.204f, 0.345f, 0.553f };
@@ -2497,14 +2552,30 @@ static void level_selection_buttons(void)
 	
 	if( switch_level_to )
 	{
+		world.st.lvl_to_load = switch_level_to;
+		world.st.lvl_load_time = vg_time + 0.25f;
+		world.st.world_transition = 1.0f;
+
+		/*
 		if( console_changelevel( 1, &switch_level_to->map_name ) )
 		{
 			world.pCmpLevel = switch_level_to;
 			gen_level_text( world.pCmpLevel );
 		}
+		*/
 	}
 }
 
+static void render_sprite( enum sprites_auto_combine_index id, v3f pos )
+{
+	struct vg_sprite *sp = &sprites_auto_combine[ id ];
+
+	glUniform4fv( SHADER_UNIFORM( shader_sprite, "uUv" ), 1, sp->uv_xywh );
+	glUniform3f( SHADER_UNIFORM( shader_sprite, "uPos" ), pos[0], pos[1], pos[2] * world.st.world_transition );
+	
+	draw_mesh( 0, 2 );
+}
+
 void vg_render(void)
 {
 	glViewport( 0,0, vg_window_x, vg_window_y );
@@ -2522,8 +2593,38 @@ void vg_render(void)
 	int const empty_start = circle_base+32;
 	int const empty_count = circle_base+32*2;
 	
+   struct world_theme *theme = &world_themes[ world_theme_id ];
+
 	if( !world.initialzed )
 		return;
+
+	// Extract render commands
+	world.tile_count = 0;
+	world.tile_special_count = 0;
+
+	for( int y = 1; y < world.h-1; y ++ )
+	{
+		for( int x = 1; x < world.w-1; x ++ )
+		{
+			struct cell *cell = pcell((v2i){x,y});
+			
+			if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
+			{
+				struct render_cmd *cmd;
+
+				if( cell->config == k_cell_type_split || (cell->state & FLAG_EMITTER ) )
+					cmd = &world.cmd_buf_tiles[ world.max_commands - (++ world.tile_special_count) ];
+				else
+					cmd = &world.cmd_buf_tiles[ world.tile_count ++ ];
+
+				cmd->pos[0] = x;
+				cmd->pos[1] = y;
+				cmd->ptr = cell;
+			}
+		}
+	}
+
+	world.cmd_buf_specials = &world.cmd_buf_tiles[ world.max_commands - world.tile_special_count ];
 	
 	// BACKGROUND
 	// ========================================================================================================
@@ -2542,7 +2643,7 @@ void vg_render(void)
 	glActiveTexture( GL_TEXTURE1 );
 	glBindTexture( GL_TEXTURE_2D, world.random_samples );
 	glUniform1i( SHADER_UNIFORM( shader_background, "uSamplerNoise" ), 1 );
-	glUniform1f( SHADER_UNIFORM( shader_background, "uVisibility" ), 1.0f ); // (sinf( vg_time ) + 1.0f) * 0.5f );
+	glUniform1f( SHADER_UNIFORM( shader_background, "uVisibility" ), 1.0f ); //world.st.world_transition );
 
 	draw_mesh( 0, 2 );
 	
@@ -2557,7 +2658,7 @@ void vg_render(void)
 	glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_main, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
 	glUniform1f( SHADER_UNIFORM( shader_tile_main, "uGhost" ), 0.0f );
 	glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 0.0f );
-	glUniform1f( SHADER_UNIFORM( shader_tile_main, "uVisibility" ), 2.0f ); // sinf( vg_time ) + 1.0f );
+	glUniform1f( SHADER_UNIFORM( shader_tile_main, "uVisibility" ), world.st.world_transition * 2.0f );
 	
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -2566,11 +2667,11 @@ void vg_render(void)
 	// Bind textures
 	vg_tex2d_bind( &tex_tile_data, 0 );
 	glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
-	
-	vg_tex2d_bind( &tex_wood, 1 );
+
+	vg_tex2d_bind( theme->tex_tiles, 1 );
 	glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
 	
-	render_tiles( NULL, NULL, colour_default, colour_default );
+	render_tiles( colour_default, colour_default );
 	
 	// MARBLES
 	// ========================================================================================================
@@ -2580,7 +2681,7 @@ void vg_render(void)
 	vg_tex2d_bind( &tex_ball_noise, 0 );
 	glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 );
 	
-	if( world_static.buttons[ k_world_button_sim ].state )
+	if( world.st.buttons[ k_world_button_sim ].state )
 	{
 		for( int i = 0; i < world.num_fishes; i ++ )
 		{
@@ -2626,55 +2727,51 @@ void vg_render(void)
 	vg_tex2d_bind( &tex_tile_data, 0 );
 	glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
 	
-	vg_tex2d_bind( &tex_wood, 1 );
+   // TODO: is this needed to be rebinded?
+	vg_tex2d_bind( theme->tex_tiles, 1 );
 	glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
 	
 	glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 1.0f );
-	render_tiles( NULL, NULL, colour_default, colour_selected  );
+	render_tiles( colour_default, colour_selected );
 
 	//	Draw splitters
-	for( int y = 2; y < world.h-2; y ++ )
+	for( int i = 0; i < world.tile_special_count; i ++ )
 	{
-		for( int x = 2; x < world.w-2; x ++ )
-		{
-			struct cell *cell = pcell((v2i){x,y});
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
 
-			if( cell->state & FLAG_CANAL )
+		if( cell->config == k_cell_type_split )
+		{
+			float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
+			
+			if( cell->state & FLAG_FLIP_ROTATING )
 			{
-				if( cell->config == k_cell_type_split )
+				if( (world.frame_lerp > curve_7_linear_section) )
 				{
-					float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
-					
-					if( cell->state & FLAG_FLIP_ROTATING )
+					float const rotation_speed = 0.4f;
+					if( (world.frame_lerp < 1.0f-rotation_speed) )
 					{
-						if( (world.frame_lerp > curve_7_linear_section) )
-						{
-							float const rotation_speed = 0.4f;
-							if( (world.frame_lerp < 1.0f-rotation_speed) )
-							{
-								float t = world.frame_lerp - curve_7_linear_section;
-								t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
-								t += 1.0f;
-								
-								rotation *= t;
-							}
-							else
-								rotation *= -1.0f;
-						}
+						float t = world.frame_lerp - curve_7_linear_section;
+						t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
+						t += 1.0f;
+						
+						rotation *= t;
 					}
-
-					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 
-					);
-					draw_mesh( 0, 2 );
+					else
+						rotation *= -1.0f;
 				}
 			}
+
+			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)cmd->pos[0], 
+				(float)cmd->pos[1] + 0.125f, 
+				cell->state & FLAG_TARGETED? 3.0f: 0.0f, 
+				0.0f 
+			);
+			draw_mesh( 0, 2 );
 		}
 	}
 	
@@ -2693,7 +2790,7 @@ void vg_render(void)
 		glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );	
 		glUniform2fv( SHADER_UNIFORM( shader_tile_main, "uMousePos" ), 1, world.tile_pos );
 		
-		render_tiles( new_begin, new_end, colour_default, colour_default );
+		render_tile_block( new_begin, new_end, colour_default, colour_default );
 		
 		world.data[ world.selected ].state ^= FLAG_CANAL;
 		map_reclassify( new_begin, new_end, 0 );
@@ -2708,15 +2805,15 @@ void vg_render(void)
 	glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 );
 	
 	enum world_button_status stat;
-	int world_paused = world_static.buttons[k_world_button_pause].state;
-	int world_running = world_static.buttons[k_world_button_sim].state;
+	int world_paused = world.st.buttons[k_world_button_pause].state;
+	int world_running = world.st.buttons[k_world_button_sim].state;
 
 	float sim_icon_x = world_paused? 3.0f: (world_running? 2.0f: 0.0f);
 
 	v3f btn_dark_blue = { 0.204f, 0.345f, 0.553f };
 	v3f btn_orange = { 0.553f, 0.345f, 0.204f };
 
-	if( world_button_exec( &world_static.buttons[k_world_button_sim], (v2f){ sim_icon_x, 3.0f }, btn_dark_blue, &stat ))
+	if( world_button_exec( &world.st.buttons[k_world_button_sim], (v2f){ sim_icon_x, 3.0f }, btn_dark_blue, &stat ))
 	{
 		if( stat == k_world_button_on_enable )
 		{
@@ -2731,7 +2828,7 @@ void vg_render(void)
 			{
 				// Trigger single step
 				world.pause_offset_target += 1.0f;
-				world_static.buttons[k_world_button_sim].state = 1;
+				world.st.buttons[k_world_button_sim].state = 1;
 			}
 			else
 			{
@@ -2740,7 +2837,7 @@ void vg_render(void)
 		}
 	}
 	
-	if( world_button_exec( &world_static.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat ))
+	if( world_button_exec( &world.st.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat ))
 	{
 		world.sim_internal_ref = world.sim_internal_time;
 		world.sim_delta_ref = vg_time;
@@ -2754,7 +2851,7 @@ void vg_render(void)
 			world.pause_offset_target = 0.0f;
 	}
 
-	if( world_button_exec( &world_static.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat ))
+	if( world_button_exec( &world.st.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat ))
 	{
 		world.sim_delta_speed = stat == k_world_button_on_enable? 10.0f: 2.5f;
 		
@@ -2765,15 +2862,43 @@ void vg_render(void)
 		}
 	}
 
-	if( world_button_exec( &world_static.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat ))
+	if( world_button_exec( &world.st.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat ))
 	{
-		
+		world.st.state = stat == k_world_button_on_enable? k_game_state_settings: k_game_state_main;	
 	}
 
 	level_selection_buttons();
 	
 	if( vg_get_button_up( "primary" ) )
 		world_button_exec( NULL, NULL, NULL, NULL );
+	
+	// SPRITES
+	// ========================================================================================================
+	SHADER_USE( shader_sprite );
+	glUniformMatrix3fv( SHADER_UNIFORM( shader_sprite, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+	vg_tex2d_bind( &tex_sprites, 0 );
+	glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
+	
+	for( int i = 0; i < world.tile_special_count; i ++ )
+	{
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
+
+		if( cell->config == k_cell_type_split )
+		{
+			v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
+
+			v3f p0 = { 0.0f, 0.0f, 4.0f };
+			v3f p1 = { 0.0f, 0.0f, 4.0f };
+
+			v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+			v2_add( center, (v2f){  0.25f, -0.25f }, p1 );
+
+			render_sprite( k_sprite_jack_1, p0 );
+			render_sprite( k_sprite_jack_2, p1 );
+		}
+	}
 
 	// TEXT ELEMENTS
 	// ========================================================================================================
@@ -2821,41 +2946,53 @@ void vg_render(void)
 	float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f;
 	float rp_x2 = 1.0f-rp_xa;
 	
-	for( int y = 2; y < world.h-2; y ++ )
+	for( int i = 0; i < world.tile_special_count; i ++ )
 	{
-		for( int x = 2; x < world.w-2; x ++ )
-		{
-			struct cell *cell = pcell((v2i){x,y});
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
 
-			if( cell->state & FLAG_CANAL )
+		if( cell->state & FLAG_TARGETED )
+		{
+			for( int j = 0; j < 2; j ++ )
 			{
-				if( cell->state & FLAG_IS_TRIGGER )
-				{
-					struct cell_description *desc = &cell_descriptions[ cell->config ];
+				if( !cell->links[j] )
+					continue;
+
+				struct cell *other_cell = &world.data[ cell->links[ j ]];
+				struct cell_description *desc = &cell_descriptions[ other_cell->config ];
 				
-					int trigger_id = cell->links[0]?0:1;
-					
-					int x2 = cell->links[trigger_id] % world.w;
-					int y2 = (cell->links[trigger_id] - x2) / world.w;
-					
-					v2f startpoint; 
-					v2f endpoint;
-					
-					startpoint[0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
-					startpoint[1] = (float)y2 + 0.25f;
-					
-					endpoint[0] = x;
-					endpoint[1] = y;
-					
-					v2_add( desc->trigger_pos, endpoint, endpoint );
-					
-					glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, trigger_id? wire_right_colour: wire_left_colour );
-					glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
-					glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
-					glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.18f );
-					glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.18f );
-					glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+				int x2 = cell->links[j] % world.w;
+				int y2 = (cell->links[j] - x2) / world.w;
+				
+				v2f startpoint; 
+				v2f endpoint;
+				
+				endpoint[0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+				endpoint[1] = (float)cmd->pos[1] + 0.25f;
+				
+				startpoint[0] = x2;
+				startpoint[1] = y2;
+				
+				v2_add( desc->trigger_pos, startpoint, startpoint );
+				
+				if( cmd->ptr->state & FLAG_EMITTER )
+				{
+					v4f wire_colour;
+					colour_code_v3( other_cell->cc, wire_colour );
+					wire_colour[3] = 1.0f;
+
+					glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour );
 				}
+				else
+				{
+					glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour );
+				}
+
+				glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), other_cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
+				glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), other_cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
+				glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), startpoint[0], startpoint[1], 0.18f );
+				glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), endpoint[0], endpoint[1], 0.18f );
+				glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
 			}
 		}
 	}
@@ -2867,77 +3004,128 @@ void vg_render(void)
 	glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
 	use_mesh( &world.shapes );
 	
-	for( int y = 2; y < world.h-2; y ++ )
+	for( int i = 0; i < world.tile_special_count; i ++ )
 	{
-		for( int x = 2; x < world.w-2; x ++ )
-		{
-			struct cell *cell = pcell((v2i){x,y});
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
 
-			if( cell->state & FLAG_CANAL )
+		if( cell->state & FLAG_TARGETED )
+		{
+			for( int j = 0; j < 2; j ++ )
 			{
-				if( cell->state & FLAG_IS_TRIGGER )
+				if( !cell->links[j] )
+					continue;
+
+				struct cell *other_cell = &world.data[ cell->links[ j ]];
+				
+				struct cell_description *desc = &cell_descriptions[ other_cell->config ];
+				
+				int x2 = cell->links[j] % world.w;
+				int y2 = (cell->links[j] - x2) / world.w;
+				
+				v2f pts[2];
+				
+				pts[0][0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+				pts[0][1] = (float)cmd->pos[1] + 0.25f;
+				
+				pts[1][0] = x2;
+				pts[1][1] = y2;
+				
+				v2_add( desc->trigger_pos, pts[1], pts[1] );
+				
+				if( other_cell->state & FLAG_EMITTER )
 				{
-					struct cell_description *desc = &cell_descriptions[ cell->config ];
+					v4f wire_colour;
+					colour_code_v3( other_cell->cc, wire_colour );
+
+					v3_muls( wire_colour, 0.8f, wire_colour );
+					wire_colour[3] = 1.0f;
+
+					glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour );
+				}
+				else
+				{
+					glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour );
+				}
 				
-					int trigger_id = cell->links[0]?0:1;
-					
-					int x2 = cell->links[trigger_id] % world.w;
-					int y2 = (cell->links[trigger_id] - x2) / world.w;
-					
-					v2f pts[2];
-					
-					pts[0][0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
-					pts[0][1] = (float)y2 + 0.25f;
-					
-					pts[1][0] = x;
-					pts[1][1] = y;
-					
-					v2_add( desc->trigger_pos, pts[1], pts[1] );
-					
-					glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 
-							1, trigger_id? wire_right_colour: wire_left_colour );
-					
-					for( int i = 0; i < 2; i ++ )
-					{
-						glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 
-							pts[i][0],
-							pts[i][1], 
-							0.08f 
-						);
-						draw_mesh( filled_start, filled_count );	
-					}
+				for( int i = 0; i < 2; i ++ )
+				{
+					glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 
+						pts[i][0],
+						pts[i][1], 
+						0.08f 
+					);
+					draw_mesh( filled_start, filled_count );	
 				}
 			}
 		}
 	}
-	
+
 	// SUB SPLITTER DIRECTION
 	// ========================================================================================================
-	
+
 	glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f );
 	
-	for( int y = 2; y < world.h-2; y ++ )
+	for( int i = 0; i < world.tile_special_count; i ++ )
 	{
-		for( int x = 2; x < world.w-2; x ++ )
-		{
-			struct cell *cell = pcell((v2i){x,y});
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
 
-			if( cell->state & FLAG_CANAL && cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
-			{
-				glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), x, y, 1.0f );
-				draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
-			}
+		if( cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
+		{
+			glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), cmd->pos[0], cmd->pos[1], 1.0f );
+			draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
 		}
 	}
+
+	// LIGHT FLARES
+	// ========================================================================================================
+	glBlendFunc(GL_ONE, GL_ONE);
+	glBlendEquation(GL_FUNC_ADD);
 	
+	SHADER_USE( shader_sprite );
+
+	vg_tex2d_bind( &tex_sprites, 0 );
+	glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
+	
+	for( int i = 0; i < world.tile_special_count; i ++ )
+	{
+		struct render_cmd *cmd = &world.cmd_buf_specials[i];
+		struct cell *cell = cmd->ptr;
+
+		if( cell->config == k_cell_type_split )
+		{
+			v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
+
+			v3f p0 = { 0.0f, 0.0f, 12.0f };
+			v3f p1 = { 0.0f, 0.0f, 12.0f };
+
+			v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+			v2_add( center, (v2f){  0.25f, -0.25f }, p1 );
+
+			if( cell->state & FLAG_FLIP_FLOP )
+				render_sprite( k_sprite_flare_y, p1 );
+			else
+				render_sprite( k_sprite_flare_b, p0 );
+		}
+	}
+
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glBlendEquation(GL_FUNC_ADD);
+
 	// I/O ARRAYS
 	// ========================================================================================================
 	
 	//glEnable(GL_BLEND);
-	
+	SHADER_USE( shader_tile_colour );
+
 	for( int i = 0; i < arrlen( world.io ); i ++ )
 	{
 		struct cell_terminal *term = &world.io[ i ];
+		
+		if( pcell(term->pos)->state & FLAG_EMITTER )
+			continue;
+
 		int is_input = pcell(term->pos)->state & FLAG_INPUT;
 
 		v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
@@ -3040,11 +3228,97 @@ void vg_render(void)
 	*/
 }
 
-void vg_ui(void) {}
+void vg_ui(void) 
+{
+	if( world.st.state == k_game_state_settings )
+	{
+		gui_group_id( 35 );
+
+		ui_global_ctx.cursor[2] = 225;
+		gui_fill_y();
+		gui_align_right();
+
+		gui_new_node();
+		{
+			gui_capture_mouse( 200 );
+
+			gui_fill_rect( ui_global_ctx.cursor, 0xC0202020 );
+			ui_rect_pad( ui_global_ctx.cursor, 8 );
+			
+			ui_global_ctx.cursor[3] = 25;
+			
+			gui_new_node();
+			{
+				gui_text( "Settings", 3 );
+			}
+			gui_end();
+
+			// Colour scheme selection
+			ui_global_ctx.cursor[1] += 30;
+
+			gui_text( "Colour Scheme", 2 );
+			ui_global_ctx.cursor[1] += 25;
+
+			gui_new_node();
+			{
+				ui_global_ctx.cursor[2] = 50;
+
+				for( int i = 0; i < 4; i ++ )
+				{
+					gui_new_node();
+					{
+						// Convert to RGB
+						u32 rgb = 0xff000000;
+
+						for( int j = 0; j < 3; j ++ )
+							rgb |= (u32)(colour_sets[ colour_set_id ][i][j]*255.0f) << j * 8;
+
+						gui_fill_rect( ui_global_ctx.cursor, rgb );
+					}
+					gui_end_right();
+				}
+			}
+			gui_end_down();
+			
+			gui_new_node();
+			{
+				ui_global_ctx.cursor[2] = 25;
+				if( gui_button( 0 ) == k_button_click )
+				{
+					if( colour_set_id > 0 )
+						colour_set_id --;
+				}
+				gui_text( "<", 2 );
+				gui_end_right();
+				
+				ui_global_ctx.cursor[2] = 150;
+				gui_new_node();
+				{
+					ui_global_ctx.cursor[0] += 45;
+					ui_global_ctx.cursor[1] += 6;
+					gui_text( (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ], 2 );
+				}
+				gui_end_right();
+
+				ui_global_ctx.cursor[2] = 25;
+				if( gui_button( 1 ) == k_button_click )
+				{
+					if( colour_set_id < vg_list_size( colour_sets )-1 )
+						colour_set_id ++;
+				}
+				gui_text( ">", 2 );
+				gui_end_down();
+			}
+			gui_end_down();
+		}
+		gui_end();
+	}
+}
 
 #if STEAM_LEADERBOARDS
 void leaderboard_dispatch_score(void)
 {
+
 	sw_upload_leaderboard_score( 
 		ui_data.upload_request.level->steam_leaderboard, 
 		k_ELeaderboardUploadScoreMethodKeepBest,
@@ -3246,8 +3520,10 @@ static int console_changelevel( int argc, char const *argv[] )
 	{
 		// Save current level
 		console_save_map( 0, NULL );
+		
 		if( console_load_map( argc, argv ) )
 		{				
+			world.st.zoom = 0.0f;
 			simulation_stop();
 			return 1;
 		}
@@ -3298,9 +3574,18 @@ void vg_start(void)
 		.name = "colours",
 		.data = &colour_set_id,
 		.data_type = k_convar_dtype_i32,
-		.opt_i32 = { .min = 0, .max = 2, .clamp = 1 }
+		.opt_i32 = { .min = 0, .max = 2, .clamp = 1 },
+		.persistent = 1
 	});
 
+   vg_convar_push( (struct vg_convar){
+      .name = "theme",
+      .data = &world_theme_id,
+      .data_type = k_convar_dtype_i32,
+      .opt_i32 = { .min = 0, .max = vg_list_size( world_themes )-1, .clamp = 1 },
+      .persistent = 1,
+   });
+
 	// Combined quad, long quad / empty circle / filled circle mesh
 	{
 		float combined_mesh[6*6 + 32*6*3] = {