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
"uniform vec4 uOffset;" // Tile x/y, uv x/y
"uniform mat3 uPv;"
"uniform mat2 uSubTransform;"
+ //"uniform float uVisibility;"
""
"out vec4 aTexCoords;"
"out vec2 aWorldCoords;"
""
"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;"
"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;"
"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,
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)
{
SHADER_INIT( shader_background );
SHADER_INIT( shader_wire );
SHADER_INIT( shader_buttons );
+ SHADER_INIT( shader_sdf );
}
/*
const char *map_name;
const char *title;
const char *description;
+ const char *achievement;
int unlocked;
int completed_score;
int serial_id;
int is_tutorial;
-
+
+ v2i world_pos;
+
+ #ifdef VG_STEAM
SteamLeaderboard_t steam_leaderboard;
+ #endif
};
static struct cmp_level cmp_levels_tutorials[] =
.title = "PRINCIPLE 1",
.map_name = "cmp_t01",
.description =
- "Utilize basic transport methods",
+ "",
._unlock = 1,
.is_tutorial = 1
.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,
.title = "PRINCIPLE 3",
.map_name = "cmp_t03",
.description =
- "Merge transport into one path",
+ "",
._unlock = 12,
.is_tutorial = 1
.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"
}
};
.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
.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
.title = "RESTRUCTURE",
.map_name = "cmp_b03",
.description =
- "It is possible to swap these values using simple\n"
- "division and addition.",
+ "",
._unlock = 8
},
.title = "PATTERNS 1",
.map_name = "cmp_b05",
.description =
- "Replicate the pattern",
+ "",
+ ._unlock = 15,
._linked = 8
},
// r2 GM
.title = "PATTERNS 2",
.map_name = "cmp_b06",
.description =
- "Replicate MORE",
+ "",
._unlock = 15
},
.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
.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
},
.title = "MIGHTY CONSUMER",
.map_name = "cmp_b07",
.description =
- "Build a greedy system",
+ "",
._linked = 10,
- ._unlock = 11
+ ._unlock = 11,
+ .achievement = "MIGHTY_CONSUMER"
},
{
.serial_id = 10,
.title = "REVERSE",
.map_name = "cmp_b09",
.description =
- "Reverse the incoming order. Always length 4",
+ "",
._unlock = 17
},
.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
.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
.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
},
.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"
}
};
.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
},
.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
},
.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
},
.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 }
}
};
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 ++ )
{
projects / fishladder.git / blobdiff