// Copyright (C) 2021 Harry Godden (hgn) - All Rights Reserved
//#define VG_CAPTURE_MODE
-#define VG_STEAM
+//#define VG_STEAM
#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
k_world_button_none = -1,
k_world_button_sim = 0,
k_world_button_pause = 1,
- k_world_button_speedy = 2
+ k_world_button_speedy = 2,
+ k_world_button_settings = 3
};
#define FLAG_CANAL 0x1
title_start, title_count,
desc_start, desc_count,
score_start, score_count,
- time_start, time_count
+ time_start, time_count,
+ grid_start, grid_count
;
#pragma pack(push,1)
}
text_buffers;
-struct world
+static struct world
{
+ struct
+ {
+ struct world_button buttons[4];
+ float zoom;
+ }
+ st;
+
#pragma pack(push,1)
struct cell
{
v2i pos;
//int id;
}
- *io;
-
- struct cell_button
- {
- float light_target, light;
- int pressed;
- }
- buttons[4];
+ *io;
int w, h;
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 } }
+ }
};
// Forward declerations
// --------------------
+// Utility functions
+// -----------------
+
+static void colour_code_v3( char const 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 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 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 );
+static int cell_interactive( v2i co );
+
+void vg_update(void);
+static void render_tiles( 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 int colour_set_id = 0;
+
static void colour_code_v3( char const cc, v3f target )
{
- 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 }
+ 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 }, // 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 ) )
+ if( id < vg_list_size( colour_sets[0] ) )
{
- v3_copy( colour_sets[ id ], target );
+ v3_copy( colour_sets[colour_set_id][ id ], target );
return;
}
}
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
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( c == '\n' )
{
- cursor[1] += size * 1.25f;
+ cursor[1] -= size * 1.25f;
cursor[0] = origin[0];
}
else if( c >= 32 && c <= 126 )
vt[3].colour = 0xffffffff;
// Emit indices
- ind[0] = count*4;
- ind[1] = count*4+1;
- ind[2] = count*4+2;
- ind[3] = count*4;
- ind[4] = count*4+2;
- ind[5] = count*4+3;
+ 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 ++;
);
glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, text_buffers.ebo );
- glBufferSubData( GL_ELEMENT_ARRAY_BUFFER, start*6*sizeof(u16), count*6*sizeof( u16 ), text_buffers.indices );
+ 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){ 0.0f, 0.0f }, 1.0f, text_buffers.title_start );
- text_buffers.desc_count = gen_text_buffer( pLevel->description, &font_Ubuntu, (v2f){ 0.0f, 0.0f }, 0.5f, text_buffers.desc_start );
- text_buffers.desc_count = 0;
+ 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 );
}
static int map_load( const char *str, const char *name )
{
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
- // Beginner
- for( int y = 16+2; y < 16+2+4; y ++ )
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
{
- u8 *px = &info_buffer[((y*64)+16-1)*4];
- px[0] = 0x10;
- }
+ struct career_level_pack *grid = &career_packs[ i ];
- // Intermediate
- for( int y = 16+2; y < 16+2+6; y ++ )
- {
- for( int x = 0; x < 3; x ++ )
+ int j = 0;
+
+ for( int y = 0; y < grid->dims[1]; y ++ )
{
- u8 *px = &info_buffer[((y*64)+16-5+x)*4];
- px[0] = 0x10;
+ 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 );
+ }
+ }
}
}
- // Expert
- for( int x = 1; x < 5; x ++ )
- {
- u8 *px = &info_buffer[((16*64)+16-5+x)*4];
- px[0] = 0x10;
- }
-
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;
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;
+ }
+
return 1;
IL_REG_ERROR:
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 ++ )
{
{
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;
}
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
+ 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 ++ )
+ {
+ if( set->pack[j].completed_score == 0 )
+ return;
+ }
+ }
+
+ sw_set_achievement( "MASTER_ENGINEER" );
+ #endif
}
}
// 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 ++ )
{
if( src->unlocked ) career_unlock_level( lvl );
if( src->score ) lvl->completed_score = src->score;
- // ...
if( lvl->serial_id == encoded.in_map )
- {
- if( console_changelevel( 1, &lvl->map_name ) )
- {
- world.pCmpLevel = lvl;
- gen_level_text( world.pCmpLevel );
- }
- }
+ lvl_to_load = lvl;
}
}
+ if( console_changelevel( 1, &lvl_to_load->map_name ) )
+ {
+ world.pCmpLevel = lvl_to_load;
+ gen_level_text( world.pCmpLevel );
+ }
+
career_load_success = 1;
}
// ===========================================================================================================
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 = world.buttons[ k_world_button_speedy ].pressed? 10.0f: 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;
return 1;
}
-void vg_update(void)
+static void vg_update(void)
{
// Camera
// ========================================================================================================
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;
- size = ( r2 < r1? (float)(world.w+5) * 0.5f: ((float)(world.h+5) * 0.5f) / r1 ) + 0.5f;
-
- v3f origin;
+ 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, vg_time_delta * 6.0f );
- v2_lerp( origin_current, origin, vg_time_delta * 6.0f, origin_current );
+ 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 );
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() )
{
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 );
if( cell_entry->config == k_cell_type_con_r || cell_entry->config == k_cell_type_con_u
|| cell_entry->config == k_cell_type_con_l || cell_entry->config == k_cell_type_con_d )
{
+ #ifdef VG_STEAM
sw_set_achievement( "CAN_DO_THAT" );
-
+ #endif
+
fish->state = k_fish_state_soon_alive;
fish->dir[0] = 0;
{
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 )
{
+ #ifdef VG_STEAM
sw_set_achievement( "BANG" );
-
+ #endif
+
// Shatter death (+0.5s)
float death_time = world.sim_internal_time + ( collide_this_frame? 0.0f: 0.5f );
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;
}
else
{
+ #ifdef VG_STEAM
if( world.sim_run > 0 )
sw_set_achievement( "GOOD_ENOUGH" );
-
+ #endif
+
vg_error( "Level failed :(\n" );
}
}
}
-void leaderboard_found( LeaderboardFindResult_t *pCallback );
-void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback );
-
static void render_tiles( v2i start, v2i end, v4f const regular_colour, v4f const selected_colour )
{
v2i full_start = { 0,0 };
}
}
-static void wbutton_run( enum e_world_button btn_name, v2f btn_tex )
+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.553f, 0.345f, 0.204f},
- {1.0f, 0.0f, 0.0f}
- };
+ static v2i click_grab = { -9999, -9999 };
- struct cell_button *btn = &world.buttons[btn_name];
-
- // Interaction
- int tex_offset = 0;
-
- 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 )
+ // Reset click_grab
+ if( !btn )
{
- // Click event
- if( btn_name == k_world_button_sim )
- {
- 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();
- }
- }
- else if( btn_name == k_world_button_pause )
- {
- btn->pressed ^= 0x1;
-
- world.sim_internal_ref = world.sim_internal_time;
- world.sim_delta_ref = vg_time;
-
- if( btn->pressed )
- {
- 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;
- }
- else if( btn_name == k_world_button_speedy )
- {
- btn->pressed ^= 0x1;
-
- world.sim_delta_speed = btn->pressed? 10.0f: 2.5f;
- world.sim_delta_ref = vg_time;
- world.sim_internal_ref = world.sim_internal_time;
- }
- else
- {
- btn->pressed ^= 0x1;
- }
-
- sfx_set_play( &audio_clicks, &audio_system_ui, btn->pressed?1:0 );
- }
-
- // Drawing
- if( btn->pressed )
- {
- if( is_hovering )
- {
- btn->light_target = 0.9f;
- }
- 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;
- }
+ click_grab[0] = -9999;
+ click_grab[1] = -9999;
+ return 0;
}
- else
- {
+
+ 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;
- btn->light = vg_lerpf( btn->light, btn->light_target, vg_time_delta*26.0f );
-
- // Draw
- if( btn_name == k_world_button_sim && world.buttons[ k_world_button_sim ].pressed )
+ // Process click action
+ if( is_hovering )
{
- if( world.buttons[ k_world_button_pause ].pressed )
- tex_offset = 3;
- else
- tex_offset = 2;
+ 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" ) )
+ {
+ // 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;
+ }
}
-
+
+ // Drawing stage
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_tex[0]+tex_offset),
- btn_tex[1]
+ 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 );
-}
-static void wbutton_draw( v2i pos, v2f tex, v4f colour )
-{
- glUniform4f( SHADER_UNIFORM( shader_buttons, "uOffset" ),
- pos[0],
- pos[1],
- tex[0],
- tex[1]
- );
- glUniform4fv( SHADER_UNIFORM( shader_buttons, "uColour" ), 1, 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 button_grid
- {
- v3f primary_colour;
- v2i origin;
- v2i dims;
- struct cmp_level *levels;
- int count;
- }
- grids[] =
- {
- {
- .primary_colour = { 0.204f, 0.345f, 0.553f },
- .origin = { -1, 2 },
- .dims = { 1, 4 },
- .levels = cmp_levels_tutorials,
- .count = vg_list_size( cmp_levels_tutorials )
- },
- {
- .primary_colour = { 0.304f, 0.245f, 0.553f },
- .origin = { -5, 2 },
- .dims = { 3, 6 },
- .levels = cmp_levels_basic,
- .count = vg_list_size( cmp_levels_basic )
- },
- {
- .primary_colour = { 0.553f, 0.345f, 0.204f },
- .origin = { -4, 0 },
- .dims = { 4, 1 },
- .levels = cmp_levels_grad,
- .count = vg_list_size( cmp_levels_grad )
- }
- };
-
- v2f tex_coord = { 0.0f, 0.0f };
- v4f final_colour = { 0.0f, 0.0f, 0.0f, 0.2f };
- v2i button_pos;
- static struct cmp_level *select_from = NULL;
struct cmp_level *switch_level_to = NULL;
-
- if( vg_get_button_down( "primary" ) )
- select_from = NULL;
-
- for( int i = 0; i < vg_list_size( grids ); i ++ )
+
+ for( int i = 0; i < vg_list_size( career_packs ); i ++ )
{
- struct button_grid *grid = &grids[i];
-
- int j = 0;
+ struct career_level_pack *grid = &career_packs[i];
- for( int x = 0; x < grid->dims[0]; x ++ )
+ for( int j = 0; j < grid->count; j ++ )
{
- for( int y = 0; y < grid->dims[1]; y ++ )
- {
- if( j < grid->count )
- {
- struct cmp_level *lvl = &grid->levels[ j ];
-
- // Determine colour
- if( lvl->unlocked )
- {
- if( lvl->is_tutorial )
- v3_copy( tutorial_colour, final_colour );
- else
- v3_copy( grid->primary_colour, final_colour );
-
- if( lvl->completed_score )
- final_colour[3] = 0.8f;
- else
- final_colour[3] = 0.2f;
- }
- else v3_copy( locked_colour, final_colour );
-
- v2i_add( grid->origin, (v2i){ x,y }, button_pos );
- int is_hovering = v2i_eq( (v2i){world.tile_x, world.tile_y}, button_pos );
+ struct cmp_level *lvl = &grid->pack[ j ];
- if( is_hovering )
- {
- final_colour[3] += 0.1f;
-
- // Up click
- if( vg_get_button_up( "primary" ) )
- if( select_from == lvl && lvl->unlocked )
- {
- switch_level_to = lvl;
- sfx_set_play( &audio_clicks, &audio_system_ui, 1 );
- }
-
- // Start click
- if( vg_get_button_down( "primary" ) )
- select_from = lvl;
-
- if( vg_get_button( "primary" ) )
- final_colour[3] += 0.2f;
- }
-
- if( world.pCmpLevel == lvl )
- final_colour[3] += fabsf(sinf( vg_time * 2.0f )) * 0.2f;
-
- wbutton_draw( (v2i){ grid->origin[0] + x, grid->origin[1] + y }, tex_coord, final_colour );
- }
- else break;
-
- 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
+ ))
+ {
+ if( status == k_world_button_on_enable && lvl->unlocked )
+ switch_level_to = lvl;
}
}
}
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 ); // (sinf( vg_time ) + 1.0f) * 0.5f );
+
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" ), 2.0f ); // sinf( vg_time ) + 1.0f );
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
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 ++ )
{
vg_tex2d_bind( &tex_buttons, 0 );
glUniform1i( SHADER_UNIFORM( shader_buttons, "uTexMain" ), 0 );
- wbutton_run( k_world_button_sim, (v2f){ 0.0f, 3.0f } );
- wbutton_run( k_world_button_pause, (v2f){ 1.0f, 3.0f } );
- wbutton_run( k_world_button_speedy, (v2f){ 0.0f, 2.0f } );
+ 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;
+
+ float sim_icon_x = world_paused? 3.0f: (world_running? 2.0f: 0.0f);
+
+ 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 ))
+ {
+ if( stat == k_world_button_on_enable )
+ {
+ simulation_start();
+
+ if( world_paused )
+ world.pause_offset_target = 0.5f;
+ }
+ else
+ {
+ if( world_paused )
+ {
+ // Trigger single step
+ world.pause_offset_target += 1.0f;
+ world.st.buttons[k_world_button_sim].state = 1;
+ }
+ else
+ {
+ simulation_stop();
+ }
+ }
+ }
+ if( world_button_exec( &world.st.buttons[k_world_button_pause], (v2f){ 1.0f, 3.0f }, btn_dark_blue, &stat ))
+ {
+ world.sim_internal_ref = world.sim_internal_time;
+ world.sim_delta_ref = vg_time;
+
+ 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;
+ }
+
+ if( world_button_exec( &world.st.buttons[k_world_button_speedy], (v2f){ 0.0f, 2.0f }, btn_orange, &stat ))
+ {
+ world.sim_delta_speed = stat == k_world_button_on_enable? 10.0f: 2.5f;
+
+ if( !world_paused )
+ {
+ 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 = k_game_settings;
+ }
+
level_selection_buttons();
+ if( vg_get_button_up( "primary" ) )
+ world_button_exec( NULL, NULL, NULL, NULL );
+
// TEXT ELEMENTS
// ========================================================================================================
SHADER_USE( shader_sdf );
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) ) );
+
// WIRES
// ========================================================================================================
//glDisable(GL_BLEND);
*/
}
-static ui_colourset flcol_list_a = {
- .main = 0xff877979,
- .hover = 0xffa09393,
- .active = 0xffbfb1b0
-};
-static ui_colourset flcol_list_b = {
- .main = 0xff7c6e6e,
- .hover = 0xffa09393,
- .active = 0xffbfb1b0
-};
-
-static ui_colourset flcol_list_complete_a = {
- .main = 0xff62a064,
- .hover = 0xff8dc18f,
- .active = 0xffb2ddb3
-};
-
-static ui_colourset flcol_list_complete_b = {
- .main = 0xff79b37b,
- .hover = 0xff8dc18f,
- .active = 0xffb2ddb3
-};
-
-static ui_colourset flcol_list_locked = {
- .main = 0xff655959,
- .hover = 0xff655959,
- .active = 0xff655959
-};
-
-static struct
-{
- SteamLeaderboard_t steam_leaderboard;
- int leaderboard_show;
-
- 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;
-
- struct
- {
- struct cmp_level *level;
-
- i32 score;
- int is_waiting;
- }
- upload_request;
-
- struct cmp_level *level_selected;
-}
-ui_data;
-
-void vg_ui(void)
-{
- /*
- // UI memory
- static int pack_selection = 0;
- static struct pack_info
- {
- struct cmp_level *levels;
- u32 level_count;
- const char *name;
- }
- pack_infos[] =
- {
- {
- .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"
- }
- };
-
- // UI Code
- ui_global_ctx.cursor[0] = 0;
- ui_global_ctx.cursor[1] = 0;
- ui_global_ctx.cursor[2] = 256;
-
- gui_fill_y();
-
- ui_global_ctx.id_base = 4 << 16;
-
- gui_new_node();
- {
- gui_capture_mouse( 9999 );
- gui_fill_rect( ui_global_ctx.cursor, 0xff5a4e4d );
-
- gui_text( "ASSIGNMENTS", 32, 0 );
-
- ui_global_ctx.cursor[1] += 30;
- ui_global_ctx.cursor[3] = 25;
-
- gui_new_node();
- {
- ui_rect_pad( ui_global_ctx.cursor, 2 );
- ui_global_ctx.cursor[2] = 84;
-
- for( int i = 0; i < 3; i ++ )
- {
- int pack_is_unlocked = pack_infos[i].levels[0].unlocked;
-
- if( i == pack_selection || !pack_is_unlocked )
- gui_override_colours( &flcol_list_locked );
-
- if( gui_button( 2000 + i ) == k_button_click && pack_is_unlocked )
- pack_selection = i;
-
- ui_global_ctx.cursor[1] += 2;
- gui_text( pack_is_unlocked? pack_infos[i].name: "???", 24, 0 );
- gui_end_right();
-
- 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 );
-
- ui_global_ctx.cursor[2] = 14;
- gui_align_right();
-
- ui_px content_height = count*level_height;
- if( content_height > view_height )
- {
- ui_scrollbar( &ui_global_ctx, &sb, 1 );
- ui_global_ctx.cursor[1] -= ui_calculate_content_scroll( &sb, content_height );
- }
- else
- {
- gui_fill_rect( ui_global_ctx.cursor, 0xff807373 );
- }
-
- ui_global_ctx.cursor[2] = 240;
- ui_global_ctx.cursor[3] = level_height;
- gui_align_left();
-
- for( int i = 0; i < count; 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, 24, 0 );
- ui_global_ctx.cursor[1] += 18;
- gui_text( lvl_info->completed_score>0? "passed": "incomplete", 24, 0 );
- }
- else
- {
- gui_button( 2 + i );
-
- ui_global_ctx.override_colour = 0xff786f6f;
- gui_text( "???", 24, 0 );
- ui_global_ctx.cursor[1] += 18;
- gui_text( "locked", 24, 0 );
- }
-
- gui_end_down();
- }
-
- gui_reset_colours();
- gui_release_clip();
- }
- gui_end_down();
- }
- }
- gui_end_right();
-
- // Selected level UI
- // ============================================================
-
- if( ui_data.level_selected )
- {
- 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;
-
- 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, 24, 0 );
-
- ui_global_ctx.cursor[1] += 30;
- 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, 16, 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 )
- {
- ui_data.level_selected = NULL;
- }
- gui_text( "BACK", 24, 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", 24, 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;
-
- {
- gui_override_colours( &flcol_list_complete_a );
- if( gui_button( 3002 ) == k_button_click )
- {
- if( console_changelevel( 1, &ui_data.level_selected->map_name ) )
- {
- world.pCmpLevel = ui_data.level_selected;
-
- ui_data.level_selected = NULL;
- ui_data.leaderboard_show = 0;
- }
- }
- gui_text( "PLAY", 24, k_text_alignment_center );
- gui_end();
- }
-
- 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", 24, 0 );
- }
- gui_end_down();
-
- ui_global_ctx.cursor[1] += 2;
-
- gui_new_node();
- {
- ui_global_ctx.cursor[3] = 32+8;
-
- for( int i = 0; i < ui_data.leaderboard_count; i ++ )
- {
- gui_new_node();
- {
- gui_fill_rect( ui_global_ctx.cursor, i&0x1? flcol_list_a.main: flcol_list_b.main );
-
- 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], 24, 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, 24, 0 );
-
- ui_global_ctx.cursor[2] = 50;
- gui_align_right();
-
- gui_text( player->score_text, 24, k_text_alignment_right );
- }
- gui_end_down();
-
- ui_global_ctx.cursor[1] += 2;
- }
- }
- gui_end();
- }
- }
- */
-}
+void vg_ui(void) {}
+#if STEAM_LEADERBOARDS
void leaderboard_dispatch_score(void)
{
-#if STEAM_LEADERBOARDS
sw_upload_leaderboard_score(
ui_data.upload_request.level->steam_leaderboard,
k_ELeaderboardUploadScoreMethodKeepBest,
ui_data.upload_request.is_waiting = 0;
vg_success( "Dispatched leaderboard score\n" );
-#endif
}
void leaderboard_found( LeaderboardFindResult_t *pCallback )
{
-#ifdef STEAM_LEADERBOARDS
if( !pCallback->m_bLeaderboardFound )
{
vg_error( "Leaderboard could not be found\n" );
}
}
}
-#endif
}
void leaderboard_downloaded( LeaderboardScoresDownloaded_t *pCallback )
{
-#ifdef STEAM_LEADERBOARDS
// Update UI if this leaderboard matches what we currently have in view
if( ui_data.level_selected->steam_leaderboard == pCallback->m_hSteamLeaderboard )
{
ui_data.leaderboard_show = 0;
}
else vg_warn( "Downloaded leaderboard does not match requested!\n" );
-#endif
}
void leaderboard_set_score( struct cmp_level *cmp_level, u32 score )
{
-#ifdef STEAM_LEADERBOARDS
if( ui_data.upload_request.is_waiting )
vg_warn( "You are uploading leaderboard entries too quickly!\n" );
leaderboard_dispatch_score();
else
sw_find_leaderboard( cmp_level->map_name );
-#endif
}
+#endif
// CONSOLE COMMANDS
// ===========================================================================================================
vg_info( " miniaudio MIT0 miniaud.io\n" );
vg_info( " QOI MIT phoboslab.org\n" );
vg_info( " STB library MIT nothings.org\n" );
+ vg_info( " Weiholmir JustFredrik\n" );
+ vg_info( " Ubuntu Regular ubuntu.com\n" );
return 0;
}
console_save_map( 0, NULL );
if( console_load_map( argc, argv ) )
{
+ world_static.zoom = 0.0f;
simulation_stop();
return 1;
}
.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 }
+ });
+
// Combined quad, long quad / empty circle / filled circle mesh
{
float combined_mesh[6*6 + 32*6*3] = {
}
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
+ time_max_size = 10,
+
+ size_level_texts = 6*9*7
;
- 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 cmp_level *lvl = &set->pack[j];
title_max_size +
desc_max_size +
score_max_size +
- time_max_size;
+ time_max_size +
+ size_level_texts;
u32 total_faces = total_characters * 2,
total_vertices = total_characters * 4,
// Working buffer
u32 work_buffer_total_chars =
- VG_MAX( VG_MAX( desc_max_size, title_max_size ), VG_MAX( score_max_size, time_max_size ) );
+ 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.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 = title_max_size;
+ 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);
// 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
void vg_free(void)
{
+#ifdef VG_STEAM
sw_free_opengl();
+#endif
+
console_save_map( 0, NULL );
career_serialize();
projects / fishladder.git / blobdiff