"level3",
"level4",
"level5",
- "level6"
+ "level6",
+ "level7_combine"
};
#pragma pack(push,1)
m3x3f m_view;
m3x3f m_mdl;
-#define FLAG_INPUT 0x1
-#define FLAG_OUTPUT 0x2
-#define FLAG_CANAL 0x4
-#define FLAG_WALL 0x8
+#define FLAG_CANAL 0x1
+#define FLAG_IS_TRIGGER 0x2
+#define FLAG_RESERVED0 0x4
+#define FLAG_RESERVED1 0x8
+
+#define FLAG_INPUT 0x10
+#define FLAG_OUTPUT 0x20
+#define FLAG_WALL 0x40
+
#define FLAG_FLIP_FLOP 0x100
#define FLAG_FLIP_ROTATING 0x200
+#define FLAG_TARGETED 0x400
/*
0000 0 | 0001 1 | 0010 2 | 0011 3
struct world
{
+#pragma pack(push,1)
struct cell
{
- u32 state;
+ u16 state;
+ u16 links[2];
u8 config;
+ u8 pad0;
}
*data;
+#pragma pack(pop)
u32 frame;
reg_end ++;
}
else if( *c == '#' ) cell->state = FLAG_WALL;
- else if( *c == '*' ) { cell->state = FLAG_CANAL; world.score ++; }
+ else if( ((u32)*c >= (u32)'A') && ((u32)*c <= (u32)'A'+0xf) )
+ {
+ // Canal flag bits (4bit/16 value):
+ // 0: Canal present
+ // 1: Is trigger
+ // 2: Reserved
+ // 3: Reserved
+
+ cell->state = ((u32)*c - (u32)'A') & FLAG_CANAL; // Only canal supported currently
+ cell->links[0] = 0; // TODO: Link these somewhere else
+ cell->links[1] = 0;
+ world.score ++;
+ }
else cell->state = 0x00;
cx ++;
if( cell->state & FLAG_WALL ) fputc( '#', stream );
else if( cell->state & FLAG_INPUT ) fputc( '+', stream );
else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream );
- else if( cell->state & FLAG_CANAL ) fputc( '*', stream );
+ else if( cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1) )
+ {
+ fputc( (cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1)) + (u32)'A', stream );
+ }
else fputc( ' ', stream );
}
world.tile_x = floorf( world.tile_pos[0] );
world.tile_y = floorf( world.tile_pos[1] );
+ static u16 id_drag_from = 0;
+ static v2f drag_from_co;
+ static v2f drag_to_co;
+
// Tilemap editing
if( !world.simulating )
{
+ v2_copy( vg_mouse_ws, drag_to_co );
+
if( cell_interactive( (v2i){ world.tile_x, world.tile_y } ))
{
world.selected = world.tile_y * world.w + world.tile_x;
{
cell_ptr->state &= ~FLAG_CANAL;
cell_ptr->state |= modify_state;
-
+
if( cell_ptr->state & FLAG_CANAL )
{
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
}
else
{
+ if( cell_ptr->state & (FLAG_IS_TRIGGER|FLAG_TARGETED) )
+ {
+ cell_ptr->state &= ~(FLAG_IS_TRIGGER|FLAG_TARGETED);
+ for( u32 i = 0; i < 2; i ++ )
+ {
+ if( cell_ptr->links[i] )
+ {
+ struct cell *other_ptr = &world.data[ cell_ptr->links[i] ];
+ other_ptr->links[ i ] = 0;
+ other_ptr->state &= ~FLAG_IS_TRIGGER;
+
+ if( other_ptr->links[ i ^ 0x1 ] == 0 )
+ other_ptr->state &= ~(FLAG_TARGETED);
+ }
+ }
+ }
+
sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
world.score --;
}
+
+ cell_ptr->links[0] = 0;
+ cell_ptr->links[1] = 0;
map_reclassify( (v2i){ world.tile_x -2, world.tile_y -2 },
(v2i){ world.tile_x +2, world.tile_y +2 }, 1 );
}
+
+ if( vg_get_button_down("secondary") && !(cell_ptr->config == k_cell_type_split) )
+ {
+ id_drag_from = world.selected;
+ drag_from_co[0] = world.tile_x + 0.5f;
+ drag_from_co[1] = world.tile_y + 0.5f;
+ }
+
+ if( id_drag_from && (cell_ptr->config == k_cell_type_split) )
+ {
+ float local_x = vg_mouse_ws[0] - (float)world.tile_x;
+ drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
+ drag_to_co[1] = (float)world.tile_y + 0.25f;
+
+ if( vg_get_button_up("secondary") )
+ {
+ struct cell *drag_ptr = &world.data[id_drag_from];
+ u32 link_id = local_x > 0.5f? 1: 0;
+
+ // Cleanup existing connections
+ if( cell_ptr->links[ link_id ] )
+ {
+ vg_warn( "Destroying existing connection on link %u (%hu)\n", link_id, cell_ptr->links[ link_id ] );
+
+ struct cell *current_connection = &world.data[ cell_ptr->links[ link_id ]];
+ current_connection->state &= ~FLAG_IS_TRIGGER;
+ current_connection->links[ link_id ] = 0;
+ }
+
+ if( drag_ptr->links[ link_id ^ 0x1 ] )
+ {
+ vg_warn( "Destroying alternate link %u (%hu)\n", link_id ^ 0x1, drag_ptr->links[ link_id ^ 0x1 ] );
+
+ struct cell *current_connection = &world.data[ drag_ptr->links[ link_id ^ 0x1 ]];
+ if( !current_connection->links[ link_id ] )
+ current_connection->state &= ~FLAG_TARGETED;
+
+ current_connection->links[ link_id ^ 0x1 ] = 0;
+ drag_ptr->links[ link_id ^ 0x1 ] = 0;
+ }
+
+ // Create the new connection
+ vg_success( "Creating connection on link %u (%hu)\n", link_id, id_drag_from );
+
+ cell_ptr->links[ link_id ] = id_drag_from;
+ drag_ptr->links[ link_id ] = world.selected;
+
+ cell_ptr->state |= FLAG_TARGETED;
+ drag_ptr->state |= FLAG_IS_TRIGGER;
+ id_drag_from = 0;
+ }
+ }
}
else
world.selected = -1;
+
+ if( vg_get_button("secondary") && id_drag_from )
+ {
+ vg_line2( drag_from_co, drag_to_co, 0xff00ff00, 0xffffff00 );
+ }
+ else
+ {
+ id_drag_from = 0;
+ }
+ }
+ else
+ {
+ world.selected = -1;
+ id_drag_from = 0;
}
- else world.selected = -1;
// Simulation stop/start
if( vg_get_button_down("go") )
fish->dir[0] = cell_current->state&FLAG_FLIP_FLOP?1:-1;
fish->dir[1] = 0;
- cell_current->state ^= FLAG_FLIP_FLOP;
+ if( !(cell_current->state & FLAG_TARGETED) )
+ cell_current->state ^= FLAG_FLIP_FLOP;
}
else if( cell_current->config == k_cell_type_merge )
{
sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
cell_entry->state |= FLAG_FLIP_ROTATING;
}
+
+ if( cell_entry->state & FLAG_IS_TRIGGER )
+ {
+ int trigger_id = cell_entry->links[0]?0:1;
+ int connection_id = cell_entry->links[trigger_id];
+ int target_px = connection_id % world.w;
+ int target_py = (connection_id - target_px)/world.w;
+
+ vg_line2( (v2f){ fish->pos[0], fish->pos[1] }, (v2f){ target_px, target_py }, 0xffffffff, 0xffffffff );
+
+ struct cell *target_peice = &world.data[ cell_entry->links[trigger_id] ];
+
+ if( trigger_id )
+ target_peice->state |= FLAG_FLIP_FLOP;
+ else
+ target_peice->state &= ~FLAG_FLIP_FLOP;
+ }
}
if( fish->alive )
{
struct cell *cell = pcell((v2i){x,y});
- if( cell->config == k_cell_type_split )
+ if( cell->state & FLAG_CANAL )
{
- float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
-
- if( cell->state & FLAG_FLIP_ROTATING )
+ if( cell->state & FLAG_IS_TRIGGER )
+ {
+ int trigger_id = cell->links[0]?0:1;
+
+ int x2 = cell->links[trigger_id] % world.w;
+ int y2 = (cell->links[trigger_id] - x2) / world.w;
+
+ v2f drag_to_co;
+
+ drag_to_co[0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
+ drag_to_co[1] = (float)y2 + 0.25f;
+
+ vg_line2( (v2f){x+0.5f,y+0.5f}, drag_to_co, 0xff0000ff, 0xff00ffff );
+ }
+
+ if( cell->config == k_cell_type_split )
{
- if( (world.frame_lerp > curve_7_linear_section) )
+ float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
+
+ if( cell->state & FLAG_FLIP_ROTATING )
{
- float const rotation_speed = 0.4f;
- if( (world.frame_lerp < 1.0f-rotation_speed) )
+ if( (world.frame_lerp > curve_7_linear_section) )
{
- float t = world.frame_lerp - curve_7_linear_section;
- t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
- t += 1.0f;
-
- rotation *= t;
+ float const rotation_speed = 0.4f;
+ if( (world.frame_lerp < 1.0f-rotation_speed) )
+ {
+ float t = world.frame_lerp - curve_7_linear_section;
+ t *= -2.0f * (1.0f/(1.0f-(curve_7_linear_section+rotation_speed)));
+ t += 1.0f;
+
+ rotation *= t;
+ }
+ else
+ rotation *= -1.0f;
}
- else
- rotation *= -1.0f;
}
- }
- m2x2_create_rotation( subtransform, rotation );
+ m2x2_create_rotation( subtransform, rotation );
- glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
- glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, 0.0f, 0.0f );
- draw_mesh( 0, 2 );
+ glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
+ glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y + 0.125f, cell->state & FLAG_TARGETED? 3.0f: 0.0f, 0.0f );
+ draw_mesh( 0, 2 );
+ }
}
}
}
projects / fishladder.git / commitdiff
