Merge pull request #742 from aaronfranke/2d-to-control

Convert some 2D nodes to Control nodes in GDPaint and Pseudolocalization demos

Author: aaronfranke

2d/gd_paint/README.md renamed to gui/gd_paint/README.md

@@ -4,8 +4,6 @@ extends Control
 const UNDO_MODE_SHAPE = -2
 # A constant for whether or not we can undo.
 const UNDO_NONE = -1
-# How large is the image (it's actually the size of DrawingAreaBG, because that's our background canvas).
-const IMAGE_SIZE = Vector2(674, 600)
 
 # Enums for the various modes and brush shapes that can be applied.
 enum BrushModes {
@@ -20,9 +18,6 @@ enum BrushShapes {
 	CIRCLE,
 }
 
-# The top-left position of the canvas.
-var TL_node
-
 # A list to hold all of the dictionaries that make up each brush.
 var brush_data_list = []
 
@@ -48,20 +43,15 @@ var brush_shape = BrushShapes.CIRCLE;
 # in the _draw function for more details).
 var bg_color = Color.WHITE
 
-func _ready():
-	# Get the top left position node. We need this to find out whether or not the mouse is inside the canvas.
-	TL_node = get_node(^"TLPos")
-	set_process(true)
+@onready var drawing_area = $"../DrawingAreaBG"
 
 
 func _process(_delta):
 	var mouse_pos = get_viewport().get_mouse_position()
 
 	# Check if the mouse is currently inside the canvas/drawing-area.
-	is_mouse_in_drawing_area = false
-	if mouse_pos.x > TL_node.global_position.x:
-		if mouse_pos.y > TL_node.global_position.y:
-			is_mouse_in_drawing_area = true
+	var drawing_area_rect := Rect2(drawing_area.position, drawing_area.size)
+	is_mouse_in_drawing_area = drawing_area_rect.has_point(mouse_pos)
 
 	if Input.is_mouse_button_pressed(MOUSE_BUTTON_LEFT):
 		# If we do not have a position for when the mouse was first clicked, then this must
@@ -110,11 +100,10 @@ func check_if_mouse_is_inside_canvas():
 		# Make sure the mouse click starting position is inside the canvas.
 		# This is so if we start out click outside the canvas (say chosing a color from the color picker)
 		# and then move our mouse back into the canvas, it won't start painting.
-		if mouse_click_start_pos.x > TL_node.global_position.x:
-			if mouse_click_start_pos.y > TL_node.global_position.y:
-				# Make sure the current mouse position is inside the canvas.
-				if is_mouse_in_drawing_area:
-					return true
+		if Rect2(drawing_area.position, drawing_area.size).has_point(mouse_click_start_pos):
+			# Make sure the current mouse position is inside the canvas.
+			if is_mouse_in_drawing_area:
+				return true
 	return false
 
 
@@ -244,7 +233,7 @@ func save_picture(path):
 	# Get the viewport image.
 	var img = get_viewport().get_texture().get_image()
 	# Crop the image so we only have canvas area.
-	var cropped_image = img.get_rect(Rect2(TL_node.global_position, IMAGE_SIZE))
+	var cropped_image = img.get_rect(Rect2(drawing_area.position, drawing_area.size))
 
 	# Save the image with the passed in path we got from the save dialog.
 	cropped_image.save_png(path)

2d/gd_paint/icon.png renamed to gui/gd_paint/icon.png

@@ -1,4 +1,4 @@
-[gd_scene load_steps=6 format=3 uid="uid://bhjmyer4wlwy2"]
+[gd_scene load_steps=10 format=3 uid="uid://bhjmyer4wlwy2"]
 
 [ext_resource type="Script" path="res://paint_control.gd" id="1"]
 [ext_resource type="Script" path="res://tools_panel.gd" id="2"]
@@ -10,6 +10,22 @@ bg_color = Color(1, 1, 1, 1)
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_npkcn"]
 bg_color = Color(0.2, 0.2, 0.2, 1)
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_v0gbg"]
+atlas = ExtResource( "3" )
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_j7akv"]
+atlas = ExtResource( "3" )
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_63q87"]
+atlas = ExtResource( "3" )
+region = Rect2(0, 16, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_t52fe"]
+atlas = ExtResource( "3" )
+region = Rect2(16, 16, 16, 16)
+
 [node name="PaintRoot" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -33,9 +49,6 @@ script = ExtResource( "1" )
 metadata/_edit_layout_mode = 1
 metadata/_edit_use_custom_anchors = false
 
-[node name="TLPos" type="Position2D" parent="PaintControl"]
-position = Vector2(350, 0)
-
 [node name="ToolsPanel" type="Panel" parent="."]
 offset_right = 350.0
 offset_bottom = 600.0
@@ -61,12 +74,18 @@ offset_bottom = 85.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/ButtonToolPencil"]
-position = Vector2(27, 26)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(0, 0, 16, 16)
+[node name="TextureRect" type="TextureRect" parent="ToolsPanel/ButtonToolPencil"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_v0gbg" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="ButtonToolEraser" type="Button" parent="ToolsPanel"]
 offset_left = 110.0
@@ -76,12 +95,18 @@ offset_bottom = 85.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/ButtonToolEraser"]
-position = Vector2(29, 26)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(16, 0, 16, 16)
+[node name="TextureRect2" type="TextureRect" parent="ToolsPanel/ButtonToolEraser"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_j7akv" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="ButtonToolRectangle" type="Button" parent="ToolsPanel"]
 offset_left = 180.0
@@ -91,12 +116,18 @@ offset_bottom = 85.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/ButtonToolRectangle"]
-position = Vector2(28, 26)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(0, 16, 16, 16)
+[node name="TextureRect" type="TextureRect" parent="ToolsPanel/ButtonToolRectangle"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_63q87" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="ButtonToolCircle" type="Button" parent="ToolsPanel"]
 offset_left = 250.0
@@ -106,12 +137,18 @@ offset_bottom = 85.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/ButtonToolCircle"]
-position = Vector2(28, 26)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(16, 16, 16, 16)
+[node name="TextureRect" type="TextureRect" parent="ToolsPanel/ButtonToolCircle"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_t52fe" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="LabelBrushColor" type="Label" parent="ToolsPanel"]
 offset_left = 20.0
@@ -172,12 +209,18 @@ offset_bottom = 114.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/BrushSettings/ButtonShapeBox"]
-position = Vector2(27, 27)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(0, 16, 16, 16)
+[node name="TextureRect" type="TextureRect" parent="ToolsPanel/BrushSettings/ButtonShapeBox"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_63q87" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="ButtonShapeCircle" type="Button" parent="ToolsPanel/BrushSettings"]
 offset_left = 190.0
@@ -187,12 +230,18 @@ offset_bottom = 114.0
 metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
-[node name="Sprite2D" type="Sprite2D" parent="ToolsPanel/BrushSettings/ButtonShapeCircle"]
-position = Vector2(28, 27)
-scale = Vector2(2.5, 2.5)
-texture = ExtResource( "3" )
-region_enabled = true
-region_rect = Rect2(16, 16, 16, 16)
+[node name="TextureRect" type="TextureRect" parent="ToolsPanel/BrushSettings/ButtonShapeCircle"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 5.0
+offset_top = 5.0
+offset_right = -5.0
+offset_bottom = -5.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = SubResource( "AtlasTexture_t52fe" )
+metadata/_edit_layout_mode = 1
+metadata/_edit_use_custom_anchors = false
 
 [node name="LabelBackgroundColor" type="Label" parent="ToolsPanel"]
 offset_left = 20.0
@@ -251,6 +300,8 @@ metadata/_edit_layout_mode = 0
 metadata/_edit_use_custom_anchors = false
 
 [node name="SaveFileDialog" type="FileDialog" parent="."]
+size = Vector2i(800, 300)
+min_size = Vector2i(800, 300)
 access = 2
 filters = PackedStringArray("*.png")
 show_hidden_files = true