From: hgn <hgodden00@gmail.com>
Date: Sat, 8 Jan 2022 11:26:13 +0000 (+0000)
Subject: zoom offset
X-Git-Url: https://harrygodden.com/git/?p=fishladder.git;a=commitdiff_plain;h=cc51e344cfe81fe418d44fcfa91e55bb1b4f89d0

zoom offset
---

diff --git a/fishladder.c b/fishladder.c
index d663fd7..bb3c98a 100644
--- 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 }
 	}
 };
 
@@ -1462,7 +1461,7 @@ static int cell_interactive( v2i co )
 	return 1;
 }
 
-void vg_update(void)
+static void vg_update(void)
 {
 	// Camera
 	// ========================================================================================================
@@ -1473,17 +1472,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 +1509,82 @@ 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 );
+	}
+
+	// calculate relative position of mouse in view_point space
+	
+	{ // Debug
+		v2f lwr; v2f upr;
+		v2f lwr1; v2f upr1;
+		v2f p0; v2f p1;
+		v2f vo;
+		v2f mouse_viewspace;
+
+		float rsize = size-view_zoom_extra;
+
+		v2_sub( (v2f){ -size + 0.1f, -size*r1 + 0.1f }, origin, lwr );
+		v2_sub( (v2f){  size - 0.1f,  size*r1 - 0.1f }, origin, upr );
+
+		v2_sub( (v2f){ -rsize, -rsize*r1 }, vt_target, lwr1 );
+		v2_sub( (v2f){  rsize,  rsize*r1 }, vt_target, upr1 );
+
+		vg_line_box( lwr, upr, 0xffffff00 );
+		vg_line_box( lwr1, upr1, 0xff00ff00 );
+
+		// Calculate vector towards mouse from vt_target
+		v2f mouse_delta;
+		v2_muls( vt_target, -1.0f, vo );
+
+		v2_sub( vt_target, vg_mouse_ws, mouse_delta );
+
+		vg_line( vo, vg_mouse_ws, 0xffffffff );
+
+		// Mouse Locally
+		v2_div( vg_mouse, (v2f){ vg_window_x, vg_window_y }, mouse_viewspace );
+		mouse_viewspace[0] = mouse_viewspace[0]*rsize*2.0f;
+		mouse_viewspace[1] = (1.0f-mouse_viewspace[1])*rsize*2.0f*r1;
+
+		v2_add( lwr1, mouse_viewspace, mouse_viewspace );
+
+		vg_line( mouse_viewspace, (v2f){0.0f, 0.0f}, 0xff0000ff );
+	//}
+
+		// Zoom
+		view_zoom_extra = vg_clampf( view_zoom_extra + vg_mouse_wheel[1], 0.0f, size - 4.0f );
+	
+		// Zoom offset adjust
+		rsize = size-view_zoom_extra;
+		v2_sub( (v2f){ -rsize, -rsize*r1 }, vt_target, lwr1 );
+		v2_sub( (v2f){  rsize,  rsize*r1 }, vt_target, upr1 );
+		
+		v2f mouse_viewspace_new;
+		v2_div( vg_mouse, (v2f){ vg_window_x, vg_window_y }, mouse_viewspace_new );
+		mouse_viewspace_new[0] = mouse_viewspace_new[0]*rsize*2.0f;
+		mouse_viewspace_new[1] = (1.0f-mouse_viewspace_new[1])*rsize*2.0f*r1;
+
+		v2_add( lwr1, mouse_viewspace_new, mouse_viewspace_new );
+
+		v2f zoom_offset;
+		v2_sub( mouse_viewspace, mouse_viewspace_new, zoom_offset );
+		v2_muladds( view_point, zoom_offset, -1.0f, view_point );
+	}
+
 	// Tilemap
 	// ========================================================================================================
 	if( !is_simulation_running() && !gui_want_mouse() )
@@ -2710,6 +2797,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" ) )
diff --git a/textures/buttons.png b/textures/buttons.png
index 3842947..de20796 100644
Binary files a/textures/buttons.png and b/textures/buttons.png differ
diff --git a/vg/config.h b/vg/config.h
index 34df41f..6bfb311 100644
--- a/vg/config.h
+++ b/vg/config.h
@@ -4,7 +4,8 @@ static struct button_binding vg_button_binds[] =
 {
 	{ .name = "primary", .bind = GLFW_MOUSE_BUTTON_LEFT },
 	{ .name = "secondary", .bind = GLFW_MOUSE_BUTTON_RIGHT },
-	{ .name = "noclip",	.bind = GLFW_KEY_V, },
+	{ .name = "tertiary", .bind = GLFW_MOUSE_BUTTON_MIDDLE },
+	{ .name = "noclip",	.bind = GLFW_KEY_V },
 	{ .name = "go", 		.bind = GLFW_KEY_SPACE },
 	{ .name = "prev",		.bind = GLFW_KEY_N },
 	{ .name = "next",		.bind = GLFW_KEY_M }
diff --git a/vg/vg.h b/vg/vg.h
index 190b9e9..6e2d0ff 100644
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -48,6 +48,7 @@ int vg_window_y = 768;
 #endif
 
 v2f vg_mouse;
+v2f vg_mouse_wheel;
 v3f vg_mouse_ws;
 
 float	vg_time;
@@ -130,7 +131,8 @@ void vg_mouse_callback( GLFWwindow* ptrW, double xpos, double ypos )
 
 void vg_scroll_callback( GLFWwindow* ptrW, double xoffset, double yoffset )
 {
-	
+	vg_mouse_wheel[0] += xoffset;
+	vg_mouse_wheel[1] += yoffset;
 }
 
 void vg_framebuffer_resize_callback( GLFWwindow *ptrW, int w, int h )
@@ -247,6 +249,8 @@ static void vg_init( int argc, char *argv[], const char *window_name )
 		// Main gameloop
 		while( !glfwWindowShouldClose( vg_window ) )
 		{
+			v2_copy( (v2f){ 0.0f, 0.0f }, vg_mouse_wheel );
+
 			glfwPollEvents();
 			
 			#ifdef VG_STEAM