Add circle tool

Author: Killarexe

assets/style/default_theme.tres

@@ -527,7 +527,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter="builds/*"
-export_path="builds/1_0/android/Little Rage 1.0.0 Android.apk"
+export_path="builds/1_0/Little Rage 1.0.0 Android.apk"
 encryption_include_filters=""
 encryption_exclude_filters=""
 encrypt_pck=false

export_presets.cfg

@@ -177,7 +177,7 @@ shift={
 
 [input_devices]
 
-pointing/emulate_mouse_from_touch=false
+pointing/android/enable_pan_and_scale_gestures=true
 
 [internationalization]
 

project.godot

@@ -433,12 +433,10 @@ control = NodePath("..")
 brush = NodePath("../../../Camera2D/BrushComponent")
 
 [node name="TilesList" type="ItemList" parent="GUI"]
-visible = false
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = -360.0
-offset_bottom = -720.0
+offset_bottom = -360.0
 grow_horizontal = 2
 grow_vertical = 2
 auto_height = true
@@ -447,6 +445,7 @@ same_column_width = true
 icon_mode = 0
 icon_scale = 4.0
 script = ExtResource("4_uccun")
+default_tile = ExtResource("3_62fuo")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="GUI/TilesList"]
 root_node = NodePath("../..")

scenes/uis/LevelEditor.tscn

@@ -22,40 +22,45 @@ enum BrushTypes {
 func _ready() -> void:
 	tiles_list.on_selected.connect(set_selected_tile)
 
+func brush_pen(tile_position: Vector2i) -> void:
+	if erase:
+		level.ground.set_cell(tile_position, 1)
+	else:
+		selected_tile.place(level, tile_position)
+
+func brush_rectangle(start_tile_position: Vector2i, end_tile_position: Vector2i) -> void:
+	var first_tile_position: Vector2i = start_tile_position
+	var last_tile_position: Vector2i = end_tile_position
+	if start_tile_position < end_tile_position:
+		first_tile_position = end_tile_position
+		last_tile_position = start_tile_position
+	for x in range(last_tile_position.x, first_tile_position.x + 1):
+		for y in range(last_tile_position.y, first_tile_position.y + 1):
+			brush_pen(Vector2i(x, y))
+
+func brush_circle(start_tile_position: Vector2i, end_tile_position: Vector2i) -> void:
+	var radius: int = start_tile_position.distance_squared_to(end_tile_position)
+	var first_tile_position: Vector2i = start_tile_position + Vector2i(radius, radius)
+	var last_tile_position: Vector2i = start_tile_position - Vector2i(radius, radius)
+	for x in range(last_tile_position.x, first_tile_position.x):
+		for y in range(last_tile_position.y, first_tile_position.y):
+			var tile_position: Vector2i = Vector2i(x, y)
+			if start_tile_position.distance_squared_to(tile_position) <= radius:
+				brush_pen(tile_position)
+
 func brush(start_position: Vector2, end_position: Vector2 = Vector2.ZERO) -> void:
 	if !enable:
 		return
-	
 	var start_tile_position: Vector2i = (start_position / 16.0).floor()
-	var end_tile_position: Vector2i = (end_position / 16.0).round()
+	var end_tile_position: Vector2i = (end_position / 16.0).floor()
 
-	if erase:
-		match brush_type:
-			BrushTypes.PEN:
-				level.ground.set_cell(start_tile_position, 1)
-			BrushTypes.RECTANGLE:
-				var first_tile_position: Vector2i = start_tile_position
-				var last_tile_position: Vector2i = end_tile_position
-				if start_tile_position < end_tile_position:
-					first_tile_position = end_tile_position
-					last_tile_position = start_tile_position
-				for x in range(last_tile_position.x, first_tile_position.x):
-					for y in range(last_tile_position.y, first_tile_position.y):
-						level.ground.set_cell(Vector2i(x, y), 1)
-
-		return
 	match brush_type:
 		BrushTypes.PEN:
-			selected_tile.place(level, start_tile_position)
+			brush_pen(start_tile_position)
 		BrushTypes.RECTANGLE:
-			var first_tile_position: Vector2i = start_tile_position
-			var last_tile_position: Vector2i = end_tile_position
-			if start_tile_position < end_tile_position:
-				first_tile_position = end_tile_position
-				last_tile_position = start_tile_position
-			for x in range(last_tile_position.x, first_tile_position.x):
-				for y in range(last_tile_position.y, first_tile_position.y):
-					selected_tile.place(level, Vector2i(x, y))
+			brush_rectangle(start_tile_position, end_tile_position)
+		BrushTypes.CIRCLE:
+			brush_circle(start_tile_position, end_tile_position)
 
 func _process(delta: float) -> void:
 	tile_sprite.visible = enable && !erase && level.mode == LevelPlayer.Mode.EDIT

scripts/uis/level_editor/BrushComponent.gd

@@ -8,7 +8,7 @@ func _ready() -> void:
 	if !tiles_list.is_node_ready():
 		await tiles_list.ready
 	tiles_list.on_selected.connect(update_tiles_button_texture)
-	update_tiles_button_texture(tiles_list.editor_tiles[0])
+	update_tiles_button_texture(tiles_list.default_tile)
 
 func update_tiles_button_texture(tile: EditorTile):
 		icon = tile.get_icon(level)

scripts/uis/level_editor/TilesButton.gd

@@ -5,14 +5,16 @@ signal on_selected(tile: EditorTile)
 
 const TILES_DIR: String = "res://data/tiles/"
 
+@export var default_tile: EditorTile
+
 var editor_tiles: Array[EditorTile]
 
 func _ready():
 	for element in DataLoader.new().load_data_in_dir(TILES_DIR, "EditorTile"):
 		if element is EditorTile:
 			editor_tiles.append(element)
 	item_selected.connect(func(index: int): on_selected.emit(editor_tiles[index]))
-	on_selected.emit(editor_tiles[0])
+	on_selected.emit(default_tile)
 
 func create_list(atlas: CompressedTexture2D):
 	clear()