X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder_resources.h;h=ddc1f00926e05f19549a32aed40f8dd6c55dc413;hb=7d33b1d4576c1e35cd03ee3034840b8053914ae1;hp=24ba9933069c814e8761115cca6ad23f475ee619;hpb=fefce08c7eecf3eb66553825ba421b5b81dae5eb;p=fishladder.git diff --git a/fishladder_resources.h b/fishladder_resources.h index 24ba993..ddc1f00 100644 --- a/fishladder_resources.h +++ b/fishladder_resources.h @@ -1,107 +1,118 @@ // FONTS -/* -vg_tex2d tex_ubuntu = { .path = "textures/ubuntu.qoi" }; -static struct ui_sdf_char characters_Ubuntu[] = { - {62911, 23039, 64063, 27647, 9, 9, 18, 18, 7}, - {3519, 23039, 4991, 33279, 7, 31, 23, 40, 9}, - {50815, 23039, 52543, 29695, 7, 33, 27, 26, 13}, - {22783, 12543, 25087, 22783, 7, 31, 36, 40, 21}, - {19647, 0, 21695, 11775, 7, 34, 32, 46, 18}, - {36095, 0, 38783, 10495, 7, 31, 42, 41, 27}, - {41343, 0, 43775, 10495, 8, 31, 38, 41, 21}, - {52543, 23039, 53887, 29695, 7, 33, 21, 26, 7}, - {7551, 0, 9215, 12543, 6, 34, 26, 49, 10}, - {9215, 0, 10879, 12543, 9, 34, 26, 49, 10}, - {43135, 23039, 45119, 30975, 8, 31, 31, 31, 15}, - {32703, 23039, 34815, 31743, 7, 26, 33, 34, 18}, - {49343, 23039, 50815, 29951, 8, 12, 23, 27, 8}, - {61247, 23039, 62911, 28415, 8, 20, 26, 21, 9}, - {57599, 23039, 59071, 28671, 7, 13, 23, 22, 8}, - {0, 0, 2047, 12543, 10, 34, 32, 49, 12}, - {50623, 0, 52735, 10495, 7, 32, 33, 41, 18}, - {1791, 23039, 3519, 33279, 6, 31, 27, 40, 18}, - {61183, 0, 63231, 10495, 7, 32, 32, 41, 18}, - {63231, 0, 65279, 10495, 7, 32, 32, 41, 18}, - {38655, 12543, 40831, 22783, 8, 31, 34, 40, 18}, - {0, 12543, 2047, 23039, 7, 31, 32, 41, 18}, - {55807, 12543, 57855, 22783, 7, 31, 32, 40, 18}, - {47359, 12543, 49471, 22783, 7, 31, 33, 40, 18}, - {52735, 0, 54847, 10495, 7, 31, 33, 41, 18}, - {49471, 12543, 51583, 22783, 7, 31, 33, 40, 18}, - {28543, 23039, 30015, 31999, 7, 25, 23, 35, 8}, - {4991, 23039, 6463, 33279, 8, 26, 23, 40, 8}, - {38911, 23039, 41023, 31487, 7, 26, 33, 33, 18}, - {47231, 23039, 49343, 29951, 7, 23, 33, 27, 18}, - {41023, 23039, 43135, 31487, 7, 26, 33, 33, 18}, - {4095, 12543, 6015, 23039, 8, 31, 30, 41, 13}, - {21695, 0, 24511, 11519, 7, 31, 44, 45, 30}, - {13055, 12543, 15551, 22783, 9, 31, 39, 40, 21}, - {40831, 12543, 43007, 22783, 6, 31, 34, 40, 20}, - {43775, 0, 46079, 10495, 7, 31, 36, 41, 20}, - {25087, 12543, 27391, 22783, 6, 31, 36, 40, 23}, - {51583, 12543, 53695, 22783, 6, 31, 33, 40, 18}, - {57855, 12543, 59903, 22783, 6, 31, 32, 40, 17}, - {46079, 0, 48383, 10495, 7, 31, 36, 41, 21}, - {29695, 12543, 31935, 22783, 6, 31, 35, 40, 22}, - {6463, 23039, 7807, 33279, 6, 31, 21, 40, 8}, - {61951, 12543, 63935, 22783, 9, 31, 31, 40, 16}, - {31935, 12543, 34175, 22783, 6, 31, 35, 40, 20}, - {59903, 12543, 61951, 22783, 6, 31, 32, 40, 16}, - {10367, 12543, 13055, 22783, 7, 31, 42, 40, 28}, - {27391, 12543, 29695, 22783, 6, 31, 36, 40, 23}, - {38783, 0, 41343, 10495, 7, 31, 40, 41, 25}, - {43007, 12543, 45183, 22783, 6, 31, 34, 40, 19}, - {17087, 0, 19647, 11775, 7, 31, 40, 46, 25}, - {48383, 0, 50623, 10495, 6, 31, 35, 41, 20}, - {54847, 0, 56959, 10495, 8, 32, 33, 41, 17}, - {34175, 12543, 36415, 22783, 8, 31, 35, 40, 18}, - {36415, 12543, 38655, 22783, 6, 31, 35, 40, 22}, - {15551, 12543, 18047, 22783, 9, 31, 39, 40, 21}, - {7423, 12543, 10367, 22783, 8, 31, 46, 40, 29}, - {18047, 12543, 20415, 22783, 8, 31, 37, 40, 20}, - {20415, 12543, 22783, 22783, 9, 31, 37, 40, 19}, - {45183, 12543, 47359, 22783, 8, 31, 34, 40, 18}, - {10879, 0, 12479, 12543, 6, 34, 25, 49, 10}, - {2047, 0, 4095, 12543, 10, 34, 32, 49, 12}, - {12479, 0, 14079, 12543, 9, 34, 25, 49, 10}, - {45119, 23039, 47231, 30719, 7, 31, 33, 30, 18}, - {59071, 23039, 61247, 28415, 9, 6, 34, 21, 15}, - {53887, 23039, 55423, 29183, 7, 34, 24, 24, 12}, - {18879, 23039, 20863, 31999, 8, 26, 31, 35, 16}, - {24511, 0, 26623, 11007, 6, 34, 33, 43, 19}, - {20863, 23039, 22847, 31999, 7, 26, 31, 35, 15}, - {26623, 0, 28735, 11007, 7, 34, 33, 43, 19}, - {12607, 23039, 14719, 31999, 7, 26, 33, 35, 18}, - {32767, 0, 34559, 11007, 6, 34, 28, 43, 12}, - {2047, 12543, 4095, 23039, 7, 26, 32, 41, 18}, - {30783, 0, 32767, 11007, 6, 34, 31, 43, 18}, - {6015, 12543, 7423, 23039, 7, 32, 22, 41, 8}, - {15423, 0, 17087, 12031, 11, 32, 26, 47, 8}, - {28735, 0, 30783, 11007, 6, 34, 32, 43, 16}, - {34559, 0, 36095, 11007, 7, 34, 24, 43, 8}, - {7807, 23039, 10431, 31999, 6, 26, 41, 35, 27}, - {22847, 23039, 24831, 31999, 6, 26, 31, 35, 18}, - {10431, 23039, 12607, 31999, 7, 26, 34, 35, 19}, - {56959, 0, 59071, 10495, 6, 26, 33, 41, 19}, - {59071, 0, 61183, 10495, 7, 26, 33, 41, 19}, - {26751, 23039, 28543, 31999, 6, 26, 28, 35, 12}, - {24831, 23039, 26751, 31999, 8, 26, 30, 35, 14}, - {0, 23039, 1791, 33279, 7, 31, 28, 40, 13}, - {16831, 23039, 18879, 31999, 7, 25, 32, 35, 18}, - {34815, 23039, 36927, 31743, 8, 25, 33, 34, 16}, - {30015, 23039, 32703, 31743, 8, 25, 42, 34, 25}, - {14719, 23039, 16831, 31999, 8, 26, 33, 35, 16}, - {53695, 12543, 55807, 22783, 9, 25, 33, 40, 16}, - {36927, 23039, 38911, 31743, 8, 25, 31, 34, 15}, - {4095, 0, 5823, 12543, 8, 34, 27, 49, 10}, - {14079, 0, 15423, 12543, 6, 34, 21, 49, 9}, - {5823, 0, 7551, 12543, 9, 34, 27, 49, 10}, - {55423, 23039, 57599, 28927, 8, 21, 34, 23, 18}, +struct sdf_char +{ + u16 uvx, uvy, originX, originY, w, h, advance; }; -static struct ui_sdf_font font_Ubuntu = { "Ubuntu", 32, 1024, 256, characters_Ubuntu, &tex_ubuntu }; -*/ +struct sdf_font +{ + const char *name; + int size, width, height; + struct sdf_char *characters; +}; + +static struct sdf_char characters_Ubuntu[] = { + {655, 167, 9, 9, 18, 18, 11}, + {561, 64, 6, 42, 25, 52, 13}, + {435, 167, 6, 45, 32, 30, 20}, + {797, 64, 7, 42, 46, 51, 32}, + {362, 0, 6, 46, 39, 60, 27}, + {918, 0, 7, 43, 55, 52, 41}, + {973, 0, 7, 43, 47, 52, 32}, + {467, 167, 6, 45, 23, 30, 11}, + {142, 0, 5, 46, 30, 64, 15}, + {172, 0, 9, 46, 30, 64, 15}, + {291, 167, 7, 42, 38, 37, 23}, + {171, 167, 6, 35, 40, 42, 27}, + {410, 167, 7, 14, 25, 31, 12}, + {625, 167, 8, 26, 30, 22, 14}, + {558, 167, 6, 15, 25, 24, 12}, + {0, 0, 10, 46, 39, 64, 18}, + {88, 64, 7, 43, 41, 52, 27}, + {532, 116, 5, 42, 32, 51, 27}, + {370, 64, 6, 43, 39, 52, 27}, + {409, 64, 6, 43, 39, 52, 27}, + {176, 116, 7, 42, 42, 51, 27}, + {448, 64, 6, 42, 39, 52, 27}, + {170, 64, 6, 42, 40, 52, 27}, + {343, 116, 6, 42, 40, 51, 27}, + {854, 0, 6, 43, 40, 53, 27}, + {210, 64, 7, 43, 40, 52, 27}, + {146, 167, 6, 34, 25, 43, 12}, + {564, 116, 7, 34, 26, 51, 12}, + {211, 167, 6, 34, 40, 39, 27}, + {370, 167, 6, 30, 40, 32, 27}, + {251, 167, 6, 34, 40, 39, 27}, + {525, 64, 8, 43, 36, 52, 19}, + {401, 0, 6, 43, 57, 59, 45}, + {700, 64, 9, 42, 49, 51, 32}, + {218, 116, 5, 42, 42, 51, 31}, + {769, 0, 6, 43, 44, 53, 30}, + {935, 64, 5, 42, 45, 51, 34}, + {383, 116, 5, 42, 40, 51, 27}, + {423, 116, 5, 42, 38, 51, 26}, + {724, 0, 6, 43, 45, 53, 32}, + {45, 116, 5, 42, 44, 51, 34}, + {590, 116, 5, 42, 23, 51, 13}, + {487, 64, 9, 42, 38, 52, 24}, + {89, 116, 5, 42, 44, 51, 30}, + {461, 116, 5, 42, 38, 51, 25}, + {646, 64, 6, 42, 54, 51, 42}, + {0, 116, 5, 42, 45, 51, 35}, + {674, 0, 6, 43, 50, 53, 37}, + {302, 116, 5, 42, 41, 51, 29}, + {312, 0, 6, 43, 50, 61, 37}, + {133, 116, 5, 42, 43, 51, 30}, + {813, 0, 7, 43, 41, 53, 25}, + {0, 64, 8, 42, 44, 52, 27}, + {44, 64, 5, 42, 44, 52, 33}, + {749, 64, 8, 42, 48, 51, 31}, + {586, 64, 8, 42, 60, 51, 44}, + {843, 64, 8, 42, 46, 51, 30}, + {889, 64, 9, 42, 46, 51, 28}, + {260, 116, 7, 42, 42, 51, 27}, + {202, 0, 4, 46, 29, 64, 16}, + {39, 0, 10, 46, 39, 64, 18}, + {231, 0, 9, 46, 29, 64, 16}, + {329, 167, 7, 42, 41, 36, 27}, + {583, 167, 9, 4, 42, 22, 23}, + {490, 167, 6, 46, 27, 28, 18}, + {695, 116, 7, 34, 38, 44, 25}, + {458, 0, 5, 46, 40, 56, 28}, + {733, 116, 7, 34, 37, 44, 22}, + {498, 0, 7, 46, 40, 56, 28}, + {655, 116, 7, 34, 40, 44, 27}, + {641, 0, 5, 46, 33, 55, 18}, + {250, 64, 7, 34, 40, 52, 27}, + {603, 0, 5, 46, 38, 55, 27}, + {894, 0, 6, 44, 24, 53, 12}, + {282, 0, 12, 44, 30, 62, 12}, + {564, 0, 5, 46, 39, 55, 25}, + {538, 0, 5, 46, 26, 56, 13}, + {860, 116, 5, 34, 52, 43, 41}, + {0, 167, 5, 34, 38, 43, 27}, + {613, 116, 7, 34, 42, 44, 28}, + {290, 64, 5, 34, 40, 52, 28}, + {330, 64, 7, 34, 40, 52, 28}, + {113, 167, 5, 34, 33, 43, 18}, + {770, 116, 7, 34, 36, 44, 21}, + {499, 116, 5, 42, 33, 51, 19}, + {38, 167, 5, 34, 38, 43, 27}, + {912, 116, 8, 34, 41, 43, 24}, + {806, 116, 8, 34, 54, 43, 37}, + {953, 116, 8, 34, 41, 43, 24}, + {129, 64, 9, 34, 41, 52, 24}, + {76, 167, 7, 34, 37, 43, 22}, + {78, 0, 7, 46, 32, 64, 16}, + {260, 0, 4, 46, 22, 64, 13}, + {110, 0, 9, 46, 32, 64, 16}, + {517, 167, 7, 27, 41, 26, 27}, +}; + +static struct sdf_font font_Ubuntu = {"Ubuntu", 48, 1024, 256, characters_Ubuntu}; + +vg_tex2d tex_ubuntu = { .path = "textures/ubuntu.qoi" }; // TEXTURES // =========================================================================================================== @@ -114,7 +125,7 @@ vg_tex2d tex_monofur = { .path = "textures/ascii.qoi", .flags = VG_TEXTURE_NO_ vg_tex2d tex_unkown = { .path = "textures/unkown.qoi" }; vg_tex2d tex_buttons = { .path = "textures/buttons.qoi" }; -vg_tex2d *texture_list[] = { &tex_tile_detail, &tex_tile_data, &tex_wood, &tex_ball_noise, &tex_monofur, &tex_unkown, &tex_buttons }; +vg_tex2d *texture_list[] = { &tex_tile_detail, &tex_tile_data, &tex_wood, &tex_ball_noise, &tex_monofur, &tex_unkown, &tex_buttons, &tex_ubuntu }; // AUDIO // =========================================================================================================== @@ -187,7 +198,8 @@ sound/y4.ogg\0\ sound/y5.ogg\0\ sound/y6.ogg\0\ sound/y7.ogg\0\ -sound/y8.ogg\0" +sound/y8.ogg\0\ +sound/win.ogg\0" }; // One two or three layers of rolling noise @@ -349,6 +361,7 @@ SHADER_DEFINE( shader_tile_main, "uniform vec4 uOffset;" // Tile x/y, uv x/y "uniform mat3 uPv;" "uniform mat2 uSubTransform;" + "uniform float uVisibility;" "" "out vec4 aTexCoords;" "out vec2 aWorldCoords;" @@ -362,13 +375,16 @@ SHADER_DEFINE( shader_tile_main, "" "void main()" "{" + "vec2 hash_val = hash22(uOffset.xy);" + "float scaling_factor = smoothstep( hash_val.x, hash_val.x+1.0, uVisibility );" + // Vertex transform - "vec2 subtransform = uSubTransform * (a_co-0.5) + 0.5;" + "vec2 subtransform = uSubTransform * (a_co-0.5) * scaling_factor + 0.5;" "vec3 worldpos = vec3( subtransform + uOffset.xy, 1.0 );" "gl_Position = vec4( uPv * worldpos, 1.0 );" // Create texture coords - "vec2 random_offset = floor(hash22(uOffset.xy) * 4.0) * 0.25;" + "vec2 random_offset = floor(hash_val * 4.0) * 0.25;" "vec2 edge_safe_coords = a_co * 0.98 + 0.01;" "aTexCoords = vec4((edge_safe_coords + uOffset.zw) * 0.25, edge_safe_coords * 0.25 + random_offset );" "aWorldCoords = worldpos.xy;" @@ -405,7 +421,7 @@ SHADER_DEFINE( shader_tile_main, "FragColor = mix( output_regular, output_ghost, uGhost ) * uColour;" "}" , - UNIFORMS({ "uPv", "uOffset", "uTexGlyphs", "uTexWood", "uSubTransform", "uGhost", "uMousePos", "uColour", "uForeground" }) + UNIFORMS({ "uPv", "uOffset", "uTexGlyphs", "uTexWood", "uSubTransform", "uGhost", "uMousePos", "uColour", "uForeground", "uVisibility" }) ) SHADER_DEFINE( shader_background, @@ -429,6 +445,7 @@ SHADER_DEFINE( shader_background, "uniform sampler2D uTexMain;" "uniform sampler2D uSamplerNoise;" "uniform float uVariance;" + "uniform float uVisibility;" "" "in vec2 aTexCoords;" "" @@ -447,7 +464,7 @@ SHADER_DEFINE( shader_background, "ao_accum -= data_this_tile.r;" - "vec3 colour_main = mix( vec3( 0.369768, 0.3654, 0.42 ),vec3( 0.275, 0.388, 0.553 ), data_this_tile.g );" + "vec3 colour_main = mix( vec3( 0.369768, 0.3654, 0.42 ), vec3( 0.275, 0.388, 0.553 ), data_this_tile.g * uVisibility );" "vec2 square_coords = fract( aTexCoords * 64.0 );" "vec2 grid_coords = abs( square_coords - 0.5 );" @@ -459,7 +476,7 @@ SHADER_DEFINE( shader_background, "FragColor = vec4( colour_main * edge_contrast + gridline * 0.02 * gridline_fadeout, 1.0 );" "}" , - UNIFORMS({ "uPv", "uOffset", "uTexMain", "uVariance", "uSamplerNoise" }) + UNIFORMS({ "uPv", "uOffset", "uTexMain", "uVariance", "uSamplerNoise", "uVisibility" }) ) SHADER_DEFINE( shader_wire, @@ -561,6 +578,38 @@ SHADER_DEFINE( shader_buttons, UNIFORMS({ "uPv", "uOffset", "uTexMain", "uColour" }) ) +SHADER_DEFINE( shader_sdf, + + // VERTEX + "layout (location=0) in vec2 a_co;" + "layout (location=1) in vec2 a_uv;" + "uniform mat3 uPv;" + "" + "out vec2 aTexCoords;" + "" + "void main()" + "{" + "gl_Position = vec4( uPv * vec3( a_co, 1.0 ), 1.0 );" + "aTexCoords = a_uv;" + "}", + + // FRAGMENT + "uniform sampler2D uTexGlyphs;" + "uniform vec4 uColour;" + "out vec4 FragColor;" + "" + "in vec2 aTexCoords;" + "in vec4 aColour;" + "" + "void main()" + "{" + "vec4 glyph = texture( uTexGlyphs, aTexCoords );" + "FragColor = vec4( uColour.rgb, smoothstep( 0.46, 0.54, glyph.r ) * uColour.a );" + //"FragColor = glyph;" + "}" + , + UNIFORMS({ "uPv", "uTexGlyphs", "uColour" }) +) void vg_register(void) { @@ -570,6 +619,7 @@ void vg_register(void) SHADER_INIT( shader_background ); SHADER_INIT( shader_wire ); SHADER_INIT( shader_buttons ); + SHADER_INIT( shader_sdf ); } /* @@ -591,163 +641,12 @@ void vg_register(void) | | | | | | | */ -float const MESH_NUMBER_0[] = { - #include "fonts/numbers/n0.h" -}; - -float const MESH_NUMBER_1[] = { - #include "fonts/numbers/n1.h" -}; - -float const MESH_NUMBER_2[] = { - #include "fonts/numbers/n2.h" -}; - -float const MESH_NUMBER_3[] = { - #include "fonts/numbers/n3.h" -}; - -float const MESH_NUMBER_4[] = { - #include "fonts/numbers/n4.h" -}; - -float const MESH_NUMBER_5[] = { - #include "fonts/numbers/n5.h" -}; - -float const MESH_NUMBER_6[] = { - #include "fonts/numbers/n6.h" -}; - -float const MESH_NUMBER_7[] = { - #include "fonts/numbers/n7.h" -}; - -float const MESH_NUMBER_8[] = { - #include "fonts/numbers/n8.h" -}; - -float const MESH_NUMBER_9[] = { - #include "fonts/numbers/n9.h" -}; - -float const MESH_NUMBERS_BUFFER[] = -{ - #include "fonts/numbers/n0.h" - #include "fonts/numbers/n1.h" - #include "fonts/numbers/n2.h" - #include "fonts/numbers/n3.h" - #include "fonts/numbers/n4.h" - #include "fonts/numbers/n5.h" - #include "fonts/numbers/n6.h" - #include "fonts/numbers/n7.h" - #include "fonts/numbers/n8.h" - #include "fonts/numbers/n9.h" -}; - -#define MESH_NUMBER_DIVISOR 6 - -u32 const MESH_NUMBERS_OFFSETS[][2] = -{ - { - 0, - vg_list_size( MESH_NUMBER_0 ) / MESH_NUMBER_DIVISOR - }, - { - vg_list_size( MESH_NUMBER_0 ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_1 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_2 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_3 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_4 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) + - vg_list_size( MESH_NUMBER_4 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_5 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) + - vg_list_size( MESH_NUMBER_4 ) + - vg_list_size( MESH_NUMBER_5 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_6 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) + - vg_list_size( MESH_NUMBER_4 ) + - vg_list_size( MESH_NUMBER_5 ) + - vg_list_size( MESH_NUMBER_6 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_7 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) + - vg_list_size( MESH_NUMBER_4 ) + - vg_list_size( MESH_NUMBER_5 ) + - vg_list_size( MESH_NUMBER_6 ) + - vg_list_size( MESH_NUMBER_7 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_8 ) / MESH_NUMBER_DIVISOR - }, - { - ( - vg_list_size( MESH_NUMBER_0 ) + - vg_list_size( MESH_NUMBER_1 ) + - vg_list_size( MESH_NUMBER_2 ) + - vg_list_size( MESH_NUMBER_3 ) + - vg_list_size( MESH_NUMBER_4 ) + - vg_list_size( MESH_NUMBER_5 ) + - vg_list_size( MESH_NUMBER_6 ) + - vg_list_size( MESH_NUMBER_7 ) + - vg_list_size( MESH_NUMBER_8 ) - ) / MESH_NUMBER_DIVISOR, - vg_list_size( MESH_NUMBER_9 ) / MESH_NUMBER_DIVISOR - } -}; - struct cmp_level { const char *map_name; const char *title; const char *description; + const char *achievement; int unlocked; int completed_score; @@ -757,8 +656,12 @@ struct cmp_level int serial_id; int is_tutorial; - + + struct world_button btn; + + #ifdef VG_STEAM SteamLeaderboard_t steam_leaderboard; + #endif }; static struct cmp_level cmp_levels_tutorials[] = @@ -769,7 +672,7 @@ static struct cmp_level cmp_levels_tutorials[] = .title = "PRINCIPLE 1", .map_name = "cmp_t01", .description = - "Utilize basic transport methods", + "", ._unlock = 1, .is_tutorial = 1 @@ -780,8 +683,7 @@ static struct cmp_level cmp_levels_tutorials[] = .title = "PRINCIPLE 2", .map_name = "cmp_t02", .description = - "Utilize the twisty turny(TM) piece to split the marble\n" - "stream into two", + "", ._unlock = 2, .is_tutorial = 1, @@ -792,7 +694,7 @@ static struct cmp_level cmp_levels_tutorials[] = .title = "PRINCIPLE 3", .map_name = "cmp_t03", .description = - "Merge transport into one path", + "", ._unlock = 12, .is_tutorial = 1 @@ -803,11 +705,11 @@ static struct cmp_level cmp_levels_tutorials[] = .title = "PRINCIPLE 4", .map_name = "cmp_t04", .description = - "Some stages require multiple runs to succeed in order to\n" - "pass", + "", ._unlock = 6, - .is_tutorial = 1 + .is_tutorial = 1, + .achievement = "TUTORIALS" } }; @@ -819,9 +721,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "PATCH", .map_name = "cmp_b04", .description = - "For some reason, the division module our intern built\n" - "for us is sending twice as many yellows as needed. Send\n" - "the excess to be recycled!", + "", ._unlock = 7, ._linked = 3 @@ -832,8 +732,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "SUBDIVISION 1", .map_name = "cmp_b01", .description = - "Sometimes getting the desired amount takes dividing up\n" - "the input and recombining it.", + "", ._linked = 4, ._unlock = 5 @@ -854,8 +753,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "RESTRUCTURE", .map_name = "cmp_b03", .description = - "It is possible to swap these values using simple\n" - "division and addition.", + "", ._unlock = 8 }, @@ -865,8 +763,9 @@ static struct cmp_level cmp_levels_basic[] = .title = "PATTERNS 1", .map_name = "cmp_b05", .description = - "Replicate the pattern", + "", + ._unlock = 15, ._linked = 8 }, // r2 GM @@ -875,7 +774,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "PATTERNS 2", .map_name = "cmp_b06", .description = - "Replicate MORE", + "", ._unlock = 15 }, @@ -885,12 +784,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "PRINCIPLE 5", .map_name = "cmp_b10", .description = - "The sharp engineers among you may have already spotted\n" - "and utilized this part of the system\n" - "\n" - "We forgot to include the relevant principle tasks as\n" - "of your training package, you will now be tasked to\n" - "complete them", + "", ._unlock = 16, .is_tutorial = 1 @@ -901,8 +795,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "ROUTING PROBLEM", .map_name = "cmp_routing", .description = - "Things can get a little chaotic on tight boards, do your\n" - "best to utilize principle 5 to get the job done\n", + "", ._linked = 9 }, @@ -912,10 +805,11 @@ static struct cmp_level cmp_levels_basic[] = .title = "MIGHTY CONSUMER", .map_name = "cmp_b07", .description = - "Build a greedy system", + "", ._linked = 10, - ._unlock = 11 + ._unlock = 11, + .achievement = "MIGHTY_CONSUMER" }, { .serial_id = 10, @@ -932,7 +826,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "REVERSE", .map_name = "cmp_b09", .description = - "Reverse the incoming order. Always length 4", + "", ._unlock = 17 }, @@ -942,14 +836,7 @@ static struct cmp_level cmp_levels_basic[] = .title = "PRINCIPLE 6", .map_name = "cmp_b11", .description = - "Usually the splitter piece will flip flop between left\n" - "and right, however it can be forced to only rotate in\n" - "one direction if trigger wires are attached.\n" - "\n" - "Right click and drag from a regular block, and attach it\n" - "to a splitter. This creates a trigger.\n" - "The default state is left, and once a marble hits the\n" - "trigger it will switch to rotating that direction.", + "(Right click)", ._unlock = 18, .is_tutorial = 1 @@ -959,9 +846,7 @@ static struct cmp_level cmp_levels_basic[] = .serial_id = 18, .title = "NOT GATE", .map_name = "cmp_not", - .description = - "Test your knowledge of triggers, build an 'NOT GATE'\n" - "emulated by marble logic.", + .description = "", ._linked = 19, ._unlock = 20 @@ -971,9 +856,7 @@ static struct cmp_level cmp_levels_basic[] = .serial_id = 19, .title = "AND GATE", .map_name = "cmp_and", - .description = - "A slightly more complicated gate, but shouldn't be\n" - "too difficult for your skillset.", + .description = "", ._unlock = 20 }, @@ -982,11 +865,10 @@ static struct cmp_level cmp_levels_basic[] = .serial_id = 20, .title = "QUALIFICATION PROJECT", .map_name = "cmp_xor", - .description = - "Significantly more complicated than an AND or NOT gate,\n" - "but possible.", + .description = "", - ._unlock = 13 + ._unlock = 13, + .achievement = "GRADUATE" } }; @@ -997,10 +879,7 @@ static struct cmp_level cmp_levels_grad[] = .serial_id = 13, .title = "SORT", .map_name = "cmp_i01", - .description = - "Devise a scheme to filter and sort the inputs. If you\n" - "believe you lack the tools required to solve this one,\n" - "take a harder look at the inputs.", + .description = "", ._linked = 14 }, @@ -1009,10 +888,7 @@ static struct cmp_level cmp_levels_grad[] = .serial_id = 14, .title = "THIRDS", .map_name = "cmp_i02", - .description = - "Split the inputs up into a third of their values\n" - "\n" - "Is this possible? -HG", + .description = "", ._linked = 21 }, @@ -1021,9 +897,7 @@ static struct cmp_level cmp_levels_grad[] = .serial_id = 21, .title = "SIMPLE ADDITION", .map_name = "cmp_grad", - .description = - "Take the amount of yellows coming in, and add them\n" - "together. Send your result using the stream of blues.", + .description = "", ._linked = 22 }, @@ -1032,31 +906,43 @@ static struct cmp_level cmp_levels_grad[] = .serial_id = 22, .title = "SECRET CODE", .map_name = "cmp_secret", - .description = - "" + .description = "" } }; #define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad )) -static struct serializable_set +static struct career_level_pack { struct cmp_level *pack; int count; + + v3f primary_colour; + v2i origin; + v2i dims; } -career_serializable[] = +career_packs[] = { { .pack = cmp_levels_tutorials, - .count = vg_list_size( cmp_levels_tutorials ) + .count = vg_list_size( cmp_levels_tutorials ), + .primary_colour = { 0.204f, 0.345f, 0.553f }, + .origin = { -5, 0 }, + .dims = { 1, 4 } }, { .pack = cmp_levels_basic, - .count = vg_list_size( cmp_levels_basic ) + .count = vg_list_size( cmp_levels_basic ), + .primary_colour = { 0.304f, 0.245f, 0.553f }, + .origin = { -3, 0 }, + .dims = { 3, 6 } }, { .pack = cmp_levels_grad, - .count = vg_list_size( cmp_levels_grad ) + .count = vg_list_size( cmp_levels_grad ), + .primary_colour = { 0.553f, 0.345f, 0.204f }, + .origin = { -5, 7 }, + .dims = { 4, 1 } } }; @@ -1066,18 +952,18 @@ static void career_local_data_init(void) struct cmp_level *level_ptrs[ NUM_CAMPAIGN_LEVELS ]; // COllect pointers - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) level_ptrs[ set->pack[j].serial_id ] = &set->pack[j]; } // Apply - for( int i = 0; i < vg_list_size( career_serializable ); i ++ ) + for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { - struct serializable_set *set = &career_serializable[i]; + struct career_level_pack *set = &career_packs[i]; for( int j = 0; j < set->count; j ++ ) {