X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=fishladder_resources.h;h=c06c17de94edf307c635bb00ea0134c4dc3662b8;hb=638d6ecd580b58ee2fc35d24e8af46b28fd9d675;hp=0585b0ce2cb295499c5db40df375074e1e98e9d9;hpb=e750e1ea996212bec83072cab19cc21c358b4d89;p=fishladder.git diff --git a/fishladder_resources.h b/fishladder_resources.h index 0585b0c..c06c17d 100644 --- a/fishladder_resources.h +++ b/fishladder_resources.h @@ -1,13 +1,15 @@ // TEXTURES // =========================================================================================================== -vg_tex2d tex_tile_data = { .path = "textures/tileset.png" }; -vg_tex2d tex_tile_detail = { .path = "textures/tile_overlays.png" }; -vg_tex2d tex_wood = { .path = "textures/wood.png" }; -vg_tex2d tex_ball = { .path = "textures/ball.png", .flags = VG_TEXTURE_CLAMP }; -vg_tex2d tex_background = { .path = "textures/background.png" }; +vg_tex2d tex_tile_data = { .path = "textures/tileset.qoi" }; +vg_tex2d tex_tile_detail = { .path = "textures/tile_overlays.qoi" }; +vg_tex2d tex_wood = { .path = "textures/wood.qoi" }; +vg_tex2d tex_background = { .path = "textures/background.qoi" }; +vg_tex2d tex_ball_noise = { .path = "textures/bnoise.qoi" }; +vg_tex2d tex_monofur = { .path = "textures/ascii.qoi", .flags = VG_TEXTURE_NO_MIP }; +vg_tex2d tex_unkown = { .path = "textures/unkown.qoi" }; -vg_tex2d *texture_list[] = { &tex_tile_detail, &tex_tile_data, &tex_wood, &tex_ball, &tex_background }; +vg_tex2d *texture_list[] = { &tex_tile_detail, &tex_tile_data, &tex_wood, &tex_background, &tex_ball_noise, &tex_monofur, &tex_unkown }; // AUDIO // =========================================================================================================== @@ -89,11 +91,28 @@ sfx_system audio_system_balls_extra = .name = "Balls Extra" }; +ui_colourset ui_fl_colours = { + .main = 0xff807373, + .hover = 0xff918484, + .active = 0xffad9f9e +}; + +ui_colourset ui_fl_colours_inactive = { + .main = 0xff655958, + .hover = 0xff655958, + .active = 0xff655958 +}; + static void resource_load_main(void) { // Textures vg_tex2d_init( texture_list, vg_list_size( texture_list ) ); + ui_override_font( tex_monofur.name, 7 ); + + ui_global_ctx.colours_main = &ui_fl_colours; + gui_reset_colours(); + // Audio sfx_set_init( &audio_tile_mod, NULL ); sfx_set_init( &audio_splitter, NULL ); @@ -144,16 +163,16 @@ SHADER_DEFINE( shader_ball, "uniform vec2 uOffset;" "uniform mat3 uPv;" "" - "out vec2 aTexCoords;" + "out vec4 aTexCoords;" "" "void main()" "{" - // Create texture coords - "aTexCoords = a_co;" - // Vertex transform "vec3 worldpos = vec3( a_co * 0.5 - 0.25 + uOffset, 1.0 );" "gl_Position = vec4( uPv * worldpos, 1.0 );" + + // Create texture coords + "aTexCoords = vec4( a_co, worldpos.xy );" "}", // FRAGMENT @@ -161,16 +180,33 @@ SHADER_DEFINE( shader_ball, "" "uniform sampler2D uTexMain;" "uniform vec3 uColour;" + "uniform vec2 uTexOffset;" "" - "in vec2 aTexCoords;" + "in vec4 aTexCoords;" "" "void main()" "{" - "vec4 glyph = texture( uTexMain, aTexCoords );" - "FragColor = vec4( uColour + glyph.rgb * 0.2, glyph.a );" + "vec2 center_coords = aTexCoords.xy - 0.5;" + "vec2 center_coords_sqr = center_coords*center_coords;" + "float circle_factor = smoothstep( 0.07, 0.0625, center_coords_sqr.x+center_coords_sqr.y );" + + "float bulge_amt = center_coords_sqr.x+center_coords_sqr.y;" + "vec2 warped_coords = aTexCoords.zw+uTexOffset - center_coords;" + "vec4 noise_sample = texture( uTexMain, warped_coords );" + + "float rim_light = (center_coords_sqr.x+center_coords_sqr.y)*15.0;" + + "vec2 shadow_coords = center_coords + vec2(0.02,0.07);" + "vec2 shadow_coords_sqr = shadow_coords*shadow_coords;" + "float shadow = exp(-((shadow_coords_sqr.x+shadow_coords_sqr.y)-0.0125)*15.0);" + + "vec3 marble_comp = uColour*0.9 + (noise_sample.x*0.7+pow(rim_light,3.0)*2.0) * 0.1;" + "vec4 colour_comp = mix( vec4(0.74,0.53,0.34,shadow), vec4(marble_comp,1.0), circle_factor );" + + "FragColor = colour_comp;" "}" , - UNIFORMS({ "uTexMain", "uColour", "uOffset", "uPv" }) + UNIFORMS({ "uTexMain", "uColour", "uOffset", "uPv", "uTexOffset" }) ) SHADER_DEFINE( shader_tile_main, @@ -219,7 +255,7 @@ SHADER_DEFINE( shader_tile_main, "" "void main()" "{" - "vec3 shadowing_colour = vec3( 0.93, 0.88536, 0.8184 );" + "vec3 shadowing_colour = vec3( 0.93, 0.88536, 0.8184 ) * 0.97;" "vec4 glyph = texture( uTexGlyphs, aTexCoords.xy );" "vec4 wood = texture( uTexWood, aTexCoords.zw );" "vec4 wood_secondary = texture( uTexWood, aTexCoords.zw + 0.25 );" @@ -277,7 +313,7 @@ SHADER_DEFINE( shader_background, "ao_accum -= data_this_tile.r;" - "vec3 colour_main = vec3( 0.369768, 0.3654, 0.42 );" + "vec3 colour_main = mix( vec3( 0.369768, 0.3654, 0.42 ),vec3( 0.275, 0.388, 0.553 ), data_this_tile.g );" "vec2 square_coords = fract( aTexCoords * 64.0 );" "vec2 grid_coords = abs( square_coords - 0.5 );" @@ -292,12 +328,65 @@ SHADER_DEFINE( shader_background, UNIFORMS({ "uPv", "uOffset", "uTexMain", "uVariance", "uSamplerNoise" }) ) +SHADER_DEFINE( shader_wire, + // VERTEX + "layout (location=0) in vec2 a_co;" + "uniform vec3 uStart;" + "uniform vec3 uEnd;" + "uniform mat3 uPv;" + "uniform float uCurve;" + "" + "out vec2 aTexCoords;" + "" + "vec3 sample_curve_time( float t )" + "{" + "vec3 line_coord = mix( uStart, uEnd, t );" + + "float curve_amt = 1.0-(pow((t*2.0-1.0),2.0));" + "return vec3( line_coord.x, line_coord.y - curve_amt*uCurve, line_coord.z );" + "}" + "" + "void main()" + "{" + // Vertex transform + "vec3 p0 = sample_curve_time( a_co.x );" + "vec3 p1 = sample_curve_time( a_co.x + 0.025 );" + + "vec2 line_tangent = normalize(p1.xy-p0.xy);" + "vec2 line_normal = vec2( -line_tangent.y, line_tangent.x );" + + "vec2 worldfinal = p0.xy + line_normal*a_co.y*p0.z;" + + "gl_Position = vec4( uPv * vec3(worldfinal, 1.0), 1.0 );" + + // Create texture coords (todo: include stretch adjusted coords?) + "aTexCoords = vec2( a_co.x, a_co.y + 0.5 );" + "}", + + // FRAGMENT + "out vec4 FragColor;" + "" + "uniform sampler2D uTexMain;" + "uniform vec4 uColour;" + "" + "in vec2 aTexCoords;" + "" + "void main()" + "{" + "FragColor = uColour;" + "}" + , + UNIFORMS({ "uPv", "uColour", "uTexMain", "uStart", "uEnd", "uCurve" }) +) + + void vg_register(void) { SHADER_INIT( shader_tile_colour ); SHADER_INIT( shader_tile_main ); SHADER_INIT( shader_ball ); SHADER_INIT( shader_background ); + SHADER_INIT( shader_wire ); } /* @@ -470,3 +559,283 @@ u32 const MESH_NUMBERS_OFFSETS[][2] = vg_list_size( MESH_NUMBER_9 ) / MESH_NUMBER_DIVISOR } }; + +struct cmp_level +{ + const char *map_name; + const char *title; + const char *description; + + int completed_score; + + int unlocks; // When completed, unlock this many levels + int linked_unlocks; // When unlocked, unlock this many levels additionally + + int serial_id; + + SteamLeaderboard_t steam_leaderboard; +}; + +struct cmp_level cmp_levels_tutorials[] = +{ + { + .title = "PRINCIPLE 1", + .map_name = "cmp_t01", + .description = "Utilize basic transport methods", + + .serial_id = 0, + .unlocks = 1 + }, + { + .title = "PRINCIPLE 2", + .map_name = "cmp_t02", + .description = "Utilize the twisty turny(TM) piece to split\n" + "the marble stream into two", + + .serial_id = 1, + .unlocks = 1 + }, + { + .title = "PRINCIPLE 3", + .map_name = "cmp_t03", + .description = "Merge transport into one", + + .serial_id = 2, + .unlocks = 1, + }, + { + .title = "PRINCIPLE 4", + .map_name = "cmp_t04", + .description = "Some stages require multiple runs to succeed\n" + "in order to pass", + + .serial_id = 12, + .unlocks = 3 + } +}; + +struct cmp_level cmp_levels_basic[] = +{ + { + .title = "SUBDIVISION 1", + .map_name = "cmp_b01", + .description = "Simple maths, branching required.", + + .serial_id = 3, + .unlocks = 1 + }, + { + .title = "SUBDIVISION 2", + .map_name = "cmp_b02", + .description = "Simple maths, except more.", + + .serial_id = 4, + .unlocks = 1 + }, + { + .title = "RESTRUCTURE", + .map_name = "cmp_b03", + .description = "Not so simple swap", + + .serial_id = 5, + .unlocks = 1 + }, + { + .title = "SERIALIZE", + .map_name = "cmp_b04", + .description = "Merge and sort", + + .serial_id = 6, + .unlocks = 1 + }, + { + .title = "PATTERNS 1", + .map_name = "cmp_b05", + .description = "Replicate", + + .serial_id = 7, + .unlocks = 1 + }, + { + .title = "PATTERNS 2", + .map_name = "cmp_b06", + .description = "Replicate MORE", + + .serial_id = 8, + .unlocks = 1 + }, + { + .title = "MIGHTY CONSUMER", + .map_name = "cmp_b07", + .description = "Build a greedy system", + + .serial_id = 9, + .unlocks = 1 + }, + { + .title = "ENCRYPTED 1", + .map_name = "cmp_b08", + .description = "Some configurations may not be valid", + + .serial_id = 10, + .unlocks = 1 + }, + { + .title = "REVERSE", + .map_name = "cmp_b09", + .description = "Reverse the incoming order. Always length 4", + + .serial_id = 11, + .unlocks = 1 + }, + { + .title = "PRINCIPLE 5", + .map_name = "cmp_b10", + .description = + "The competent engineers among you may have already\n" + "spotted and utilized these parts 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", + + .serial_id = 15, + .linked_unlocks = 1 + }, + { + .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", + + .serial_id = 16, + .unlocks = 1 + }, + { + .title = "PRINCIPLE 6", + .map_name = "cmp_b11", + .description = + "While hovering over a simple tile peice, right click and\n" + "drag to start creating a wire. These can be connected to\n" + "the left, or right recieving pins of a Twisty Turny(TM).\n" + "\n" + "Once connected, the Twisty Turny(TM) will no longer\n" + "'flip flop' as marbles run through them, but instead be\n" + "et to left or right rotating only. As indicated by the\n" + "status arrow beneath them\n" + "\n" + "When the left or right slot is triggered, the Twisty\n" + "Turny(TM) will switch modes according to that input.\n" + "\n" + "Trigger wires apply instantaneously, however if both the\n" + "left and right inputs are recieved at the same time,\n" + "this results in no operation being performed, and no\n" + "state changes take place in the Twisty Turny(TM)\n", + + .serial_id = 17, + .linked_unlocks = 1 + }, + { + .title = "NOT GATE", + .map_name = "cmp_not", + .description = + "Test your knowledge of triggers, build an 'NOT GATE'\n" + "emulated by marble logic.", + + .serial_id = 18, + .unlocks = 1 + }, + { + .title = "AND GATE", + .map_name = "cmp_and", + .description = + "A slightly more complicated gate, but shouldn't be\n" + "too difficult for your skillset.", + + .serial_id = 19, + .unlocks = 1 + }, + { + .title = "QUALIFICATION PROJECT", + .map_name = "cmp_grad", + .description = + "There's no instructions here, resolve and complete this\n" + "task to qualify yourself as an official marble engineer", + .serial_id = 20, + .unlocks = 3 + } +}; + +struct cmp_level cmp_levels_grad[] = +{ + { + .title = "SORT", + .map_name = "cmp_i01", + .description = + "Device 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.", + + .serial_id = 13 + }, + { + .title = "THIRDS", + .map_name = "cmp_i02", + .description = + "Split the inputs up into a third of their values\n" + "\n" + "Is this possible? -HG", + + .serial_id = 14 + }, + { + .title = "XOR CHIP", + .map_name = "cmp_xor", + .description = + "Significantly more complicated than an AND or NOT gate,\n" + "but possible.", + .serial_id = 21 + }, + { + .title = "SECRET CODE", + .map_name = "cmp_secret", + .description = + "Only one input should send an unlock signal marble to\n" + "the output.\n" + "The code: 100110", + .serial_id = 22 + } +}; + +#define NUM_CAMPAIGN_LEVELS (vg_list_size( cmp_levels_tutorials ) + vg_list_size( cmp_levels_basic ) + vg_list_size( cmp_levels_grad )) + +struct +{ + int total_unlocked; +} +career_local = +{ + .total_unlocked = 1 +}; + +struct serializable_set +{ + struct cmp_level *pack; + int count; +} +career_serializable[] = +{ + { + .pack = cmp_levels_tutorials, + .count = vg_list_size( cmp_levels_tutorials ) + }, + { + .pack = cmp_levels_basic, + .count = vg_list_size( cmp_levels_basic ) + }, + { + .pack = cmp_levels_grad, + .count = vg_list_size( cmp_levels_grad ) + } +};