// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
-#define VG_STEAM
+#define MARBLE_COMP_VERSION 4
+//#define VG_CAPTURE_MODE
#define VG_STEAM_APPID 1218140U
#include "vg/vg.h"
+
+enum world_button_mode
+{
+ k_world_button_mode_once,
+ k_world_button_mode_toggle
+};
+
+struct world_button
+{
+ v2i position;
+
+ float light_target, light, extra_light;
+ int state;
+
+ enum world_button_mode mode;
+};
+
+enum world_button_status
+{
+ k_world_button_on_enable,
+ k_world_button_on_disable
+};
+
#include "fishladder_resources.h"
+// #define STEAM_LEADERBOARDS
+
// CONSTANTS
// ===========================================================================================================
k_world_button_none = -1,
k_world_button_sim = 0,
k_world_button_pause = 1,
- k_world_button_wire_mode = 2
+ k_world_button_speedy = 2,
+ k_world_button_settings = 3
+};
+
+enum e_game_state
+{
+ k_game_state_main,
+ k_game_state_settings,
+ k_game_state_update
};
#define FLAG_CANAL 0x1
#define FLAG_INPUT 0x10
#define FLAG_OUTPUT 0x20
#define FLAG_WALL 0x40
+#define FLAG_EMITTER 0x80
#define FLAG_FLIP_FLOP 0x100
#define FLAG_TRIGGERED 0x200
#define FLAG_FLIP_ROTATING 0x400
#define FLAG_TARGETED 0x800
+#define FLAG_INPUT_NICE 0x1000
+
/*
0000 0 | 0001 1 | 0010 2 | 0011 3
| | | | |
int is_linear;
v2f trigger_pos;
+ enum sprites_auto_combine_index trigger_sprite;
}
cell_descriptions[] =
{
// 0-3
- {},
- { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
- { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f } },
- { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.25f } },
+ { .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
+ { .start = { 1, 0 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
+ { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 0, 1 }, .end = { 1, 0 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
// 4-7
- { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
- { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .is_linear = 1 },
- { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f } },
+ { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
+ { .start = { -1, 0 }, .end = { 1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d, .is_linear = 1 },
+ { .start = { 0, 1 }, .end = { -1, 0 }, .trigger_pos = { 0.5f, 0.25f }, .trigger_sprite = k_sprite_brk_d },
{ .start = { 0, 1 }, .is_special = 1 },
// 8-11
- { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f } },
- { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.75f } },
- { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .is_linear = 1 },
+ { .start = { 0, -1 }, .end = { 0, 1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l },
+ { .start = { 0, 1 }, .end = { 0, -1 }, .trigger_pos = { 0.25f, 0.5f }, .trigger_sprite = k_sprite_brk_l, .is_linear = 1 },
{ },
// 12-15
- { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.75f, 0.75f } },
- { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f } },
+ { .start = { -1, 0 }, .end = { 0, -1 }, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u },
+ { .end = { 0, -1 }, .is_special = 1, .trigger_pos = { 0.5f, 0.75f }, .trigger_sprite = k_sprite_brk_u },
{ },
{ }
};
u32 elements;
};
-struct world
+static struct world
{
-#pragma pack(push,1)
+ // Things that are 'static', aka, initialized once
+ struct
+ {
+ struct world_button buttons[4];
+ float zoom;
+ enum e_game_state state;
+
+ struct cmp_level *lvl_to_load;
+ float lvl_load_time;
+
+ float world_transition;
+ ui_ctx world_text;
+ }
+ st;
+
struct cell
{
u16 state;
u16 links[2];
u8 config;
- u8 pad0;
+ i8 emit[2];
}
*data;
-#pragma pack(pop)
-
+
+ struct render_cmd
+ {
+ struct cell *ptr;
+ v2i pos;
+ }
+ *cmd_buf_tiles, *cmd_buf_specials;
+
+ u32 tile_count, tile_special_count, max_commands;
int initialzed;
-
int sim_run, max_runs;
int sim_frame, sim_target;
{
struct terminal_run
{
- char conditions[8];
- char recieved[8];
+ i8 steps[8];
+ i8 recieved[8];
- int condition_count, recv_count;
+ int step_count, recv_count;
}
runs[8];
v2i pos;
//int id;
}
- *io;
-
- struct cell_button
- {
- float light_target, light;
- int pressed;
- }
- buttons[4];
+ *io;
int w, h;
- struct mesh shapes, numbers;
+ struct mesh shapes;
struct mesh_wire
{
GLuint vao, vbo, ebo;
v2i pos;
v2i dir;
enum e_fish_state state;
- char payload;
+ i8 colour;
int flow_reversed;
float death_time;
v2f physics_v;
v2f physics_co;
}
- fishes[16];
+ fishes[64];
int num_fishes;
char map_name[64];
- //struct career_level *ptr_career_level;
struct cmp_level *pCmpLevel;
u32 score;
u16 id_drag_from;
v2f drag_from_co;
v2f drag_to_co;
+}
+world =
+{
+ .st =
+ {
+ .buttons = { { .mode = k_world_button_mode_toggle },
+ { .mode = k_world_button_mode_toggle },
+ { .mode = k_world_button_mode_toggle },
+ { .mode = k_world_button_mode_toggle } }
+ },
+ .selected = -1
};
// Forward declerations
// --------------------
+// Utility functions
+// -----------------
+
+static void colour_code_v3( i8 cc, v3f target );
+static int hash21i( v2i p, u32 umod );
+
+// Mesh functions
+// --------------
+static void init_mesh( struct mesh *m, float const *tris, u32 length );
+static void free_mesh( struct mesh *m );
+static void use_mesh( struct mesh *m );
+static void draw_mesh( int const start, int const count );
+
+// World buttons
+// -------------
+static void level_selection_buttons(void);
+
+// Map/world interface
+// -------------------
+static void map_free(void);
+static void io_reset(void);
+static struct cell *pcell( v2i pos );
+static void lcell( int id, v2i pos );
+static void map_reclassify( v2i start, v2i end, int update_texbuffer );
+static void gen_level_text(void);
+static int map_load( const char *str, const char *name );
+static void map_serialize( FILE *stream );
+
+// Career
+// ------
+static void career_serialize(void);
+static void career_unlock_level( struct cmp_level *lvl );
+static void career_unlock_level( struct cmp_level *lvl );
+static void career_pass_level( struct cmp_level *lvl, int score, int upload );
+static void career_reset_level( struct cmp_level *lvl );
+static void career_load(void);
+static void clear_animation_flags(void);
+
+// Gameplay main
+// -------------
+static void simulation_stop(void);
+static void simulation_start(void);
+static int world_check_pos_ok( v2i co, int dist );
+static int cell_interactive( v2i co );
+
+void vg_update(void);
+static void render_tiles( v4f const regular_colour, v4f const selected_colour );
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour );
+
+void vg_render(void);
+void vg_ui(void);
+
+// Leaderboard stuff
+// -----------------
+#ifdef STEAM_LEADERBOARDS
+void leaderboard_set_score( struct cmp_level *cmp_level, u32 score );
+void leaderboard_dispatch_score(void);
+void leaderboard_found( LeaderboardFindResult_t *pCallback );
+void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback );
+void leaderboard_set_score( struct cmp_level *cmp_level, u32 score );
+#endif
+
+// Console commands
+// ----------------
static int console_credits( int argc, char const *argv[] );
static int console_save_map( int argc, char const *argv[] );
static int console_load_map( int argc, char const *argv[] );
static int console_changelevel( int argc, char const *argv[] );
+void vg_start(void);
+void vg_free(void);
+
+int main( int argc, char *argv[] );
+
// GLOBALS
// ===========================================================================================================
m3x3f m_view;
m3x3f m_mdl;
-struct world world;
-
// UTILITY
// ===========================================================================================================
-static void colour_code_v3( char const cc, v3f target )
+static int colour_set_id = 0;
+static int world_theme_id = 0;
+
+static v3f colour_sets[][4] =
{
- static v3f colour_sets[] =
- { { 1.0f, 0.9f, 0.3f },
- { 0.2f, 0.9f, 0.14f },
- { 0.4f, 0.8f, 1.00f },
- { 0.882f, 0.204f, 0.922f }
- };
+ { { 1.0f, 0.9f, 0.3f }, // Yellow
+ { 0.4f, 0.8f, 1.00f }, // Blue
+ { 0.2f, 0.9f, 0.14f }, // Green
+ { 0.882f, 0.204f, 0.922f } // Pink
+ },
+ { { 1.0f, 0.9f, 0.3f }, // Yellow
+ { 0.4f, 0.8f, 1.00f }, // Blue
+ { 0.85f, 0.85f, 0.85f }, // Weiss
+ { 0.2f, 0.2f, 0.2f } // Black/Gray
+ },
+ { { 1.0f, 0.9f, 0.3f }, // Yellow
+ { 0.827f, 0.373f, 0.718f }, // Pink
+ { 0.0f, 0.353f, 0.71f }, // Blue
+ { 0.863f, 0.196f, 0.125f } // Red
+ },
+};
- if( cc >= 'a' && cc <= 'z' )
- {
- int id = cc - 'a';
-
- if( id < vg_list_size( colour_sets ) )
- {
- v3_copy( colour_sets[ id ], target );
- return;
- }
- }
+static struct world_theme
+{
+ const char *name;
+ v3f col_shadow;
+
+ vg_tex2d *tex_tiles;
+}
+world_themes[] =
+{
+ {
+ "Minimal",
+ { 0.8f, 0.8f, 0.8f },
+ &tex_tiles_min
+ },
+ {
+ "Wood",
+ { 0.89f, 0.8f, 0.7f },
+ &tex_tiles_wood
+ },
+ {
+ "Lab",
+ { 0.7f, 0.7f, 0.7f },
+ &tex_tiles_lab
+ }
+};
+
+static void colour_code_v3( i8 cc, v3f target )
+{
+ if( (cc >= 0) && (cc < vg_list_size( colour_sets[0] )) )
+ {
+ v3_copy( colour_sets[colour_set_id][ cc ], target );
+ return;
+ }
+ vg_error( "Invalid colour code used '%d'\n", (int)cc );
v3_copy( (v3f){0.0f,0.0f,0.0f}, target );
}
glBindVertexArray( m->vao );
}
-
-
-
-
-static struct cell_button *get_wbutton( enum e_world_button btn )
-{
- return &world.buttons[ btn ];
-}
-
void leaderboard_set_score( struct cmp_level *cmp_level, u32 score );
// WORLD/MAP
{
arrfree( world.data );
arrfree( world.io );
-
+
+ free( world.cmd_buf_tiles );
+ world.cmd_buf_tiles = NULL;
+
world.w = 0;
world.h = 0;
world.data = NULL;
return &world.data[ pos[1]*world.w + pos[0] ];
}
+static void lcell( int id, v2i pos )
+{
+ pos[0] = id % world.w;
+ pos[1] = (id - pos[0]) / world.w;
+}
+
static void map_reclassify( v2i start, v2i end, int update_texbuffer )
{
v2i full_start = { 1,1 };
u8 height = 0;
u8 config = 0x00;
- if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
{
for( int i = 0; i < vg_list_size( dirs ); i ++ )
{
struct cell *neighbour = pcell((v2i){x+dirs[i][0], y+dirs[i][1]});
- if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( neighbour->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
config |= 0x1 << i;
}
if( cell->state & FLAG_WALL )
height = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F );
- config = 0xF;
+ config = cell->state & FLAG_INPUT_NICE? 0xB: 0xF;
}
pcell((v2i){x,y})->config = config;
if(
(
((cell->state & FLAG_IS_TRIGGER) && (cell->config == 0xF || cell->config == k_cell_type_split)) ||
- ((cell->state & FLAG_TARGETED) && (cell->config != k_cell_type_split))
+ ((cell->state & FLAG_TARGETED) && ((cell->config != k_cell_type_split) && !(cell->state & FLAG_EMITTER)))
) && update_texbuffer
){
cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER);
}
}
+static void gen_level_text(void)
+{
+ // Old style UI.
+ ui_px const unit_scale_px = 4*UI_GLYPH_SPACING_X; // 4 char per unit
+ ui_begin( &world.st.world_text, world.w*unit_scale_px, world.h*unit_scale_px );
+
+ if( world.pCmpLevel )
+ {
+ for( int i = 0; i < vg_list_size( world.pCmpLevel->strings ); i ++ )
+ {
+ struct world_string *wstr = &world.pCmpLevel->strings[i];
+
+ if( wstr->str )
+ {
+ ui_px pos[2];
+
+ pos[0] = -UI_GLYPH_SPACING_X/2;
+
+ if( wstr->placement == k_placement_bottom )
+ pos[1] = 2*-unit_scale_px;
+ else
+ pos[1] = (world.h-1)*-unit_scale_px -6;
+
+ ui_text( &world.st.world_text, pos, wstr->str, 1, k_text_align_left );
+ }
+ }
+ }
+
+ // re-create level scores
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
+ {
+ struct career_level_pack *set = &career_packs[i];
+
+ ui_text( &world.st.world_text,
+ (ui_px [2]){
+ set->origin[0]*unit_scale_px,
+ -(set->origin[1]+set->dims[1]+1)*unit_scale_px + 18
+ },
+ set->title, 1, k_text_align_left );
+
+ for( int j = 0; j < set->count; j ++ )
+ {
+ struct cmp_level *lvl = &set->pack[j];
+
+ if( lvl->completed_score && !lvl->is_tutorial )
+ {
+ char num[10];
+ snprintf( num, 9, "%d", lvl->completed_score );
+
+ ui_text( &world.st.world_text,
+ (ui_px [2]){
+ lvl->btn.position[0]*unit_scale_px + unit_scale_px/2,
+ -lvl->btn.position[1]*unit_scale_px - unit_scale_px/2
+ },
+ num, 1, k_text_align_center );
+ }
+ }
+ }
+
+ //ui_text( &world.st.world_text, (ui_px [2]){ 0, 0 }, "Preview", 1, k_text_align_left );
+
+ ui_resolve( &world.st.world_text );
+}
+
static int map_load( const char *str, const char *name )
{
- //TODO: It may be worthwhile, at this point, to switch to binary encoding for save data
-
map_free();
char const *c = str;
struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ];
if( (*c >= 'a' && *c <= 'z') || *c == ' ' )
- {
- run->conditions[ run->condition_count ++ ] = *c;
+ {
+ i8 code = -1;
+ if( *c != ' ' )
+ code = *c - 'a';
+
+ run->steps[ run->step_count ++ ] = code;
}
else
{
}
else if( *c == ':' )
{
- terminal->runs[ terminal->run_count ].condition_count = 0;
+ terminal->runs[ terminal->run_count ].step_count = 0;
terminal->run_count ++;
world.max_runs = vg_max( world.max_runs, terminal->run_count );
}
struct cell *cell = &row[ cx ];
cell->config = 0xF;
- if( *c == '+' || *c == '-' )
+ cell->links[0] = 0;
+ cell->links[1] = 0;
+
+ if( *c == '+' || *c == '-' || *c == '*' )
{
struct cell_terminal *term = arraddnptr( world.io, 1 );
term->pos[0] = cx;
term->pos[1] = world.h;
term->run_count = 1;
- term->runs[0].condition_count = 0;
+ term->runs[0].step_count = 0;
+
+ switch( *c )
+ {
+ case '+': cell->state = FLAG_INPUT; break;
+ case '-': cell->state = FLAG_OUTPUT; break;
+ case '*': cell->state = FLAG_EMITTER; break;
+ }
- cell->state = *c == '+'? FLAG_INPUT: FLAG_OUTPUT;
reg_end ++;
}
+ else if( *c == '.' ) cell->state = FLAG_INPUT_NICE;
else if( *c == '#' ) cell->state = FLAG_WALL;
else if( ((u32)*c >= (u32)'A') && ((u32)*c <= (u32)'A'+0xf) )
{
if( cell->state & FLAG_IS_TRIGGER )
arrpush( links_to_make, cx + world.h*world.w );
- cell->links[0] = 0;
- cell->links[1] = 0;
world.score ++;
}
else cell->state = 0x00;
c ++;
}
+
+ // Assign emitter codes
+ for( int i = 0; i < arrlen( world.io ); i ++ )
+ {
+ struct cell_terminal *term = &world.io[i];
+ struct cell *cell = pcell( term->pos );
+
+ if( cell->state & FLAG_EMITTER )
+ {
+ if( (term->run_count > 0) && (term->runs[0].step_count >= 2) )
+ {
+ cell->emit[0] = term->runs[0].steps[0];
+ cell->emit[1] = term->runs[0].steps[1];
+ }
+ else
+ {
+ vg_error( "Emitter was not assigned emit values\n" );
+ goto IL_REG_ERROR;
+ }
+ }
+ }
// Update data texture to fill out the background
{
{
u8 *px = &info_buffer[((x*64)+y)*4];
- px[0] = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F );
+ // Fade out edges of world so that there isnt an obvious line
+ int dist_x = 16 - VG_MIN( VG_MIN( x, 16 ), 16-VG_MAX( x-16-world.w, 0 ) );
+ int dist_y = 16 - VG_MIN( VG_MIN( y, 16 ), 16-VG_MAX( y-16-world.h, 0 ) );
+ int dist = VG_MAX( dist_x, dist_y ) * 16;
+
+ int value = VG_MAX( 0, 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ) - dist );
+
+ px[0] = value;
px[1] = 0;
px[2] = 0;
px[3] = 0;
}
}
+
+ // Level selection area
+
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
+ {
+ struct career_level_pack *grid = &career_packs[ i ];
+
+ int j = 0;
+
+ for( int y = 0; y < grid->dims[1]; y ++ )
+ {
+ for( int x = 0; x < grid->dims[0]; x ++ )
+ {
+ u8 *px = &info_buffer[((y+16+grid->origin[1])*64+16+x+grid->origin[0])*4];
+ px[0] = 0x10;
+
+ if( j < grid->count )
+ {
+ struct cmp_level *lvl = &grid->pack[ j ++ ];
+ v2i_add( grid->origin, (v2i){x,y}, lvl->btn.position );
+ }
+ }
+ }
+ }
+
+ info_buffer[(((16+world.h-3)*64)+world.w+16-1)*4] = 0x30;
+ info_buffer[(((16+world.h-2)*64)+world.w+16-1)*4] = 0x30;
// Random walks.. kinda
for( int i = 0; i < arrlen(world.io); i ++ )
v2i turtle;
v2i turtle_dir;
int original_y;
+
+ // Only make breakouts for terminals on the edge
+ if( !(term->pos[1] == 1 || term->pos[1] == world.h-2) )
+ continue;
turtle[0] = 16+term->pos[0];
turtle[1] = 16+term->pos[1];
turtle_dir[0] = 0;
- turtle_dir[1] = pcell(term->pos)->state & FLAG_INPUT? 1: -1;
+ turtle_dir[1] = pcell(term->pos)->state & (FLAG_INPUT|FLAG_EMITTER)? 1: -1;
original_y = turtle_dir[1];
info_buffer[((turtle[1]*64)+turtle[0])*4] = 0;
if( src->links[link_id] <= world.h*world.w )
{
struct cell *target = &world.data[ src->links[link_id] ];
- if( (target->state & FLAG_CANAL) && (target->config == k_cell_type_split) )
+ if( ((target->state & FLAG_CANAL) && (target->config == k_cell_type_split))
+ || (target->state & FLAG_EMITTER) )
{
if( target->links[ link_id ] )
{
}
}
+ // ==========================================================
+ // Successful load
+
vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h );
io_reset();
strncpy( world.map_name, name, vg_list_size( world.map_name )-1 );
world.initialzed = 1;
+
+ // Setup world button locations
+ for( int i = 0; i < vg_list_size( world.st.buttons ); i ++ )
+ {
+ struct world_button *btn = &world.st.buttons[i];
+ btn->position[0] = world.w -1;
+ btn->position[1] = world.h -i -2;
+ }
+
+ // Allocate buffers for render commands
+ world.cmd_buf_tiles = malloc( world.w*world.h* sizeof( struct render_cmd ) );
+ world.max_commands = world.w*world.h;
+
return 1;
IL_REG_ERROR:
struct cell *cell = pcell( (v2i){ x, y } );
if( cell->state & FLAG_WALL ) fputc( '#', stream );
+ else if( cell->state & FLAG_INPUT_NICE ) fputc( '.', stream );
else if( cell->state & FLAG_INPUT ) fputc( '+', stream );
else if( cell->state & FLAG_OUTPUT ) fputc( '-', stream );
+ else if( cell->state & FLAG_EMITTER ) 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 );
{
struct terminal_run *run = &term->runs[j];
- for( int k = 0; k < run->condition_count; k ++ )
- fputc( run->conditions[k], stream );
+ for( int k = 0; k < run->step_count; k ++ )
+ {
+ i8 step = run->steps[k];
+ fputc( step == -1? ' ': ('a' + run->steps[k]), stream );
+ }
if( j < term->run_count-1 )
fputc( ':', stream );
struct dlevel_state
{
i32 score;
+
i32 unlocked;
i32 reserved[2];
}
return;
struct dcareer_state encoded;
- encoded.version = 2;
+ encoded.version = MARBLE_COMP_VERSION;
encoded.in_map = world.pCmpLevel? world.pCmpLevel->serial_id: -1;
memset( encoded.reserved, 0, sizeof( encoded.reserved ) );
- 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 ++ )
{
dest->score = lvl->completed_score;
dest->unlocked = lvl->unlocked;
dest->reserved[0] = 0;
- dest->reserved[1] = 0;
+ dest->reserved[1] = 0;
}
}
static void career_pass_level( struct cmp_level *lvl, int score, int upload )
{
if( score > 0 )
- {
- if( score < lvl->completed_score || lvl->completed_score == 0 )
+ {
+ lvl->completed_score = score;
+ gen_level_text();
+
+ if( lvl->unlock )
+ career_unlock_level( lvl->unlock );
+
+ if( lvl->achievement )
+ sw_set_achievement( lvl->achievement );
+
+ // Check ALL maps to trigger master engineer
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
{
- if( !lvl->is_tutorial && upload )
- leaderboard_set_score( lvl, score );
+ struct career_level_pack *set = &career_packs[i];
- lvl->completed_score = score;
+ for( int j = 0; j < set->count; j ++ )
+ {
+ if( set->pack[j].completed_score == 0 )
+ return;
+ }
}
- if( lvl->unlock ) career_unlock_level( lvl->unlock );
+ sw_set_achievement( "MASTER_ENGINEER" );
}
}
// Blank save state
memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) );
- encoded.in_map = -1;
+ encoded.in_map = 0;
encoded.levels[0].unlocked = 1;
// Load and copy data into encoded
vg_info( "No save file... Using blank one\n" );
// Reset memory
- 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 ++ )
career_reset_level( &set->pack[j] );
// Header information
// =================================
+ struct cmp_level *lvl_to_load = &career_packs[0].pack[0];
+
// Decode everything from dstate
- 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 ++ )
{
struct dlevel_state *src = &encoded.levels[lvl->serial_id];
if( src->unlocked ) career_unlock_level( lvl );
- if( src->score ) lvl->completed_score = src->score;
+ if( src->score )
+ {
+ lvl->completed_score = src->score;
+
+ // Apply unlocking to next levels in case there was an update
+ if( lvl->unlock )
+ career_unlock_level( lvl->unlock );
+ }
- // ...
if( lvl->serial_id == encoded.in_map )
- {
- if( console_changelevel( 1, &lvl->map_name ) )
- world.pCmpLevel = lvl;
- }
+ lvl_to_load = lvl;
}
}
+ if( console_changelevel( 1, &lvl_to_load->map_name ) )
+ {
+ world.pCmpLevel = lvl_to_load;
+ gen_level_text();
+ }
+
career_load_success = 1;
+
+ if( encoded.version < MARBLE_COMP_VERSION || 1 )
+ world.st.state = k_game_state_update;
}
// MAIN GAMEPLAY
// ===========================================================================================================
static int is_simulation_running(void)
{
- return world.buttons[ k_world_button_sim ].pressed;
+ return world.st.buttons[ k_world_button_sim ].state;
}
static void clear_animation_flags(void)
static void simulation_stop(void)
{
- world.buttons[ k_world_button_sim ].pressed = 0;
- world.buttons[ k_world_button_pause ].pressed = 0;
+ world.st.buttons[ k_world_button_sim ].state = 0;
+ world.st.buttons[ k_world_button_pause ].state = 0;
world.num_fishes = 0;
world.sim_frame = 0;
world.sim_frame = 0;
world.sim_run = 0;
- world.sim_delta_speed = 2.5f;
+ world.sim_delta_speed = world.st.buttons[ k_world_button_speedy ].state? 10.0f: 2.5f;
world.sim_delta_ref = vg_time;
world.sim_internal_ref = 0.0f;
world.sim_internal_time = 0.0f;
clear_animation_flags();
io_reset();
+
+ if( world.pCmpLevel )
+ {
+ world.pCmpLevel->completed_score = 0;
+ gen_level_text();
+ }
}
-static int world_check_pos_ok( v2i co )
+static int world_check_pos_ok( v2i co, int dist )
{
- return (co[0] < 2 || co[0] >= world.w-2 || co[1] < 2 || co[1] >= world.h-2)? 0: 1;
+ return (co[0] < dist || co[0] >= world.w-dist || co[1] < dist || co[1] >= world.h-dist)? 0: 1;
}
static int cell_interactive( v2i co )
{
+ struct cell *cell;
+
// Bounds check
- if( !world_check_pos_ok( co ) )
+ if( world_check_pos_ok( co, 1 ) )
+ {
+ cell = pcell( co );
+ if( cell->state & FLAG_EMITTER )
+ return 1;
+ }
+
+ if( !world_check_pos_ok( co, 2 ) )
return 0;
// Flags check
- if( world.data[ world.w*co[1] + co[0] ].state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
+ if( cell->state & (FLAG_WALL|FLAG_INPUT|FLAG_OUTPUT) )
return 0;
// List of 3x3 configurations that we do not allow
{
struct cell *cell = pcell((v2i){x,y});
- if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT)) )
+ if( cell && (cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER)) )
blob |= 0x1 << ((y-(co[1]-2))*5 + x-(co[0]-2));
}
return 1;
}
-void vg_update(void)
+static void vg_update(void)
{
+ // Async events
+ if( world.st.lvl_to_load )
+ {
+ world.st.world_transition = (world.st.lvl_load_time-vg_time) * 4.0f;
+
+ if( vg_time > world.st.lvl_load_time )
+ {
+ if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) )
+ {
+ world.pCmpLevel = world.st.lvl_to_load;
+ gen_level_text();
+ }
+
+ world.st.lvl_to_load = NULL;
+ }
+ }
+ else
+ {
+ world.st.world_transition = vg_minf( 1.0f, (vg_time-world.st.lvl_load_time) * 4.0f );
+ }
+
// Camera
// ========================================================================================================
r2 = (float)world.h / (float)world.w,
size;
- size = ( r2 < r1? (float)world.w * 0.5f: ((float)world.h * 0.5f) / r1 ) + 2.5f;
- m3x3_projection( m_projection, -size, size, -size*r1, size*r1 );
+ static float size_current = 2.0f;
+ static v3f origin_current = { 0.0f, 0.0f, 0.0f };
+ static v2f drag_offset = { 0.0f, 0.0f };
+ static v2f view_point = { 0.0f, 0.0f };
+ v2f result_view;
+
+ size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f;
- v3f origin;
- origin[0] = floorf( -0.5f * world.w );
+ v2f origin;
+ v2f vt_target;
+
+ origin[0] = floorf( -0.5f * ((float)world.w-4.5f) );
origin[1] = floorf( -0.5f * world.h );
- origin[2] = 0.0f;
+ // Create and clamp result view
+ v2_add( view_point, drag_offset, result_view );
+ result_view[0] = vg_clampf( result_view[0], -world.st.zoom, world.st.zoom );
+ result_view[1] = vg_clampf( result_view[1], -world.st.zoom*r1, world.st.zoom*r1 );
+
+ v2_add( origin, result_view, vt_target );
+
+ // Lerp towards target
+ size_current = vg_lerpf( size_current, size - world.st.zoom, vg_time_delta * 6.0f );
+ v2_lerp( origin_current, vt_target, vg_time_delta * 6.0f, origin_current );
+
+ m3x3_projection( m_projection, -size_current, size_current, -size_current*r1, size_current*r1 );
m3x3_identity( m_view );
- m3x3_translate( m_view, origin );
+ m3x3_translate( m_view, origin_current );
m3x3_mul( m_projection, m_view, vg_pv );
vg_projection_update();
+
+ if( world.st.state == k_game_state_update )
+ return;
// Mouse input
// ========================================================================================================
world.tile_x = floorf( world.tile_pos[0] );
world.tile_y = floorf( world.tile_pos[1] );
+ // Camera dragging
+ {
+ static v2f drag_origin; // x/y pixel
+
+ if( vg_get_button_down( "tertiary" ) )
+ v2_copy( vg_mouse, drag_origin );
+ else if( vg_get_button( "tertiary" ) )
+ {
+ // get offset
+ v2_sub( vg_mouse, drag_origin, drag_offset );
+ v2_div( drag_offset, (v2f){ vg_window_x, vg_window_y }, drag_offset );
+ v2_mul( drag_offset, (v2f){ size_current*2.0f, -size_current*r1*2.0f }, drag_offset );
+ }
+ else
+ {
+ v2_copy( result_view, view_point );
+ v2_copy( (v2f){0.0f,0.0f}, drag_offset );
+ }
+ }
+
+ // Zooming
+ {
+ v2f mview_local;
+ v2f mview_new;
+ v2f mview_cur;
+ v2f mview_delta;
+ float rsize;
+
+ rsize = size-world.st.zoom;
+
+ v2_div( vg_mouse, (v2f){ vg_window_x*0.5f, vg_window_y*0.5f }, mview_local );
+ v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_cur );
+
+ world.st.zoom = vg_clampf( world.st.zoom + vg_mouse_wheel[1], 0.0f, size - 4.0f );
+
+ // Recalculate new position
+ rsize = size-world.st.zoom;
+ v2_add( (v2f){ -rsize, -rsize*r1 }, (v2f){ mview_local[0]*rsize, (2.0f-mview_local[1])*rsize*r1 }, mview_new );
+
+ // Apply offset
+ v2_sub( mview_new, mview_cur, mview_delta );
+ v2_add( mview_delta, view_point, view_point );
+ }
+
// Tilemap
// ========================================================================================================
if( !is_simulation_running() && !gui_want_mouse() )
world.selected = world.tile_y * world.w + world.tile_x;
static u32 modify_state = 0;
-
struct cell *cell_ptr = &world.data[world.selected];
-
- if( vg_get_button_down("primary") )
- modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
-
- if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
+
+ if( !(cell_ptr->state & FLAG_EMITTER) )
{
- cell_ptr->state &= ~FLAG_CANAL;
- cell_ptr->state |= modify_state;
+ if( vg_get_button_down("primary") )
+ modify_state = (cell_ptr->state & FLAG_CANAL) ^ FLAG_CANAL;
- if( cell_ptr->state & FLAG_CANAL )
+ if( vg_get_button("primary") && ((cell_ptr->state & FLAG_CANAL) != modify_state) )
{
- cell_ptr->links[0] = 0;
- cell_ptr->links[1] = 0;
+ cell_ptr->state &= ~FLAG_CANAL;
+ cell_ptr->state |= modify_state;
- sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
- world.score ++;
- }
- else
- {
- sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
- world.score --;
- }
+ if( cell_ptr->state & FLAG_CANAL )
+ {
+ cell_ptr->links[0] = 0;
+ cell_ptr->links[1] = 0;
+
+ sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 3, 6 );
+ world.score ++;
+ }
+ else
+ {
+ sfx_set_playrnd( &audio_tile_mod, &audio_system_sfx, 0, 3 );
+ world.score --;
+ }
- map_reclassify( (v2i){ world.tile_x -2, world.tile_y -2 },
+ 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->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
- {
- world.id_drag_from = world.selected;
-
- struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
- v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+ }
+
+ if( vg_get_button_down("secondary") && (cell_ptr->state & FLAG_CANAL) && !(cell_ptr->config == k_cell_type_split) )
+ {
+ world.id_drag_from = world.selected;
+
+ struct cell_description *desc = &cell_descriptions[ world.data[world.id_drag_from].config ];
+ v2_add( desc->trigger_pos, (v2f){ world.tile_x, world.tile_y }, world.drag_from_co );
+ }
}
float local_x = vg_mouse_ws[0] - (float)world.tile_x;
if( vg_get_button_up("secondary") && world.id_drag_from == world.selected )
{
- u32 link_id = local_x > 0.5f? 1: 0;
+ u32 link_id = cell_ptr->links[ 0 ]? 0: 1;
// break existing connection off
if( cell_ptr->links[ link_id ] )
world.id_drag_from = 0;
}
- if( world.id_drag_from && (cell_ptr->state & FLAG_CANAL) && (cell_ptr->config == k_cell_type_split) )
+ else if( world.id_drag_from && (cell_ptr->state & (FLAG_CANAL|FLAG_EMITTER)) &&
+ ((cell_ptr->config == k_cell_type_split) || (cell_ptr->state & FLAG_EMITTER)) )
{
world.drag_to_co[0] = (float)world.tile_x + (local_x > 0.5f? 0.75f: 0.25f);
world.drag_to_co[1] = (float)world.tile_y + 0.25f;
current_connection->state &= ~FLAG_IS_TRIGGER;
current_connection->links[ link_id ] = 0;
}
-
- if( drag_ptr->links[ link_id ^ 0x1 ] )
+
+ for( u32 i = 0; i < 2; i ++ )
{
- 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;
+ if( drag_ptr->links[ i ] )
+ {
+ vg_warn( "Destroying link %u (%hu)\n", i, drag_ptr->links[ i ] );
+
+ struct cell *current_connection = &world.data[ drag_ptr->links[ i ]];
+ if( current_connection->links[ i ^ 0x1 ] == 0 )
+ current_connection->state &= ~FLAG_TARGETED;
+
+ current_connection->links[ i ] = 0;
+ drag_ptr->links[ i ] = 0;
+ }
}
// Create the new connection
{
float old_time = world.sim_internal_time;
- if( !world.buttons[ k_world_button_pause ].pressed )
+ if( !world.st.buttons[ k_world_button_pause ].state )
world.sim_internal_time = world.sim_internal_ref + (vg_time-world.sim_delta_ref) * world.sim_delta_speed;
else
world.sim_internal_time = vg_lerpf( world.sim_internal_time, world.sim_internal_ref + world.pause_offset_target, vg_time_delta*15.0f );
world.sim_target = (int)floorf(world.sim_internal_time);
+ int success_this_frame = 0;
+ int failure_this_frame = 0;
+
while( world.sim_frame < world.sim_target )
{
sfx_set_playrnd( &audio_random, &audio_system_balls_switching, 0, 8 );
{
cell->state &= ~FLAG_FLIP_ROTATING;
}
- if( cell->state & FLAG_IS_TRIGGER )
+ if( cell->state & (FLAG_IS_TRIGGER|FLAG_EMITTER) )
cell->state &= ~FLAG_TRIGGERED;
}
{
struct terminal_run *run = &term->runs[ world.sim_run ];
if( run->recv_count < vg_list_size( run->recieved ) )
- run->recieved[ run->recv_count ++ ] = fish->payload;
+ {
+ if( fish->colour == run->steps[ run->recv_count ] )
+ success_this_frame = 1;
+ else
+ failure_this_frame = 1;
+
+ run->recieved[ run->recv_count ++ ] = fish->colour;
+ }
+ else
+ failure_this_frame = 1;
break;
}
}
else
{
- if( world_check_pos_ok( fish->pos ) )
+ if( world_check_pos_ok( fish->pos, 2 ) )
fish->state = k_fish_state_bg;
else
{
{
v2i_add( fish->pos, fish->dir, fish->pos );
- if( !world_check_pos_ok( fish->pos ) )
+ if( !world_check_pos_ok( fish->pos, 2 ) )
{
fish->state = k_fish_state_dead;
fish->death_time = -1000.0f;
|| cell_entry->config == k_cell_type_con_l || cell_entry->config == k_cell_type_con_d )
{
sw_set_achievement( "CAN_DO_THAT" );
-
+
fish->state = k_fish_state_soon_alive;
fish->dir[0] = 0;
{
struct fish *fish = &world.fishes[i];
+ // Apply movement
if( fish->state == k_fish_state_alive )
- {
v2i_add( fish->pos, fish->dir, fish->pos );
+
+ if( fish->state == k_fish_state_alive || fish->state == k_fish_state_soon_alive )
+ {
struct cell *cell_current = pcell( fish->pos );
if( cell_current->state & FLAG_IS_TRIGGER )
struct cell *target_peice = &world.data[ cell_current->links[trigger_id] ];
- cell_current->state |= FLAG_TRIGGERED;
-
- if( trigger_id )
- target_peice->state |= FLAG_FLIP_FLOP;
+ // Spawn new marble
+ if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED))
+ {
+ if( world.num_fishes < vg_list_size( world.fishes ) )
+ {
+ struct fish *fish = &world.fishes[ world.num_fishes ];
+ lcell( cell_current->links[trigger_id], fish->pos );
+
+ fish->state = k_fish_state_soon_alive;
+ fish->colour = target_peice->emit[ trigger_id ];
+
+ if( target_peice->config != k_cell_type_stub )
+ {
+ struct cell_description *desc = &cell_descriptions[ target_peice->config ];
+ v2i_copy( desc->start, fish->dir );
+ fish->flow_reversed = 1;
+
+ world.num_fishes ++;
+ alive_count ++;
+ }
+ }
+ else
+ vg_warn( "Max marbles exceeded\n" );
+ }
else
- target_peice->state &= ~FLAG_FLIP_FLOP;
+ {
+ if( trigger_id )
+ target_peice->state |= FLAG_FLIP_FLOP;
+ else
+ target_peice->state &= ~FLAG_FLIP_FLOP;
+ }
+
+ cell_current->state |= FLAG_TRIGGERED;
}
}
}
{
fj = &world.fishes[j];
- if( (fj->state == k_fish_state_alive) )
+ if( fj->state == k_fish_state_alive )
{
v2i fi_prev;
v2i fj_prev;
if( collide_next_frame || collide_this_frame )
{
sw_set_achievement( "BANG" );
-
+
// Shatter death (+0.5s)
float death_time = world.sim_internal_time + ( collide_this_frame? 0.0f: 0.5f );
if( is_input )
{
- if( world.sim_frame < term->runs[ world.sim_run ].condition_count )
+ if( world.sim_frame < term->runs[ world.sim_run ].step_count )
{
- char emit = term->runs[ world.sim_run ].conditions[ world.sim_frame ];
- if( emit == ' ' )
+ i8 emit = term->runs[ world.sim_run ].steps[ world.sim_frame ];
+ if( emit == -1 )
continue;
struct fish *fish = &world.fishes[ world.num_fishes ];
v2i_copy( term->pos, fish->pos );
fish->state = k_fish_state_alive;
- fish->payload = emit;
+ fish->colour = emit;
struct cell *cell_ptr = pcell( fish->pos );
if( cell_ptr->config != k_cell_type_stub )
- {
- struct cell_description *desc = &cell_descriptions[ cell_ptr->config ];
-
- v2i_copy( desc->start, fish->dir );
- fish->flow_reversed = 1;
-
- world.num_fishes ++;
- alive_count ++;
+ {
+ if( world.num_fishes < vg_list_size(world.fishes))
+ {
+ struct cell_description *desc = &cell_descriptions[ cell_ptr->config ];
+
+ v2i_copy( desc->start, fish->dir );
+ fish->flow_reversed = 1;
+
+ world.num_fishes ++;
+ alive_count ++;
+ }
+ else
+ vg_warn( "Max marbles exceeded\n" );
}
}
}
for( int i = 0; i < arrlen( world.io ); i ++ )
{
struct cell_terminal *term = &world.io[ i ];
- int is_input = pcell(term->pos)->state & FLAG_INPUT;
- if( !is_input )
+ if( pcell(term->pos)->state & FLAG_OUTPUT )
{
struct terminal_run *run = &term->runs[ world.sim_run ];
- if( run->recv_count == run->condition_count )
+ if( run->recv_count == run->step_count )
{
- for( int j = 0; j < run->condition_count; j ++ )
+ for( int j = 0; j < run->step_count; j ++ )
{
- if( run->recieved[j] != run->conditions[j] )
+ if( run->recieved[j] != run->steps[j] )
{
world.completed = 0;
break;
world.sim_delta_ref = vg_time;
world.sim_internal_ref = 0.0f;
- if( world.buttons[ k_world_button_pause ].pressed )
+ if( world.st.buttons[ k_world_button_pause ].state )
world.pause_offset_target = 0.5f;
else
world.pause_offset_target = 0.0f;
{
career_pass_level( world.pCmpLevel, world.score, 1 );
}
+
+ sfx_set_play( &audio_tones, &audio_system_balls_extra, 9 );
+ failure_this_frame = 0;
+ success_this_frame = 0;
}
}
else
{
if( world.sim_run > 0 )
sw_set_achievement( "GOOD_ENOUGH" );
-
+
vg_error( "Level failed :(\n" );
}
world.sim_frame ++;
}
+ // Sounds
+ if( failure_this_frame )
+ {
+ sfx_set_play( &audio_tones, &audio_system_balls_extra, 0 );
+ }
+ else if( success_this_frame )
+ {
+ static int succes_counter = 0;
+
+ sfx_set_play( &audio_tones, &audio_system_balls_extra, 1+(succes_counter++) );
+
+ if( succes_counter == 7 )
+ succes_counter = 0;
+ }
+
// Position update
// =====================================================================================================
}
}
-void leaderboard_found( LeaderboardFindResult_t *pCallback );
-void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback );
+static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4f const selected_colour )
+{
+ int selected = world.selected == pos[1]*world.w + pos[0];
+ int uv[2];
+
+ uv[0] = ptr->config & 0x3;
+ uv[1] = ptr->config >> 2;
+
+ glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ),
+ (float)pos[0],
+ (float)pos[1],
+ uv[0],
+ uv[1]
+ );
+
+ if( selected )
+ {
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
+ draw_mesh( 0, 2 );
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+ }
+ else
+ draw_mesh( 0, 2 );
+}
-static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
+// Renders specific chunk of tiles
+static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
{
v2i full_start = { 0,0 };
v2i full_end = { world.w, world.h };
start = full_start;
end = full_end;
}
-
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
for( int y = start[1]; y < end[1]; y ++ )
{
for( int x = start[0]; x < end[0]; x ++ )
{
- struct cell *cell = pcell((v2i){x,y});
- int selected = world.selected == y*world.w + 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|FLAG_INPUT|FLAG_OUTPUT) )
- {
- uv[0] = tile_offsets[ cell->config ][0];
- uv[1] = tile_offsets[ cell->config ][1];
- } else continue;
-
- glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)x, (float)y, uv[0], uv[1] );
- if( selected )
- {
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, selected_colour );
- draw_mesh( 0, 2 );
- glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
- }
- else
- draw_mesh( 0, 2 );
+ v2i pos = { x, y };
+ struct cell *cell = pcell( pos );
+
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) )
+ render_tile( pos, cell, regular_colour, selected_colour );
}
}
}
-/*
-static void draw_numbers( v3f coord, int number )
+// Renders all tiles in the command list
+static void render_tiles( v4f const regular_colour, v4f const selected_colour )
{
- v3f pos;
- v3_copy( coord, pos );
- int digits[8]; int i = 0;
-
- while( number > 0 && i < 8 )
- {
- digits[i ++] = number % 10;
- number = number / 10;
+ glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour );
+
+ struct render_list
+ {
+ struct render_cmd *arr;
+ u32 count;
}
-
- for( int j = 0; j < i; j ++ )
+ render_lists[] = {
+ { world.cmd_buf_tiles, world.tile_count },
+ { world.cmd_buf_specials, world.tile_special_count }
+ };
+
+ for( int i = 0; i < vg_list_size( render_lists ); i ++ )
{
- glUniform3fv( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), 1, pos );
- draw_mesh( MESH_NUMBERS_OFFSETS[digits[i-j-1]][0], MESH_NUMBERS_OFFSETS[digits[i-j-1]][1] );
- pos[0] += pos[2] * 0.75f;
+ struct render_list *list = &render_lists[i];
+ for( int j = 0; j < list->count; j ++ )
+ {
+ struct render_cmd *cmd = &list->arr[j];
+ struct cell *cell = cmd->ptr;
+
+ render_tile( cmd->pos, cell, regular_colour, selected_colour );
+ }
}
-}*/
+}
-static void wbutton_run( enum e_world_button btn_name )
+static int world_button_exec( struct world_button *btn, v2f texture, v3f colour, enum world_button_status *status )
{
- static v3f button_colours[] = {
- {0.204f, 0.345f, 0.553f},
- {0.204f, 0.345f, 0.553f},
- {0.741f, 0.513f, 0.078f},
- {1.0f, 0.0f, 0.0f}
- };
+ static v2i click_grab = { -9999, -9999 };
- struct cell_button *btn = &world.buttons[btn_name];
-
- // Interaction
+ // Reset click_grab
+ if( !btn )
+ {
+ click_grab[0] = -9999;
+ click_grab[1] = -9999;
+ return 0;
+ }
+
+ v2i click_tile = { world.tile_x, world.tile_y };
+
+ int triggered = 0;
+ int is_hovering = v2i_eq( click_tile, btn->position );
+
+ // Set up light targets before logic runs
+ if( btn->state )
+ btn->light_target = is_hovering? 0.9f: 0.8f;
+ else
+ btn->light_target = is_hovering? 0.2f: 0.0f;
+
+ if( vg_get_button( "primary" ) && is_hovering )
+ btn->light_target = 1.0f;
- int is_hovering = (world.tile_x == world.w-1 && world.tile_y == world.h-btn_name-2)?1:0;
- if( vg_get_button_up( "primary" ) && is_hovering )
+ // Process click action
+ if( is_hovering )
{
- // Click event
- if( btn_name == k_world_button_sim )
+ if( vg_get_button_down( "primary" ) && is_hovering )
+ v2i_copy( click_tile, click_grab );
+ else if( v2i_eq( click_grab, click_tile ) && vg_get_button_up( "primary" ) )
{
- if( world.buttons[ k_world_button_pause ].pressed )
- {
- if( !btn->pressed )
- {
- btn->pressed = 1;
- simulation_start();
-
- world.pause_offset_target = 0.5f;
- }
- else
- world.pause_offset_target += 1.0f;
- }
- else
- {
- btn->pressed ^= 0x1;
-
- if( btn->pressed )
- simulation_start();
- else
- simulation_stop();
- }
+ // Click event
+ *status = btn->state? k_world_button_on_disable: k_world_button_on_enable;
+
+ if( btn->mode == k_world_button_mode_toggle )
+ btn->state ^= 0x1;
+
+ sfx_set_play( &audio_clicks, &audio_system_ui, btn->state? 1:0 );
+ triggered = 1;
}
- else if( btn_name == k_world_button_pause )
- {
- btn->pressed ^= 0x1;
+ }
+
+ // Drawing stage
+ v4f final_colour;
+
+ btn->light = vg_lerpf( btn->light, btn->light_target + btn->extra_light, vg_time_delta*26.0f );
+
+ v3_copy( colour, final_colour );
+ final_colour[3] = btn->light;
+
+ glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ),
+ btn->position[0],
+ btn->position[1],
+ texture[0],
+ texture[1]
+ );
+ glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour );
+ draw_mesh( 0, 2 );
+
+ return triggered;
+}
+
+static void level_selection_buttons(void)
+{
+ v3f tutorial_colour = { 0.204f, 0.345f, 0.553f };
+ v3f locked_colour = { 0.2f, 0.2f, 0.2f };
+
+ struct cmp_level *switch_level_to = NULL;
+
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
+ {
+ struct career_level_pack *grid = &career_packs[i];
- world.sim_internal_ref = world.sim_internal_time;
- world.sim_delta_ref = vg_time;
-
- if( btn->pressed )
+ for( int j = 0; j < grid->count; j ++ )
+ {
+ struct cmp_level *lvl = &grid->pack[ j ];
+
+ if( world.pCmpLevel == lvl )
+ lvl->btn.extra_light = 0.35f + fabsf(sinf( vg_time * 2.0f )) * 0.05f;
+ else lvl->btn.extra_light = 0.2f;
+
+ if( lvl->completed_score )
+ lvl->btn.extra_light += 0.8f;
+
+ enum world_button_status status;
+ if( world_button_exec(
+ &lvl->btn,
+ (v2f){0.0f,0.0f},
+ lvl->unlocked? (lvl->is_tutorial? tutorial_colour: grid->primary_colour): locked_colour,
+ &status
+ ))
{
- float time_frac = world.sim_internal_time-floorf(world.sim_internal_time);
- world.pause_offset_target = 0.5f - time_frac;
+ if( status == k_world_button_on_enable && lvl->unlocked )
+ switch_level_to = lvl;
}
- else
- world.pause_offset_target = 0.0f;
}
- else
- {
- btn->pressed ^= 0x1;
- }
-
- sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 );
}
- // Drawing
- if( btn->pressed )
+ if( switch_level_to )
{
- if( is_hovering )
+ world.st.lvl_to_load = switch_level_to;
+ world.st.lvl_load_time = vg_time + 0.25f;
+ world.st.world_transition = 1.0f;
+
+ /*
+ if( console_changelevel( 1, &switch_level_to->map_name ) )
{
- btn->light_target = 0.9f;
+ world.pCmpLevel = switch_level_to;
+ gen_level_text( world.pCmpLevel );
}
- else
- {
- if( btn_name == k_world_button_sim && world.buttons[ k_world_button_pause ].pressed )
- btn->light_target = fabsf(sinf( vg_time * 2.0f )) * 0.3f + 0.3f;
- else
- btn->light_target = 0.8f;
- }
- }
- else
- {
- btn->light_target = is_hovering? 0.2f: 0.0f;
+ */
}
+}
- if( vg_get_button( "primary" ) && is_hovering )
- btn->light_target = 1.0f;
-
- btn->light = vg_lerpf( btn->light, btn->light_target, vg_time_delta*26.0f );
-
- // Draw
-
- v4f final_colour;
- v3_copy( button_colours[ btn_name ], final_colour );
- final_colour[3] = btn->light;
-
- glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ),
- world.w-1,
- world.h-btn_name-2,
- (float)btn_name,
- 3.0f
- );
- glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, final_colour );
+static void render_sprite( enum sprites_auto_combine_index id, v3f pos )
+{
+ struct vg_sprite *sp = &sprites_auto_combine[ id ];
+
+ glUniform4fv( SHADER_UNIFORM( shader_sprite, "uUv" ), 1, sp->uv_xywh );
+ glUniform3f( SHADER_UNIFORM( shader_sprite, "uPos" ), pos[0], pos[1], pos[2] * world.st.world_transition );
draw_mesh( 0, 2 );
}
int const empty_start = circle_base+32;
int const empty_count = circle_base+32*2;
+ struct world_theme *theme = &world_themes[ world_theme_id ];
+
+ if( !world.initialzed )
+ return;
+
+ // Extract render commands
+ world.tile_count = 0;
+ world.tile_special_count = 0;
+
+ for( int y = 1; y < world.h-1; y ++ )
+ {
+ for( int x = 1; x < world.w-1; x ++ )
+ {
+ struct cell *cell = pcell((v2i){x,y});
+
+ if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER|FLAG_INPUT_NICE) )
+ {
+ struct render_cmd *cmd;
+
+ if(
+ (cell->config == k_cell_type_split && (cell->state & FLAG_CANAL))
+ || (cell->state & (FLAG_EMITTER|FLAG_IS_TRIGGER))
+ )
+ cmd = &world.cmd_buf_tiles[ world.max_commands - (++ world.tile_special_count) ];
+ else
+ cmd = &world.cmd_buf_tiles[ world.tile_count ++ ];
+
+ cmd->pos[0] = x;
+ cmd->pos[1] = y;
+ cmd->ptr = cell;
+ }
+ }
+ }
+
+ world.cmd_buf_specials = &world.cmd_buf_tiles[ world.max_commands - world.tile_special_count ];
+
// BACKGROUND
// ========================================================================================================
use_mesh( &world.shapes );
glActiveTexture( GL_TEXTURE1 );
glBindTexture( GL_TEXTURE_2D, world.random_samples );
glUniform1i( SHADER_UNIFORM( shader_background, "uSamplerNoise" ), 1 );
-
+ glUniform1f( SHADER_UNIFORM( shader_background, "uVisibility" ), 1.0f ); //world.st.world_transition );
+
draw_mesh( 0, 2 );
// TILESET BACKGROUND LAYER
glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_main, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
glUniform1f( SHADER_UNIFORM( shader_tile_main, "uGhost" ), 0.0f );
glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 0.0f );
+ glUniform1f( SHADER_UNIFORM( shader_tile_main, "uVisibility" ), world.st.world_transition * 2.0f );
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
- // Bind textures
+ // rebind textures
vg_tex2d_bind( &tex_tile_data, 0 );
- glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
-
- vg_tex2d_bind( &tex_wood, 1 );
- glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
-
- render_tiles( NULL, NULL, colour_default, colour_default );
+ vg_tex2d_bind( theme->tex_tiles, 1 );
+
+ glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uShadowing" ), 1, theme->col_shadow );
+
+ render_tiles( colour_default, colour_default );
// MARBLES
// ========================================================================================================
vg_tex2d_bind( &tex_ball_noise, 0 );
glUniform1i( SHADER_UNIFORM( shader_ball, "uTexMain" ), 0 );
- if( get_wbutton( k_world_button_sim )->pressed )
+ if( world.st.buttons[ k_world_button_sim ].state )
{
for( int i = 0; i < world.num_fishes; i ++ )
{
v2_copy( fish->physics_co, render_pos );
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
- colour_code_v3( fish->payload, dot_colour );
+ colour_code_v3( fish->colour, dot_colour );
glUniform3fv( SHADER_UNIFORM( shader_ball, "uColour" ), 1, dot_colour );
glUniform3fv( SHADER_UNIFORM( shader_ball, "uOffset" ), 1, render_pos );
vg_tex2d_bind( &tex_tile_data, 0 );
glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 );
- vg_tex2d_bind( &tex_wood, 1 );
+ // TODO: is this needed to be rebinded?
+ vg_tex2d_bind( theme->tex_tiles, 1 );
glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 );
glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 1.0f );
- render_tiles( NULL, NULL, colour_default, colour_selected );
+ render_tiles( colour_default, colour_selected );
// Draw splitters
- for( int y = 2; y < world.h-2; y ++ )
+ for( int i = 0; i < world.tile_special_count; i ++ )
{
- for( int x = 2; x < world.w-2; x ++ )
- {
- struct cell *cell = pcell((v2i){x,y});
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
- if( cell->state & FLAG_CANAL )
+ if( cell->config == k_cell_type_split )
+ {
+ float rotation = cell->state & FLAG_FLIP_FLOP? vg_rad( -45.0f ): vg_rad( 45.0f );
+
+ if( cell->state & FLAG_FLIP_ROTATING )
{
- 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 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;
- }
+ 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;
}
-
- 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,
- cell->state & FLAG_TARGETED? 3.0f: 0.0f,
- 0.0f
- );
- draw_mesh( 0, 2 );
+ else
+ rotation *= -1.0f;
}
}
+
+ 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)cmd->pos[0],
+ (float)cmd->pos[1] + 0.125f,
+ cell->state & FLAG_TARGETED? 3.0f: 2.0f,
+ 3.0f
+ );
+ draw_mesh( 0, 2 );
}
}
glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform );
glUniform2fv( SHADER_UNIFORM( shader_tile_main, "uMousePos" ), 1, world.tile_pos );
- render_tiles( new_begin, new_end, colour_default, colour_default );
+ render_tile_block( new_begin, new_end, colour_default, colour_default );
world.data[ world.selected ].state ^= FLAG_CANAL;
map_reclassify( new_begin, new_end, 0 );
vg_tex2d_bind( &tex_buttons, 0 );
glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 );
- wbutton_run( k_world_button_sim );
- wbutton_run( k_world_button_pause );
- //wbutton_run( k_world_button_wire_mode );
-
- // WIRES
- // ========================================================================================================
- //glDisable(GL_BLEND);
+ enum world_button_status stat;
+ int world_paused = world.st.buttons[k_world_button_pause].state;
+ int world_running = world.st.buttons[k_world_button_sim].state;
- SHADER_USE( shader_wire );
- glBindVertexArray( world.wire.vao );
+ float sim_icon_x = world_paused? 3.0f: (world_running? 2.0f: 0.0f);
- glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
-
- v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f };
- v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f };
- v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f };
-
- glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f );
-
- if( world.id_drag_from )
- {
- glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f );
- glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
- }
-
- // Pulling animation
- float rp_x1 = world.frame_lerp*9.0f;
- float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f;
- float rp_x2 = 1.0f-rp_xa;
-
- for( int y = 2; y < world.h-2; y ++ )
+ v3f btn_dark_blue = { 0.204f, 0.345f, 0.553f };
+ v3f btn_orange = { 0.553f, 0.345f, 0.204f };
+
+ if( world_button_exec( &world.st.buttons[k_world_button_sim], (v2f){ sim_icon_x, 3.0f }, btn_dark_blue, &stat ))
{
- for( int x = 2; x < world.w-2; x ++ )
+ if( stat == k_world_button_on_enable )
{
- struct cell *cell = pcell((v2i){x,y});
+ simulation_start();
- if( cell->state & FLAG_CANAL )
+ if( world_paused )
+ world.pause_offset_target = 0.5f;
+ }
+ else
+ {
+ if( world_paused )
{
- if( cell->state & FLAG_IS_TRIGGER )
- {
- struct cell_description *desc = &cell_descriptions[ cell->config ];
-
- 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 startpoint;
- v2f endpoint;
-
- startpoint[0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
- startpoint[1] = (float)y2 + 0.25f;
-
- endpoint[0] = x;
- endpoint[1] = y;
-
- v2_add( desc->trigger_pos, endpoint, endpoint );
-
- glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, trigger_id? wire_right_colour: wire_left_colour );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
- glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), startpoint[0], startpoint[1], 0.18f );
- glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), endpoint[0], endpoint[1], 0.18f );
- glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
- }
+ // Trigger single step
+ world.pause_offset_target += 1.0f;
+ world.st.buttons[k_world_button_sim].state = 1;
+ }
+ else
+ {
+ simulation_stop();
}
}
}
- // WIRE ENDPOINTS
- // ========================================================================================================
-
- SHADER_USE( shader_tile_colour );
- glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
- use_mesh( &world.shapes );
-
- for( int y = 2; y < world.h-2; y ++ )
+ if( world_button_exec( &world.st.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat ))
{
- for( int x = 2; x < world.w-2; x ++ )
- {
- struct cell *cell = pcell((v2i){x,y});
+ world.sim_internal_ref = world.sim_internal_time;
+ world.sim_delta_ref = vg_time;
- if( cell->state & FLAG_CANAL )
- {
- if( cell->state & FLAG_IS_TRIGGER )
- {
- struct cell_description *desc = &cell_descriptions[ cell->config ];
-
- 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 pts[2];
-
- pts[0][0] = (float)x2 + (trigger_id? 0.75f: 0.25f);
- pts[0][1] = (float)y2 + 0.25f;
-
- pts[1][0] = x;
- pts[1][1] = y;
-
- v2_add( desc->trigger_pos, pts[1], pts[1] );
-
- glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ),
- 1, trigger_id? wire_right_colour: wire_left_colour );
-
- for( int i = 0; i < 2; i ++ )
- {
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
- pts[i][0],
- pts[i][1],
- 0.08f
- );
- draw_mesh( filled_start, filled_count );
- }
- }
- }
+ if( stat == k_world_button_on_enable )
+ {
+ float time_frac = world.sim_internal_time-floorf(world.sim_internal_time);
+ world.pause_offset_target = 0.5f - time_frac;
}
+ else
+ world.pause_offset_target = 0.0f;
}
-
- // SUB SPLITTER DIRECTION
- // ========================================================================================================
-
- glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f );
-
- for( int y = 2; y < world.h-2; y ++ )
+
+ if( world_button_exec( &world.st.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat ))
{
- for( int x = 2; x < world.w-2; x ++ )
+ world.sim_delta_speed = stat == k_world_button_on_enable? 10.0f: 2.5f;
+
+ if( !world_paused )
{
- struct cell *cell = pcell((v2i){x,y});
-
- if( cell->state & FLAG_CANAL && cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
- {
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), x, y, 1.0f );
- draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
- }
+ world.sim_delta_ref = vg_time;
+ world.sim_internal_ref = world.sim_internal_time;
}
}
+
+ if( world_button_exec( &world.st.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat ))
+ {
+ world.st.state = stat == k_world_button_on_enable? k_game_state_settings: k_game_state_main;
+ }
+
+ level_selection_buttons();
+
+ if( vg_get_button_up( "primary" ) )
+ world_button_exec( NULL, NULL, NULL, NULL );
// I/O ARRAYS
// ========================================================================================================
//glEnable(GL_BLEND);
-
+ SHADER_USE( shader_tile_colour );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_tile_colour, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
for( int i = 0; i < arrlen( world.io ); i ++ )
{
struct cell_terminal *term = &world.io[ i ];
- int is_input = pcell(term->pos)->state & FLAG_INPUT;
+ struct cell *cell = pcell(term->pos);
+ int is_input = cell->state & FLAG_INPUT;
v4f dot_colour = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+ if( cell->state & FLAG_EMITTER )
+ {
+ for( int j = 0; j < 2; j ++ )
+ {
+ if( cell->emit[j] != -1 )
+ {
+ colour_code_v3( cell->emit[j], dot_colour );
+
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ term->pos[0] + 0.25f + (float)j * 0.5f,
+ term->pos[1] + 0.25f,
+ 0.12f
+ );
+
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
+ draw_mesh( filled_start, filled_count );
+ }
+ }
+ continue;
+ }
for( int k = 0; k < term->run_count; k ++ )
{
if( bar_draw )
{
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, bar_colour );
- glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), (float)term->pos[0], y_position - 0.1f, 1.0f );
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ (float)term->pos[0], y_position - 0.1f, 1.0f );
+
draw_mesh( 2, 2 );
}
- for( int j = 0; j < term->runs[k].condition_count; j ++ )
+ for( int j = 0; j < term->runs[k].step_count; j ++ )
{
glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
(float)term->pos[0] + 0.2f + 0.2f * (float)j,
if( is_input )
{
- char cc = term->runs[k].conditions[j];
- if( cc != ' ' )
+ i8 colour = term->runs[k].steps[j];
+ if( colour != -1 )
{
- colour_code_v3( cc, dot_colour );
+ colour_code_v3( colour, dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
// Draw filled if tick not passed, draw empty if empty
draw_mesh( filled_start, filled_count );
}
- colour_code_v3( term->runs[k].conditions[j], dot_colour );
+ colour_code_v3( term->runs[k].steps[j], dot_colour );
glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, dot_colour );
draw_mesh( empty_start, empty_count );
}
}
}
+
+ // SPRITES
+ // ========================================================================================================
+ SHADER_USE( shader_sprite );
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_sprite, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
+
+ vg_tex2d_bind( &tex_sprites, 0 );
+ glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
- glDisable(GL_BLEND);
-
- // Draw score
- /*
- float const score_bright = 1.25f;
- glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ),
- 0.4f*score_bright, 0.39f*score_bright, 0.45f*score_bright, 1.0f );
-
- use_mesh( &world.numbers );
- draw_numbers( (v3f){ 2.0f, (float)world.h-1.875f, 0.3333f }, world.score );
- */
-}
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
-static ui_colourset flcol_list_a = {
- .main = 0xff877979,
- .hover = 0xffa09393,
- .active = 0xffbfb1b0
-};
-static ui_colourset flcol_list_b = {
- .main = 0xff7c6e6e,
- .hover = 0xffa09393,
- .active = 0xffbfb1b0
-};
+ if( (cell->config == k_cell_type_split) || (cell->state & FLAG_EMITTER) )
+ {
+ v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
-static ui_colourset flcol_list_complete_a = {
- .main = 0xff62a064,
- .hover = 0xff8dc18f,
- .active = 0xffb2ddb3
-};
+ v3f p0 = { 0.0f, 0.0f, 4.0f };
+ v3f p1 = { 0.0f, 0.0f, 4.0f };
-static ui_colourset flcol_list_complete_b = {
- .main = 0xff79b37b,
- .hover = 0xff8dc18f,
- .active = 0xffb2ddb3
-};
+ v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+ v2_add( center, (v2f){ 0.25f, -0.25f }, p1 );
-static ui_colourset flcol_list_locked = {
- .main = 0xff655959,
- .hover = 0xff655959,
- .active = 0xff655959
-};
+ render_sprite( k_sprite_jack_1, p0 );
+ render_sprite( k_sprite_jack_2, p1 );
+ }
+ else if( cell->state & FLAG_IS_TRIGGER )
+ {
+ v3f p0 = { 0.0f, 0.0f, 4.0f };
+
+ struct cell_description *desc = &cell_descriptions[ cell->config ];
+
+ v2_add( (v2f){ cmd->pos[0], cmd->pos[1] }, desc->trigger_pos, p0 );
+ render_sprite( desc->trigger_sprite, p0 );
+ }
+ }
-static struct
-{
- SteamLeaderboard_t steam_leaderboard;
- int leaderboard_show;
+ // TEXT ELEMENTS
+ // ========================================================================================================
+ // Old style
+ m3x3f mvp_text;
+ m3x3_identity( mvp_text );
+ m3x3_scale( mvp_text, (v3f){
+ 1.0f/ ((float)UI_GLYPH_SPACING_X*4.0f),
+ 1.0f/ -((float)UI_GLYPH_SPACING_X*4.0f),
+ 1.0f
+ });
+
+ m3x3_mul( vg_pv, mvp_text, mvp_text );
+ ui_draw( &world.st.world_text, mvp_text );
+
+ // WIRES
+ // ========================================================================================================
+ glEnable(GL_BLEND);
+
+ SHADER_USE( shader_wire );
+ glBindVertexArray( world.wire.vao );
+
+ glUniformMatrix3fv( SHADER_UNIFORM( shader_wire, "uPv" ), 1, GL_FALSE, (float *)vg_pv );
- struct leaderboard_player
- {
- // Internal
- u64_steamid id;
- i32 score;
- int is_local_player;
-
- // To be displayed
- char score_text[ 16 ];
- char player_name[ 48 ];
- GLuint texture; // Not dynamic
- }
- leaderboard_players[10];
- int leaderboard_count;
+ v4f const wire_left_colour = { 0.5f, 0.5f, 0.5f, 1.0f };
+ v4f const wire_right_colour = { 0.2f, 0.2f, 0.2f, 1.0f };
+ v4f const wire_drag_colour = { 0.2f, 0.2f, 0.2f, 0.6f };
- struct
- {
- struct cmp_level *level;
-
- i32 score;
- int is_waiting;
- }
- upload_request;
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f );
- struct cmp_level *level_selected;
-}
-ui_data;
-
-void vg_ui(void)
-{
- // UI memory
- static int pack_selection = 0;
- static struct pack_info
+ if( world.id_drag_from )
{
- struct cmp_level *levels;
- u32 level_count;
- const char *name;
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_drag_colour );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), 0.4f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), world.drag_from_co[0], world.drag_from_co[1], 0.20f*world.st.world_transition );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), world.drag_to_co[0], world.drag_to_co[1], 0.20f*world.st.world_transition );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
}
- pack_infos[] =
+
+ // Pulling animation
+ float rp_x1 = world.frame_lerp*9.0f;
+ float rp_xa = rp_x1*expf(1.0f-rp_x1)* 0.36f;
+ float rp_x2 = 1.0f-rp_xa;
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
{
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED )
{
- .levels = cmp_levels_tutorials,
- .level_count = vg_list_size(cmp_levels_tutorials),
- .name = "Training"
- },
- {
- .levels = cmp_levels_basic,
- .level_count = vg_list_size(cmp_levels_basic),
- .name = "Main"
- },
- {
- .levels = cmp_levels_grad,
- .level_count = vg_list_size(cmp_levels_tutorials),
- .name = "Expert"
+ for( int j = 0; j < 2; j ++ )
+ {
+ if( !cell->links[j] )
+ continue;
+
+ struct cell *other_cell = &world.data[ cell->links[ j ]];
+ struct cell_description *desc = &cell_descriptions[ other_cell->config ];
+
+ int x2 = cell->links[j] % world.w;
+ int y2 = (cell->links[j] - x2) / world.w;
+
+ v2f startpoint;
+ v2f endpoint;
+
+ endpoint[0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+ endpoint[1] = (float)cmd->pos[1] + 0.25f;
+
+ startpoint[0] = x2;
+ startpoint[1] = y2;
+
+ v2_add( desc->trigger_pos, startpoint, startpoint );
+
+ if( cmd->ptr->state & FLAG_EMITTER )
+ {
+ v4f wire_colour;
+ colour_code_v3( cmd->ptr->emit[j], wire_colour );
+ wire_colour[3] = 1.0f;
+
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, wire_colour );
+ }
+ else
+ glUniform4fv( SHADER_UNIFORM( shader_wire, "uColour" ), 1, j? wire_right_colour: wire_left_colour );
+
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uCurve" ), other_cell->state & FLAG_TRIGGERED? rp_x2 * 0.4f: 0.4f );
+ glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), other_cell->state & FLAG_TRIGGERED? rp_xa: 0.0f );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uEnd" ), startpoint[0], startpoint[1], 0.18f*world.st.world_transition );
+ glUniform3f( SHADER_UNIFORM( shader_wire, "uStart" ), endpoint[0], endpoint[1], 0.18f*world.st.world_transition );
+ glDrawElements( GL_TRIANGLES, world.wire.em, GL_UNSIGNED_SHORT, (void*)(0) );
+ }
}
- };
+ }
- // UI Code
- ui_global_ctx.cursor[0] = 0;
- ui_global_ctx.cursor[1] = 0;
- ui_global_ctx.cursor[2] = 256;
-
- gui_fill_y();
+ // WIRE ENDPOINTS
+ // ========================================================================================================
- ui_global_ctx.id_base = 4 << 16;
+ SHADER_USE( shader_tile_colour );
+ use_mesh( &world.shapes );
- gui_new_node();
+ for( int i = 0; i < world.tile_special_count; i ++ )
{
- gui_capture_mouse( 9999 );
- gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-
- gui_text( "ASSIGNMENTS", 8, 0 );
-
- ui_global_ctx.cursor[1] += 30;
- ui_global_ctx.cursor[3] = 25;
-
- gui_new_node();
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED )
{
- ui_rect_pad( ui_global_ctx.cursor, 2 );
- ui_global_ctx.cursor[2] = 84;
-
- for( int i = 0; i < 3; i ++ )
+ for( int j = 0; j < 2; j ++ )
{
- int pack_is_unlocked = pack_infos[i].levels[0].unlocked;
-
- if( i == pack_selection || !pack_is_unlocked )
- gui_override_colours( &flcol_list_locked );
+ if( !cell->links[j] )
+ continue;
+
+ struct cell *other_cell = &world.data[ cell->links[ j ]];
+ struct cell_description *desc = &cell_descriptions[ other_cell->config ];
- if( gui_button( 2000 + i ) == k_button_click && pack_is_unlocked )
- pack_selection = i;
+ int x2 = cell->links[j] % world.w;
+ int y2 = (cell->links[j] - x2) / world.w;
- ui_global_ctx.cursor[1] += 2;
- gui_text( pack_is_unlocked? pack_infos[i].name: "???", 4, 0 );
- gui_end_right();
+ v2f pts[2];
- gui_reset_colours();
- }
- }
- gui_end_down();
-
- ui_global_ctx.cursor[3] = 500;
-
- // DRAW LEVEL SELECTION LIST
- {
- struct cmp_level *levels = pack_infos[ pack_selection ].levels;
- int count = pack_infos[ pack_selection ].level_count;
-
- static struct ui_scrollbar sb = {
- .bar_height = 400
- };
-
- ui_px view_height = ui_global_ctx.cursor[3];
- ui_px level_height = 50;
-
- // Level scroll view
- gui_new_node();
- {
- gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
- gui_set_clip( ui_global_ctx.cursor );
+ pts[0][0] = (float)cmd->pos[0] + (j? 0.75f: 0.25f);
+ pts[0][1] = (float)cmd->pos[1] + 0.25f;
+
+ pts[1][0] = x2;
+ pts[1][1] = y2;
- ui_global_ctx.cursor[2] = 14;
- gui_align_right();
+ v2_add( desc->trigger_pos, pts[1], pts[1] );
- ui_px content_height = count*level_height;
- if( content_height > view_height )
+ if( cell->state & FLAG_EMITTER )
{
- ui_scrollbar( &ui_global_ctx, &sb, 1 );
- ui_global_ctx.cursor[1] -= ui_calculate_content_scroll( &sb, content_height );
+ v4f wire_colour;
+ colour_code_v3( cell->emit[j], wire_colour );
+
+ v3_muls( wire_colour, 0.8f, wire_colour );
+ wire_colour[3] = 1.0f;
+
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1, wire_colour );
}
else
- {
- gui_fill_rect( ui_global_ctx.cursor, 0xff807373 );
- }
+ glUniform4fv( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 1,j?wire_right_colour: wire_left_colour );
- ui_global_ctx.cursor[2] = 240;
- ui_global_ctx.cursor[3] = level_height;
- gui_align_left();
-
- for( int i = 0; i < count; i ++ )
+ for( int i = 0; i < 2; i ++ )
{
- struct cmp_level *lvl_info = &levels[i];
-
- if( lvl_info->unlocked )
- {
- if( lvl_info->completed_score != 0 )
- gui_override_colours( i&0x1? &flcol_list_complete_a: &flcol_list_complete_b );
- else
- gui_override_colours( i&0x1? &flcol_list_a: &flcol_list_b );
- }
- else
- gui_override_colours( &flcol_list_locked );
-
- if( lvl_info->unlocked )
- {
- if( gui_button( 2 + i ) == k_button_click )
- {
- ui_data.level_selected = &levels[i];
- ui_data.leaderboard_show = 0;
-
- if( pack_selection >= 1 )
- sw_find_leaderboard( ui_data.level_selected->map_name );
- }
-
- ui_global_ctx.override_colour = 0xffffffff;
- gui_text( lvl_info->title, 6, 0 );
- ui_global_ctx.cursor[1] += 18;
- gui_text( lvl_info->completed_score>0? "passed": "incomplete", 4, 0 );
- }
- else
- {
- gui_button( 2 + i );
-
- ui_global_ctx.override_colour = 0xff786f6f;
- gui_text( "???", 6, 0 );
- ui_global_ctx.cursor[1] += 18;
- gui_text( "locked", 4, 0 );
- }
-
- gui_end_down();
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ),
+ pts[i][0],
+ pts[i][1],
+ 0.08f * world.st.world_transition
+ );
+ draw_mesh( filled_start, filled_count );
}
-
- gui_reset_colours();
- gui_release_clip();
}
- gui_end_down();
}
}
- gui_end_right();
+
+ // SUB SPLITTER DIRECTION
+ // ========================================================================================================
+
+ /*
+ glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ), 0.9f, 0.35f, 0.1f, 0.75f );
+
+ for( int i = 0; i < world.tile_special_count; i ++ )
+ {
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->state & FLAG_TARGETED && cell->config == k_cell_type_split )
+ {
+ glUniform3f( SHADER_UNIFORM( shader_tile_colour, "uOffset" ), cmd->pos[0], cmd->pos[1], 1.0f );
+ draw_mesh( cell->state & FLAG_FLIP_FLOP? 5: 4, 1 );
+ }
+ }
+ */
+
+ // LIGHT FLARES
+ // ========================================================================================================
+ glBlendFunc(GL_ONE, GL_ONE);
+ glBlendEquation(GL_FUNC_ADD);
- // Selected level UI
- // ============================================================
+ SHADER_USE( shader_sprite );
+
+ vg_tex2d_bind( &tex_sprites, 0 );
+ glUniform1i( SHADER_UNIFORM( shader_sprite, "uTexMain" ), 0 );
- if( ui_data.level_selected )
+ for( int i = 0; i < world.tile_special_count; i ++ )
{
- ui_global_ctx.cursor[0] += 16;
- ui_global_ctx.cursor[1] += 16;
- ui_global_ctx.cursor[2] = 512-40;
- ui_global_ctx.cursor[3] = 560-16;
+ struct render_cmd *cmd = &world.cmd_buf_specials[i];
+ struct cell *cell = cmd->ptr;
+
+ if( cell->config == k_cell_type_split )
+ {
+ v2f center = { cmd->pos[0] + 0.5f, cmd->pos[1] + 0.5f };
+
+ v3f p0 = { 0.0f, 0.0f, 12.0f };
+ v3f p1 = { 0.0f, 0.0f, 12.0f };
+
+ v2_add( center, (v2f){ -0.25f, -0.25f }, p0 );
+ v2_add( center, (v2f){ 0.25f, -0.25f }, p1 );
+
+ if( cell->state & FLAG_TARGETED )
+ {
+ if( cell->state & FLAG_FLIP_FLOP )
+ render_sprite( k_sprite_flare_y, p1 );
+ else
+ render_sprite( k_sprite_flare_b, p0 );
+ }
+ else
+ render_sprite( k_sprite_flare_w, cell->state &FLAG_FLIP_FLOP? p1: p0 );
+ }
+ }
+
+ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ glBlendEquation(GL_FUNC_ADD);
+
+
+ glDisable(GL_BLEND);
+
+ // Draw score
+ /*
+ float const score_bright = 1.25f;
+ glUniform4f( SHADER_UNIFORM( shader_tile_colour, "uColour" ),
+ 0.4f*score_bright, 0.39f*score_bright, 0.45f*score_bright, 1.0f );
+ use_mesh( &world.numbers );
+ draw_numbers( (v3f){ 2.0f, (float)world.h-1.875f, 0.3333f }, world.score );
+ */
+}
+
+void vg_ui(void)
+{
+ // Drawing world name
+ if( world.pCmpLevel )
+ {
+ gui_text( (ui_px [2]){ vg_window_x / 2, 4 }, world.pCmpLevel->title, 2, k_text_align_center );
+ gui_text( (ui_px [2]){ vg_window_x / 2, 28 }, world.pCmpLevel->description, 1, k_text_align_center );
+ }
+
+ if( world.st.state == k_game_state_update )
+ {
+ gui_group_id( 34 );
+
+ ui_global_ctx.cursor[2] = 458;
+ ui_global_ctx.cursor[3] = 316;
+ ui_global_ctx.cursor[0] = vg_window_x / 2 - 229;
+ ui_global_ctx.cursor[1] = vg_window_y / 2 - 158;
+
+ gui_new_node();
+ {
+ gui_capture_mouse( 200 );
+ gui_fill_rect( ui_global_ctx.cursor, 0xE8303030 );
+
+ ui_px title_pos[2];
+ title_pos[0] = ui_global_ctx.cursor[0] + 229;
+ title_pos[1] = ui_global_ctx.cursor[1] + 16;
+
+ gui_text( title_pos, "Update 1.5", 2, k_text_align_center );
+
+ gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 16, title_pos[1] + 45 },
+ "Welcome to the first update to marble computing!"
+ "\n"
+ "New features have been added:\n"
+ "\n"
+ " - Settings menu\n"
+ " - Map skins\n"
+ " - More levels and a new block type\n"
+ " - Scores for each level\n"
+ " - Zooming and panning (mousewheel)\n"
+ "\n"
+ "There is much more in the works, such as a\n"
+ "soundtrack, and the rest of the levels for the\n"
+ "3 bit computer!\n"
+ "\n"
+ "Thank you everyone for enjoying my game :)\n",
+ 1, k_text_align_left
+ );
+
+ ui_global_ctx.cursor[2] = 100;
+ ui_global_ctx.cursor[3] = 30;
+ ui_global_ctx.cursor[0] += 229 - 50;
+ ui_global_ctx.cursor[1] += 316 - 30 - 16;
+
+ if( gui_button( 1 ) )
+ {
+ world.st.state = k_game_state_main;
+ }
+ gui_text( (ui_px [2]){ ui_global_ctx.cursor[0] + 50,
+ ui_global_ctx.cursor[1] + 4 }, "OK", 1, k_text_align_center );
+ gui_end();
+ }
+ gui_end();
+ }
+ else if( world.st.state == k_game_state_settings )
+ {
+ gui_group_id( 35 );
+
+ ui_global_ctx.cursor[2] = 225;
+ gui_fill_y();
+ gui_align_right();
+
gui_new_node();
{
- gui_capture_mouse( 9999 );
-
- gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
- ui_global_ctx.cursor[1] += 4;
- gui_text( ui_data.level_selected->title, 6, 0 );
-
- ui_global_ctx.cursor[1] += 30;
+ gui_capture_mouse( 200 );
+
+ gui_fill_rect( ui_global_ctx.cursor, 0xC0202020 );
ui_rect_pad( ui_global_ctx.cursor, 8 );
- ui_global_ctx.cursor[3] = 300;
-
- gui_new_node();
- {
- gui_fill_rect( ui_global_ctx.cursor, 0xff655959 );
- }
- gui_end_down();
-
- ui_text_use_paragraph( &ui_global_ctx );
- ui_global_ctx.cursor[1] += 2;
- gui_text( ui_data.level_selected->description, 5, 0 );
- ui_text_use_title( &ui_global_ctx );
-
- // Buttons at the bottom
ui_global_ctx.cursor[3] = 25;
- ui_global_ctx.cursor[2] = 80;
-
- gui_align_bottom();
- ui_global_ctx.cursor[1] -= 8;
- if( gui_button( 3000 ) == k_button_click )
+ gui_new_node();
{
- ui_data.level_selected = NULL;
+ gui_text( ui_global_ctx.cursor, "SETTINGS", 2, 0 );
}
- gui_text( "BACK", 6, k_text_alignment_center );
gui_end();
-
- gui_align_right();
- ui_global_ctx.cursor[2] = 170;
- ui_global_ctx.cursor[0] -= 8 + 170 + 2;
-
- {
- gui_override_colours( &flcol_list_locked );
- if( gui_button( 3001 ) == k_button_click )
- vg_error( "UNIMPLEMENTED\n" );
-
- ui_global_ctx.override_colour = 0xff888888;
-
- gui_text( "RESTORE SOLUTION", 6, k_text_alignment_center );
- gui_end_right();
- ui_global_ctx.override_colour = 0xffffffff;
- }
-
- ui_global_ctx.cursor[0] += 2;
- ui_global_ctx.cursor[2] = 80;
-
+
+ // Colour scheme selection
+ ui_global_ctx.cursor[1] += 30;
+
+ gui_text( ui_global_ctx.cursor, "Colour Scheme", 1, 0 );
+ ui_global_ctx.cursor[1] += 25;
+
+ gui_new_node();
{
- gui_override_colours( &flcol_list_complete_a );
- if( gui_button( 3002 ) == k_button_click )
+ ui_global_ctx.cursor[2] = 50;
+
+ for( int i = 0; i < 4; i ++ )
{
- if( console_changelevel( 1, &ui_data.level_selected->map_name ) )
+ gui_new_node();
{
- world.pCmpLevel = ui_data.level_selected;
+ // Convert to RGB
+ u32 rgb = 0xff000000;
- ui_data.level_selected = NULL;
- ui_data.leaderboard_show = 0;
+ for( int j = 0; j < 3; j ++ )
+ rgb |= (u32)(colour_sets[ colour_set_id ][i][j]*255.0f) << j * 8;
+
+ gui_fill_rect( ui_global_ctx.cursor, rgb );
}
+ gui_end_right();
}
- gui_text( "PLAY", 6, k_text_alignment_center );
- gui_end();
}
+ gui_end_down();
- gui_reset_colours();
- }
- gui_end_right();
-
- if( ui_data.leaderboard_show )
- {
- ui_global_ctx.cursor[0] += 16;
- ui_global_ctx.cursor[2] = 350;
- ui_global_ctx.cursor[3] = 25;
-
- // If has results
gui_new_node();
{
- gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
- gui_text( "FRIEND LEADERBOARD", 6, 0 );
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 0 ) == k_button_click )
+ {
+ if( colour_set_id > 0 )
+ colour_set_id --;
+ }
+ gui_text( ui_global_ctx.cursor, "<", 2, 0 );
+ gui_end_right();
+
+ ui_global_ctx.cursor[2] = 150;
+ gui_new_node();
+ {
+ gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff );
+ gui_text(
+ (ui_px [2]){ ui_global_ctx.cursor[0] + 75, ui_global_ctx.cursor[1] + 6 },
+ (const char *[]){ "Normal", "Extra1", "Extra2" }[ colour_set_id ],
+ 1, k_text_align_center
+ );
+ }
+ gui_end_right();
+
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 1 ) == k_button_click )
+ {
+ if( colour_set_id < vg_list_size( colour_sets )-1 )
+ colour_set_id ++;
+ }
+ gui_text( ui_global_ctx.cursor, ">", 2, 0 );
+ gui_end_down();
}
gui_end_down();
-
- ui_global_ctx.cursor[1] += 2;
-
+
+ // Theme select
+ // TODO: remove code dupe
+ ui_global_ctx.cursor[1] += 16;
+
+ gui_text( ui_global_ctx.cursor, "Tile Theme", 1, 0 );
+ ui_global_ctx.cursor[1] += 20;
+
gui_new_node();
{
- ui_global_ctx.cursor[3] = 32+8;
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 0 ) == k_button_click )
+ {
+ if( world_theme_id > 0 )
+ world_theme_id --;
+ }
+ gui_text( ui_global_ctx.cursor, "<", 2, 0 );
+ gui_end_right();
- for( int i = 0; i < ui_data.leaderboard_count; i ++ )
+ ui_global_ctx.cursor[2] = 150;
+ gui_new_node();
{
- gui_new_node();
- {
- gui_fill_rect( ui_global_ctx.cursor, i&0x1? flcol_list_a.main: flcol_list_b.main );
+ gui_fill_rect( ui_global_ctx.cursor, 0x33ffffff );
+ gui_text(
+ (ui_px [2]){ ui_global_ctx.cursor[0] + 75, ui_global_ctx.cursor[1] + 6 },
+ world_themes[ world_theme_id ].name, 1, k_text_align_center
+ );
+ }
+ gui_end_right();
- ui_global_ctx.cursor[0] += 4;
- ui_global_ctx.cursor[1] += 4;
-
- // 1,2,3 ...
- static const char *places[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" };
- gui_text( places[i], 7, 0 );
- ui_global_ctx.cursor[0] += 32;
-
- struct leaderboard_player *player = &ui_data.leaderboard_players[i];
-
- // Players image
- ui_global_ctx.cursor[2] = 32;
- ui_global_ctx.cursor[3] = 32;
-
- gui_new_node();
- {
- gui_push_image( ui_global_ctx.cursor, player->texture );
- }
- gui_end_right();
-
- // Players name
- gui_text( player->player_name, 7, 0 );
-
- ui_global_ctx.cursor[2] = 50;
- gui_align_right();
-
- gui_text( player->score_text, 7, k_text_alignment_right );
- }
- gui_end_down();
-
- ui_global_ctx.cursor[1] += 2;
+ ui_global_ctx.cursor[2] = 25;
+ if( gui_button( 1 ) == k_button_click )
+ {
+ if( world_theme_id < vg_list_size( world_themes )-1 )
+ world_theme_id ++;
}
+ gui_text( ui_global_ctx.cursor, ">", 2, 0 );
+ gui_end_down();
}
- gui_end();
+ gui_end_down();
}
+ gui_end();
}
}
+#if STEAM_LEADERBOARDS
void leaderboard_dispatch_score(void)
{
+
sw_upload_leaderboard_score(
ui_data.upload_request.level->steam_leaderboard,
k_ELeaderboardUploadScoreMethodKeepBest,
else
sw_find_leaderboard( cmp_level->map_name );
}
+#endif
// CONSOLE COMMANDS
// ===========================================================================================================
{
// Save current level
console_save_map( 0, NULL );
+
if( console_load_map( argc, argv ) )
{
+ world.st.zoom = 0.0f;
simulation_stop();
return 1;
}
void vg_start(void)
{
// Steamworks callbacks
+ #ifdef STEAM_LEADERBOARDS
sw_leaderboard_found = &leaderboard_found;
sw_leaderboard_downloaded = &leaderboard_downloaded;
+ #endif
vg_function_push( (struct vg_cmd){
.name = "_map_write",
.function = console_credits
});
+ vg_convar_push( (struct vg_convar){
+ .name = "colours",
+ .data = &colour_set_id,
+ .data_type = k_convar_dtype_i32,
+ .opt_i32 = { .min = 0, .max = 2, .clamp = 1 },
+ .persistent = 1
+ });
+
+ vg_convar_push( (struct vg_convar){
+ .name = "theme",
+ .data = &world_theme_id,
+ .data_type = k_convar_dtype_i32,
+ .opt_i32 = { .min = 0, .max = vg_list_size( world_themes )-1, .clamp = 1 },
+ .persistent = 1,
+ });
+
// Combined quad, long quad / empty circle / filled circle mesh
{
float combined_mesh[6*6 + 32*6*3] = {
init_mesh( &world.shapes, combined_mesh, vg_list_size( combined_mesh ) );
}
- // Numbers mesh
- {
- init_mesh( &world.numbers,
- MESH_NUMBERS_BUFFER,
- vg_list_size( MESH_NUMBERS_BUFFER )
- );
-
- for( int i = 0; i < 10; i ++ )
- {
- vg_info( "offset: %u, length: %u\n", MESH_NUMBERS_OFFSETS[i][0], MESH_NUMBERS_OFFSETS[i][1] );
- }
- }
-
// Create wire mesh
{
int const num_segments = 64;
}
resource_load_main();
-
+
+ // Init world text
+ {
+ ui_init_context( &world.st.world_text, 15000 );
+ }
+
// Restore gamestate
career_local_data_init();
career_load();
void vg_free(void)
{
- sw_free_opengl();
console_save_map( 0, NULL );
career_serialize();
glDeleteBuffers( 1, &world.wire.ebo );
free_mesh( &world.shapes );
- free_mesh( &world.numbers );
+ ui_context_free( &world.st.world_text );
+
map_free();
}
projects / fishladder.git / blobdiff