mirror of
https://github.com/Orama-Interactive/Pixelorama.git
synced 2025-01-18 17:19:50 +00:00
91bfef16b3
* Initial conversion * Hide some dialogs * Update addons * Fix errors in scripts Temporarily commented out adding new file import types and certain Control methods that are not available in the Window class, such as get_global_mouse_position() * Update shaders * Fix some more errors and signals, rename "pressed" to "button_pressed" * Even more error fixes and renaming corrections * Fixed more errors, Pixelorama almost runs * Update ValueSlider.gd * Remove lock() and unlock(), more ImageTexture.create_from_image() static usage * More static function using * Re-add some of the dialog signals, fix window transparency * Change instances of popup_hide to visibility_changed * More more errors and warnings * Fix more errors and warnings * Get rid of errors in the output when opening Pixelorama in Godot * Properly connect most signals without using strings * Fix some scenes * Don't load Main.tscn * Emit signals directly instead of using strings * Fix Keychain menu nodes * Get rid of self. on most instances, as setters and getters are now always called * Some more static typing * Disable texture filters * Fix zooming * Fix int as enum warnings * Fix tools and rename doubleclick to double_click * Update tool scenes * Fix tabs * Fix create new image * Use static typing on flood fill to speed it up * Update static-checks.yml * Reverts #729 for a speedup, hopefully the bug won't get re-introduced * Fix TransparentChecker warning * Re-add Default template * Fix 3D cels * Fix rotation Project converted bug. Should be fixed by https://github.com/godotengine/godot/pull/79264 * Fix UITransparency alignment issue, thanks Variable * Add missing OptionButton items Hopefully that should be all of them * Fix the appearance of CollapsibleContainer * Change instances of world to world_3d * Fix tool button backgrounds * Fix Splash dialog * Fix brush selection * Update Main.gd * Fix About Dialog * Fix more zooming issues * Fix canvas preview zooming * Use signals for queue_redraw on project change * Fix layer button's look * Fix gradients * Some gradient fixes and code cleanups, dithering is still broken * Fix bucket * Fix the rest of the undo_redo.add_(un)do_method() cases * Fix guides * Fix guide text * Some small changes in Main * Update Tools.gd * Fix palette importing * Get rid of TODOGODOT4s * Fix the rest of the dialogs * Update the rest of the scenes * Fix onion skinning and frame tag dialogs * Fix file brushes being imported twice * Fix palette swatch crashing on double click * Use nearest filter for some of the windows * Remove old .tres font files * Fix language switching * Get rid of Keychain.action_get_first_key() on the extra shortcuts of tools * Get rid of Keychain.MenuInputActions and directly set shortcuts to the menu items This temporarily removes echoing support for undo and redo, this will be re-added once https://github.com/godotengine/godot/pull/36493 or https://github.com/godotengine/godot/pull/64317 is merged. * Clean shortcut-related duplicate code in TopMenuContainer * Remove DroidSansFallback now that system fonts can be used as fallback * Remove 3.x settings from project.godot * Format * Format gdgifexporter * Reset Keychain to its original state * Remove textures from the dark and gray themes * Remove all textures from the dark theme * Better static typing in DrawingAlgos * Use Vector2i for project size * [Risky commit] Use Vector2i instead of Vector2 for tools I tested it and everything seems to be working the same as before, but more testing would be appreciated. * Format after previous commit * Fix line angle constraint being rotated 180 degrees This is not a regression from the previous commit(s), Godot 4 probably reversed the logic of `angle_to_point()`. * Fix input map action not found errors when pressing Shift or Control * Make AnimatePanel bigger, add spring interpolation * Fix some layouts/extensions/preferences loading errors * Fix dithering * Update layout resources Probably doesn't change anything at all, but I suppose it might be a good thing to do * Small changes * Disable filter in ResizeCanvas dialog * Fix some preferences default button states * Fix tile mode always having masking on * Use integers in tile mode * Fix checkboxes in preferences not working * More statically typed arrays! No need to have these # Array of X comments anymore! * Fix "apply all" for multiple preview dialogs * Update theme.tres * Add HeaderSmall theme type variation * Fix dynamics buttons * Don't allow sub-zero zoom values * Let zoom_out_max always remain Vector2(0.01, 0.01) This fixes zooming on large canvases * Bump version to v1.0-dev * Fix ambient light not working on 3D cels * Fix .obj loading * Don't allow greater than max values in the zoom slider * Set maximum zoom value to always be (500, 500) * Set zoom slider minimum value to 1 * Some UI changes, mostly related to buttons and the timeline * Change window titles to what they were before * [COMPATIBILITY BROKEN WITH v0.x] Fix loading 3D cels * Avoid changing Cel3DObject's file_path if it's the same * Make preferences window bigger * Fix png exporting * Fix reference image initial size and filter setting * Fix perspective line reverse scaling on zoom and facing 180 degrees away from cursor * Format and some linting * Remove most Images from the rest of the themes * Remove all textures from all themes * Fix drawing when the mouse gets released outside the canvas boundaries * Format Keychain * Implement #890 * Fix recorder * Fix layout deletion * Better static typing and fix empty_clicked signal-connected methods not having arguments * Fix layout and extension directory creation if they don't already exist * Change all instances of "HTML5" to "Web" OS.get_name() now returns "Web" instead of "HTML5" in Godot 4 * Fix JavaScript detection Opening files in the Web version does not yet work for some reason * Fix formatting * Fix lint errors * Remove unneeded lines from rotation shaders * Clean some rotation shader related code * Remove ErrorManager from #891, as it's no longer needed in Godot 4 * Some docstrings * More Vector2i and Recti replacing their float counterparts * Remove the hardcoded shortcut from ValueSlider Note that the brush size shortcut may not change properly because Keychain isn't updated to support Godot 4's input map properly yet. * Fix bugs from the rebase, integer zooming is currently broken * Format * Fix bug where some imported images would fail to load when using smart slice * Fix integer zooming (I think) * Fix errors after #898 * Fix some UI issues with PreviewDialog * Use ctrl/command instead of just ctrl in the shortcuts of the InputMap - gets rid of the need for _use_osx_shortcuts() in Main.gd * Update Keychain and addons/README.md * Update CI to Godot 4.1.1 (probably will not work) * Remove XDGDataPaths.gd * Make windows non-exclusive * Attempt to fix macOS CI * Attempt to fix CI * Attempt to fix CI * Minor fix in the dark theme, more will follow * Silence enumerator/integer warning * Attempt to fix macOS CI * Another attempt to fix macOS CI * Attempt to fix Windows & macOS CI * fix: Recorder directory create (#903) * Update Keychain so that the brush size shortcuts can be changed This update generally lets users use modifier buttons (control, alt, shift, meta) with mouse buttons * Change OSX to macOS * Detect if multi-threading is enabled when exporting gifs * Fix color picker not working on the top color mode * Make some public methods private in Export.gd * Remove Global.window_title variable * Fix frame UI in the timeline breaking after 100 frames * Static typing improvements for the timeline * Better static typing for grids * Fix typo * Fix pixel grid not appearing * Move preference updating code to Global using setters This should make the code a bit more readable, as the logic for each property update can be found directly under the variable declaration, and not hidden in PreferencesDialog's preference_update() method. This also allows for changing these properties outside the preferences, if that will ever be needed. In theory it's also faster as we don't have to do all these string comparisons anymore, but I doubt this will be noticeable in practice. * Remove RestoreDefaultButton.tscn * Implement changing font size in the preferences * Resize HeaderSmall font size along with the default font size * A step towards fixing image loading in the Web version Doesn't completely fix the issue, it requires a fix from Godot's side as well * Implement missing input event actions for buttons TODO: Add default shortcuts * Do not change language and theme if they are already the defaults Reduces the initial loading time a bit * Remove update_hint_tooltips() as it's no longer needed, only keep it for tools This was needed in order for hint tooltips to be successfully translated while taking the shortcuts into account. Godot 4 already it correctly for us now. Tools still need it because they contain multiple shortcut data in their tooltips. * Change ExportDialog's PathDialog's file mode to be "open directory" and make them bigger * Fix Vector2i + Vector2 errors in grid center snapping * Update tooltips when the shortcut profile changes * Fix copy-paste mistake * Update tooltips during startup if the shortcut profile is not the default * Fix gif warning label size in ExportDialog * Fix BBCode in ExportDialog * Fix some Godot 4.2 warnings * Some CI fixes * Static typing improvements and more inline functions * Format * Even more static typing, inline methods, docstrings etc * Some more static typing improvements and inline setters * Remove unneeded project type specifying * Fix splash dialog error * Fix enumerator warning * Don't preload the font in the rules and guides * Fix some integer division warnings Sometimes we indeed need them to be floats * Change some Rect2s to Rect2is * Minor static typing improvements * Update README, CHANGELOG, Translations * Only load translation files when needed, reduces loading time a bit * Update Keychain so it doesn't load languages during startup * Lazy load all tool scenes, breaks compatibility with the extension API Decreases initial loading time * Format * Very minor loading time speedups * Remove unneeded project type specifying * Even more static typing and docstring improvements * Fix extension loading * Palette docstrings --------- Co-authored-by: ppphp <kevinniub@gmail.com>
258 lines
8.5 KiB
GDScript
258 lines
8.5 KiB
GDScript
class_name RegionUnpacker
|
||
extends RefCounted
|
||
|
||
# THIS CLASS TAKES INSPIRATION FROM PIXELORAMA'S FLOOD FILL
|
||
# AND HAS BEEN MODIFIED FOR OPTIMIZATION
|
||
|
||
var slice_thread := Thread.new()
|
||
|
||
var _include_boundary_threshold: int ## Τhe size of rect below which merging accounts for boundary
|
||
## After crossing threshold the smaller image will merge with larger image
|
||
## if it is within the _merge_dist
|
||
var _merge_dist: int
|
||
|
||
## Working array used as buffer for segments while flooding
|
||
var _allegro_flood_segments: Array[Segment]
|
||
## Results array per image while flooding
|
||
var _allegro_image_segments: Array[Segment]
|
||
|
||
|
||
class RectData:
|
||
var rects: Array[Rect2i]
|
||
var frame_size: Vector2i
|
||
|
||
func _init(_rects: Array[Rect2i], _frame_size: Vector2i):
|
||
rects = _rects
|
||
frame_size = _frame_size
|
||
|
||
|
||
class Segment:
|
||
var flooding := false
|
||
var todo_above := false
|
||
var todo_below := false
|
||
var left_position := -5
|
||
var right_position := -5
|
||
var y := 0
|
||
var next := 0
|
||
|
||
func _init(_y: int) -> void:
|
||
y = _y
|
||
|
||
|
||
func _init(threshold: int, merge_dist: int) -> void:
|
||
_include_boundary_threshold = threshold
|
||
_merge_dist = merge_dist
|
||
|
||
|
||
func get_used_rects(image: Image) -> RectData:
|
||
if ProjectSettings.get_setting("rendering/driver/threads/thread_model") != 2:
|
||
# Single-threaded mode
|
||
return get_rects(image)
|
||
else: # Multi-threaded mode
|
||
if slice_thread.is_started():
|
||
slice_thread.wait_to_finish()
|
||
var error := slice_thread.start(get_rects.bind(image))
|
||
if error == OK:
|
||
return slice_thread.wait_to_finish()
|
||
else:
|
||
return get_rects(image)
|
||
|
||
|
||
func get_rects(image: Image) -> RectData:
|
||
# Make a smaller image to make the loop shorter
|
||
var used_rect := image.get_used_rect()
|
||
if used_rect.size == Vector2i.ZERO:
|
||
return clean_rects([])
|
||
var test_image := image.get_region(used_rect)
|
||
# Prepare a bitmap to keep track of previous places
|
||
var scanned_area := BitMap.new()
|
||
scanned_area.create(test_image.get_size())
|
||
# Scan the image
|
||
var rects: Array[Rect2i] = []
|
||
var frame_size := Vector2i.ZERO
|
||
for y in test_image.get_size().y:
|
||
for x in test_image.get_size().x:
|
||
var position := Vector2i(x, y)
|
||
if test_image.get_pixelv(position).a > 0: # used portion of image detected
|
||
if !scanned_area.get_bitv(position):
|
||
var rect := _estimate_rect(test_image, position)
|
||
scanned_area.set_bit_rect(rect, true)
|
||
rect.position += used_rect.position
|
||
rects.append(rect)
|
||
var rects_info := clean_rects(rects)
|
||
rects_info.rects.sort_custom(sort_rects)
|
||
return rects_info
|
||
|
||
|
||
func clean_rects(rects: Array[Rect2i]) -> RectData:
|
||
var frame_size := Vector2i.ZERO
|
||
for i in rects.size():
|
||
var target: Rect2i = rects.pop_front()
|
||
var test_rect := target
|
||
if (
|
||
target.size.x < _include_boundary_threshold
|
||
or target.size.y < _include_boundary_threshold
|
||
):
|
||
test_rect.size += Vector2i(_merge_dist, _merge_dist)
|
||
test_rect.position -= Vector2i(_merge_dist, _merge_dist) / 2
|
||
var merged := false
|
||
for rect_i in rects.size():
|
||
if test_rect.intersects(rects[rect_i]):
|
||
rects[rect_i] = target.merge(rects[rect_i])
|
||
merged = true
|
||
break
|
||
if !merged:
|
||
rects.append(target)
|
||
|
||
# calculation for a suitable frame size
|
||
if target.size.x > frame_size.x:
|
||
frame_size.x = target.size.x
|
||
if target.size.y > frame_size.y:
|
||
frame_size.y = target.size.y
|
||
return RectData.new(rects, frame_size)
|
||
|
||
|
||
func sort_rects(rect_a: Rect2i, rect_b: Rect2i) -> bool:
|
||
# After many failed attempts, this version works for some reason (it's best not to disturb it)
|
||
if rect_a.end.y < rect_b.position.y:
|
||
return true
|
||
if rect_a.position.x < rect_b.position.x:
|
||
# if both lie in the same row
|
||
var start := rect_a.position
|
||
var size := Vector2i(rect_b.end.x, rect_a.end.y)
|
||
if Rect2i(start, size).intersects(rect_b):
|
||
return true
|
||
return false
|
||
|
||
|
||
func _estimate_rect(image: Image, position: Vector2) -> Rect2i:
|
||
var cel_image := Image.new()
|
||
cel_image.copy_from(image)
|
||
var small_rect := _flood_fill(position, cel_image)
|
||
return small_rect
|
||
|
||
|
||
## Add a new segment to the array
|
||
func _add_new_segment(y := 0) -> void:
|
||
_allegro_flood_segments.append(Segment.new(y))
|
||
|
||
|
||
## Fill an horizontal segment around the specified position, and adds it to the
|
||
## list of segments filled. Returns the first x coordinate after the part of the
|
||
## line that has been filled.
|
||
## this method is called by `_flood_fill` after the required data structures
|
||
## have been initialized
|
||
func _flood_line_around_point(position: Vector2i, image: Image) -> int:
|
||
if not image.get_pixelv(position).a > 0:
|
||
return position.x + 1
|
||
var west := position
|
||
var east := position
|
||
while west.x >= 0 && image.get_pixelv(west).a > 0:
|
||
west += Vector2i.LEFT
|
||
while east.x < image.get_width() && image.get_pixelv(east).a > 0:
|
||
east += Vector2i.RIGHT
|
||
# Make a note of the stuff we processed
|
||
var c := position.y
|
||
var segment := _allegro_flood_segments[c]
|
||
# we may have already processed some segments on this y coordinate
|
||
if segment.flooding:
|
||
while segment.next > 0:
|
||
c = segment.next # index of next segment in this line of image
|
||
segment = _allegro_flood_segments[c]
|
||
# found last current segment on this line
|
||
c = _allegro_flood_segments.size()
|
||
segment.next = c
|
||
_add_new_segment(position.y)
|
||
segment = _allegro_flood_segments[c]
|
||
# set the values for the current segment
|
||
segment.flooding = true
|
||
segment.left_position = west.x + 1
|
||
segment.right_position = east.x - 1
|
||
segment.y = position.y
|
||
segment.next = 0
|
||
# Should we process segments above or below this one?
|
||
# when there is a selected area, the pixels above and below the one we started creating this
|
||
# segment from may be outside it. It's easier to assume we should be checking for segments
|
||
# above and below this one than to specifically check every single pixel in it, because that
|
||
# test will be performed later anyway.
|
||
# On the other hand, this test we described is the same `project.can_pixel_get_drawn` does if
|
||
# there is no selection, so we don't need branching here.
|
||
segment.todo_above = position.y > 0
|
||
segment.todo_below = position.y < image.get_height() - 1
|
||
# this is an actual segment we should be coloring, so we add it to the results for the
|
||
# current image
|
||
if segment.right_position >= segment.left_position:
|
||
_allegro_image_segments.append(segment)
|
||
# we know the point just east of the segment is not part of a segment that should be
|
||
# processed, else it would be part of this segment
|
||
return east.x + 1
|
||
|
||
|
||
func _check_flooded_segment(y: int, left: int, right: int, image: Image) -> bool:
|
||
var ret := false
|
||
var c := 0
|
||
while left <= right:
|
||
c = y
|
||
while true:
|
||
var segment := _allegro_flood_segments[c]
|
||
if left >= segment.left_position and left <= segment.right_position:
|
||
left = segment.right_position + 2
|
||
break
|
||
c = segment.next
|
||
if c == 0: # couldn't find a valid segment, so we draw a new one
|
||
left = _flood_line_around_point(Vector2i(left, y), image)
|
||
ret = true
|
||
break
|
||
return ret
|
||
|
||
|
||
func _flood_fill(position: Vector2i, image: Image) -> Rect2i:
|
||
# implements the floodfill routine by Shawn Hargreaves
|
||
# from https://www1.udel.edu/CIS/software/dist/allegro-4.2.1/src/flood.c
|
||
# init flood data structures
|
||
_allegro_flood_segments = []
|
||
_allegro_image_segments = []
|
||
_compute_segments_for_image(position, image)
|
||
# now actually color the image: since we have already checked a few things for the points
|
||
# we'll process here, we're going to skip a bunch of safety checks to speed things up.
|
||
|
||
var final_image := Image.new()
|
||
final_image.copy_from(image)
|
||
final_image.fill(Color.TRANSPARENT)
|
||
_select_segments(final_image)
|
||
|
||
return final_image.get_used_rect()
|
||
|
||
|
||
func _compute_segments_for_image(position: Vector2i, image: Image) -> void:
|
||
# initially allocate at least 1 segment per line of image
|
||
for j in image.get_height():
|
||
_add_new_segment(j)
|
||
# start flood algorithm
|
||
_flood_line_around_point(position, image)
|
||
# test all segments while also discovering more
|
||
var done := false
|
||
while not done:
|
||
done = true
|
||
var max_index := _allegro_flood_segments.size()
|
||
for c in max_index:
|
||
var p := _allegro_flood_segments[c]
|
||
if p.todo_below: # check below the segment?
|
||
p.todo_below = false
|
||
if _check_flooded_segment(p.y + 1, p.left_position, p.right_position, image):
|
||
done = false
|
||
if p.todo_above: # check above the segment?
|
||
p.todo_above = false
|
||
if _check_flooded_segment(p.y - 1, p.left_position, p.right_position, image):
|
||
done = false
|
||
|
||
|
||
func _select_segments(map: Image) -> void:
|
||
# short circuit for flat colors
|
||
for c in _allegro_image_segments.size():
|
||
var p := _allegro_image_segments[c]
|
||
var rect := Rect2i()
|
||
rect.position = Vector2i(p.left_position, p.y)
|
||
rect.end = Vector2i(p.right_position + 1, p.y + 1)
|
||
map.fill_rect(rect, Color.WHITE)
|