emit test, wire fixes

[fishladder.git] / fishladder_resources.h

diff --git a/fishladder_resources.h b/fishladder_resources.h
index c6ecc9a806d788a55bacad0784f738a8d5d8a5ed..82efc47100aee05fcf6954141cd26c17cd6816dc 100644 (file)
--- a/fishladder_resources.h
+++ b/fishladder_resources.h
@@ -463,6 +463,7 @@ SHADER_DEFINE( shader_background,
                "vec4 data_this_tile = texture( uTexMain, aTexCoords );"
                
                "ao_accum -= data_this_tile.r;"
+               "ao_accum *= uVisibility;"
                
                "vec3 colour_main = mix( vec3( 0.369768, 0.3654, 0.42 ), vec3( 0.275, 0.388, 0.553 ), data_this_tile.g * uVisibility );"
                
@@ -899,18 +900,47 @@ static struct cmp_level cmp_levels_grad[] =
                .map_name = "cmp_grad",
                .description = "",
 
-               ._linked = 22
+               ._linked = 22,
+               ._unlock = 23
        },
        // r2 GM
        {
                .serial_id = 22,
                .title = "SECRET CODE",
                .map_name = "cmp_secret",
+               .description = "",
+
+               ._unlock = 23
+       }
+};
+
+static struct cmp_level cmp_levels_computer[] = 
+{
+       {
+               .serial_id = 23,
+               .title = "3 BIT BINARY",
+               .map_name = "cmp_binary",
+               .description = "",
+               
+               ._unlock = 24
+       },
+       {
+               .serial_id = 24,
+               .title = "3 BIT ADDITION",
+               .map_name = "cmp_add3b",
+               .description = "",
+
+               ._unlock = 25
+       },
+       {
+               .serial_id = 25,
+               .title = "3x3 PLOT",
+               .map_name = "cmp_plot3x3",
                .description = ""
        }
 };
 
-#define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad ))
+#define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad ) + vg_list_size( cmp_levels_computer ) )
 
 static struct career_level_pack 
 {
@@ -943,6 +973,13 @@ career_packs[] =
                .primary_colour = { 0.553f, 0.345f, 0.204f },
                .origin = { -5, 6 },
                .dims = { 4, 1 }
+       },
+       {
+               .pack = cmp_levels_computer,
+               .count = vg_list_size( cmp_levels_computer ),
+               .primary_colour = { 0.75f, 0.23f, 0.39f },
+               .origin = { -5, 8 },
+               .dims = { 5, 1 }
        }
 };