Make image cropping run on a different thread, make images clickable

Additionally store the rotation count as an integer

Author: NetroScript

components/PreviewContainer.tscn

@@ -22,6 +22,7 @@ base_font = ExtResource("3_kats2")
 custom_minimum_size = Vector2(0, 80)
 offset_right = 80.0
 offset_bottom = 80.0
+mouse_default_cursor_shape = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_7sarn")
 script = ExtResource("1_7r3w4")
 

scripts/Application.gd

@@ -107,19 +107,28 @@ func _poll_threads() -> void:
 func threaded_load_image(path: String, callback: Callable) -> void:
 
 	var worktask := ImageThreadWorkerTask.new(callback, path)
+	var worker := select_worker()
+	worker.add_item_to_queue(worktask)
+	
+func threaded_crop_image(image: Image, size: Rect2i, callback: Callable) -> void:
 
-	# FInd a non working thread
+	var worktask := ImageThreadWorkerTask.new(callback, "", ImageThreadWorkerTask.WORKER_TASKS.CROP, {
+		"image": image,
+		"size": size,
+		"crop_size": crop_to_size
+	})
+	var worker := select_worker()
+	worker.add_item_to_queue(worktask)
+
+func select_worker() -> ImageThreadWorker:
+	# Find a non working thread
 
 	for worker in thread_workers:
 		if worker.current_work_item == null:
-			worker.add_item_to_queue(worktask)
-			return
+			return worker
 
 	# If we have no free worker sample a random one where we assign the work
-	
-	var worker : ImageThreadWorker = thread_workers.pick_random()
-	worker.add_item_to_queue(worktask)
-	
+	return thread_workers.pick_random()
 
 func _entry_path_changed() -> void:
 	clear()
@@ -190,9 +199,14 @@ class ImageThreadWorker extends Resource:
 		# If we are currently working on an item, check if we have finished that, if so clear it
 		if current_work_item != null:
 			if !thread.is_alive():
-				var image := thread.wait_to_finish() as ImageTexture
-
-				current_work_item.callback.call(image)
+				
+				match current_work_item.task:
+					ImageThreadWorkerTask.WORKER_TASKS.LOAD:
+						var image := thread.wait_to_finish() as ImageTexture
+						current_work_item.callback.call(image)
+					ImageThreadWorkerTask.WORKER_TASKS.CROP:
+						var image := thread.wait_to_finish() as Image
+						current_work_item.callback.call(image)
 
 				current_work_item = null
 				check_for_work()
@@ -202,7 +216,16 @@ class ImageThreadWorker extends Resource:
 				current_work_item = working_queue.pop_back() as ImageThreadWorkerTask
 				thread = Thread.new()
 
-				thread.start(load_image_texture.bind(current_work_item.path))
+				match current_work_item.task:
+					ImageThreadWorkerTask.WORKER_TASKS.LOAD:
+						thread.start(load_image_texture.bind(current_work_item.path))
+						
+					ImageThreadWorkerTask.WORKER_TASKS.CROP:
+						thread.start(crop_image.bind(
+							current_work_item.data_playload["image"],
+							current_work_item.data_playload["size"],
+							current_work_item.data_playload["crop_size"],
+						))
 
 
 	func load_image_texture(path: String) -> ImageTexture:
@@ -214,3 +237,16 @@ class ImageThreadWorker extends Resource:
 			return null
 
 		return ImageTexture.create_from_image(loaded_image)
+		
+	func crop_image(image: Image, rect: Rect2i, size: Vector2i) -> Image:
+		
+		if image == null:
+			return null
+		
+		# Get the region of the image we actually want
+		var new_image := image.get_region(rect)
+		
+		# Now we resize that target region into the crop size we actually want
+		new_image.resize(size.x, size.y, Image.INTERPOLATE_LANCZOS)
+		
+		return new_image

scripts/PreviewContainer.gd

@@ -59,6 +59,8 @@ func update_outline() -> void:#
 
 func set_texture() -> void:
 
+	update_outline()
+	
 	if image_reference == null:
 		return
 
@@ -70,6 +72,14 @@ func set_texture() -> void:
 	else:
 		texture.texture = preload("res://assets/icons/Image.svg")
 
+func _gui_input(event: InputEvent) -> void:
+	
+	if image_reference == null:
+		return
+	
+	if event is InputEventMouseButton:
+		if event.pressed and event.button_index == MOUSE_BUTTON_LEFT:
+			Application.current_active_index = image_reference.index
 
 func load_image() -> void:
 

scripts/ProcessedImage.gd

@@ -16,6 +16,7 @@ var original_texture : Texture2D = null
 var preview_texture : Texture2D = null
 
 var index: int = 0
+var total_rotations: int = 0
 
 var is_loading_image: bool = false
 
@@ -52,6 +53,8 @@ func rotate(direction: int) -> void:
 	if original_texture == null:
 		return 
 
+	total_rotations -= direction * 2 - 1 
+	
 	var new_image = original_texture.get_image()
 	new_image.rotate_90(direction)
 
@@ -68,22 +71,23 @@ func unload_image() -> bool:
 
 	return false
 
-func export_image(position: Rect2i) -> bool:
+func export_image(position: Rect2i) -> void:
 
 	exported_section = position
 
 	# We now have our image section, where we extract a new image
 	if original_texture != null:
-		var new_image := original_texture.get_image().get_region(position)
 
-		# Now we resize that target region into the crop size we actually want
-		new_image.resize(Application.crop_to_size.x, Application.crop_to_size.y, Image.INTERPOLATE_LANCZOS)
+		Application.threaded_crop_image(
+			original_texture.get_image(),
+			position,
+			func(image: Image):
+				preview_texture = ImageTexture.create_from_image(image)
+				was_already_exported = true
+				was_exported.emit()
+		)
+		
 
-		preview_texture = ImageTexture.create_from_image(new_image)
-	
-		was_already_exported = true
-		was_exported.emit()
-	return false
 
 func get_file_name() -> String:
 	return source_path.get_file()