UNIFORMS({ "uPv", "uOffset", "uColour" })
)
+SHADER_DEFINE( shader_tile_main,
+ // VERTEX
+ "layout (location=0) in vec2 a_co;"
+ "uniform vec4 uOffset;" // Tile x/y, uv x/y
+ "uniform mat3 uPv;"
+ ""
+ "out vec4 aTexCoords;"
+ ""
+ "vec2 hash22(vec2 p)"
+ "{"
+ "vec3 p3 = fract(vec3(p.xyx) * vec3(.1031, .1030, .0973));"
+ "p3 += dot(p3, p3.yzx+33.33);"
+ "return fract((p3.xx+p3.yz)*p3.zy);"
+ "}"
+ ""
+ "void main()"
+ "{"
+ "vec2 random_offset = floor(hash22(uOffset.xy) * 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 );"
+ "gl_Position = vec4( uPv * vec3( a_co + uOffset.xy, 1.0 ), 1.0 );"
+ "}",
+
+ // FRAGMENT
+ "out vec4 FragColor;"
+ ""
+ "uniform sampler2D uTexGlyphs;"
+ "uniform sampler2D uTexWood;"
+ ""
+ "in vec4 aTexCoords;"
+ ""
+ "void main()"
+ "{"
+ "vec3 shadowing_colour = vec3( 0.93, 0.88536, 0.8184 );"
+ "vec4 glyph = texture( uTexGlyphs, aTexCoords.xy );"
+ "vec4 wood = texture( uTexWood, aTexCoords.zw );"
+ "vec4 wood_secondary = texture( uTexWood, aTexCoords.zw + 0.25 );"
+ "vec3 wood_comp = mix( wood_secondary.rgb * shadowing_colour, wood.rgb, clamp( glyph.b * 2.0 - 1.0, 0.0, 1.0 ) );"
+
+ "vec3 shadows = mix( vec3( 0.85, 0.7344, 0.561 ), vec3(1.0,1.0,1.0), glyph.r );"
+
+ "FragColor = vec4( wood_comp * shadows, 1.0 );"
+ "}"
+ ,
+ UNIFORMS({ "uPv", "uOffset", "uTexGlyphs", "uTexWood" })
+)
+
+const char *level_pack[] =
+{
+ // Level 0
+ "#########;\n"
+ "###-#####;acac\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "#####+###;acac\n"
+ "#########;\n",
+
+ // Level 1
+ "#########;\n"
+ "##-###-##;b,b\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "####+####;bb\n"
+ "#########;\n",
+
+ // Level 2
+ "###########;\n"
+ "#####-#####;bbbbb\n"
+ "## ##;\n"
+ "## ###;\n"
+ "## # ##;\n"
+ "## ##;\n"
+ "###+##+####;bbb,bb\n"
+ "###########;\n",
+
+ // Level 3
+ "#############;\n"
+ "###-#####-###;a,aaa\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "######+######;aaaa\n"
+ "#############;\n",
+
+ // Level 4
+ "#############;\n"
+ "###-#####-###;aaa,aa\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "## ##;\n"
+ "###+#####+###;aa,aaa\n"
+ "#############;\n"
+};
+
+GLuint tex_tile_data;
+GLuint tex_tile_detail;
+GLuint tex_wood;
+
m3x3f m_projection;
m3x3f m_view;
m3x3f m_mdl;
int main( int argc, char *argv[] )
{
- vg_init( argc, argv, "FishLadder" );
+ vg_init( argc, argv, "Fish (Marbles Computer) Ladder Simulator 2022 | N,M: change level | SPACE: Test | LeftClick: Toggle tile" );
}
void vg_register(void)
{
SHADER_INIT( shader_tile_colour );
+ SHADER_INIT( shader_tile_main );
}
void vg_start(void)
init_mesh( &world.splitter_r, splitter_r, vg_list_size( splitter_r ) );
}
- map_load
- (
- "#############;\n"
- "###-#####-###;aaa,aa\n"
- "## ##;\n"
- "## ##;\n"
- "## ##;\n"
- "## ##;\n"
- "## ##;\n"
- "## ##;\n"
- "###+#####+###;aa,aaa\n"
- "#############;\n"
- );
+ // Textures
+ {
+ tex_tile_detail = vg_tex2d_rgba( "textures/tile_overlays.png" );
+ vg_tex2d_mipmap();
+ vg_tex2d_linear_mipmap();
+ vg_tex2d_repeat();
+
+ tex_tile_data = vg_tex2d_rgba( "textures/tileset.png" );
+ vg_tex2d_mipmap();
+ vg_tex2d_linear_mipmap();
+ vg_tex2d_repeat();
+
+ tex_wood = vg_tex2d_rgba( "textures/wood.png" );
+ vg_tex2d_mipmap();
+ vg_tex2d_linear_mipmap();
+ vg_tex2d_repeat();
+ }
+
+ map_load( level_pack[ 0 ] );
}
void vg_free(void)
free_mesh( &world.splitter_r );
map_free();
+
+ glDeleteTextures( 1, &tex_tile_data );
+ glDeleteTextures( 1, &tex_tile_detail );
+ glDeleteTextures( 1, &tex_wood );
}
static int cell_interactive( v2i co )
// List of 3x3 configurations that we do not allow
static u32 invalid_src[][9] =
{
+ /*
{ 0,1,0,
1,1,1,
0,1,0
- },
+ },*/
{ 0,0,0,
0,1,1,
0,1,1
1,1,0,
0,0,0
},
+ /*
{ 0,1,0,
0,1,1,
0,1,0
{ 0,1,0,
1,1,0,
0,1,0
- }
+ }*/
};
// Statically compile invalid configurations into bitmasks
void vg_update(void)
{
+ static int curlevel = 0;
+ int changelvl = curlevel;
+ if( vg_get_button_down( "prev" ) ) { if( curlevel > 0 ) changelvl --; }
+ else if( vg_get_button_down( "next" ) ) { if( curlevel < vg_list_size( level_pack )-1 ) changelvl ++; }
+
+ if( changelvl != curlevel )
+ {
+ map_load( level_pack[ changelvl ] );
+ curlevel = changelvl;
+
+ // TEMP!!! code dupe
+ world.simulating = 0;
+ world.num_fishes = 0;
+ world.sim_frame = 0;
+
+ for( int i = 0; i < arrlen( world.io ); i ++ )
+ world.io[i].recv_count = 0;
+
+ vg_info( "Stopping simulation!\n" );
+ }
+
float ratio = (float)vg_window_y / (float)vg_window_x;
float const size = 9.5f;
int tile_x = floorf( tile_pos[0] );
int tile_y = floorf( tile_pos[1] );
-
+
// Tilemap editing
if( !world.simulating )
{
// Simulation stuff
// ========================================================
- // Reclassify world. TODO: Move into own function
for( int y = 2; y < world.h-2; y ++ )
{
for( int x = 2; x < world.w-2; x ++ )
v2i dirs[] = {{1,0},{-1,0},{0,-1}};
for( int j = 0; j < vg_list_size(dirs); j ++ )
- {
- v2i target;
if( pcell( (v2i){ posx+dirs[j][0], posy+dirs[j][1] } )->state & FLAG_CANAL )
{
fish->dir[0] = dirs[j][0];
can_spawn = 1;
break;
}
- }
if( !can_spawn )
world.num_fishes--;
else
{
struct cell *cell_next = pcell( (v2i){ fish->pos[0]+fish->dir[0], fish->pos[1]+fish->dir[1] } );
- if( !(cell_next->state & FLAG_CANAL) )
+ if( !(cell_next->state & (FLAG_CANAL|FLAG_OUTPUT)) )
{
// Try other directions for valid, so down, left, right..
v2i dirs[] = {{1,0},{-1,0},{0,-1}};
if( (dirs[j][0] == -fish->dir[0]) && (dirs[j][1] == -fish->dir[1]) )
continue;
- if( pcell( (v2i){ fish->pos[0]+dirs[j][0], fish->pos[1]+dirs[j][1] } )->state & FLAG_CANAL )
+ if( pcell( (v2i){ fish->pos[0]+dirs[j][0], fish->pos[1]+dirs[j][1] } )->state & (FLAG_CANAL|FLAG_OUTPUT) )
{
fish->dir[0] = dirs[j][0];
fish->dir[1] = dirs[j][1];
glClearColor( 0.8f, 0.8f, 0.8f, 1.0f );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
- use_mesh( &world.tile );
- SHADER_USE( shader_tile_colour );
- glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
-
// Shadow layer
+ /*
glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.5f, 0.5f, 0.5f, 1.0f );
for( int y = 0; y < world.h; y ++ )
for( int x = 0; x < world.w; x ++ )
if( cell->state & FLAG_WALL ) { v4_copy( (v4f){ 0.2f, 0.2f, 0.2f, 1.0f }, colour ); }
else if( cell->state & FLAG_CANAL ) { v4_copy( (v4f){ 0.6f, 0.6f, 0.6f, 1.0f }, colour ); }
else if( cell->state & FLAG_INPUT ) { v4_copy( (v4f){ 0.5f, 0.5f, 0.5f, 1.0f }, colour ); }
- else if( cell->state & FLAG_OUTPUT ) { v4_copy( (v4f){ 0.2f, 0.7f, 0.3f, 1.0f }, colour ); }
+ else if( cell->state & FLAG_OUTPUT ) { v4_copy( (v4f){ 0.4f, 0.4f, 0.4f, 1.0f }, colour ); }
else v4_copy( (v4f){ 0.9f, 0.9f, 0.9f, 1.0f }, colour );
//if( cell->water[world.frame&0x1] )
draw_mesh( 0, 2 );
}
}
+ */
+
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBlendEquation(GL_FUNC_ADD);
+
+ use_mesh( &world.tile );
+ SHADER_USE( shader_tile_main );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_main, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ // Bind textures
+ glActiveTexture( GL_TEXTURE0 );
+ glBindTexture( GL_TEXTURE_2D, tex_tile_data );
+ glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
+
+ glActiveTexture( GL_TEXTURE1 );
+ glBindTexture( GL_TEXTURE_2D, tex_wood );
+ glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
+
+ for( int y = 0; y < world.h; y ++ )
+ {
+ for( int x = 0; x < world.w; x ++ )
+ {
+ struct cell *cell = pcell((v2i){x,y});
+ int selected = world.selected == y*world.w + x;
+
+ /*
+ 0000 0 | 0001 1 | 0010 2 | 0011 3
+ | | | | |
+ X | X= | X | X=
+ | | |
+ 0100 4 | 0101 5 | 0110 6 | 0111 7
+ | | | | |
+ =X | =X= | =X | =X=
+ | | |
+ 1000 8 | 1001 9 | 1010 10 | 1011 11
+ | | | | |
+ X | X= | X | X=
+ | | | | | | |
+ 1100 12 | 1101 13 | 1110 14 | 1111 15
+ | | | | |
+ =X | =X= | =X | =X=
+ | | | | | | |
+ */
+
+ int tile_offsets[][2] =
+ {
+ {2, 0}, {0, 3}, {0, 2}, {2, 2},
+ {1, 0}, {2, 3}, {3, 2}, {1, 3},
+ {3, 1}, {0, 1}, {1, 2}, {2, 1},
+ {1, 1}, {3, 3}, {2, 1}, {2, 1}
+ };
+
+ int uv[2] = { 3, 0 };
+
+ if( cell->state & FLAG_CANAL )
+ {
+ uv[0] = tile_offsets[ cell->config ][0];
+ uv[1] = tile_offsets[ cell->config ][1];
+ }
+
+ glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y, uv[0], uv[1] ); // TODO: PICK GLYPH
+ draw_mesh( 0, 2 );
+ }
+ }
+
+ SHADER_USE( shader_tile_colour );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ glDisable(GL_BLEND);
+
+
use_mesh( &world.circle );
colour_code_v3( fish->payload, dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)fish->pos[0] + 0.5f - (float)fish->dir[0]*lerp, (float)fish->pos[1] + 0.25f - (float)fish->dir[1]*lerp, 0.25f );
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)fish->pos[0] + 0.5f - (float)fish->dir[0]*lerp, (float)fish->pos[1] + 0.5f - (float)fish->dir[1]*lerp, 0.125f );
draw_mesh( 0, 32 );
}
}
+
+ if( world.simulating )
+ {
+ glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.0f, 0.0f, 0.0f, 1.0f );
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), -0.5f + cosf( vg_time * 4.0f ) * 0.2f, sinf( vg_time * 4.0f ) * 0.2f + (float)world.h * 0.5f, 0.05f );
+ draw_mesh( 0, 32 );
+ }
}
-void vg_ui(void){}
+void vg_ui(void)
+{
+ //ui_test();
+}
projects / fishladder.git / blobdiff