Compare commits
10
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5484be0028 | ||
|
|
5a06cbaf65 | ||
|
|
34f60a1bbe | ||
|
|
feec70d2ab | ||
|
|
141c62952c | ||
|
|
9c15ba991b | ||
|
|
ad07784366 | ||
|
|
4957c7ab47 | ||
|
|
dbc3e0738f | ||
|
|
c60a03228a |
No files matched your search
@@ -16,22 +16,41 @@ signal burst_ended
|
||||
var _input_action: String
|
||||
|
||||
func _ready() -> void:
|
||||
var saved_position = _local_data.settings.load_value("misc", "ShutterWindowPosition")
|
||||
if saved_position:
|
||||
position = saved_position
|
||||
old_position = position
|
||||
var only_run_in_editor = _local_data.settings.load_value("misc", "OnlyRunInEditorCheckBox", true)
|
||||
visible = _local_data.settings.load_value("misc", "ShowShutterCheckBox", true)
|
||||
|
||||
if only_run_in_editor and not OS.has_feature("editor"):
|
||||
set_process_input(false)
|
||||
hide()
|
||||
return
|
||||
|
||||
_input_action = _local_data.settings.load_value("misc", "InputActionLineEdit", "")
|
||||
%ShutterButton.pressed.connect(take_burst)
|
||||
close_requested.connect(_on_close_requested)
|
||||
|
||||
|
||||
func _on_close_requested() -> void:
|
||||
hide()
|
||||
|
||||
var old_position : Vector2i
|
||||
|
||||
func _input(event: InputEvent) -> void:
|
||||
if old_position != position:
|
||||
_local_data.settings.save("misc", "ShutterWindowPosition", position)
|
||||
old_position = position
|
||||
if not InputMap.has_action(_input_action):
|
||||
return
|
||||
if event.is_action_pressed(_input_action):
|
||||
take_burst()
|
||||
|
||||
|
||||
## Takes one or more screenshots (a burst) using settings specified in the Debugger panel
|
||||
func take_burst() -> void:
|
||||
var old_position = position
|
||||
_local_data.settings.load_config()
|
||||
burst_starting.emit()
|
||||
var pause_game = _local_data.settings.load_value("misc", "PausesGameCheckBox", true)
|
||||
@@ -46,7 +65,7 @@ func take_burst() -> void:
|
||||
if pause_game:
|
||||
tree.paused = true
|
||||
var prev_size = DisplayServer.window_get_size()
|
||||
var timestamp = Time.get_time_string_from_system()
|
||||
|
||||
|
||||
|
||||
# Take screenshots for each configured size
|
||||
@@ -55,28 +74,95 @@ func take_burst() -> void:
|
||||
await get_tree().create_timer(0.01).timeout
|
||||
|
||||
for locale in locales:
|
||||
if not locale == "none":
|
||||
TranslationServer.set_locale(locale)
|
||||
await get_tree().process_frame
|
||||
var locale_to_set = locale
|
||||
|
||||
_send_viewport_texture_to_debugger(timestamp, TranslationServer.get_locale())
|
||||
if locale == "none":
|
||||
locale_to_set = previous_locale
|
||||
|
||||
TranslationServer.set_locale(locale_to_set)
|
||||
await get_tree().process_frame
|
||||
save_image()
|
||||
|
||||
TranslationServer.set_locale(previous_locale)
|
||||
DisplayServer.window_set_size(prev_size)
|
||||
|
||||
# Print clickable paths
|
||||
print_rich("[color=green][Screenshots] Done! (%s)[/color]" % timestamp)
|
||||
|
||||
tree.paused = game_was_paused
|
||||
visible = shutter_was_visible
|
||||
burst_ended.emit()
|
||||
print_rich("[color=green][Screenshots] Done![/color]")
|
||||
position = old_position
|
||||
|
||||
func _send_viewport_texture_to_debugger(timestamp: String, locale: String) -> void:
|
||||
func save_image() -> void:
|
||||
var locale = TranslationServer.get_locale()
|
||||
var timestamp = Time.get_time_string_from_system()
|
||||
var play_shutter_sounds = _local_data.settings.load_value("misc", "ShutterSoundsCheckBox", true)
|
||||
# Save the screenshot
|
||||
var image = get_parent().get_viewport().get_texture().get_image()
|
||||
EngineDebugger.send_message("screenshot:take", [image.save_png_to_buffer(), timestamp, locale])
|
||||
image_captured.emit(image)
|
||||
|
||||
if play_shutter_sounds:
|
||||
%AudioStreamPlayer.play()
|
||||
var save_folder: String = _local_data.settings.load_value("misc", "PathLineEdit", "user://screenshots")
|
||||
var project_title = ProjectSettings.get_setting("application/config/name")
|
||||
var screenshot_size = image.get_size()
|
||||
|
||||
# Build the save path with optional subfolders
|
||||
var target_folder = save_folder
|
||||
if _local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false):
|
||||
# Create subfolder structure: Project_timestamp/locale/resolution
|
||||
var timestamp_folder = "%s_%s" % [project_title, timestamp.replace(":", "-")]
|
||||
var locale_folder = locale
|
||||
var resolution_folder = "%dx%d" % [screenshot_size.x, screenshot_size.y]
|
||||
|
||||
target_folder = save_folder.path_join(timestamp_folder).path_join(locale_folder).path_join(resolution_folder)
|
||||
|
||||
# Ensure target folder exists
|
||||
if not DirAccess.dir_exists_absolute(target_folder):
|
||||
DirAccess.make_dir_recursive_absolute(target_folder)
|
||||
|
||||
var formats = {
|
||||
"PNGCheckBox": ["png", image.save_png, true],
|
||||
"JPGCheckBox": ["jpg", image.save_jpg, false],
|
||||
"WEBPCheckBox": ["webp", image.save_webp, false]
|
||||
}
|
||||
|
||||
for setting_key in formats:
|
||||
var default = formats[setting_key][2]
|
||||
if _local_data.settings.load_value("misc", setting_key, default):
|
||||
var extension = formats[setting_key][0]
|
||||
var save_method = formats[setting_key][1]
|
||||
|
||||
var filename: String
|
||||
if _local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false):
|
||||
filename = "%s_%s" % [project_title, timestamp.replace(":", "-")]
|
||||
else:
|
||||
filename = "%s_%s_%s_%dx%d" % [project_title, timestamp.replace(":", "-"), locale, screenshot_size.x, screenshot_size.y]
|
||||
|
||||
var file_path = target_folder.path_join("%s.%s" % [filename, extension])
|
||||
|
||||
# Get unique filepath to avoid overwriting
|
||||
file_path = get_unique_filepath(file_path)
|
||||
|
||||
save_method.call(file_path)
|
||||
EngineDebugger.send_message("screenshot:taken", [file_path, timestamp, locale])
|
||||
|
||||
print_rich("[Screenshots] Saved at: [url=%s]%s[/url]" % [ProjectSettings.globalize_path(file_path.get_base_dir()), file_path])
|
||||
|
||||
func get_unique_filepath(base_path: String) -> String:
|
||||
if not FileAccess.file_exists(base_path):
|
||||
return base_path
|
||||
|
||||
var dir = base_path.get_base_dir()
|
||||
var filename = base_path.get_file().get_basename()
|
||||
var extension = base_path.get_extension()
|
||||
|
||||
var counter = 1
|
||||
var new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension]
|
||||
|
||||
while FileAccess.file_exists(new_path):
|
||||
counter += 1
|
||||
new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension]
|
||||
|
||||
return new_path
|
||||
|
||||
@@ -41,11 +41,7 @@ func on_session_started() -> void:
|
||||
pass
|
||||
|
||||
func on_editor_debugger_plugin_capture(p_message, p_data) -> bool:
|
||||
if p_message == "screenshot:take":
|
||||
var buffer: PackedByteArray = p_data[0]
|
||||
var img := Image.new()
|
||||
var err := img.load_png_from_buffer(buffer)
|
||||
if err == OK:
|
||||
%CameraRoll.save_image(img, p_data[1], p_data[2])
|
||||
if p_message == "screenshot:taken":
|
||||
%CameraRoll.add_preview(p_data[0], p_data[1], p_data[2])
|
||||
return true
|
||||
return false
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=11 format=3 uid="uid://b2ktx6dty0dq4"]
|
||||
[gd_scene load_steps=12 format=3 uid="uid://b2ktx6dty0dq4"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://culd18vnvt4ej" path="res://addons/screenshots/debugger/bottom_panel/bottom_panel.gd" id="1_7ct7k"]
|
||||
[ext_resource type="Script" uid="uid://bq5amyoktrfo4" path="res://addons/screenshots/debugger/bottom_panel/settings.gd" id="2_ivg3g"]
|
||||
@@ -6,14 +6,15 @@
|
||||
[ext_resource type="Script" uid="uid://c034i367kogf6" path="res://addons/screenshots/debugger/bottom_panel/locales.gd" id="6_m7syr"]
|
||||
[ext_resource type="Script" uid="uid://jfpjg1put47h" path="res://addons/screenshots/debugger/bottom_panel/save_folder.gd" id="7_q2ypf"]
|
||||
[ext_resource type="Script" uid="uid://cvvxb0tom0wc" path="res://addons/screenshots/debugger/bottom_panel/camera_roll.gd" id="8_6oft3"]
|
||||
[ext_resource type="Script" uid="uid://x5sotkduu1be" path="res://addons/screenshots/debugger/bottom_panel/directory_watcher.gd" id="8_2337e"]
|
||||
[ext_resource type="Script" uid="uid://c5poruw4iu2ve" path="res://addons/screenshots/debugger/bottom_panel/camera_roll_bottom_buttons.gd" id="8_epjix"]
|
||||
[ext_resource type="Script" uid="uid://cx82rfmwl8gk0" path="res://addons/screenshots/screenshots_local_data.gd" id="9_ke0xa"]
|
||||
|
||||
[sub_resource type="DPITexture" id="DPITexture_q8tfr"]
|
||||
[sub_resource type="DPITexture" id="DPITexture_2337e"]
|
||||
_source = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\"><path fill=\"#ff5d5d\" d=\"M2 1v8.586l1.293-1.293a1 1 0 0 1 1.414 0L7 10.587l2.293-2.293a1 1 0 0 1 1.414 0L13 10.586l1-1V6H9V1H2zm8 0v4h4zm-6 9.414-2 2V15h12v-2.586l-.293.293a1 1 0 0 1-1.414 0L10 10.414l-2.293 2.293a1 1 0 0 1-1.414 0L4 10.414z\"/></svg>
|
||||
"
|
||||
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2337e"]
|
||||
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_ua4ux"]
|
||||
content_margin_left = 4.0
|
||||
content_margin_top = 4.0
|
||||
content_margin_right = 4.0
|
||||
@@ -36,7 +37,7 @@ grow_vertical = 2
|
||||
size_flags_horizontal = 3
|
||||
size_flags_vertical = 3
|
||||
script = ExtResource("1_7ct7k")
|
||||
nodes_to_save = [NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4/PausesGameCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer2/ShowShutterCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer3/ShutterSoundsCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer/InputActionLineEdit"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/PNGCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/JPGCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/WEBPCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer/PathLineEdit"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer2/UseSubFoldersCheckBox")]
|
||||
nodes_to_save = [NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4/PausesGameCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer2/ShowShutterCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer3/ShutterSoundsCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer/InputActionLineEdit"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/PNGCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/JPGCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers/WEBPCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer/PathLineEdit"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer2/UseSubFoldersCheckBox"), NodePath("HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer5/OnlyRunInEditorCheckBox")]
|
||||
|
||||
[node name="LocalData" type="Node" parent="."]
|
||||
unique_name_in_owner = true
|
||||
@@ -63,7 +64,7 @@ alignment = 1
|
||||
[node name="SettingsIcon" type="TextureRect" parent="HSplitContainer/VBoxContainer/PanelContainer/HBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
texture = SubResource("DPITexture_q8tfr")
|
||||
texture = SubResource("DPITexture_2337e")
|
||||
stretch_mode = 3
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/PanelContainer/HBoxContainer"]
|
||||
@@ -92,26 +93,14 @@ title = "Shutter"
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
[node name="HBoxContainer4" type="HBoxContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
text = "Pauses game"
|
||||
|
||||
[node name="PausesGameCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "On"
|
||||
|
||||
[node name="HBoxContainer2" type="HBoxContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer2"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "Toggle shutter visibility"
|
||||
mouse_filter = 1
|
||||
text = "Show shutter"
|
||||
|
||||
[node name="ShowShutterCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer2"]
|
||||
@@ -120,12 +109,45 @@ layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "On"
|
||||
|
||||
[node name="HBoxContainer5" type="HBoxContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer5"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "If the game is running outside the editor, hide the shutter and disable input processing"
|
||||
mouse_filter = 1
|
||||
text = "Only run in Editor"
|
||||
|
||||
[node name="OnlyRunInEditorCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer5"]
|
||||
layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "On"
|
||||
|
||||
[node name="HBoxContainer4" type="HBoxContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "Pause execution while taking screenshots. Useful for ensuring consistency across burst captures."
|
||||
mouse_filter = 1
|
||||
text = "Pauses game"
|
||||
|
||||
[node name="PausesGameCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer4"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "On"
|
||||
|
||||
[node name="HBoxContainer3" type="HBoxContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer3"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "Whether to play shutter sound effect"
|
||||
mouse_filter = 1
|
||||
text = "Shutter sounds"
|
||||
|
||||
[node name="ShutterSoundsCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer3"]
|
||||
@@ -139,6 +161,8 @@ layout_mode = 2
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "Set an Input Action to trigger a screenshot"
|
||||
mouse_filter = 1
|
||||
text = "Input Action"
|
||||
|
||||
[node name="InputActionLineEdit" type="LineEdit" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Shutter/VBoxContainer/HBoxContainer"]
|
||||
@@ -195,13 +219,13 @@ layout_mode = 2
|
||||
[node name="SelectAll" type="Button" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Locales/VBoxContainer/HBoxContainer"]
|
||||
layout_mode = 2
|
||||
text = "Select all"
|
||||
icon = SubResource("DPITexture_q8tfr")
|
||||
icon = SubResource("DPITexture_2337e")
|
||||
flat = true
|
||||
|
||||
[node name="DeselectAll" type="Button" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/Locales/VBoxContainer/HBoxContainer"]
|
||||
layout_mode = 2
|
||||
text = "Deselect all"
|
||||
icon = SubResource("DPITexture_q8tfr")
|
||||
icon = SubResource("DPITexture_2337e")
|
||||
flat = true
|
||||
|
||||
[node name="SaveFolder" type="FoldableContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings" node_paths=PackedStringArray("local_data")]
|
||||
@@ -241,7 +265,7 @@ text = "user://screenshots"
|
||||
[node name="PickFolderButton" type="Button" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
icon = SubResource("DPITexture_q8tfr")
|
||||
icon = SubResource("DPITexture_2337e")
|
||||
|
||||
[node name="FormatsContainers" type="HFlowContainer" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
@@ -255,7 +279,6 @@ text = "PNG"
|
||||
|
||||
[node name="JPGCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers"]
|
||||
layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "JPG"
|
||||
|
||||
[node name="WEBPCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/FormatsContainers"]
|
||||
@@ -268,10 +291,13 @@ layout_mode = 2
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer2"]
|
||||
custom_minimum_size = Vector2(250, 0)
|
||||
layout_mode = 2
|
||||
tooltip_text = "Organize bursts into folders with this structure [projectname_timestamp/locale/resolution]"
|
||||
mouse_filter = 1
|
||||
text = "Use subfolders"
|
||||
|
||||
[node name="UseSubFoldersCheckBox" type="CheckBox" parent="HSplitContainer/VBoxContainer/ScrollContainer/Settings/SaveFolder/VBoxContainer/HBoxContainer2"]
|
||||
layout_mode = 2
|
||||
button_pressed = true
|
||||
text = "On"
|
||||
|
||||
[node name="VBoxContainer2" type="VBoxContainer" parent="HSplitContainer"]
|
||||
@@ -287,7 +313,7 @@ alignment = 1
|
||||
[node name="CameraRollIcon" type="TextureRect" parent="HSplitContainer/VBoxContainer2/PanelContainer/HBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
texture = SubResource("DPITexture_q8tfr")
|
||||
texture = SubResource("DPITexture_2337e")
|
||||
stretch_mode = 3
|
||||
|
||||
[node name="Label" type="Label" parent="HSplitContainer/VBoxContainer2/PanelContainer/HBoxContainer"]
|
||||
@@ -316,13 +342,17 @@ unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 3
|
||||
size_flags_vertical = 3
|
||||
theme_override_styles/panel = SubResource("StyleBoxFlat_2337e")
|
||||
theme_override_styles/panel = SubResource("StyleBoxFlat_ua4ux")
|
||||
|
||||
[node name="RollHFlowContainer" type="HFlowContainer" parent="HSplitContainer/VBoxContainer2/ScrollContainer2/CameraRoll/RollPanelContainer"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
theme_override_constants/v_separation = 20
|
||||
|
||||
[node name="DirectoryWatcher" type="Node" parent="HSplitContainer/VBoxContainer2/ScrollContainer2/CameraRoll"]
|
||||
unique_name_in_owner = true
|
||||
script = ExtResource("8_2337e")
|
||||
|
||||
[node name="CameraRollBottomButtons" type="HBoxContainer" parent="HSplitContainer/VBoxContainer2"]
|
||||
layout_mode = 2
|
||||
alignment = 2
|
||||
@@ -332,11 +362,11 @@ script = ExtResource("8_epjix")
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
text = "Delete all"
|
||||
icon = SubResource("DPITexture_q8tfr")
|
||||
icon = SubResource("DPITexture_2337e")
|
||||
|
||||
[node name="OpenFolderButton" type="Button" parent="HSplitContainer/VBoxContainer2/CameraRollBottomButtons"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
size_flags_horizontal = 8
|
||||
text = "Open in File Manager"
|
||||
icon = SubResource("DPITexture_q8tfr")
|
||||
icon = SubResource("DPITexture_2337e")
|
||||
@@ -6,105 +6,42 @@ extends VBoxContainer
|
||||
|
||||
const SCREENSHOT_PREVIEW = preload("res://addons/screenshots/debugger/bottom_panel/screenshot_preview/screenshot_preview.tscn")
|
||||
|
||||
var roll_directory : String
|
||||
func _ready() -> void:
|
||||
%RollPanelContainer.add_theme_stylebox_override("panel", get_theme_stylebox("panel", "ItemListSecondary"))
|
||||
%CameraRollIcon.texture = get_theme_icon("CameraTexture", "EditorIcons")
|
||||
for filepath in local_data.settings.load_value("misc", "CameraRollPreviews", []):
|
||||
var img = Image.new()
|
||||
img = img.load_from_file(filepath)
|
||||
roll_directory = local_data.settings.load_value("misc", "PathLineEdit", "user://screenshots")
|
||||
%DirectoryWatcher.add_scan_directory(roll_directory)
|
||||
local_data.settings.value_changed.connect(_on_local_data_changed)
|
||||
%DirectoryWatcher.files_deleted.connect(_on_files_deleted)
|
||||
|
||||
func _on_files_deleted(files: PackedStringArray) -> void:
|
||||
for file in files:
|
||||
for preview in previews_container.get_children():
|
||||
if ProjectSettings.globalize_path(preview.path) == ProjectSettings.localize_path(file):
|
||||
preview.queue_free()
|
||||
|
||||
func _on_local_data_changed(section: String, key: String, new_value) -> void:
|
||||
if not key == "PathLineEdit":
|
||||
return
|
||||
|
||||
%DirectoryWatcher.remove_scan_directory(roll_directory)
|
||||
roll_directory = new_value
|
||||
%DirectoryWatcher.add_scan_directory(roll_directory)
|
||||
|
||||
if img == null:
|
||||
continue
|
||||
|
||||
var s = SCREENSHOT_PREVIEW.instantiate()
|
||||
s.texture = ImageTexture.create_from_image(img)
|
||||
s.path = filepath
|
||||
s.locale = ""
|
||||
previews_container.add_child(s)
|
||||
|
||||
local_data.settings.save("misc", "CameraRollPreviews", get_all_previews_paths())
|
||||
previews_container.child_entered_tree.connect(_on_preview_added)
|
||||
previews_container.child_exiting_tree.connect(_on_preview_removed)
|
||||
func add_preview(file_path: String, timestamp: String, locale: String) -> void:
|
||||
var s = SCREENSHOT_PREVIEW.instantiate()
|
||||
var image = Image.load_from_file(file_path)
|
||||
var texture = ImageTexture.create_from_image(image)
|
||||
s.texture = texture
|
||||
|
||||
func _on_preview_added(preview: Node) -> void:
|
||||
local_data.settings.save("misc", "CameraRollPreviews", get_all_previews_paths())
|
||||
pass
|
||||
|
||||
func _on_preview_removed(preview: Node) -> void:
|
||||
await preview.tree_exited
|
||||
local_data.settings.save("misc", "CameraRollPreviews", get_all_previews_paths())
|
||||
pass
|
||||
s.path = file_path
|
||||
s.locale = locale
|
||||
previews_container.add_child(s)
|
||||
|
||||
func get_all_previews_paths() -> Array[String]:
|
||||
var arr : Array[String] = []
|
||||
for preview in previews_container.get_children():
|
||||
arr.append(preview.path)
|
||||
return arr
|
||||
|
||||
func get_unique_filepath(base_path: String) -> String:
|
||||
if not FileAccess.file_exists(base_path):
|
||||
return base_path
|
||||
|
||||
var dir = base_path.get_base_dir()
|
||||
var filename = base_path.get_file().get_basename()
|
||||
var extension = base_path.get_extension()
|
||||
|
||||
var counter = 1
|
||||
var new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension]
|
||||
|
||||
while FileAccess.file_exists(new_path):
|
||||
counter += 1
|
||||
new_path = "%s/%s_%d.%s" % [dir, filename, counter, extension]
|
||||
|
||||
return new_path
|
||||
|
||||
func save_image(image: Image, timestamp: String, locale: String) -> void:
|
||||
var save_folder: String = %PathLineEdit.text
|
||||
var project_title = ProjectSettings.get_setting("application/config/name")
|
||||
var screenshot_size = image.get_size()
|
||||
|
||||
# Build the save path with optional subfolders
|
||||
var target_folder = save_folder
|
||||
if local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false):
|
||||
# Create subfolder structure: Project_timestamp/locale/resolution
|
||||
var timestamp_folder = "%s_%s" % [project_title, timestamp.replace(":", "-")]
|
||||
var locale_folder = locale
|
||||
var resolution_folder = "%dx%d" % [screenshot_size.x, screenshot_size.y]
|
||||
|
||||
target_folder = save_folder.path_join(timestamp_folder).path_join(locale_folder).path_join(resolution_folder)
|
||||
|
||||
# Ensure target folder exists
|
||||
if not DirAccess.dir_exists_absolute(target_folder):
|
||||
DirAccess.make_dir_recursive_absolute(target_folder)
|
||||
|
||||
var formats = {
|
||||
"PNGCheckBox": ["png", image.save_png, true],
|
||||
"JPGCheckBox": ["jpg", image.save_jpg, false],
|
||||
"WEBPCheckBox": ["webp", image.save_webp, false]
|
||||
}
|
||||
|
||||
for setting_key in formats:
|
||||
var default = formats[setting_key][2]
|
||||
if local_data.settings.load_value("misc", setting_key, default):
|
||||
var extension = formats[setting_key][0]
|
||||
var save_method = formats[setting_key][1]
|
||||
|
||||
var filename: String
|
||||
if local_data.settings.load_value("misc", "UseSubFoldersCheckBox", false):
|
||||
filename = "%s_%s" % [project_title, timestamp.replace(":", "-")]
|
||||
else:
|
||||
filename = "%s_%s_%s_%dx%d" % [project_title, timestamp.replace(":", "-"), locale, screenshot_size.x, screenshot_size.y]
|
||||
|
||||
var file_path = target_folder.path_join("%s.%s" % [filename, extension])
|
||||
|
||||
# Get unique filepath to avoid overwriting
|
||||
file_path = get_unique_filepath(file_path)
|
||||
|
||||
save_method.call(file_path)
|
||||
|
||||
var s = SCREENSHOT_PREVIEW.instantiate()
|
||||
s.texture = ImageTexture.create_from_image(image)
|
||||
s.path = file_path
|
||||
s.locale = locale
|
||||
previews_container.add_child(s)
|
||||
print_rich("[Screenshots] Saved at: [url=%s]%s[/url]" % [ProjectSettings.globalize_path(file_path.get_base_dir()), file_path])
|
||||
@@ -0,0 +1,148 @@
|
||||
#============================================================================
|
||||
# |
|
||||
#============================================================================
|
||||
# This file is part of: |
|
||||
# MIT License |
|
||||
# https://github.com/KoBeWi/Godot-Directory-Watcher |
|
||||
#============================================================================
|
||||
# Copyright (c) 2019 Tomek |
|
||||
# |
|
||||
# Permission is hereby granted, free of charge, to any person obtaining |
|
||||
# a copy of this software and associated documentation files (the |
|
||||
# "Software"), to deal in the Software without restriction, including |
|
||||
# without limitation the rights to use, copy, modify, merge, publish, |
|
||||
# distribute, sublicense, and/or sell copies of the Software, and to |
|
||||
# permit persons to whom the Software is furnished to do so, subject to |
|
||||
# the following conditions: |
|
||||
# |
|
||||
# The above copyright notice and this permission notice shall be |
|
||||
# included in all copies or substantial portions of the Software. |
|
||||
# |
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
|
||||
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
|
||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. |
|
||||
# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY |
|
||||
# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, |
|
||||
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
|
||||
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
|
||||
#============================================================================
|
||||
|
||||
@tool
|
||||
extends Node
|
||||
|
||||
## Scans the provided directory (or directories) and informs about file changes. The scan is done periodically with configurable speed.
|
||||
|
||||
class WatchedDirectory:
|
||||
var first_scan := true
|
||||
var new: PackedStringArray
|
||||
var modified: PackedStringArray
|
||||
var current: Dictionary#[String, int]
|
||||
var previous: Dictionary#[String, int]
|
||||
|
||||
var _directory := DirAccess.open(".")
|
||||
|
||||
var _directory_list: Dictionary#[String, WatchedDirectory]
|
||||
var _directory_cache: Array[String]
|
||||
var _to_delete: Array
|
||||
|
||||
var _current_directory_index: int
|
||||
var _current_directory_name: String
|
||||
var _remaining_steps: int
|
||||
var _current_delay: float
|
||||
|
||||
## Delay between directory scans (in seconds).
|
||||
var scan_delay: float = 1
|
||||
## Files scanned per frame.
|
||||
var scan_step := 50
|
||||
|
||||
## Emitted when files are created in the scanned directories.
|
||||
signal files_created(files: PackedStringArray)
|
||||
## Emitted when files are modified in the scanned directories (based on modified time).
|
||||
signal files_modified(files: PackedStringArray)
|
||||
## Emitted when files are deleted in the scanned directories.
|
||||
signal files_deleted(files: PackedStringArray)
|
||||
|
||||
func _ready() -> void:
|
||||
_current_delay = scan_delay
|
||||
_remaining_steps = scan_step
|
||||
_directory.include_hidden = true
|
||||
|
||||
## Adds a directory that will be scanned. You can add more than 1. Only supports absolute paths and res://, user://.
|
||||
func add_scan_directory(directory: String):
|
||||
directory = ProjectSettings.globalize_path(directory)
|
||||
_directory_list[directory] = WatchedDirectory.new()
|
||||
_directory_cache.assign(_directory_list.keys())
|
||||
|
||||
## Removes a scanned directory. Does nothing if the directory wasn't added.
|
||||
func remove_scan_directory(directory: String):
|
||||
directory = ProjectSettings.globalize_path(directory)
|
||||
_to_delete.append(directory)
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
if _directory_list.is_empty():
|
||||
push_error("No directory to watch. Please kill me ;_;")
|
||||
return
|
||||
|
||||
if _current_delay > 0:
|
||||
_current_delay -= delta
|
||||
return
|
||||
|
||||
while _remaining_steps > 0:
|
||||
if _current_directory_name.is_empty():
|
||||
_current_directory_name = _directory_cache[_current_directory_index]
|
||||
_directory.change_dir(_current_directory_name)
|
||||
_directory.list_dir_begin()
|
||||
|
||||
var directory: WatchedDirectory = _directory_list[_current_directory_name]
|
||||
|
||||
var file := _directory.get_next()
|
||||
if file.is_empty():
|
||||
_current_directory_index += 1
|
||||
_current_directory_name = ""
|
||||
|
||||
if directory.first_scan:
|
||||
directory.new.clear()
|
||||
directory.modified.clear()
|
||||
directory.first_scan = false
|
||||
else:
|
||||
if not directory.new.is_empty():
|
||||
files_created.emit(directory.new)
|
||||
directory.new.clear()
|
||||
|
||||
if not directory.modified.is_empty():
|
||||
files_modified.emit(directory.modified)
|
||||
directory.modified.clear()
|
||||
|
||||
var deleted: PackedStringArray
|
||||
for path in directory.previous:
|
||||
if not path in directory.current:
|
||||
deleted.append(_directory.get_current_dir().path_join(path))
|
||||
|
||||
if not deleted.is_empty():
|
||||
files_deleted.emit(deleted)
|
||||
|
||||
directory.previous = directory.current
|
||||
directory.current = {}
|
||||
|
||||
if _current_directory_index == _directory_list.size():
|
||||
if not _to_delete.is_empty():
|
||||
for dir in _to_delete:
|
||||
_directory_list.erase(dir)
|
||||
|
||||
_current_directory_index = 0
|
||||
break
|
||||
else:
|
||||
if _directory.current_is_dir():
|
||||
continue
|
||||
var full_file := _directory.get_current_dir().path_join(file)
|
||||
|
||||
directory.current[file] = FileAccess.get_modified_time(full_file)
|
||||
if directory.previous.get(file, -1) == -1:
|
||||
directory.new.append(full_file)
|
||||
elif directory.current[file] > directory.previous[file]:
|
||||
directory.modified.append(full_file)
|
||||
|
||||
_remaining_steps -= 1
|
||||
|
||||
_remaining_steps = scan_step
|
||||
_current_delay = scan_delay
|
||||
@@ -0,0 +1 @@
|
||||
uid://x5sotkduu1be
|
||||
+1
-1
@@ -3,5 +3,5 @@
|
||||
name="Screenshots"
|
||||
description="Takes screenshots of all sizes and locales with a single click."
|
||||
author="Davide Di Staso"
|
||||
version="1.0"
|
||||
version="1.1"
|
||||
script="plugin.gd"
|
||||
@@ -6,10 +6,21 @@ const SHUTTER_WINDOW = "res://addons/screenshots/autoload/shutter_window/shutter
|
||||
var m_editor_debugger_plugin : EditorDebuggerPlugin = preload("res://addons/screenshots/debugger/editor_debugger_plugin.gd").new()
|
||||
var bottom_panel : Control
|
||||
|
||||
func _enter_tree():
|
||||
add_debugger_plugin(m_editor_debugger_plugin)
|
||||
func _enable_plugin() -> void:
|
||||
add_autoload_singleton("Screenshots", SHUTTER_WINDOW)
|
||||
pass
|
||||
|
||||
func _exit_tree():
|
||||
remove_debugger_plugin(m_editor_debugger_plugin)
|
||||
|
||||
func _disable_plugin() -> void:
|
||||
remove_autoload_singleton("Screenshots")
|
||||
pass
|
||||
|
||||
|
||||
func _enter_tree() -> void:
|
||||
add_debugger_plugin(m_editor_debugger_plugin)
|
||||
pass
|
||||
|
||||
|
||||
func _exit_tree() -> void:
|
||||
remove_debugger_plugin(m_editor_debugger_plugin)
|
||||
pass
|
||||
@@ -1,12 +1,13 @@
|
||||
@tool
|
||||
extends Node
|
||||
|
||||
var settings: LocalFile
|
||||
|
||||
func _ready():
|
||||
settings = LocalFile.new("res://addons/screenshots/settings.cfg")
|
||||
|
||||
class LocalFile:
|
||||
signal value_changed(section: String, key: String, new_value)
|
||||
|
||||
var config: ConfigFile
|
||||
var file_path: String
|
||||
|
||||
@@ -23,10 +24,20 @@ class LocalFile:
|
||||
pass
|
||||
|
||||
func save(section: String, key: String, value):
|
||||
config.set_value(section, key, value)
|
||||
var err = config.save(file_path)
|
||||
if err != OK:
|
||||
push_error("Failed to save config file " + file_path + ": " + str(err))
|
||||
var old_value = null
|
||||
var has_existing_key = config.has_section_key(section, key)
|
||||
|
||||
if has_existing_key:
|
||||
old_value = config.get_value(section, key)
|
||||
|
||||
# Only save and emit if the value is different
|
||||
if not has_existing_key or old_value != value:
|
||||
config.set_value(section, key, value)
|
||||
var err = config.save(file_path)
|
||||
if err != OK:
|
||||
push_error("Failed to save config file " + file_path + ": " + str(err))
|
||||
else:
|
||||
value_changed.emit(section, key, value)
|
||||
|
||||
func load_value(section: String, key: String, default_value = null):
|
||||
# Check if the key exists first to avoid C++ errors
|
||||
|
||||
Reference in new issue
Block a user