X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=blobdiff_plain;f=fishladder.c;h=61226b0b440ade2aa535068faa2ca48c97ae2e1d;hp=11d65b0b5c1dae488b02073d1d414cdb0e9c22d6;hb=HEAD;hpb=bf818249690c5ae1a1e4634714dd2e722fa35632 diff --git a/fishladder.c b/fishladder.c index 11d65b0..61226b0 100644 --- a/fishladder.c +++ b/fishladder.c @@ -1,8 +1,12 @@ -// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved +/* Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved */ -//#define VG_CAPTURE_MODE -//#define VG_STEAM +#define MARBLE_COMP_VERSION 4 +#if 0 + #define VG_CAPTURE_MODE + #define VG_STEAM +#endif #define VG_STEAM_APPID 1218140U +#define VG_FRAMEBUFFER_RESIZE 1 #include "vg/vg.h" enum world_button_mode @@ -29,10 +33,9 @@ enum world_button_status #include "fishladder_resources.h" -// #define STEAM_LEADERBOARDS - -// CONSTANTS -// =========================================================================================================== +#if 0 + #define STEAM_LEADERBOARDS +#endif enum cell_type { @@ -68,7 +71,8 @@ enum e_world_button enum e_game_state { k_game_state_main, - k_game_state_settings + k_game_state_settings, + k_game_state_update }; #define FLAG_CANAL 0x1 @@ -76,6 +80,8 @@ enum e_game_state #define FLAG_RESERVED0 0x4 #define FLAG_RESERVED1 0x8 +#define FLAG_4B_GROUP (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1) + #define FLAG_INPUT 0x10 #define FLAG_OUTPUT 0x20 #define FLAG_WALL 0x40 @@ -86,6 +92,8 @@ enum e_game_state #define FLAG_FLIP_ROTATING 0x400 #define FLAG_TARGETED 0x800 +#define FLAG_INPUT_NICE 0x1000 + /* 0000 0 | 0001 1 | 0010 2 | 0011 3 | | | | | @@ -118,24 +126,35 @@ static struct cell_description } cell_descriptions[] = { - // 0-3 - {}, - { .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 }, .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 }, + /* 0-3 */ + { .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 }, + .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 }, .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 }, + /* 8-11 */ + { .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.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 }, + /* 12-15 */ + { .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 }, { }, { } }; @@ -150,52 +169,24 @@ v2f const curve_4[] = {{0.0f,0.5f},{0.3f,0.5f},{0.5f,0.5f},{0.8f,0.5f}}; v2f const curve_2[] = {{0.5f,1.0f},{0.5f,0.8f},{0.5f,0.3f},{0.5f,0.2f}}; v2f const curve_8[] = {{0.5f,0.0f},{0.5f,0.3f},{0.5f,0.5f},{0.5f,0.8f}}; -v2f const curve_7[] = {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}}; -v2f const curve_7_1[] = {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}}; +v2f const curve_7[] = + {{0.5f,0.8438f},{0.875f,0.8438f},{0.625f,0.5f},{1.0f,0.5f}}; +v2f const curve_7_1[] = + {{0.5f,0.8438f},{1.0f-0.875f,0.8438f},{1.0-0.625f,0.5f},{0.0f,0.5f}}; float const curve_7_linear_section = 0.1562f; -// Types -// =========================================================================================================== - struct mesh { GLuint vao, vbo; u32 elements; }; -struct -{ - GLuint vao; - GLuint vbo; - GLuint ebo; - - u32 - title_start, title_count, - desc_start, desc_count, - score_start, score_count, - time_start, time_count, - grid_start, grid_count - ; - - #pragma pack(push,1) - struct vector_glyph_vert - { - v2f co; - v2f uv; - - u32 colour; - } - *buffer; - #pragma pack(pop) - - u16 *indices; -} -text_buffers; +#define EFFECT_BUFFER_RATIO 4 static struct world { - // Things that are 'static', aka, initialized once + /* Things that are 'static', aka, initialized once */ struct { struct world_button buttons[4]; @@ -206,6 +197,12 @@ static struct world float lvl_load_time; float world_transition; + ui_ctx world_text; + + GLuint framebuffer, + colourbuffer, + bloomframebuffer[2], /* Quater res */ + bloomcolourbuffer[2]; } st; @@ -215,6 +212,8 @@ static struct world u16 links[2]; u8 config; i8 emit[2]; + + v3f glow[2]; } *data; @@ -231,13 +230,13 @@ static struct world int sim_run, max_runs; int sim_frame, sim_target; - float sim_internal_time, // current tick-time - sim_internal_delta, // time delta - sim_internal_ref, // Reference point of internal time - sim_delta_ref, // Reference point of vg_time when we started at current sim_speed - sim_delta_speed, // Rate to apply time delta - frame_lerp, // Fractional part of sim_internal_time - pause_offset_target; // + float sim_internal_time, + sim_internal_delta, + sim_internal_ref, + sim_delta_ref, + sim_delta_speed, + frame_lerp, + pause_offset_target; struct cell_terminal { @@ -252,7 +251,6 @@ static struct world int run_count; v2i pos; - //int id; } *io; @@ -306,43 +304,41 @@ world = { .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 -// -------------- +/* + * 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 -// ------------- +/* + * World buttons + */ static void level_selection_buttons(void); -// Map/world interface -// ------------------- +/* + * 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 u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, float size, u32 start ); -static void gen_level_text( struct cmp_level *pLevel ); +static void gen_level_text(void); static int map_load( const char *str, const char *name ); static void map_serialize( FILE *stream ); -// Career -// ------ +/* + * Career + */ static void career_serialize(void); static void career_unlock_level( struct cmp_level *lvl ); static void career_unlock_level( struct cmp_level *lvl ); @@ -351,22 +347,19 @@ static void career_reset_level( struct cmp_level *lvl ); static void career_load(void); static void clear_animation_flags(void); -// Gameplay main -// ------------- +/* + * 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 ); +static void render_tiles( v4f const regular_colour, + v4f const selected_colour, int with_glow ); +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); @@ -375,47 +368,52 @@ 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_render(void); +void vg_ui(void); +void vg_update(void); void vg_start(void); void vg_free(void); - int main( int argc, char *argv[] ); -// GLOBALS -// =========================================================================================================== - +/* + * Globals -- runtime + */ m3x3f m_projection; m3x3f m_view; m3x3f m_mdl; -// UTILITY -// =========================================================================================================== - static int colour_set_id = 0; static int world_theme_id = 0; +static int enable_bloom = 1; +static int enable_vignette = 1; +static float music_volume = 1.0f; + +static void music_volume_update(void) +{ + sfx_vol_fset( &audio_volume_music, music_volume ); +} static v3f colour_sets[][4] = { - { { 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 }, + { 0.4f, 0.8f, 1.00f }, + { 0.2f, 0.9f, 0.14f }, + { 0.882f, 0.204f, 0.922f } }, - { { 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 }, + { 0.4f, 0.8f, 1.00f }, + { 0.85f, 0.85f, 0.85f }, + { 0.2f, 0.2f, 0.2f } }, - { { 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 + { { 1.0f, 0.9f, 0.3f }, + { 0.827f, 0.373f, 0.718f }, + { 0.0f, 0.353f, 0.71f }, + { 0.863f, 0.196f, 0.125f } }, }; @@ -428,16 +426,16 @@ static struct world_theme } world_themes[] = { + { + "Minimal", + { 0.6f, 0.6f, 0.6f }, + &tex_tiles_min + }, { "Wood", { 0.89f, 0.8f, 0.7f }, &tex_tiles_wood }, - { - "Minimal", - { 0.8f, 0.8f, 0.8f }, - &tex_tiles_min - }, { "Lab", { 0.7f, 0.7f, 0.7f }, @@ -459,48 +457,76 @@ static void colour_code_v3( i8 cc, v3f target ) static int hash21i( v2i p, u32 umod ) { - static const int random_noise[] = - { - 0x46,0xD5,0xB8,0xD3,0xF2,0xE5,0xCC,0x07,0xD0,0xB3,0x7A,0xA2,0xC3,0xDA,0xDC,0x7F,0xE0,0xB7,0x42,0xA0,0xBF,0x41,0x92,0x32,0x6F,0x0D,0x45,0xC7,0x54,0xDB,0x30,0xC2, - 0xD5,0xDA,0x55,0x09,0xDE,0x74,0x48,0x20,0xE1,0x24,0x5C,0x4D,0x6F,0x36,0xD8,0xE9,0x8D,0x8F,0x54,0x99,0x98,0x51,0xFE,0xDB,0x26,0x04,0x65,0x57,0x56,0xF3,0x53,0x30, - 0x3D,0x16,0xC0,0xB6,0xF2,0x47,0xCF,0x62,0xB0,0x6C,0x8F,0x4F,0x8C,0x4C,0x17,0xF0,0x19,0x7E,0x2D,0x81,0x8D,0xFB,0x10,0xD3,0x49,0x50,0x60,0xFD,0x38,0x15,0x3B,0xEE, - 0x05,0xC1,0xCF,0x62,0x97,0x75,0xDF,0x4E,0x4D,0x89,0x5E,0x88,0x5C,0x30,0x8C,0x54,0x1D,0x39,0x41,0xEA,0xA2,0x63,0x12,0x1B,0x8E,0x35,0x22,0x9B,0x98,0xA3,0x7F,0x80, - 0xD6,0x27,0x94,0x66,0xB5,0x1D,0x7E,0xDF,0x96,0x28,0x38,0x3A,0xA0,0xE8,0x71,0x09,0x62,0x5E,0x9D,0x53,0x58,0x1B,0x7D,0x0D,0x2D,0x99,0x77,0x83,0xC3,0x89,0xC2,0xA2, - 0xA7,0x1D,0x78,0x80,0x37,0xC1,0x87,0xFF,0x65,0xBF,0x2C,0xF1,0xE5,0xB3,0x09,0xE0,0x25,0x92,0x83,0x0F,0x8A,0x57,0x3C,0x0B,0xC6,0xBC,0x44,0x16,0xE3,0xCE,0xC3,0x0D, - 0x69,0xD3,0xC6,0x99,0xB8,0x46,0x44,0xC4,0xF3,0x1E,0xBF,0xF5,0xB4,0xDB,0xFB,0x93,0xA1,0x7B,0xC9,0x08,0x77,0x22,0xE5,0x02,0xEF,0x9E,0x90,0x94,0x8A,0xA6,0x3D,0x7E, - 0xA2,0xA0,0x10,0x82,0x47,0x5C,0xAA,0xF8,0x2F,0x0D,0x9F,0x76,0xDA,0x99,0x0F,0xCB,0xE2,0x02,0x0C,0x75,0xCA,0x35,0x29,0xA6,0x49,0x83,0x6D,0x91,0xB4,0xEC,0x31,0x69, - 0xBA,0x13,0xF3,0xC7,0x21,0x06,0xC8,0x79,0xEF,0xB1,0x9C,0x6A,0xEE,0x64,0x9A,0xDC,0x1E,0xC6,0x18,0x93,0xA9,0x7E,0x89,0x7D,0x96,0xE5,0x44,0xB8,0x00,0x15,0xAF,0x8C, - 0x78,0x8F,0xA8,0x05,0xA7,0x07,0x25,0x9A,0xC8,0x5D,0x90,0x1A,0x41,0x53,0x30,0xD3,0x24,0x33,0x71,0xB4,0x50,0x6E,0xE4,0xEA,0x0D,0x2B,0x6D,0xF5,0x17,0x08,0x74,0x49, - 0x71,0xC2,0xAC,0xF7,0xDC,0xB2,0x7E,0xCC,0xB6,0x1B,0xB8,0xA9,0x52,0xCF,0x6B,0x51,0xD2,0x4E,0xC9,0x43,0xEE,0x2E,0x92,0x24,0xBB,0x47,0x4D,0x0C,0x3E,0x21,0x53,0x19, - 0xD4,0x82,0xE2,0xC6,0x93,0x85,0x0A,0xF8,0xFA,0x04,0x07,0xD3,0x1D,0xEC,0x03,0x66,0xFD,0xB1,0xFB,0x8F,0xC5,0xDE,0xE8,0x29,0xDF,0x23,0x09,0x9D,0x7C,0x43,0x3D,0x4D, - 0x89,0xB9,0x6F,0xB4,0x6B,0x4A,0x51,0xC3,0x94,0xF4,0x7C,0x5E,0x19,0x87,0x79,0xC1,0x80,0x0C,0x45,0x12,0xEC,0x95,0xF3,0x31,0x68,0x42,0xE1,0x06,0x57,0x0E,0xA7,0xFB, - 0x78,0x96,0x87,0x23,0xA5,0x20,0x7A,0x09,0x3A,0x45,0xE6,0xD9,0x5E,0x6A,0xD6,0xAA,0x29,0x50,0x92,0x4E,0xD0,0xB5,0x91,0xC2,0x9A,0xCF,0x07,0xFE,0xB2,0x15,0xEB,0xE4, - 0x84,0x40,0x14,0x47,0xFA,0x93,0xB9,0x06,0x69,0xDB,0xBD,0x4E,0xEA,0x52,0x9B,0xDE,0x5B,0x50,0x36,0xAB,0xB3,0x1F,0xD2,0xCD,0x9C,0x13,0x07,0x7E,0x8B,0xED,0x72,0x62, - 0x74,0x77,0x3B,0x88,0xAC,0x5B,0x6A,0xBC,0xDA,0x99,0xE8,0x24,0x90,0x5A,0xCA,0x8D,0x5C,0x2B,0xF8,0xF1,0xE1,0x1D,0x94,0x11,0xEA,0xCC,0x02,0x09,0x1E,0xA2,0x48,0x67, - 0x87,0x5A,0x7E,0xC6,0xCC,0xA3,0xFB,0xC5,0x36,0xEB,0x5C,0xE1,0xAF,0x1E,0xBE,0xE7,0xD8,0x8F,0x70,0xAE,0x42,0x05,0xF5,0xCD,0x2D,0xA2,0xB0,0xFD,0xEF,0x65,0x2C,0x22, - 0xCB,0x8C,0x8B,0xAA,0x3D,0x86,0xE2,0xCD,0xBE,0xC3,0x42,0x38,0xE3,0x9C,0x08,0xB5,0xAE,0xBD,0x54,0x73,0x83,0x70,0x24,0x47,0xCA,0x4C,0x04,0xC4,0xE0,0x1D,0x40,0xED, - 0xF4,0x2B,0x50,0x8E,0x97,0xB3,0xF0,0xA6,0x76,0xDB,0x49,0x30,0xE5,0xD9,0x71,0x07,0xB2,0xF1,0x0F,0xD6,0x77,0xAA,0x72,0xC0,0xAF,0x66,0xD8,0x40,0xC6,0x08,0x19,0x8C, - 0xD9,0x8F,0x5A,0x75,0xAC,0xBE,0xC2,0x40,0x5B,0xBD,0x0D,0x1D,0x00,0xAF,0x26,0x5E,0x78,0x43,0xAA,0xC6,0x4F,0xF3,0xD8,0xE2,0x7F,0x0C,0x1E,0x77,0x4D,0x35,0x96,0x23, - 0x32,0x44,0x03,0x8D,0x92,0xE7,0xFD,0x48,0x07,0xD0,0x58,0xFC,0x6D,0xC9,0x91,0x33,0xF0,0x23,0x45,0xA4,0x29,0xB9,0xF5,0xB0,0x68,0x8F,0x7B,0x59,0x15,0x8E,0xA6,0x66, - 0x15,0xA0,0x76,0x9B,0x69,0xCB,0x38,0xA5,0xF4,0xB4,0x6B,0xDC,0x1F,0xAB,0xAE,0x12,0x77,0xC0,0x8C,0x4A,0x03,0xB9,0x73,0xD3,0x6D,0x52,0xC5,0xF5,0x6E,0x4E,0x4B,0xA3, - 0x24,0x02,0x58,0xEE,0x5F,0xF9,0xD6,0xD0,0x1D,0xBC,0xF4,0xB8,0x4F,0xFD,0x4B,0x2D,0x34,0x77,0x46,0xE5,0xD4,0x33,0x7B,0x9C,0x35,0xCD,0xB0,0x5D,0x06,0x39,0x99,0xEB, - 0x0C,0xD0,0x0F,0xF7,0x92,0xB5,0x58,0x5B,0x5E,0x79,0x12,0xF4,0x05,0xF6,0x21,0x07,0x0B,0x49,0x1A,0xFB,0xD4,0x98,0xC4,0xEF,0x7A,0xD6,0xCA,0xA1,0xDA,0xB3,0x51,0x00, - 0x76,0xEC,0x08,0x48,0x40,0x35,0xD7,0x94,0xBE,0xF5,0x7B,0xA4,0x20,0x81,0x5F,0x82,0xF3,0x6F,0x96,0x24,0x98,0xB6,0x49,0x18,0xC8,0xC5,0x8C,0xD2,0x38,0x7F,0xC4,0xF6, - 0xAA,0x87,0xDC,0x73,0x5B,0xA1,0xAF,0xE5,0x3D,0x37,0x6B,0x85,0xED,0x38,0x62,0x7D,0x57,0xBD,0xCF,0xB5,0x1B,0xA8,0xBB,0x32,0x33,0xD3,0x34,0x5A,0xC1,0x5D,0xFB,0x28, - 0x6E,0xE1,0x67,0x51,0xBB,0x31,0x92,0x83,0xAC,0xAA,0x72,0x52,0xFD,0x13,0x4F,0x73,0xD3,0xF0,0x5E,0xFC,0xBA,0xB1,0x3C,0x7B,0x08,0x76,0x03,0x38,0x1E,0xD1,0xCC,0x33, - 0xA3,0x1E,0xFC,0xE0,0x82,0x30,0x27,0x93,0x71,0x35,0x75,0x77,0xBA,0x78,0x10,0x33,0xCD,0xAB,0xCF,0x8E,0xAD,0xF9,0x32,0xC9,0x15,0x9F,0xD6,0x6D,0xA8,0xAE,0xB1,0x3F, - 0x90,0xEB,0xD4,0xF9,0x31,0x81,0xA3,0x53,0x99,0x4B,0x3C,0x93,0x3B,0xFE,0x55,0xFF,0x25,0x9F,0xCC,0x07,0xC5,0x2C,0x14,0xA7,0xA4,0x1E,0x6C,0xB6,0x91,0x2A,0xE0,0x3E, - 0x7F,0x39,0x0A,0xD9,0x24,0x3C,0x01,0xA0,0x30,0x99,0x8E,0xB8,0x1D,0xF9,0xA7,0x78,0x86,0x95,0x35,0x0E,0x21,0xDA,0x7A,0x7B,0xAD,0x9F,0x4E,0xF6,0x63,0x5B,0x96,0xBB, - 0x87,0x36,0x3F,0xA7,0x1A,0x66,0x91,0xCD,0xB0,0x3B,0xC0,0x4F,0x54,0xD2,0x5F,0xBB,0x38,0x89,0x1C,0x79,0x7E,0xA2,0x02,0xE4,0x80,0x84,0x1E,0x33,0xAB,0x74,0xFA,0xBE, - 0x31,0x46,0x2E,0xC5,0x15,0xB9,0x12,0xE9,0xD3,0x73,0x43,0xEA,0x74,0x11,0xA7,0xC0,0xD5,0xD8,0x39,0x08,0x9F,0x4F,0xC7,0x71,0x25,0x09,0x51,0x65,0xD6,0xA8,0x02,0x1F - }; +static const int random_noise[] = { +0x46,0xD5,0xB8,0xD3,0xF2,0xE5,0xCC,0x07,0xD0,0xB3,0x7A,0xA2,0xC3,0xDA,0xDC,0x7F, +0xE0,0xB7,0x42,0xA0,0xBF,0x41,0x92,0x32,0x6F,0x0D,0x45,0xC7,0x54,0xDB,0x30,0xC2, +0xD5,0xDA,0x55,0x09,0xDE,0x74,0x48,0x20,0xE1,0x24,0x5C,0x4D,0x6F,0x36,0xD8,0xE9, +0x8D,0x8F,0x54,0x99,0x98,0x51,0xFE,0xDB,0x26,0x04,0x65,0x57,0x56,0xF3,0x53,0x30, +0x3D,0x16,0xC0,0xB6,0xF2,0x47,0xCF,0x62,0xB0,0x6C,0x8F,0x4F,0x8C,0x4C,0x17,0xF0, +0x19,0x7E,0x2D,0x81,0x8D,0xFB,0x10,0xD3,0x49,0x50,0x60,0xFD,0x38,0x15,0x3B,0xEE, +0x05,0xC1,0xCF,0x62,0x97,0x75,0xDF,0x4E,0x4D,0x89,0x5E,0x88,0x5C,0x30,0x8C,0x54, +0x1D,0x39,0x41,0xEA,0xA2,0x63,0x12,0x1B,0x8E,0x35,0x22,0x9B,0x98,0xA3,0x7F,0x80, +0xD6,0x27,0x94,0x66,0xB5,0x1D,0x7E,0xDF,0x96,0x28,0x38,0x3A,0xA0,0xE8,0x71,0x09, +0x62,0x5E,0x9D,0x53,0x58,0x1B,0x7D,0x0D,0x2D,0x99,0x77,0x83,0xC3,0x89,0xC2,0xA2, +0xA7,0x1D,0x78,0x80,0x37,0xC1,0x87,0xFF,0x65,0xBF,0x2C,0xF1,0xE5,0xB3,0x09,0xE0, +0x25,0x92,0x83,0x0F,0x8A,0x57,0x3C,0x0B,0xC6,0xBC,0x44,0x16,0xE3,0xCE,0xC3,0x0D, +0x69,0xD3,0xC6,0x99,0xB8,0x46,0x44,0xC4,0xF3,0x1E,0xBF,0xF5,0xB4,0xDB,0xFB,0x93, +0xA1,0x7B,0xC9,0x08,0x77,0x22,0xE5,0x02,0xEF,0x9E,0x90,0x94,0x8A,0xA6,0x3D,0x7E, +0xA2,0xA0,0x10,0x82,0x47,0x5C,0xAA,0xF8,0x2F,0x0D,0x9F,0x76,0xDA,0x99,0x0F,0xCB, +0xE2,0x02,0x0C,0x75,0xCA,0x35,0x29,0xA6,0x49,0x83,0x6D,0x91,0xB4,0xEC,0x31,0x69, +0xBA,0x13,0xF3,0xC7,0x21,0x06,0xC8,0x79,0xEF,0xB1,0x9C,0x6A,0xEE,0x64,0x9A,0xDC, +0x1E,0xC6,0x18,0x93,0xA9,0x7E,0x89,0x7D,0x96,0xE5,0x44,0xB8,0x00,0x15,0xAF,0x8C, +0x78,0x8F,0xA8,0x05,0xA7,0x07,0x25,0x9A,0xC8,0x5D,0x90,0x1A,0x41,0x53,0x30,0xD3, +0x24,0x33,0x71,0xB4,0x50,0x6E,0xE4,0xEA,0x0D,0x2B,0x6D,0xF5,0x17,0x08,0x74,0x49, +0x71,0xC2,0xAC,0xF7,0xDC,0xB2,0x7E,0xCC,0xB6,0x1B,0xB8,0xA9,0x52,0xCF,0x6B,0x51, +0xD2,0x4E,0xC9,0x43,0xEE,0x2E,0x92,0x24,0xBB,0x47,0x4D,0x0C,0x3E,0x21,0x53,0x19, +0xD4,0x82,0xE2,0xC6,0x93,0x85,0x0A,0xF8,0xFA,0x04,0x07,0xD3,0x1D,0xEC,0x03,0x66, +0xFD,0xB1,0xFB,0x8F,0xC5,0xDE,0xE8,0x29,0xDF,0x23,0x09,0x9D,0x7C,0x43,0x3D,0x4D, +0x89,0xB9,0x6F,0xB4,0x6B,0x4A,0x51,0xC3,0x94,0xF4,0x7C,0x5E,0x19,0x87,0x79,0xC1, +0x80,0x0C,0x45,0x12,0xEC,0x95,0xF3,0x31,0x68,0x42,0xE1,0x06,0x57,0x0E,0xA7,0xFB, +0x78,0x96,0x87,0x23,0xA5,0x20,0x7A,0x09,0x3A,0x45,0xE6,0xD9,0x5E,0x6A,0xD6,0xAA, +0x29,0x50,0x92,0x4E,0xD0,0xB5,0x91,0xC2,0x9A,0xCF,0x07,0xFE,0xB2,0x15,0xEB,0xE4, +0x84,0x40,0x14,0x47,0xFA,0x93,0xB9,0x06,0x69,0xDB,0xBD,0x4E,0xEA,0x52,0x9B,0xDE, +0x5B,0x50,0x36,0xAB,0xB3,0x1F,0xD2,0xCD,0x9C,0x13,0x07,0x7E,0x8B,0xED,0x72,0x62, +0x74,0x77,0x3B,0x88,0xAC,0x5B,0x6A,0xBC,0xDA,0x99,0xE8,0x24,0x90,0x5A,0xCA,0x8D, +0x5C,0x2B,0xF8,0xF1,0xE1,0x1D,0x94,0x11,0xEA,0xCC,0x02,0x09,0x1E,0xA2,0x48,0x67, +0x87,0x5A,0x7E,0xC6,0xCC,0xA3,0xFB,0xC5,0x36,0xEB,0x5C,0xE1,0xAF,0x1E,0xBE,0xE7, +0xD8,0x8F,0x70,0xAE,0x42,0x05,0xF5,0xCD,0x2D,0xA2,0xB0,0xFD,0xEF,0x65,0x2C,0x22, +0xCB,0x8C,0x8B,0xAA,0x3D,0x86,0xE2,0xCD,0xBE,0xC3,0x42,0x38,0xE3,0x9C,0x08,0xB5, +0xAE,0xBD,0x54,0x73,0x83,0x70,0x24,0x47,0xCA,0x4C,0x04,0xC4,0xE0,0x1D,0x40,0xED, +0xF4,0x2B,0x50,0x8E,0x97,0xB3,0xF0,0xA6,0x76,0xDB,0x49,0x30,0xE5,0xD9,0x71,0x07, +0xB2,0xF1,0x0F,0xD6,0x77,0xAA,0x72,0xC0,0xAF,0x66,0xD8,0x40,0xC6,0x08,0x19,0x8C, +0xD9,0x8F,0x5A,0x75,0xAC,0xBE,0xC2,0x40,0x5B,0xBD,0x0D,0x1D,0x00,0xAF,0x26,0x5E, +0x78,0x43,0xAA,0xC6,0x4F,0xF3,0xD8,0xE2,0x7F,0x0C,0x1E,0x77,0x4D,0x35,0x96,0x23, +0x32,0x44,0x03,0x8D,0x92,0xE7,0xFD,0x48,0x07,0xD0,0x58,0xFC,0x6D,0xC9,0x91,0x33, +0xF0,0x23,0x45,0xA4,0x29,0xB9,0xF5,0xB0,0x68,0x8F,0x7B,0x59,0x15,0x8E,0xA6,0x66, +0x15,0xA0,0x76,0x9B,0x69,0xCB,0x38,0xA5,0xF4,0xB4,0x6B,0xDC,0x1F,0xAB,0xAE,0x12, +0x77,0xC0,0x8C,0x4A,0x03,0xB9,0x73,0xD3,0x6D,0x52,0xC5,0xF5,0x6E,0x4E,0x4B,0xA3, +0x24,0x02,0x58,0xEE,0x5F,0xF9,0xD6,0xD0,0x1D,0xBC,0xF4,0xB8,0x4F,0xFD,0x4B,0x2D, +0x34,0x77,0x46,0xE5,0xD4,0x33,0x7B,0x9C,0x35,0xCD,0xB0,0x5D,0x06,0x39,0x99,0xEB, +0x0C,0xD0,0x0F,0xF7,0x92,0xB5,0x58,0x5B,0x5E,0x79,0x12,0xF4,0x05,0xF6,0x21,0x07, +0x0B,0x49,0x1A,0xFB,0xD4,0x98,0xC4,0xEF,0x7A,0xD6,0xCA,0xA1,0xDA,0xB3,0x51,0x00, +0x76,0xEC,0x08,0x48,0x40,0x35,0xD7,0x94,0xBE,0xF5,0x7B,0xA4,0x20,0x81,0x5F,0x82, +0xF3,0x6F,0x96,0x24,0x98,0xB6,0x49,0x18,0xC8,0xC5,0x8C,0xD2,0x38,0x7F,0xC4,0xF6, +0xAA,0x87,0xDC,0x73,0x5B,0xA1,0xAF,0xE5,0x3D,0x37,0x6B,0x85,0xED,0x38,0x62,0x7D, +0x57,0xBD,0xCF,0xB5,0x1B,0xA8,0xBB,0x32,0x33,0xD3,0x34,0x5A,0xC1,0x5D,0xFB,0x28, +0x6E,0xE1,0x67,0x51,0xBB,0x31,0x92,0x83,0xAC,0xAA,0x72,0x52,0xFD,0x13,0x4F,0x73, +0xD3,0xF0,0x5E,0xFC,0xBA,0xB1,0x3C,0x7B,0x08,0x76,0x03,0x38,0x1E,0xD1,0xCC,0x33, +0xA3,0x1E,0xFC,0xE0,0x82,0x30,0x27,0x93,0x71,0x35,0x75,0x77,0xBA,0x78,0x10,0x33, +0xCD,0xAB,0xCF,0x8E,0xAD,0xF9,0x32,0xC9,0x15,0x9F,0xD6,0x6D,0xA8,0xAE,0xB1,0x3F, +0x90,0xEB,0xD4,0xF9,0x31,0x81,0xA3,0x53,0x99,0x4B,0x3C,0x93,0x3B,0xFE,0x55,0xFF, +0x25,0x9F,0xCC,0x07,0xC5,0x2C,0x14,0xA7,0xA4,0x1E,0x6C,0xB6,0x91,0x2A,0xE0,0x3E, +0x7F,0x39,0x0A,0xD9,0x24,0x3C,0x01,0xA0,0x30,0x99,0x8E,0xB8,0x1D,0xF9,0xA7,0x78, +0x86,0x95,0x35,0x0E,0x21,0xDA,0x7A,0x7B,0xAD,0x9F,0x4E,0xF6,0x63,0x5B,0x96,0xBB, +0x87,0x36,0x3F,0xA7,0x1A,0x66,0x91,0xCD,0xB0,0x3B,0xC0,0x4F,0x54,0xD2,0x5F,0xBB, +0x38,0x89,0x1C,0x79,0x7E,0xA2,0x02,0xE4,0x80,0x84,0x1E,0x33,0xAB,0x74,0xFA,0xBE, +0x31,0x46,0x2E,0xC5,0x15,0xB9,0x12,0xE9,0xD3,0x73,0x43,0xEA,0x74,0x11,0xA7,0xC0, +0xD5,0xD8,0x39,0x08,0x9F,0x4F,0xC7,0x71,0x25,0x09,0x51,0x65,0xD6,0xA8,0x02,0x1F +}; return random_noise[ (random_noise[p[1] & 1023] + p[0]) & 1023 ] & umod; } -// MESH -// =========================================================================================================== - static void init_mesh( struct mesh *m, float const *tris, u32 length ) { m->elements = length/3; @@ -511,7 +537,7 @@ static void init_mesh( struct mesh *m, float const *tris, u32 length ) glBindBuffer( GL_ARRAY_BUFFER, m->vbo ); glBufferData( GL_ARRAY_BUFFER, length*sizeof(float), tris, GL_STATIC_DRAW ); - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2 * sizeof(float), (void*)0 ); + glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, 2*sizeof(float), (void*)0 ); glEnableVertexAttribArray( 0 ); VG_CHECK_GL(); @@ -535,9 +561,6 @@ static void use_mesh( struct mesh *m ) void leaderboard_set_score( struct cmp_level *cmp_level, u32 score ); -// WORLD/MAP -// =========================================================================================================== - static void map_free(void) { arrfree( world.data ); @@ -590,7 +613,7 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) end = full_end; } - // Texture data + /* Texture data */ u8 info_buffer[64*64*4]; u32 pixel_id = 0; @@ -614,9 +637,14 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) { 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|FLAG_EMITTER) ) + struct cell *neighbour = + pcell((v2i){ x+dirs[i][0], y+dirs[i][1] }); + + if( neighbour->state & + (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) + { config |= 0x1 << i; + } } height = 128; @@ -624,9 +652,9 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) else { if( cell->state & FLAG_WALL ) - height = 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ); + height = 0xFF; /*-0x3F + hash21i( (v2i){x,y}, 0x3F );*/ - config = 0xF; + config = cell->state & FLAG_INPUT_NICE? 0xB: 0xF; } pcell((v2i){x,y})->config = config; @@ -637,12 +665,21 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) info_px[2] = 0; info_px[3] = 0; - 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_EMITTER))) - ) && update_texbuffer - ){ + /* + * Detecting hanging links that should be removed + */ + int is_trigger = cell->state & FLAG_IS_TRIGGER; + int trigger_invalid = cell->config == 0xF || + cell->config == k_cell_type_split; + int is_targeted = cell->state & FLAG_TARGETED; + int target_invalid = (cell->config != k_cell_type_split) && + !(cell->state & FLAG_EMITTER); + + if(( + (is_trigger && trigger_invalid) || + (is_targeted && target_invalid) + ) && update_texbuffer) + { cell->state &= ~(FLAG_TARGETED|FLAG_IS_TRIGGER); for( u32 i = 0; i < 2; i ++ ) { @@ -666,97 +703,359 @@ static void map_reclassify( v2i start, v2i end, int update_texbuffer ) if( update_texbuffer ) { glBindTexture( GL_TEXTURE_2D, world.background_data ); - glTexSubImage2D( GL_TEXTURE_2D, 0, px0 + 16, py0 + 16, px1-px0, py1-py0, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer ); + glTexSubImage2D( GL_TEXTURE_2D, 0, + px0 + 16, py0 + 16, + px1-px0, py1-py0, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer ); } } -static u32 gen_text_buffer( const char *str, struct sdf_font *font, v2f origin, float size, u32 start ) +static void gen_level_text(void) { - u32 count = 0; + ui_px const unit_scale_px = 4*UI_GLYPH_SPACING_X; + 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]; - v2f cursor; - v2f invUv; - v2_copy( origin, cursor ); - - float invScale = (size / (float)font->size); - invUv[0] = 1.0f / (float)font->width; - invUv[1] = 1.0f / (float)font->height; - - u16 base_idx = start * 4; - - const char *_c = str; - char c; - while( (c = *(_c ++)) ) + 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_resolve( &world.st.world_text ); +} + +/* Usually for ignoring windows crap */ +static int map_load_char_ignore( char c ) +{ + if( c == '\r' ) return 1; + return 0; +} + +static int map_load_sequence_char( struct terminal_run *run, char c ) +{ + if( (c >= 'a' && c <= 'z') || c == ' ' ) + { + i8 code = -1; + if( c != ' ' ) + code = c - 'a'; + + run->steps[ run->step_count ++ ] = code; + + return 1; + } + + return 0; +} + +static int map_load_is_digit( char c ) +{ + if( (((u32)c >= (u32)'0') && ((u32)c <= (u32)'9')) || c == '-' ) + { + return 1; + } + + return 0; +} + +static int map_load_is_terminal( char c ) +{ + if( c == '+' || c == '-' || c == '*' ) + return 1; + return 0; +} + +static int map_load_apply_emitter_codes( struct cell_terminal *term ) +{ + 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" ); + return 0; + } + } + + return 1; +} + +static void map_load_cell( struct cell *cell, char c, int cx ) +{ + cell->config = 0xF; + + cell->links[0] = 0; + cell->links[1] = 0; + + v3_zero( cell->glow[0] ); + v3_zero( cell->glow[1] ); + + /* Input, output, emitter */ + if( map_load_is_terminal(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].step_count = 0; + + switch( c ) + { + case '+': cell->state = FLAG_INPUT; break; + case '-': cell->state = FLAG_OUTPUT; break; + case '*': cell->state = FLAG_EMITTER; break; + } + } + 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) ) + { + /* + * Canal flag bits (4bit/16 value): + * 0: Canal present + * 1: Is trigger + * 2: Reserved + * 3: Reserved + */ + cell->state = ((u32)c - (u32)'A') & (FLAG_CANAL|FLAG_IS_TRIGGER); + world.score ++; + } + else cell->state = 0x00; +} + +static void map_load_draw_background(void) +{ + u8 info_buffer[64*64*4]; + + for( int x = 0; x < 64; x ++ ) + { + for( int y = 0; y < 64; y ++ ) + { + u8 *px = &info_buffer[((x*64)+y)*4]; + +#if 0 + /* Fade out edges of world so that there isnt an obvious line */ + int dx = 16 - VG_MIN( VG_MIN( x, 16 ), 16-VG_MAX( x-16-world.w, 0 ) ), + dy = 16 - VG_MIN( VG_MIN( y, 16 ), 16-VG_MAX( y-16-world.h, 0 ) ), + + dist = VG_MAX( dx, dy ) * 16, + value = VG_MAX( 0, 0xFF-0x3F + hash21i( (v2i){x,y}, 0x3F ) - dist); +#endif + + px[0] = 0xFF; + px[1] = 0; + px[2] = 0; + px[3] = 0; + } + } + + /* + * Level selection indentation, to make it look like the buttons are in a + * recessed area of the map. + */ + 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 ++ ) + { + int cy = y+16+grid->origin[1], + cx = 16+x+grid->origin[0]; + + u8 *px = &info_buffer[(cy*64+cx)*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 ); + } + } + } + } + + /* + * Recess the UI buttons, this adds a little bit of a (subtle) outline + * to them when the background shader is run + */ + for( int i=0; i<4; i++ ) + info_buffer[(((16+world.h-(i+2))*64)+world.w+16-1)*4] = 0x30; + + /* + * Digging 'wires' from the output/input terminals, to make it look like + * there is something connecting our world. + */ + for( int i = 0; i < arrlen(world.io); i ++ ) + { + struct cell_terminal *term = &world.io[ i ]; + + v2i turtle; + v2i turtle_dir; + int original_y; + + /* + * Only make breakouts for terminals on the edge, + * starting them from every position leads to some weird overlapping + * and confusing lines. + * */ + 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|FLAG_EMITTER)? 1: -1; + original_y = turtle_dir[1]; + + info_buffer[((turtle[1]*64)+turtle[0])*4] = 0; + v2i_add( turtle_dir, turtle, turtle ); + + for( int i = 0; i < 100; i ++ ) + { + info_buffer[((turtle[1]*64)+turtle[0])*4] = 0; + + v2i_add( turtle_dir, turtle, turtle ); + + if( turtle[0] == 0 ) break; + if( turtle[0] == 63 ) break; + if( turtle[1] == 0 ) break; + if( turtle[1] == 63 ) break; + + int random_value = hash21i( turtle, 0xFF ); + if( random_value > 255-40 && !turtle_dir[0] ) + { + turtle_dir[0] = -1; + turtle_dir[1] = 0; + } + else if( random_value > 255-80 && !turtle_dir[0] ) + { + turtle_dir[0] = 1; + turtle_dir[1] = 0; + } + else if( random_value > 255-100 ) + { + turtle_dir[0] = 0; + turtle_dir[1] = original_y; + } + } + } + + glBindTexture( GL_TEXTURE_2D, world.background_data ); + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 64, 64, + GL_RGBA, GL_UNSIGNED_BYTE, info_buffer ); +} + +static int map_load_validate(void) +{ + for( int i = 0; i < world.h*world.w; i ++ ) { - if( c == '\n' ) - { - cursor[1] -= size * 1.25f; - cursor[0] = origin[0]; - } - else if( c >= 32 && c <= 126 ) + struct cell *src = &world.data[i]; + + if( src->state & FLAG_IS_TRIGGER ) { - struct sdf_char *pch = &font->characters[ c - ' ' ]; - struct vector_glyph_vert *vt = &text_buffers.buffer[ count * 4 ]; - u16 *ind = &text_buffers.indices[ count * 6 ]; - - // Emit quad - v2f p0; v2f uv0; - v2f p1; v2f uv1; - - v2_muladds( cursor, (v2f){ pch->originX, -pch->originY }, -invScale, p0 ); - v2_muladds( p0, (v2f){ pch->w, -pch->h }, invScale, p1 ); - - v2_mul( (v2f){ pch->uvx, pch->uvy }, invUv, uv0 ); - v2_muladd( uv0, (v2f){ pch->w, pch->h }, invUv, uv1 ); - - v2_copy( p0, vt[0].co ); - v2_copy( uv0, vt[0].uv ); - vt[0].colour = 0xffffffff; - - v2_copy( (v2f){ p0[0], p1[1] }, vt[1].co ); - v2_copy( (v2f){ uv0[0], uv1[1] }, vt[1].uv ); - vt[1].colour = 0xffffffff; - - v2_copy( p1, vt[2].co ); - v2_copy( uv1, vt[2].uv ); - vt[2].colour = 0xffffffff; - - v2_copy( (v2f){ p1[0], p0[1] }, vt[3].co ); - v2_copy( (v2f){ uv1[0], uv0[1] }, vt[3].uv ); - vt[3].colour = 0xffffffff; - - // Emit indices - ind[0] = base_idx+count*4; - ind[1] = base_idx+count*4+1; - ind[2] = base_idx+count*4+2; - ind[3] = base_idx+count*4; - ind[4] = base_idx+count*4+2; - ind[5] = base_idx+count*4+3; - - cursor[0] += (float)pch->advance * invScale; - count ++; + int link_id = src->links[0]?0:1; + if( src->links[link_id] <= world.h*world.w ) + { + struct cell *target = &world.data[ src->links[link_id] ]; + + int is_canal = target->state & FLAG_CANAL, + is_splitter = target->config == k_cell_type_split, + is_emitter = target->state & FLAG_EMITTER; + + if((is_canal && is_splitter) || is_emitter) + { + if( target->links[ link_id ] ) + { + vg_error( "Link target was already targeted\n" ); + return 0; + } + else + { + /* + * Valid link, apply reverse mapping to other cell so it + * knows who is linking to it + */ + target->links[ link_id ] = i; + target->state |= FLAG_TARGETED; + } + } + else + { + vg_error( "Link target was invalid\n" ); + return 0; + } + } + else + { + vg_error( "Link target out of bounds\n" ); + return 0; + } } } - - glBindVertexArray( text_buffers.vao ); - - glBindBuffer( GL_ARRAY_BUFFER, text_buffers.vbo ); - glBufferSubData( GL_ARRAY_BUFFER, - start*4*sizeof( struct vector_glyph_vert ), - count*4*sizeof( struct vector_glyph_vert ), - text_buffers.buffer - ); - - glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo ); - glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof(u16), text_buffers.indices ); - - return count; -} -static void gen_level_text( struct cmp_level *pLevel ) -{ - text_buffers.title_count = gen_text_buffer( pLevel->title, &font_Ubuntu, (v2f){ -5.0f, -0.6f }, 0.6f, text_buffers.title_start ); - text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ -5.0, -0.9f }, 0.25f, text_buffers.desc_start ); + return 1; } static int map_load( const char *str, const char *name ) @@ -765,7 +1064,7 @@ static int map_load( const char *str, const char *name ) char const *c = str; - // Scan for width + /* Predetermine width */ for(;; world.w ++) { if( c[world.w] == ';' ) @@ -791,8 +1090,8 @@ static int map_load( const char *str, const char *name ) { if( !*c ) break; - - if( *c == '\r' ) { c ++; continue; } // fuck off windows + + if( map_load_char_ignore( *c ) ) { c++; continue; } if( *c == ';' ) { @@ -800,44 +1099,40 @@ static int map_load( const char *str, const char *name ) if( *c == '\r' ) c ++; - // Parse attribs + /* Parse attribs */ if( *c != '\n' ) { while( *c ) { - if( *c == '\r' ) { c ++; continue; } + if( map_load_char_ignore( *c ) ) { c++; continue; } if( reg_start < reg_end ) { struct cell_terminal *terminal = &world.io[ reg_start ]; - struct terminal_run *run = &terminal->runs[ terminal->run_count-1 ]; - - if( (*c >= 'a' && *c <= 'z') || *c == ' ' ) + struct terminal_run *run = + &terminal->runs[ terminal->run_count-1 ]; + + if( !map_load_sequence_char( run, *c ) ) { - i8 code = -1; - if( *c != ' ' ) - code = *c - 'a'; - - run->steps[ run->step_count ++ ] = code; - } - else - { - if( *c == ',' || *c == '\n' ) + /* Control characters */ + if( *c == ',' || *c == '\n' ) /* Next terminal */ { reg_start ++; if( *c == '\n' ) break; } - else if( *c == ':' ) + else if( *c == ':' ) /* New run starting */ { terminal->runs[ terminal->run_count ].step_count = 0; terminal->run_count ++; - world.max_runs = vg_max( world.max_runs, terminal->run_count ); + world.max_runs = + vg_max( world.max_runs, terminal->run_count ); } else { - vg_error( "Unkown attribute '%c' (row: %u)\n", *c, world.h ); + vg_error( "Unkown attribute '%c' (row: %u)\n", + *c, world.h ); goto IL_REG_ERROR; } } @@ -846,17 +1141,19 @@ static int map_load( const char *str, const char *name ) { if( links_satisfied < arrlen( links_to_make ) ) { - struct cell *target = &world.data[ links_to_make[ links_satisfied ] ]; + struct cell *target = + &world.data[ links_to_make[ links_satisfied ] ]; - if( (((u32)*c >= (u32)'0') && ((u32)*c <= (u32)'9')) || *c == '-' ) - { + if( map_load_is_digit( *c ) ) + { if( link_id_n >= vg_list_size( link_id_buffer )-1 ) { - vg_error( "Number was way too long to be parsed (row: %u)\n", world.h ); + vg_error( "Number was way too long to be parsed" + " (row: %u)\n", world.h ); goto IL_REG_ERROR; } - link_id_buffer[ link_id_n ++ ] = *c; + link_id_buffer[ link_id_n ++ ] = *c; } else if( *c == ',' || *c == '\n' ) { @@ -872,13 +1169,15 @@ static int map_load( const char *str, const char *name ) } else { - vg_error( "Invalid character '%c' (row: %u)\n", *c, world.h ); + vg_error( "Invalid character '%c'" + " (row: %u)\n", *c, world.h ); goto IL_REG_ERROR; } } else { - vg_error( "Too many values to assign (row: %u)\n", world.h ); + vg_error( "Too many values to assign" + " (row: %u)\n", world.h ); goto IL_REG_ERROR; } } @@ -887,264 +1186,77 @@ static int map_load( const char *str, const char *name ) } } - // Registry length-error checks + /* Registry length-error checks */ if( reg_start != reg_end ) { - vg_error( "Not enough spawn values assigned (row: %u, %u of %u)\n", world.h, reg_start, reg_end ); + vg_error( "Not enough spawn values assigned (row: %u, %u of %u)\n", + world.h, reg_start, reg_end ); goto IL_REG_ERROR; } if( links_satisfied != arrlen( links_to_make ) ) - { - vg_error( "Not enough link values assigned (row: %u, %u of %u)\n", world.h, links_satisfied, arrlen( links_to_make ) ); - goto IL_REG_ERROR; - } - - if( cx != world.w ) - { - vg_error( "Not enough cells to match previous row definition (row: %u, %u<%u)\n", world.h, cx, world.w ); - goto IL_REG_ERROR; - } - - row = arraddnptr( world.data, world.w ); - cx = 0; - world.h ++; - reg_end = reg_start = arrlen( world.io ); - - arrsetlen( links_to_make, 0 ); - links_satisfied = 0; - } - else - { - if( cx == world.w ) - { - vg_error( "Too many cells to match previous row definition (row: %u, %u>%u)\n", world.h, cx, world.w ); - goto IL_REG_ERROR; - } - - // Tile initialization - // row[ cx ] .. etc - struct cell *cell = &row[ cx ]; - cell->config = 0xF; - - 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].step_count = 0; - - switch( *c ) - { - case '+': cell->state = FLAG_INPUT; break; - case '-': cell->state = FLAG_OUTPUT; break; - case '*': cell->state = FLAG_EMITTER; break; - } - - reg_end ++; - } - else if( *c == '#' ) cell->state = FLAG_WALL; - 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|FLAG_IS_TRIGGER); - - if( cell->state & FLAG_IS_TRIGGER ) - arrpush( links_to_make, cx + world.h*world.w ); - - world.score ++; - } - else cell->state = 0x00; - - cx ++; - } - - 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 info_buffer[64*64*4]; - for( int x = 0; x < 64; x ++ ) - { - for( int y = 0; y < 64; y ++ ) - { - u8 *px = &info_buffer[((x*64)+y)*4]; - - // 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 ++ ) - { - struct cell_terminal *term = &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|FLAG_EMITTER)? 1: -1; - original_y = turtle_dir[1]; - - info_buffer[((turtle[1]*64)+turtle[0])*4] = 0; - v2i_add( turtle_dir, turtle, turtle ); - - for( int i = 0; i < 100; i ++ ) - { - info_buffer[((turtle[1]*64)+turtle[0])*4] = 0; - - v2i_add( turtle_dir, turtle, turtle ); - - if( turtle[0] == 0 ) break; - if( turtle[0] == 63 ) break; - if( turtle[1] == 0 ) break; - if( turtle[1] == 63 ) break; - - int random_value = hash21i( turtle, 0xFF ); - if( random_value > 255-40 && !turtle_dir[0] ) - { - turtle_dir[0] = -1; - turtle_dir[1] = 0; - } - else if( random_value > 255-80 && !turtle_dir[0] ) - { - turtle_dir[0] = 1; - turtle_dir[1] = 0; - } - else if( random_value > 255-100 ) - { - turtle_dir[0] = 0; - turtle_dir[1] = original_y; - } - } - } - - glBindTexture( GL_TEXTURE_2D, world.background_data ); - glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 64, 64, GL_RGBA, GL_UNSIGNED_BYTE, info_buffer ); - } - - arrfree( links_to_make ); - - map_reclassify( NULL, NULL, 1 ); - - // Validate links - for( int i = 0; i < world.h*world.w; i ++ ) - { - struct cell *src = &world.data[i]; - if( src->state & FLAG_IS_TRIGGER ) - { - int link_id = src->links[0]?0:1; - 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)) - || (target->state & FLAG_EMITTER) ) - { - if( target->links[ link_id ] ) - { - vg_error( "Link target was already targeted\n" ); - goto IL_REG_ERROR; - } - else - { - // Valid link - target->links[ link_id ] = i; - target->state |= FLAG_TARGETED; - } - } - else - { - vg_error( "Link target was invalid\n" ); - goto IL_REG_ERROR; - } + { + vg_error( "Not enough link values assigned (row: %u, %u of %u)\n", + world.h, links_satisfied, arrlen( links_to_make ) ); + goto IL_REG_ERROR; } - else + + if( cx != world.w ) { - vg_error( "Link target out of bounds\n" ); + vg_error( "Not enough cells to match previous row definition" + " (row: %u, %u<%u)\n", world.h, cx, world.w ); + goto IL_REG_ERROR; + } + + row = arraddnptr( world.data, world.w ); + cx = 0; + world.h ++; + reg_end = reg_start = arrlen( world.io ); + + arrsetlen( links_to_make, 0 ); + links_satisfied = 0; + } + else + { + if( cx == world.w ) + { + vg_error( "Too many cells to match previous row definition" + " (row: %u, %u>%u)\n", world.h, cx, world.w ); goto IL_REG_ERROR; } + + struct cell *cell = &row[ cx ]; + map_load_cell( cell, *c, cx ); + + if( map_load_is_terminal(*c) ) + reg_end ++; + + if( cell->state & FLAG_IS_TRIGGER ) + arrpush( links_to_make, cx + world.h*world.w ); + + cx ++; } + + c ++; + } + + for( int i = 0; i < arrlen( world.io ); i ++ ) + { + if( !map_load_apply_emitter_codes( &world.io[i] ) ) + goto IL_REG_ERROR; } - // ========================================================== - // Successful load + map_load_draw_background(); + map_reclassify( NULL, NULL, 1 ); + + if( !map_load_validate() ) + goto IL_REG_ERROR; + + /* + * At this point the world is in a fully loaded and complete state + */ + + arrfree( links_to_make ); vg_success( "Map '%s' loaded! (%u:%u)\n", name, world.w, world.h ); @@ -1153,7 +1265,7 @@ static int map_load( const char *str, const char *name ) strncpy( world.map_name, name, vg_list_size( world.map_name )-1 ); world.initialzed = 1; - // Setup world button locations + /* Setup world button locations */ for( int i = 0; i < vg_list_size( world.st.buttons ); i ++ ) { struct world_button *btn = &world.st.buttons[i]; @@ -1161,10 +1273,9 @@ static int map_load( const char *str, const char *name ) btn->position[1] = world.h -i -2; } - // Allocate buffers for render commands + /* 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: @@ -1182,18 +1293,21 @@ static void map_serialize( FILE *stream ) 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) ) + else if( cell->state & FLAG_4B_GROUP ) { - fputc( (cell->state & (FLAG_CANAL|FLAG_IS_TRIGGER|FLAG_RESERVED0|FLAG_RESERVED1)) + (u32)'A', stream ); + /* + * Serialize the '4 bit group' into ABCD... + */ + fputc( (cell->state & FLAG_4B_GROUP) + (u32)'A', stream ); } else fputc( ' ', stream ); } fputc( ';', stream ); - int terminal_write_count = 0; for( int x = 0; x < world.w; x ++ ) @@ -1233,7 +1347,8 @@ static void map_serialize( FILE *stream ) fputc( ',', stream ); terminal_write_count ++; - fprintf( stream, "%d", cell->links[0]? -cell->links[0]: cell->links[1] ); + fprintf( stream, "%d", + cell->links[0]? -cell->links[0]: cell->links[1] ); } } @@ -1241,9 +1356,9 @@ static void map_serialize( FILE *stream ) } } -// CAREER STATE -// =========================================================================================================== - +/* + * Career state + */ #pragma pack(push,1) struct dcareer_state { @@ -1255,6 +1370,7 @@ struct dcareer_state struct dlevel_state { i32 score; + i32 unlocked; i32 reserved[2]; } @@ -1270,7 +1386,7 @@ static void career_serialize(void) 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 ) ); @@ -1287,7 +1403,7 @@ static void career_serialize(void) dest->score = lvl->completed_score; dest->unlocked = lvl->unlocked; dest->reserved[0] = 0; - dest->reserved[1] = 0; + dest->reserved[1] = 0; } } @@ -1306,26 +1422,18 @@ static void career_unlock_level( struct cmp_level *lvl ) 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 ) - { - #ifdef VG_STEAM - if( !lvl->is_tutorial && upload ) - leaderboard_set_score( lvl, score ); - #endif - - lvl->completed_score = score; - } + { + lvl->completed_score = score; + gen_level_text(); - if( lvl->unlock ) career_unlock_level( lvl->unlock ); + if( lvl->unlock ) + career_unlock_level( lvl->unlock ); #ifdef VG_STEAM if( lvl->achievement ) - { sw_set_achievement( lvl->achievement ); - } - // Check ALL maps to trigger master engineer + /* Check ALL maps to trigger master engineer */ for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { struct career_level_pack *set = &career_packs[i]; @@ -1353,12 +1461,16 @@ static void career_load(void) i64 sz; struct dcareer_state encoded; - // Blank save state + /* Blank save state */ memset( (void*)&encoded, 0, sizeof( struct dcareer_state ) ); encoded.in_map = 0; encoded.levels[0].unlocked = 1; - // Load and copy data into encoded + /* + * Load and copy, this step is just to ensure old/newer saves can be loaded + * without crashing. Old saves will load fine, too new saves will lose data, + * such a situation should rarely (never) happen with the steam version. + */ void *cr = vg_asset_read_s( "sav/game.sv2", &sz ); if( cr ) @@ -1368,17 +1480,18 @@ static void career_load(void) if( sz <= offsetof( struct dcareer_state, levels ) ) { - vg_warn( "This save file is too small to have a header. Creating a blank one\n" ); + vg_warn( "This save file is too small to have a header. " + "Creating a blank one\n" ); free( cr ); } - memcpy( (void*)&encoded, cr, VG_MIN( sizeof( struct dcareer_state ), sz ) ); + memcpy( (void*)&encoded, cr, VG_MIN( sizeof( struct dcareer_state ), sz)); free( cr ); } else vg_info( "No save file... Using blank one\n" ); - // Reset memory + /* Reset memory */ for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { struct career_level_pack *set = &career_packs[i]; @@ -1387,12 +1500,11 @@ static void career_load(void) career_reset_level( &set->pack[j] ); } - // Header information - // ================================= + /* Header information */ struct cmp_level *lvl_to_load = &career_packs[0].pack[0]; - // Decode everything from dstate + /* Decode everything from dstate */ for( int i = 0; i < vg_list_size( career_packs ); i ++ ) { struct career_level_pack *set = &career_packs[i]; @@ -1403,7 +1515,17 @@ static void career_load(void) 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 trigger to next levels, + * in case the level graph was updated in the future + */ + if( lvl->unlock ) + career_unlock_level( lvl->unlock ); + } if( lvl->serial_id == encoded.in_map ) lvl_to_load = lvl; @@ -1413,14 +1535,20 @@ static void career_load(void) if( console_changelevel( 1, &lvl_to_load->map_name ) ) { world.pCmpLevel = lvl_to_load; - gen_level_text( world.pCmpLevel ); + gen_level_text(); } career_load_success = 1; + +#if 0 + if( encoded.version < MARBLE_COMP_VERSION ) + world.st.state = k_game_state_update; +#endif } -// MAIN GAMEPLAY -// =========================================================================================================== +/* + * Main gameplay + */ static int is_simulation_running(void) { return world.st.buttons[ k_world_button_sim ].state; @@ -1476,6 +1604,7 @@ static void simulation_start(void) if( world.pCmpLevel ) { world.pCmpLevel->completed_score = 0; + gen_level_text(); } } @@ -1486,7 +1615,7 @@ static int world_check_pos_ok( v2i co, int dist ) static int cell_interactive( v2i co ) { - struct cell *cell; + struct cell *cell = NULL; // Bounds check if( world_check_pos_ok( co, 1 ) ) @@ -1590,7 +1719,7 @@ static void vg_update(void) if( console_changelevel( 1, &world.st.lvl_to_load->map_name ) ) { world.pCmpLevel = world.st.lvl_to_load; - gen_level_text( world.pCmpLevel ); + gen_level_text(); } world.st.lvl_to_load = NULL; @@ -1638,6 +1767,9 @@ static void vg_update(void) 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 // ======================================================================================================== @@ -2039,7 +2171,7 @@ static void vg_update(void) for( int i = 0; i < world.num_fishes; i ++ ) { struct fish *fish = &world.fishes[i]; - + // Apply movement if( fish->state == k_fish_state_alive ) v2i_add( fish->pos, fish->dir, fish->pos ); @@ -2047,7 +2179,7 @@ static void vg_update(void) 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 ) { int trigger_id = cell_current->links[0]?0:1; @@ -2057,21 +2189,26 @@ static void vg_update(void) // Spawn new marble if( (target_peice->state & FLAG_EMITTER) && !(target_peice->state & FLAG_TRIGGERED)) { - 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 ++; - } + 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 { @@ -2093,7 +2230,8 @@ static void vg_update(void) { fi = &world.fishes[i]; - if( fi->state == k_fish_state_alive ) + if( (fi->state == k_fish_state_alive) | + (fi->state == k_fish_state_soon_alive) ) { int continue_again = 0; @@ -2101,7 +2239,8 @@ static void vg_update(void) { fj = &world.fishes[j]; - if( fj->state == k_fish_state_alive ) + if( (fj->state == k_fish_state_alive) | + (fj->state == k_fish_state_soon_alive) ) { v2i fi_prev; v2i fj_prev; @@ -2167,14 +2306,19 @@ static void vg_update(void) 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" ); } } } @@ -2377,22 +2521,14 @@ static void vg_update(void) } } -static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4f const selected_colour ) +static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, + v4f const selected_colour, int with_glow ) { int selected = world.selected == pos[1]*world.w + pos[0]; - - 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]; - uv[0] = tile_offsets[ ptr->config ][0]; - uv[1] = tile_offsets[ ptr->config ][1]; + uv[0] = ptr->config & 0x3; + uv[1] = ptr->config >> 2; glUniform4f( SHADER_UNIFORM( shader_tile_main, "uOffset" ), (float)pos[0], @@ -2400,6 +2536,25 @@ static void render_tile( v2i pos, struct cell *ptr, v4f const regular_colour, v4 uv[0], uv[1] ); + + if( with_glow ) + { + glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uGlowA" ), + 1, ptr->glow[0] ); + glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uGlowB" ), + 1, ptr->glow[1] ); + } + else + { + glUniform3f( SHADER_UNIFORM( shader_tile_main, "uGlowA" ), + 0.0f, + 0.0f, + 0.0f ); + glUniform3f( SHADER_UNIFORM( shader_tile_main, "uGlowB" ), + 0.0f, + 0.0f, + 0.0f ); + } if( selected ) { @@ -2431,13 +2586,14 @@ static void render_tile_block( v2i start, v2i end, v4f const regular_colour, v4f struct cell *cell = pcell( pos ); if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) - render_tile( pos, cell, regular_colour, selected_colour ); + render_tile( pos, cell, regular_colour, selected_colour, 0 ); } } } // Renders all tiles in the command list -static void render_tiles( v4f const regular_colour, v4f const selected_colour ) +static void render_tiles( v4f const regular_colour, v4f const selected_colour, + int with_glow ) { glUniform4fv( SHADER_UNIFORM( shader_tile_main, "uColour" ), 1, regular_colour ); @@ -2451,6 +2607,33 @@ static void render_tiles( v4f const regular_colour, v4f const selected_colour ) { world.cmd_buf_specials, world.tile_special_count } }; + int world_paused = world.st.buttons[k_world_button_pause].state; + if( with_glow && !world_paused ) + { + for( int i = 0; i < world.num_fishes; i ++ ) + { + struct fish *fish = &world.fishes[i]; + + if( !(fish->state == k_fish_state_alive || + fish->state == k_fish_state_soon_alive) ) continue; + + struct cell *cell_x = pcell( fish->pos ); + v3f glow_colour; + colour_code_v3( fish->colour, glow_colour ); + + int c = 0; + if( cell_x->config == k_cell_type_split ) + c = cell_x->state & FLAG_FLIP_FLOP? 1:0; + + if( cell_x->config == k_cell_type_merge ) + c = fish->dir[0]==-1?1:0; + + v3_muladds( cell_x->glow[c], glow_colour, + powf(world.frame_lerp,2.0f)*0.03f * world.sim_delta_speed, + cell_x->glow[c]); + } + } + for( int i = 0; i < vg_list_size( render_lists ); i ++ ) { struct render_list *list = &render_lists[i]; @@ -2459,7 +2642,7 @@ static void render_tiles( v4f const regular_colour, v4f const selected_colour ) struct render_cmd *cmd = &list->arr[j]; struct cell *cell = cmd->ptr; - render_tile( cmd->pos, cell, regular_colour, selected_colour ); + render_tile( cmd->pos, cell, regular_colour, selected_colour, with_glow ); } } } @@ -2479,11 +2662,11 @@ static int world_button_exec( struct world_button *btn, v2f texture, v3f colour, v2i click_tile = { world.tile_x, world.tile_y }; int triggered = 0; - int is_hovering = v2i_eq( click_tile, btn->position ); + int is_hovering = v2i_eq( click_tile, btn->position ) && !gui_want_mouse(); // Set up light targets before logic runs if( btn->state ) - btn->light_target = is_hovering? 0.9f: 0.8f; + btn->light_target = is_hovering? 0.7f: 0.6f; else btn->light_target = is_hovering? 0.2f: 0.0f; @@ -2548,7 +2731,7 @@ static void level_selection_buttons(void) else lvl->btn.extra_light = 0.2f; if( lvl->completed_score ) - lvl->btn.extra_light += 0.8f; + lvl->btn.extra_light += 0.6f; enum world_button_status status; if( world_button_exec( @@ -2585,17 +2768,38 @@ 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 ); + glUniform3f( SHADER_UNIFORM( shader_sprite, "uPos" ), + pos[0], pos[1], pos[2] * world.st.world_transition ); draw_mesh( 0, 2 ); } +static void vg_framebuffer_resize(int w, int h) +{ + glBindTexture( GL_TEXTURE_2D, world.st.colourbuffer ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, w, h, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL ); + + for( int i=0; i<2; i++ ) + { + glBindTexture( GL_TEXTURE_2D, world.st.bloomcolourbuffer[i] ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, + w/EFFECT_BUFFER_RATIO, h/EFFECT_BUFFER_RATIO, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL ); + } +} + void vg_render(void) { + if( enable_bloom || enable_vignette ) + glBindFramebuffer( GL_FRAMEBUFFER, world.st.framebuffer ); + else + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + glViewport( 0,0, vg_window_x, vg_window_y ); glDisable( GL_DEPTH_TEST ); - glClearColor( 0.369768f, 0.3654f, 0.42f, 1.0f ); + glClearColor( 0.14f, 0.14f, 0.14f, 1.0f ); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); v4f const colour_default = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -2607,7 +2811,11 @@ void vg_render(void) int const empty_start = circle_base+32; int const empty_count = circle_base+32*2; +#if 0 struct world_theme *theme = &world_themes[ world_theme_id ]; +#else + struct world_theme *theme = &world_themes[ 0 ]; +#endif if( !world.initialzed ) return; @@ -2622,11 +2830,14 @@ void vg_render(void) { struct cell *cell = pcell((v2i){x,y}); - if( cell->state & (FLAG_CANAL|FLAG_INPUT|FLAG_OUTPUT|FLAG_EMITTER) ) + 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_EMITTER || cell->state & FLAG_IS_TRIGGER) ) + 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 ++ ]; @@ -2634,6 +2845,14 @@ void vg_render(void) cmd->pos[0] = x; cmd->pos[1] = y; cmd->ptr = cell; + + int world_paused = world.st.buttons[k_world_button_pause].state; + if( !world_paused ) + { + float decay = 1.0f - world.sim_delta_speed*0.005f; + v3_muls( cell->glow[0], decay, cell->glow[0] ); + v3_muls( cell->glow[1], decay, cell->glow[1] ); + } } } } @@ -2652,7 +2871,7 @@ void vg_render(void) glUniform1i( SHADER_UNIFORM( shader_background, "uTexMain" ), 0 ); glUniform3f( SHADER_UNIFORM( shader_background, "uOffset" ), -16, -16, 64 ); - glUniform1f( SHADER_UNIFORM( shader_background, "uVariance" ), 0.02f ); + glUniform1f( SHADER_UNIFORM( shader_background, "uVariance" ), 0.05f ); glActiveTexture( GL_TEXTURE1 ); glBindTexture( GL_TEXTURE_2D, world.random_samples ); @@ -2681,10 +2900,15 @@ void vg_render(void) // rebind textures vg_tex2d_bind( &tex_tile_data, 0 ); vg_tex2d_bind( theme->tex_tiles, 1 ); + vg_tex2d_bind( &tex_tile_glow, 2 ); + glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 ); + glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 ); + glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlow" ), 2 ); + glUniform3fv( SHADER_UNIFORM( shader_tile_main, "uShadowing" ), 1, theme->col_shadow ); - render_tiles( colour_default, colour_default ); + render_tiles( colour_default, colour_default, 1 ); // MARBLES // ======================================================================================================== @@ -2736,16 +2960,13 @@ void vg_render(void) // ======================================================================================================== SHADER_USE( shader_tile_main ); - // Bind textures + // Re Bind textures vg_tex2d_bind( &tex_tile_data, 0 ); - glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexGlyphs" ), 0 ); - - // TODO: is this needed to be rebinded? vg_tex2d_bind( theme->tex_tiles, 1 ); - glUniform1i( SHADER_UNIFORM( shader_tile_main, "uTexWood" ), 1 ); + vg_tex2d_bind( &tex_tile_glow, 2 ); glUniform1f( SHADER_UNIFORM( shader_tile_main, "uForeground" ), 1.0f ); - render_tiles( colour_default, colour_selected ); + render_tiles( colour_default, colour_selected, 0 ); // Draw splitters for( int i = 0; i < world.tile_special_count; i ++ ) @@ -2777,12 +2998,14 @@ void vg_render(void) m2x2_create_rotation( subtransform, rotation ); - glUniformMatrix2fv( SHADER_UNIFORM( shader_tile_main, "uSubTransform" ), 1, GL_FALSE, (float *)subtransform ); + 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: 0.0f, - 0.0f + cell->state & FLAG_TARGETED? 3.0f: 2.0f, + 3.0f ); draw_mesh( 0, 2 ); } @@ -2877,7 +3100,8 @@ void vg_render(void) 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; + world.st.state = stat == k_world_button_on_enable? + k_game_state_settings: k_game_state_main; } level_selection_buttons(); @@ -3047,32 +3271,30 @@ void vg_render(void) // TEXT ELEMENTS // ======================================================================================================== - SHADER_USE( shader_sdf ); - glBindVertexArray( text_buffers.vao ); - glUniformMatrix3fv( SHADER_UNIFORM( shader_sdf, "uPv" ), 1, GL_FALSE, (float *)vg_pv ); - - vg_tex2d_bind( &tex_ubuntu, 0 ); - glUniform1i( SHADER_UNIFORM( shader_sdf, "uTexGlyphs" ), 0 ); - - glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 1.0f ); - glDrawElements( GL_TRIANGLES, text_buffers.title_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.title_start*6*sizeof(u16) ) ); - glDrawElements( GL_TRIANGLES, text_buffers.desc_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.desc_start*6*sizeof(u16) ) ); - - glUniform4f( SHADER_UNIFORM( shader_sdf, "uColour" ), 1.0f, 1.0f, 1.0f, 0.17f ); - glDrawElements( GL_TRIANGLES, text_buffers.grid_count*6, GL_UNSIGNED_SHORT, (void*)( text_buffers.grid_start*6*sizeof(u16) ) ); - + // 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 // ======================================================================================================== - //glDisable(GL_BLEND); + glEnable(GL_BLEND); SHADER_USE( shader_wire ); glBindVertexArray( world.wire.vao ); 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 }; + v4f const wire_left_colour = { 0.9f, 0.9f, 0.9f, 1.0f }; + v4f const wire_right_colour = { 0.5f, 0.5f, 0.5f, 1.0f }; + v4f const wire_drag_colour = { 0.3f, 0.3f, 0.3f, 0.6f }; glUniform1f( SHADER_UNIFORM( shader_wire, "uTime" ), world.frame_lerp ); glUniform1f( SHADER_UNIFORM( shader_wire, "uGlow" ), 0.0f ); @@ -3243,17 +3465,21 @@ void vg_render(void) v2_add( center, (v2f){ -0.25f, -0.25f }, p0 ); v2_add( center, (v2f){ 0.25f, -0.25f }, p1 ); - - if( cell->state & FLAG_FLIP_FLOP ) - render_sprite( k_sprite_flare_y, p1 ); - else - render_sprite( k_sprite_flare_b, p0 ); + + 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); @@ -3266,15 +3492,145 @@ void vg_render(void) use_mesh( &world.numbers ); draw_numbers( (v3f){ 2.0f, (float)world.h-1.875f, 0.3333f }, world.score ); */ + + if( !enable_bloom ) + { + if( enable_vignette ) + goto image_composite; + + return; + } + + /* Scale down image and remap colour values */ + glViewport( 0,0, + vg_window_x/EFFECT_BUFFER_RATIO, vg_window_y/EFFECT_BUFFER_RATIO ); + glBindFramebuffer( GL_FRAMEBUFFER, world.st.bloomframebuffer[0] ); + + SHADER_USE( shader_post_darken ); + glActiveTexture( GL_TEXTURE0 ); + glBindTexture( GL_TEXTURE_2D, world.st.colourbuffer ); + glUniform1i( SHADER_UNIFORM( shader_post_darken, "uTexMain" ), 0 ); + + draw_mesh( 0, 2 ); + + /* Two pass blur */ + v2f res_inv, blur_dir; + res_inv[0] = 1.0f / (float)( vg_window_x/EFFECT_BUFFER_RATIO ); + res_inv[1] = 1.0f / (float)( vg_window_y/EFFECT_BUFFER_RATIO ); + + SHADER_USE( shader_post_blur ); + glUniform1i( SHADER_UNIFORM( shader_post_blur, "uTexMain" ), 0 ); + + for( int i=0; i<1; i++ ) + { + glBindFramebuffer( GL_FRAMEBUFFER, world.st.bloomframebuffer[1] ); + + v2_mul( (v2f){ 1.0f*(float)(i+1), 0.0f }, res_inv, blur_dir ); + + glUniform2fv( SHADER_UNIFORM(shader_post_blur,"uDir"), 1, blur_dir ); + glActiveTexture( GL_TEXTURE0 ); + glBindTexture( GL_TEXTURE_2D, world.st.bloomcolourbuffer[0] ); + + draw_mesh( 0, 2 ); + + v2_mul( (v2f){ 0.0f, 1.0f*(float)(i+1) }, res_inv, blur_dir ); + + glBindFramebuffer( GL_FRAMEBUFFER, world.st.bloomframebuffer[0] ); + glUniform2fv( SHADER_UNIFORM(shader_post_blur,"uDir"), 1, blur_dir ); + glBindTexture( GL_TEXTURE_2D, world.st.bloomcolourbuffer[1] ); + draw_mesh( 0, 2 ); + } + + /* Scene composite */ + glViewport( 0,0, vg_window_x, vg_window_y ); + +image_composite: + glBindFramebuffer( GL_FRAMEBUFFER, 0 ); + + SHADER_USE( shader_post_comp ); + + glActiveTexture( GL_TEXTURE0 ); + glBindTexture( GL_TEXTURE_2D, world.st.colourbuffer ); + glUniform1i( SHADER_UNIFORM( shader_post_comp, "uTexMain" ), 0 ); + + glActiveTexture( GL_TEXTURE1 ); + glBindTexture( GL_TEXTURE_2D, world.st.bloomcolourbuffer[0] ); + glUniform1i( SHADER_UNIFORM( shader_post_comp, "uTexBloom" ), 1 ); + + glUniform2f( SHADER_UNIFORM( shader_post_comp, "uComp" ), + enable_bloom? 1.0f: 0.0f, + enable_vignette? 0.0f: 1.0f ); + + draw_mesh( 0, 2 ); } void vg_ui(void) { // Drawing world name - gui_text( (ui_px [2]){ vg_window_x / 2, 4 }, "THIS IS A WORLD NAME", 2, k_text_align_center ); - gui_text( (ui_px [2]){ vg_window_x / 2, 28 }, "And here is its cool description yo", 1, k_text_align_center ); + 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_settings ) +#if 0 + 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 +#endif + if( world.st.state == k_game_state_settings ) { gui_group_id( 35 ); @@ -3294,6 +3650,20 @@ void vg_ui(void) gui_new_node(); { gui_text( ui_global_ctx.cursor, "SETTINGS", 2, 0 ); + + ui_global_ctx.cursor[2] = 25; + gui_align_right(); + + if( gui_button(4) == k_button_click ) + { + world.st.buttons[ k_world_button_settings ].state = 0; + world.st.state = k_game_state_main; + vg_info( "exit\n" ); + } + ui_global_ctx.cursor[0] += 4; + ui_global_ctx.cursor[1] -= 4; + gui_text( ui_global_ctx.cursor, "x", 2, 0 ); + gui_end(); } gui_end(); @@ -3332,7 +3702,7 @@ void vg_ui(void) if( colour_set_id > 0 ) colour_set_id --; } - gui_text( ui_global_ctx.cursor, "<", 1, 0 ); + gui_text( ui_global_ctx.cursor, "<", 2, 0 ); gui_end_right(); ui_global_ctx.cursor[2] = 150; @@ -3353,27 +3723,27 @@ void vg_ui(void) if( colour_set_id < vg_list_size( colour_sets )-1 ) colour_set_id ++; } - gui_text( ui_global_ctx.cursor, ">", 1, 0 ); + gui_text( ui_global_ctx.cursor, ">", 2, 0 ); gui_end_down(); } gui_end_down(); // Theme select - // TODO: remove code dupe ui_global_ctx.cursor[1] += 16; +#if 0 gui_text( ui_global_ctx.cursor, "Tile Theme", 1, 0 ); ui_global_ctx.cursor[1] += 20; gui_new_node(); { ui_global_ctx.cursor[2] = 25; - if( gui_button( 0 ) == k_button_click ) + if( gui_button( 2 ) == k_button_click ) { if( world_theme_id > 0 ) world_theme_id --; } - gui_text( ui_global_ctx.cursor, "<", 1, 0 ); + gui_text( ui_global_ctx.cursor, "<", 2, 0 ); gui_end_right(); ui_global_ctx.cursor[2] = 150; @@ -3388,12 +3758,96 @@ void vg_ui(void) gui_end_right(); ui_global_ctx.cursor[2] = 25; - if( gui_button( 1 ) == k_button_click ) + if( gui_button( 3 ) == k_button_click ) { if( world_theme_id < vg_list_size( world_themes )-1 ) world_theme_id ++; } - gui_text( ui_global_ctx.cursor, ">", 1, 0 ); + gui_text( ui_global_ctx.cursor, ">", 2, 0 ); + gui_end_down(); + } + gui_end_down(); +#endif + + gui_text( ui_global_ctx.cursor, "Graphics", 1, 0 ); + ui_global_ctx.cursor[1] += 20; + + gui_new_node(); + { + ui_global_ctx.cursor[2] = 200; + if( gui_button( 5 ) == k_button_click ) + { + enable_bloom ^= 0x1; + } + ui_global_ctx.cursor[0] += 4; + ui_global_ctx.cursor[1] += 4; + gui_text( ui_global_ctx.cursor, enable_bloom? + "Bloom: ENABLED": + "Bloom: DISABLED", 1, 0 ); + gui_end_down(); + } + gui_end_down(); + + ui_global_ctx.cursor[1] += 10; + gui_new_node(); + { + ui_global_ctx.cursor[2] = 200; + if( gui_button( 6 ) == k_button_click ) + { + enable_vignette ^= 0x1; + } + ui_global_ctx.cursor[0] += 4; + ui_global_ctx.cursor[1] += 4; + gui_text( ui_global_ctx.cursor, enable_vignette? + "Vignette: ENABLED": + "Vignette: DISABLED", 1, 0 ); + gui_end_down(); + } + gui_end_down(); + + ui_global_ctx.cursor[1] += 16; + gui_text( ui_global_ctx.cursor, "Music Volume", 1, 0 ); + ui_global_ctx.cursor[1] += 20; + + gui_new_node(); + { + ui_px slider_start = ui_global_ctx.cursor[0]; + + float const bar_width = 45.0f, + bar_total = 200.0f, + bar_movement = bar_total-bar_width, + bar_start = bar_width * 0.5f; + + ui_global_ctx.cursor[2] = bar_total; + ui_fill_rect( &ui_global_ctx, + ui_global_ctx.cursor, + 0xff111111 ); + + ui_global_ctx.cursor[2] = bar_width; + ui_global_ctx.cursor[0] = slider_start + music_volume * bar_movement; + + int status = gui_button( 7 ); + + static ui_px drag_start = 0.0f; + + if( status == k_button_start_click ) + drag_start = ui_global_ctx.mouse[0]; + else if( ui_global_ctx.capture_lock && + (ui_global_ctx.capture_mouse_id == ui_group_id(&ui_global_ctx,7))) + { + ui_px drag_offset = ui_global_ctx.mouse[0] - drag_start; + float offset_local = (drag_start + drag_offset - slider_start - bar_start) / bar_movement; + + music_volume = vg_minf( vg_maxf( offset_local, 0.0f ), 1.0f ); + music_volume_update(); + } + + ui_global_ctx.cursor[0] += 4; + ui_global_ctx.cursor[1] += 4; + + char volbuf[12]; + snprintf( volbuf, 12, "%.2f", music_volume ); + gui_text( ui_global_ctx.cursor, volbuf, 1, 0 ); gui_end_down(); } gui_end_down(); @@ -3517,7 +3971,6 @@ static int console_credits( int argc, char const *argv[] ) vg_info( " miniaudio MIT0 miniaud.io\n" ); vg_info( " QOI MIT phoboslab.org\n" ); vg_info( " STB library MIT nothings.org\n" ); - vg_info( " Ubuntu Regular ubuntu.com\n" ); return 0; } @@ -3670,6 +4123,34 @@ void vg_start(void) .data_type = k_convar_dtype_i32, .opt_i32 = { .min = 0, .max = vg_list_size( world_themes )-1, .clamp = 1 }, .persistent = 1, + .update = NULL + }); + + vg_convar_push( (struct vg_convar){ + .name = "enable_bloom", + .data = &enable_bloom, + .data_type = k_convar_dtype_i32, + .opt_i32 = { .min = 0, .max = 1, .clamp = 1 }, + .persistent = 1, + .update = NULL + }); + + vg_convar_push( (struct vg_convar){ + .name = "enable_vignette", + .data = &enable_vignette, + .data_type = k_convar_dtype_i32, + .opt_i32 = { .min = 0, .max = 1, .clamp = 1 }, + .persistent = 1, + .update = NULL + }); + + vg_convar_push( (struct vg_convar){ + .name = "music_volume", + .data = &music_volume, + .data_type = k_convar_dtype_f32, + .opt_f32 = { .min = 0.0f, .max = 1.0f, .clamp = 1 }, + .persistent = 1, + .update = music_volume_update }); // Combined quad, long quad / empty circle / filled circle mesh @@ -3779,7 +4260,7 @@ void vg_start(void) glGenTextures( 1, &world.random_samples ); glBindTexture( GL_TEXTURE_2D, world.random_samples ); glTexImage2D( GL_TEXTURE_2D, 0, GL_RG, 512, 512, 0, GL_RG, GL_UNSIGNED_BYTE, data ); - vg_tex2d_linear(); + vg_tex2d_nearest(); vg_tex2d_repeat(); free( data ); @@ -3787,123 +4268,48 @@ void vg_start(void) resource_load_main(); - // Create text buffers - { - // Work out the counts for each 'segment' - u32 desc_max_size = 0, title_max_size = 0, - score_max_size = 10, - time_max_size = 10, - - size_level_texts = 6*9*7 - ; - - for( int i = 0; i < vg_list_size( career_packs ); i ++ ) - { - struct career_level_pack *set = &career_packs[i]; - for( int j = 0; j < set->count; j ++ ) - { - struct cmp_level *lvl = &set->pack[j]; - - desc_max_size = VG_MAX( desc_max_size, strlen( lvl->description ) ); - title_max_size = VG_MAX( title_max_size, strlen( lvl->title ) ); - } - } - - // Full buffer - u32 total_characters = - title_max_size + - desc_max_size + - score_max_size + - time_max_size + - size_level_texts; - - u32 total_faces = total_characters * 2, - total_vertices = total_characters * 4, - total_indices = total_faces * 3; - - // Working buffer - u32 work_buffer_total_chars = - VG_MAX( 7, VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) ) ); - - u32 total_work_faces = work_buffer_total_chars * 2, - total_work_vertices = work_buffer_total_chars * 4, - total_work_indices = total_work_faces * 3; - - text_buffers.title_count = 0; - text_buffers.desc_count = 0; - text_buffers.score_count = 0; - text_buffers.time_count = 0; - text_buffers.grid_count = size_level_texts; - - // Calculate offsets - text_buffers.title_start = 0; - text_buffers.desc_start = text_buffers.title_start + title_max_size; - text_buffers.score_start = text_buffers.desc_start + desc_max_size; - text_buffers.time_start = text_buffers.score_start + score_max_size; - text_buffers.grid_start = text_buffers.time_start + time_max_size; - - // Opengl - glGenVertexArrays(1, &text_buffers.vao); - glGenBuffers( 1, &text_buffers.vbo ); - glGenBuffers( 1, &text_buffers.ebo ); - glBindVertexArray( text_buffers.vao ); - - glBindBuffer( GL_ARRAY_BUFFER, text_buffers.vbo ); - glBufferData( GL_ARRAY_BUFFER, total_vertices * sizeof( struct vector_glyph_vert ), NULL, GL_DYNAMIC_DRAW ); + // Init world text + { + ui_init_context( &world.st.world_text, 15000 ); + } - glBindVertexArray( text_buffers.vao ); - - glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo ); - glBufferData( GL_ELEMENT_ARRAY_BUFFER, total_indices * sizeof( u16 ), NULL, GL_DYNAMIC_DRAW ); - - u32 const stride = sizeof( struct vector_glyph_vert ); - - // XY - glVertexAttribPointer( 0, 2, GL_FLOAT, GL_FALSE, stride, (void *)offsetof( struct vector_glyph_vert, co ) ); - glEnableVertexAttribArray( 0 ); - - // UV - glVertexAttribPointer( 1, 2, GL_FLOAT, GL_FALSE, stride, (void *)offsetof( struct vector_glyph_vert, uv ) ); - glEnableVertexAttribArray( 1 ); - - // COLOUR - glVertexAttribPointer( 2, 4, GL_UNSIGNED_BYTE, GL_TRUE, stride, (void *)offsetof( struct vector_glyph_vert, colour ) ); - glEnableVertexAttribArray( 2 ); - - // Offline memory - text_buffers.buffer = (struct vector_glyph_vert *)malloc( total_work_vertices * sizeof(struct vector_glyph_vert) ); - text_buffers.indices = (u16*)malloc( total_work_indices * sizeof(u16) ); - - char label[8]; - for( int i = 1; i < 7; i ++ ) - label[i] = ' '; - label[7] = 0x00; - - // Reset grid - for( int x = 0; x < 6; x ++ ) - { - for( int y = 0; y < 9; y ++ ) - { - label[0] = ' '; - - if( x == 0 ) - { - if( y != 8 ) - label[0] = 'A' + y; - } - else if( y == 8 ) - { - label[0] = '0' + x; - } - - gen_text_buffer( label, &font_Ubuntu, (v2f){ -6.0f + x + (x == 0? 0.6f: 0.2f), y + 0.2f }, 0.35f, text_buffers.grid_start+(y*6+x)*7 ); - } - } - } - // Restore gamestate career_local_data_init(); career_load(); + + /* Create framebuffers */ + glGenFramebuffers( 1, &world.st.framebuffer ); + glBindFramebuffer( GL_FRAMEBUFFER, world.st.framebuffer ); + + glGenTextures( 1, &world.st.colourbuffer ); + glBindTexture( GL_TEXTURE_2D, world.st.colourbuffer ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, vg_window_x, vg_window_y, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, + world.st.colourbuffer, 0); + + /* Bloom framebuffer (quater res) */ + glGenFramebuffers( 2, world.st.bloomframebuffer ); + glGenTextures( 2, world.st.bloomcolourbuffer ); + + for( int i=0; i<2; i++ ) + { + glBindFramebuffer( GL_FRAMEBUFFER, world.st.bloomframebuffer[i] ); + + glBindTexture( GL_TEXTURE_2D, world.st.bloomcolourbuffer[i] ); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, + vg_window_x/EFFECT_BUFFER_RATIO, vg_window_y/EFFECT_BUFFER_RATIO, + 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + vg_tex2d_clamp(); + + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, + GL_TEXTURE_2D, world.st.bloomcolourbuffer[i], 0); + } } void vg_free(void) @@ -3915,13 +4321,6 @@ void vg_free(void) console_save_map( 0, NULL ); career_serialize(); - glDeleteVertexArrays( 1, &text_buffers.vao ); - glDeleteBuffers( 1, &text_buffers.vbo ); - glDeleteBuffers( 1, &text_buffers.ebo ); - - free( text_buffers.buffer ); - free( text_buffers.indices ); - resource_free_main(); glDeleteTextures( 1, &world.background_data ); @@ -3933,6 +4332,8 @@ void vg_free(void) free_mesh( &world.shapes ); + ui_context_free( &world.st.world_text ); + map_free(); }