Move viewport camera to the subviewport container

Author: MewPurPur

src/ui_parts/display.tscn

@@ -9,11 +9,11 @@
 [ext_resource type="PackedScene" uid="uid://oltvrf01xrxl" path="res://src/ui_widgets/zoom_menu.tscn" id="8_xtdmn"]
 [ext_resource type="Script" uid="uid://b6pmlbnl76wmm" path="res://src/ui_parts/viewport.gd" id="9_4xrk7"]
 [ext_resource type="Script" uid="uid://rqrxhe8wa6fn" path="res://src/ui_parts/tab_bar.gd" id="9_rll1m"]
+[ext_resource type="Script" uid="uid://cbajqkgudfvh0" path="res://src/ui_parts/viewport_container.gd" id="9_ryr8t"]
 [ext_resource type="Shader" uid="uid://i2y5pyhcgra2" path="res://src/shaders/zoom_shader.gdshader" id="10_x7ybk"]
 [ext_resource type="Texture2D" uid="uid://c68og6bsqt0lb" path="res://assets/icons/backgrounds/Checkerboard.svg" id="11_1bm1s"]
 [ext_resource type="Script" uid="uid://dtplje5mhdmrj" path="res://src/ui_parts/display_texture.gd" id="12_qi23s"]
 [ext_resource type="Script" uid="uid://csqewpxr21ywy" path="res://src/ui_parts/handles_manager.gd" id="13_lwhwy"]
-[ext_resource type="Script" uid="uid://cm5033meho5vr" path="res://src/ui_widgets/camera.gd" id="15_hevpa"]
 
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_kqplg"]
 shader = ExtResource("10_x7ybk")
@@ -101,10 +101,12 @@ unique_name_in_owner = true
 layout_mode = 2
 
 [node name="ViewportContainer" type="SubViewportContainer" parent="ViewportPanel/VBoxContainer"]
+clip_contents = true
 custom_minimum_size = Vector2(450, 0)
 layout_mode = 2
 size_flags_vertical = 3
 stretch = true
+script = ExtResource("9_ryr8t")
 
 [node name="Viewport" type="SubViewport" parent="ViewportPanel/VBoxContainer/ViewportContainer"]
 unique_name_in_owner = true
@@ -148,12 +150,6 @@ anchors_preset = 0
 mouse_filter = 1
 script = ExtResource("13_lwhwy")
 
-[node name="Camera" type="Control" parent="ViewportPanel/VBoxContainer/ViewportContainer/Viewport"]
-layout_mode = 3
-anchors_preset = 0
-mouse_filter = 2
-script = ExtResource("15_hevpa")
-
 [node name="DebugMargins" type="MarginContainer" parent="ViewportPanel"]
 visible = false
 layout_mode = 2

src/ui_parts/handles_manager.gd

@@ -798,7 +798,7 @@ func _unhandled_input(event: InputEvent) -> void:
 	event.button_mask == 0) or (event is InputEventMouseButton and\
 	(event.button_index in [MOUSE_BUTTON_LEFT, MOUSE_BUTTON_RIGHT]))):
 		var nearest_handle := find_nearest_handle(event.position / State.zoom +\
-				get_parent().view.position)
+				get_parent().get_parent().camera_position)
 		if is_instance_valid(nearest_handle):
 			hovered_handle = nearest_handle
 			if hovered_handle is PathHandle:
@@ -910,7 +910,7 @@ func find_nearest_handle(event_pos: Vector2) -> Handle:
 
 # Two 64-bit coordinates instead of a Vector2.
 func get_event_pos(event: InputEvent) -> PackedFloat64Array:
-	return apply_snap(event.position / State.zoom + get_parent().view.position)
+	return apply_snap(event.position / State.zoom + get_parent().get_parent().camera_position)
 
 func apply_snap(pos: Vector2) -> PackedFloat64Array:
 	var precision_snap := 0.1 ** maxi(ceili(-log(1.0 / State.zoom) / log(10)), 0)

src/ui_parts/viewport.gd

@@ -1,7 +1,6 @@
 extends SubViewport
 
 const ZoomMenu = preload("res://src/ui_widgets/zoom_menu.gd")
-const Camera = preload("res://src/ui_widgets/camera.gd")
 const HandlesManager = preload("res://src/ui_parts/handles_manager.gd")
 const DisplayTexture = preload("res://src/ui_parts/display_texture.gd")
 
@@ -17,7 +16,7 @@ var limit_top := 0.0
 var limit_bottom := 0.0
 
 @onready var display: TextureRect = $Checkerboard
-@onready var view: Camera = $Camera
+@onready var view: SubViewportContainer = get_parent()
 @onready var controls: HandlesManager = $Controls
 @onready var display_texture: DisplayTexture = $Checkerboard/DisplayTexture
 @onready var reference_texture: TextureRect = $ReferenceTexture
@@ -36,14 +35,14 @@ func _ready() -> void:
 # Top left corner.
 func set_view(new_position: Vector2) -> void:
 	var scaled_size := size / State.zoom
-	view.unsnapped_position = new_position.clamp(Vector2(limit_left, limit_top),
+	view.camera_unsnapped_position = new_position.clamp(Vector2(limit_left, limit_top),
 			Vector2(limit_right, limit_bottom) - scaled_size)
 
-	var stripped_left := maxf(view.unsnapped_position.x, 0.0)
-	var stripped_top := maxf(view.unsnapped_position.y, 0.0)
-	var stripped_right := minf(view.unsnapped_position.x + scaled_size.x,
+	var stripped_left := maxf(view.camera_unsnapped_position.x, 0.0)
+	var stripped_top := maxf(view.camera_unsnapped_position.y, 0.0)
+	var stripped_right := minf(view.camera_unsnapped_position.x + scaled_size.x,
 			State.root_element.width)
-	var stripped_bottom := minf(view.unsnapped_position.y + scaled_size.y,
+	var stripped_bottom := minf(view.camera_unsnapped_position.y + scaled_size.y,
 			State.root_element.height)
 	display_texture.view_rect = Rect2(stripped_left, stripped_top,
 			stripped_right - stripped_left, stripped_bottom - stripped_top)
@@ -87,7 +86,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		# Panning with LMB or MMB. This gives a reliable way to adjust the view
 		# without dragging the things on it.
 		else:
-			set_view(view.unsnapped_position - (wrap_mouse(event.relative) if\
+			set_view(view.camera_unsnapped_position - (wrap_mouse(event.relative) if\
 					Configs.savedata.wraparound_panning else event.relative) / State.zoom)
 
 	elif event is InputEventPanGesture and not DisplayServer.get_name() == "Android":
@@ -96,7 +95,7 @@ func _unhandled_input(event: InputEvent) -> void:
 			zoom_menu.set_zoom(State.zoom * (1 + event.delta.y / 2))
 		# Panning with touch.
 		else:
-			set_view(view.unsnapped_position + event.delta * 32 / State.zoom)
+			set_view(view.camera_unsnapped_position + event.delta * 32 / State.zoom)
 	# Zooming with touch.
 	elif event is InputEventMagnifyGesture:
 		zoom_menu.set_zoom(State.zoom * event.factor)
@@ -142,7 +141,7 @@ func _unhandled_input(event: InputEvent) -> void:
 		elif zoom_dir == -1:
 			zoom_menu.zoom_out(factor, mouse_offset)
 
-		set_view(view.unsnapped_position + move_vec * factor / State.zoom * 32)
+		set_view(view.camera_unsnapped_position + move_vec * factor / State.zoom * 32)
 
 	else:
 		if not event.is_echo():
@@ -174,9 +173,9 @@ func adjust_view(offset := Vector2(0.5, 0.5)) -> void:
 	limit_top = -zoomed_size.y
 	limit_bottom = zoomed_size.y + svg_h
 
-	set_view(Vector2(lerpf(view.unsnapped_position.x, view.unsnapped_position.x +\
-			old_size.x - size.x / State.zoom, offset.x), lerpf(view.unsnapped_position.y,
-			view.unsnapped_position.y + old_size.y - size.y / State.zoom, offset.y)))
+	set_view(Vector2(lerpf(view.camera_unsnapped_position.x, view.camera_unsnapped_position.x +\
+			old_size.x - size.x / State.zoom, offset.x), lerpf(view.camera_unsnapped_position.y,
+			view.camera_unsnapped_position.y + old_size.y - size.y / State.zoom, offset.y)))
 
 func _on_size_changed() -> void:
 	State.set_viewport_size(size)

src/ui_parts/viewport_container.gd

@@ -0,0 +1,130 @@
+extends SubViewportContainer
+
+const TICKS_INTERVAL = 4
+const TICK_DISTANCE = float(TICKS_INTERVAL)
+
+var ci := get_canvas_item()
+var grid_ci := RenderingServer.canvas_item_create()
+var grid_numbers_ci := RenderingServer.canvas_item_create()
+
+var camera_zoom: float
+var camera_position: Vector2
+var camera_unsnapped_position: Vector2
+
+
+func _ready() -> void:
+	Configs.grid_color_changed.connect(queue_redraw)
+	State.show_grid_changed.connect(update_show_grid)
+	update_show_grid()
+	RenderingServer.canvas_item_set_parent(grid_ci, ci)
+	RenderingServer.canvas_item_set_parent(grid_numbers_ci, ci)
+	State.svg_resized.connect(queue_redraw)
+	State.zoom_changed.connect(change_zoom)
+	State.zoom_changed.connect(queue_redraw)
+
+func exit_tree() -> void:
+	RenderingServer.free_rid(grid_numbers_ci)
+
+func change_zoom() -> void:
+	camera_zoom = State.zoom
+
+func update_show_grid() -> void:
+	RenderingServer.canvas_item_set_visible(grid_ci, State.show_grid)
+	RenderingServer.canvas_item_set_visible(grid_numbers_ci, State.show_grid)
+
+
+func update() -> void:
+	var new_position := camera_unsnapped_position.snapped(Vector2(1, 1) / camera_zoom)
+	if camera_position != new_position:
+		camera_position = new_position
+		State.view_changed.emit()
+	
+	get_child(0).canvas_transform = Transform2D(0.0, Vector2(camera_zoom, camera_zoom),
+			0.0, -camera_position * camera_zoom)
+	queue_redraw()
+
+
+# Don't ask me to explain this.
+func _draw() -> void:
+	RenderingServer.canvas_item_clear(grid_ci)
+	RenderingServer.canvas_item_clear(grid_numbers_ci)
+	
+	var axis_line_color := Color(Configs.savedata.grid_color, 0.75)
+	var major_grid_color := Color(Configs.savedata.grid_color, 0.35)
+	var minor_grid_color := Color(Configs.savedata.grid_color, 0.15)
+	
+	var grid_size := Vector2(State.viewport_size) / camera_zoom
+	RenderingServer.canvas_item_add_line(grid_ci, Vector2(-camera_position.x * camera_zoom, 0),
+			Vector2(-camera_position.x * camera_zoom, grid_size.y * camera_zoom), axis_line_color)
+	RenderingServer.canvas_item_add_line(grid_ci, Vector2(0, -camera_position.y * camera_zoom),
+			Vector2(grid_size.x * camera_zoom, -camera_position.y * camera_zoom), axis_line_color)
+	
+	var major_points := PackedVector2Array()
+	var minor_points := PackedVector2Array()
+	var draw_minor_lines := (camera_zoom >= 8.0)
+	var mark_pixel_lines := (camera_zoom >= 128.0)
+	@warning_ignore("integer_division")
+	var rate := nearest_po2(roundi(maxf(128.0 / (TICKS_INTERVAL * camera_zoom), 2.0))) / 2
+	
+	var i := fmod(-camera_position.x, 1.0)
+	var major_line_h_offset := fposmod(-camera_position.x, TICK_DISTANCE)
+	# Horizontal offset.
+	while i <= grid_size.x:
+		if major_line_h_offset != fposmod(i, TICK_DISTANCE):
+			if draw_minor_lines:
+				minor_points.append(Vector2(i * camera_zoom, 0))
+				minor_points.append(Vector2(i * camera_zoom, grid_size.y * camera_zoom))
+				if mark_pixel_lines:
+					ThemeUtils.regular_font.draw_string(grid_numbers_ci,
+							Vector2(i * camera_zoom + 4, 14), String.num_int64(floori(i + camera_position.x)),
+							HORIZONTAL_ALIGNMENT_LEFT, -1, 14, axis_line_color)
+		else:
+			var coord := snappedi(i + camera_position.x, TICKS_INTERVAL)
+			if int(coord / TICK_DISTANCE) % rate == 0:
+				major_points.append(Vector2(i * camera_zoom, 0))
+				major_points.append(Vector2(i * camera_zoom, grid_size.y * camera_zoom))
+				ThemeUtils.regular_font.draw_string(grid_numbers_ci,
+						Vector2(i * camera_zoom + 4, 14), String.num_int64(coord),
+						HORIZONTAL_ALIGNMENT_LEFT, -1, 14, axis_line_color)
+			elif coord % rate == 0:
+				minor_points.append(Vector2(i * camera_zoom, 0))
+				minor_points.append(Vector2(i * camera_zoom, grid_size.y * camera_zoom))
+		i += 1.0
+	
+	i = fmod(-camera_position.y, 1.0)
+	var major_line_v_offset := fposmod(-camera_position.y, TICK_DISTANCE)
+	# Vertical offset.
+	while i < grid_size.y:
+		if major_line_v_offset != fposmod(i, TICK_DISTANCE):
+			if draw_minor_lines:
+				minor_points.append(Vector2(0, i * camera_zoom))
+				minor_points.append(Vector2(grid_size.x * camera_zoom, i * camera_zoom))
+				if mark_pixel_lines:
+					ThemeUtils.regular_font.draw_string(grid_numbers_ci,
+							Vector2(4, i * camera_zoom + 14), String.num_int64(floori(i + camera_position.y)),
+							HORIZONTAL_ALIGNMENT_LEFT, -1, 14, axis_line_color)
+		else:
+			var coord := snappedi(i + camera_position.y, TICKS_INTERVAL)
+			if int(coord / TICK_DISTANCE) % rate == 0:
+				major_points.append(Vector2(0, i * camera_zoom))
+				major_points.append(Vector2(grid_size.x * camera_zoom, i * camera_zoom))
+				ThemeUtils.regular_font.draw_string(grid_numbers_ci,
+						Vector2(4, i * camera_zoom + 14), String.num_int64(coord),
+						HORIZONTAL_ALIGNMENT_LEFT, -1, 14, axis_line_color)
+			elif coord % rate == 0:
+				minor_points.append(Vector2(0, i * camera_zoom))
+				minor_points.append(Vector2(grid_size.x * camera_zoom, i * camera_zoom))
+		i += 1.0
+	
+	if not major_points.is_empty():
+		var pca := PackedColorArray()
+		@warning_ignore("integer_division")
+		pca.resize(major_points.size() / 2)
+		pca.fill(major_grid_color)
+		RenderingServer.canvas_item_add_multiline(grid_ci, major_points, pca)
+	if not minor_points.is_empty():
+		var pca := PackedColorArray()
+		@warning_ignore("integer_division")
+		pca.resize(minor_points.size() / 2)
+		pca.fill(minor_grid_color)
+		RenderingServer.canvas_item_add_multiline(grid_ci, minor_points, pca)

src/ui_parts/viewport_container.gd.uid

@@ -0,0 +1 @@
+uid://cbajqkgudfvh0