cleaned up world edges

[fishladder.git] / fishladder.c

diff --git a/fishladder.c b/fishladder.c
index d663fd75927207502217807753fbe318c022601d..a568516123b8ab072e3cbf5ad65fa62691bd96d8 100644 (file)
--- a/fishladder.c
+++ b/fishladder.c
@@ -61,7 +61,8 @@ enum e_world_button
        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
@@ -194,9 +195,7 @@ world_static =
                { .mode = k_world_button_mode_toggle },
                { .mode = k_world_button_mode_toggle },
                { .mode = k_world_button_mode_toggle },
-               {
-                       // TODO: Settings button and menu
-               }
+               { .mode = k_world_button_mode_toggle }
        }
 };
 
@@ -918,7 +917,13 @@ 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 );
+                               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;
@@ -1462,7 +1467,7 @@ static int cell_interactive( v2i co )
        return 1;
 }
 
-void vg_update(void)
+static void vg_update(void)
 {
        // Camera
        // ========================================================================================================
@@ -1473,17 +1478,29 @@ void vg_update(void)
        
        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;
+       static float view_zoom_extra = 0.0f;
+
+       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], -view_zoom_extra, view_zoom_extra );
+       result_view[1] = vg_clampf( result_view[1], -view_zoom_extra*r1, view_zoom_extra*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 - view_zoom_extra, 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 );
@@ -1498,6 +1515,50 @@ void vg_update(void)
        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-view_zoom_extra;
+
+               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 );
+
+               view_zoom_extra = vg_clampf( view_zoom_extra + vg_mouse_wheel[1], 0.0f, size - 4.0f );
+
+               // Recalculate new position
+               rsize = size-view_zoom_extra;
+               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() )
@@ -1878,7 +1939,7 @@ void vg_update(void)
                                        {
                                                fj = &world.fishes[j];
                                                
-                                               if( (fj->state == k_fish_state_alive) )
+                                               if( fj->state == k_fish_state_alive )
                                                {
                                                        v2i fi_prev;
                                                        v2i fj_prev;
@@ -2710,6 +2771,11 @@ void vg_render(void)
                }
        }
 
+       if( world_button_exec( &world_static.buttons[k_world_button_settings], (v2f){ 1.0f, 2.0f }, btn_orange, &stat ))
+       {
+               
+       }
+
        level_selection_buttons();
        
        if( vg_get_button_up( "primary" ) )