X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=blobdiff_plain;f=fishladder_resources.h;fp=fishladder_resources.h;h=a3a2a87bc08ce8ba3b180035e11d866a00d92661;hp=030a050645ec1d9066c1aef8acf4eea1a912affe;hb=a69a9e27e7de338a3116ed345ff2d9d19f084329;hpb=7756287016b03ba7eb76b0a57cebe28952a4ce41 diff --git a/fishladder_resources.h b/fishladder_resources.h index 030a050..a3a2a87 100644 --- a/fishladder_resources.h +++ b/fishladder_resources.h @@ -1,119 +1,3 @@ -// FONTS - -struct sdf_char -{ - u16 uvx, uvy, originX, originY, w, h, advance; -}; - -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 // =========================================================================================================== @@ -140,7 +24,6 @@ vg_tex2d *texture_list[] = { &tex_monofur, &tex_unkown, &tex_buttons, - &tex_ubuntu, &tex_sprites }; @@ -590,38 +473,6 @@ 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;" - "" - "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" }) -) - SHADER_DEFINE( shader_sprite, // VERTEX @@ -663,7 +514,6 @@ void vg_register(void) SHADER_INIT( shader_background ); SHADER_INIT( shader_wire ); SHADER_INIT( shader_buttons ); - SHADER_INIT( shader_sdf ); SHADER_INIT( shader_sprite ); } @@ -724,7 +574,6 @@ struct cmp_level static struct cmp_level cmp_levels_tutorials[] = { - // r1 { .serial_id = 0, .title = "PRINCIPLE 1", @@ -735,7 +584,6 @@ static struct cmp_level cmp_levels_tutorials[] = ._unlock = 1, .is_tutorial = 1 }, - // r1 { .serial_id = 1, .title = "PRINCIPLE 2", @@ -746,7 +594,6 @@ static struct cmp_level cmp_levels_tutorials[] = ._unlock = 2, .is_tutorial = 1, }, - // r1 { .serial_id = 2, .title = "PRINCIPLE 3", @@ -757,7 +604,6 @@ static struct cmp_level cmp_levels_tutorials[] = ._unlock = 12, .is_tutorial = 1 }, - // r1 { .serial_id = 12, .title = "PRINCIPLE 4", @@ -768,12 +614,31 @@ static struct cmp_level cmp_levels_tutorials[] = ._unlock = 6, .is_tutorial = 1, .achievement = "TUTORIALS" + }, + { + .serial_id = 15, + .title = "PRINCIPLE 5", + .map_name = "cmp_b10", + .description = + "", + + ._unlock = 16, + .is_tutorial = 1 + }, + { + .serial_id = 17, + .title = "PRINCIPLE 6", + .map_name = "cmp_b11", + .description = + "(Right click)", + + ._unlock = 18, + .is_tutorial = 1 } }; static struct cmp_level cmp_levels_basic[] = { - // r2 GM { .serial_id = 6, .title = "PATCH", @@ -784,7 +649,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 7, ._linked = 3 }, - // r1 GM { .serial_id = 3, .title = "SUBDIVISION 1", @@ -795,7 +659,6 @@ static struct cmp_level cmp_levels_basic[] = ._linked = 4, ._unlock = 5 }, - // r1 GM { .serial_id = 4, .title = "SUBDIVISION 2", @@ -805,7 +668,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 7 }, - // r1 GM { .serial_id = 5, .title = "RESTRUCTURE", @@ -815,7 +677,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 8 }, - // r2 GM { .serial_id = 7, .title = "PATTERNS 1", @@ -826,7 +687,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 15, ._linked = 8 }, - // r2 GM { .serial_id = 8, .title = "PATTERNS 2", @@ -836,18 +696,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 15 }, - // r2 GM - { - .serial_id = 15, - .title = "PRINCIPLE 5", - .map_name = "cmp_b10", - .description = - "", - - ._unlock = 16, - .is_tutorial = 1 - }, - // r2 GM { .serial_id = 16, .title = "ROUTING PROBLEM", @@ -857,7 +705,6 @@ static struct cmp_level cmp_levels_basic[] = ._linked = 9 }, - // r2 GM { .serial_id = 9, .title = "MIGHTY CONSUMER", @@ -878,7 +725,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 17 }, - // r2 GM { .serial_id = 11, .title = "REVERSE", @@ -888,18 +734,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 17 }, - // r2 GM - { - .serial_id = 17, - .title = "PRINCIPLE 6", - .map_name = "cmp_b11", - .description = - "(Right click)", - - ._unlock = 18, - .is_tutorial = 1 - }, - // r2 GM { .serial_id = 18, .title = "NOT GATE", @@ -909,7 +743,6 @@ static struct cmp_level cmp_levels_basic[] = ._linked = 19, ._unlock = 20 }, - // r2 GM { .serial_id = 19, .title = "AND GATE", @@ -918,7 +751,6 @@ static struct cmp_level cmp_levels_basic[] = ._unlock = 20 }, - // r2 GM { .serial_id = 20, .title = "QUALIFICATION PROJECT", @@ -950,7 +782,6 @@ static struct cmp_level cmp_levels_grad[] = ._linked = 21 }, - // r2 GM { .serial_id = 21, .title = "SIMPLE ADDITION", @@ -960,7 +791,6 @@ static struct cmp_level cmp_levels_grad[] = ._linked = 22, ._unlock = 23 }, - // r2 GM { .serial_id = 22, .title = "SECRET CODE", @@ -983,25 +813,25 @@ static struct cmp_level cmp_levels_computer[] = }, { .serial_id = 24, - .title = "3 BIT ADDITION", + .title = "3 BIT ADDER", .map_name = "cmp_add3b", - .description = "", + .description = "binary addition", .strings = { { .placement = k_placement_top, //.str ="\t\t\t\t\t\t\t\t\t| NUMBER A | | NUMBER B |\n" .str ="" -"\t\t\t\t\t\t\t\t\t\x80\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x82 \x80\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x81\x82\n" -"\t\t\t\t\t\t\t\t\t\x83 4 2 1 \x84 add \x83 4 2 1 \x84\n" +"\t\t\t\t\t\t\t\t\t\x8A 4 2 1 \x8B \x8A 4 2 1 \x8B\n" +"\t\t\t\t\t\t\t\t\t\x83 \x84 add \x83 \x84\n" "\t\t\t\t\t\t\t\t\t\x83 \x84 \x83 \x84" }, { .placement = k_placement_bottom, .str = "\t\t\t\x83 \x84\n" -"\t\t\t\x83 8 4 2 1 \x84 result a+b\n" -"\t\t\t\x85\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x87\x86" +"\t\t\t\x83 \x84 result a+b\n" +"\t\t\t\x83 8 4 2 1 \x84" } }, @@ -1032,29 +862,29 @@ career_packs[] = .pack = cmp_levels_tutorials, .count = vg_list_size( cmp_levels_tutorials ), .primary_colour = { 0.204f, 0.345f, 0.553f }, - .origin = { -5, 0 }, - .dims = { 1, 4 } + .origin = { -5, -2 }, + .dims = { 1, 7 } }, { .pack = cmp_levels_basic, .count = vg_list_size( cmp_levels_basic ), .primary_colour = { 0.304f, 0.245f, 0.553f }, - .origin = { -3, 0 }, - .dims = { 3, 5 } + .origin = { -3, -2 }, + .dims = { 3, 7 } }, { .pack = cmp_levels_grad, .count = vg_list_size( cmp_levels_grad ), .primary_colour = { 0.553f, 0.345f, 0.204f }, .origin = { -5, 6 }, - .dims = { 4, 1 } + .dims = { 5, 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 } + .dims = { 5, 2 } } };