huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Shader Rotation fix (#687)

Browse source 
* add limit change with brush

* Delete Draw.gd

* Delete BaseTool.gd

* added error calculation

* revert last commit

* fixed rotation bug caused on some transparency

* fix for a bug

when selection was present

* added a comment

* added a fix when selection was enabled

* formating

* fixed another bug

* Added quick buttons for rotation
This commit is contained in:
Variable 2022-05-03 17:38:29 +01:00 committed by GitHub
parent 9e7dd1210b
commit 0232f95c84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 95 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Shaders/Rotation.shader
View file

@ -1,4 +1,5 @@
shader_type canvas_item;
render_mode unshaded;
uniform float angle;
uniform sampler2D selection_tex;
@ -49,9 +50,11 @@ void fragment() {
// Mixing
vec4 rotated = texture(TEXTURE, rotate(pixelated_uv, pivot, ratio)); // Rotated image
rotated.a *= texture(selection_tex, rotate(pixelated_uv, pivot, ratio)).a; // Combine with rotated selection mask
rotated.a *= texture(selection_tex, rotate(pixelated_uv, pivot, ratio)).a; // Combine with selection mask
float mask = mix(selection, 1.0, 1.0 - ceil(original.a)); // Combine selection mask with area outside original
COLOR.rgb = mix(original.rgb, rotated.rgb, rotated.a * border); // Mix original image and rotated
// Combine original and rotated image only when intersecting, otherwise just pure rotated image.
COLOR.rgb = mix(mix(original.rgb, rotated.rgb, rotated.a * border), rotated.rgb, mask);
COLOR.a = mix(original.a, 0.0, selection); // Remove alpha on the selected area
COLOR.a = mix(COLOR.a, 1.0, rotated.a * border); // Combine alpha of original image and rotated
}
}

28
src/UI/Dialogs/ImageEffects/RotateImage.gd
View file

@ -101,7 +101,11 @@ func commit_action(_cel: Image, _project: Project = Global.current_project) -> v
gen.generate_image(_cel, shader, params, _project.size)
yield(gen, "done")
if _project.has_selection and selection_checkbox.pressed:
if (
_project.has_selection
and selection_checkbox.pressed
and type_option_button.text != "Nearest neighbour (Shader)"
):
_cel.blend_rect(image, Rect2(Vector2.ZERO, image.get_size()), Vector2.ZERO)
else:
_cel.blit_rect(image, Rect2(Vector2.ZERO, image.get_size()), Vector2.ZERO)
@ -147,3 +151,25 @@ func _on_LiveCheckbox_toggled(button_pressed: bool) -> void:
live_preview = button_pressed
wait_time_spinbox.editable = !live_preview
wait_time_spinbox.get_parent().visible = !live_preview
func _on_quick_change_angle_pressed(change_type: String) -> void:
var current_angle = angle_hslider.value
var new_angle = current_angle
match change_type:
"-90":
new_angle = current_angle - 90
"-45":
new_angle = current_angle - 45
"0":
new_angle = 0
"+45":
new_angle = current_angle + 45
"+90":
new_angle = current_angle + 90
if new_angle < 0:
new_angle = new_angle + 360
elif new_angle >= 360:
new_angle = new_angle - 360
angle_hslider.value = new_angle

89
src/UI/Dialogs/ImageEffects/RotateImage.tscn
View file

@ -4,15 +4,12 @@
[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2]
[node name="RotateImage" type="ConfirmationDialog"]
margin_right = 348.0
margin_right = 320.0
margin_bottom = 380.0
rect_min_size = Vector2( 348, 380 )
rect_min_size = Vector2( 320, 380 )
window_title = "Rotate Image"
resizable = true
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="VBoxContainer" type="VBoxContainer" parent="."]
anchor_right = 1.0
@ -21,19 +18,16 @@ margin_left = 8.0
margin_top = 8.0
margin_right = -8.0
margin_bottom = -36.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="AspectRatioContainer" type="AspectRatioContainer" parent="VBoxContainer"]
margin_right = 332.0
margin_bottom = 228.0
margin_right = 304.0
margin_bottom = 204.0
size_flags_vertical = 3
[node name="Preview" type="TextureRect" parent="VBoxContainer/AspectRatioContainer"]
margin_left = 52.0
margin_right = 280.0
margin_bottom = 228.0
margin_left = 50.0
margin_right = 254.0
margin_bottom = 204.0
rect_min_size = Vector2( 200, 200 )
expand = true
stretch_mode = 5
@ -46,14 +40,14 @@ margin_right = 0.0
margin_bottom = 0.0
[node name="LiveSettings" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 232.0
margin_right = 332.0
margin_bottom = 256.0
margin_top = 208.0
margin_right = 304.0
margin_bottom = 232.0
alignment = 1
[node name="LiveCheckbox" type="CheckBox" parent="VBoxContainer/LiveSettings"]
margin_left = 112.0
margin_right = 220.0
margin_left = 98.0
margin_right = 206.0
margin_bottom = 24.0
pressed = true
text = "Live Preview"
@ -86,9 +80,9 @@ editable = false
suffix = "msec"
[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 260.0
margin_right = 332.0
margin_bottom = 280.0
margin_top = 236.0
margin_right = 304.0
margin_bottom = 256.0
[node name="Label" type="Label" parent="VBoxContainer/HBoxContainer2"]
margin_top = 3.0
@ -98,15 +92,51 @@ text = "Type:"
[node name="TypeOptionButton" type="OptionButton" parent="VBoxContainer/HBoxContainer2"]
margin_left = 38.0
margin_right = 332.0
margin_right = 304.0
margin_bottom = 20.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 260.0
margin_right = 304.0
margin_bottom = 280.0
alignment = 1
[node name="Deduct90" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 65.0
margin_right = 98.0
margin_bottom = 20.0
text = "-90"
[node name="Deduct45" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 102.0
margin_right = 135.0
margin_bottom = 20.0
text = "-45"
[node name="Zero" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 139.0
margin_right = 159.0
margin_bottom = 20.0
text = "0"
[node name="Add45" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 163.0
margin_right = 199.0
margin_bottom = 20.0
text = "+45"
[node name="Add90" type="Button" parent="VBoxContainer/HBoxContainer"]
margin_left = 203.0
margin_right = 239.0
margin_bottom = 20.0
text = "+90"
[node name="AngleOptions" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 284.0
margin_right = 332.0
margin_right = 304.0
margin_bottom = 308.0
[node name="Label" type="Label" parent="VBoxContainer/AngleOptions"]
@ -117,7 +147,7 @@ text = "Angle:"
[node name="AngleHSlider" type="HSlider" parent="VBoxContainer/AngleOptions"]
margin_left = 44.0
margin_right = 254.0
margin_right = 226.0
margin_bottom = 24.0
mouse_default_cursor_shape = 2
size_flags_horizontal = 3
@ -128,8 +158,8 @@ __meta__ = {
}
[node name="AngleSpinBox" type="SpinBox" parent="VBoxContainer/AngleOptions"]
margin_left = 258.0
margin_right = 332.0
margin_left = 230.0
margin_right = 304.0
margin_bottom = 24.0
mouse_default_cursor_shape = 2
max_value = 359.0
@ -137,7 +167,7 @@ suffix = "°"
[node name="OptionsContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 312.0
margin_right = 332.0
margin_right = 304.0
margin_bottom = 336.0
[node name="SelectionCheckBox" type="CheckBox" parent="VBoxContainer/OptionsContainer"]
@ -161,6 +191,11 @@ selected = 0
[connection signal="toggled" from="VBoxContainer/LiveSettings/LiveCheckbox" to="." method="_on_LiveCheckbox_toggled"]
[connection signal="value_changed" from="VBoxContainer/WaitSettings/WaitTime" to="." method="_on_WaitTime_value_changed"]
[connection signal="item_selected" from="VBoxContainer/HBoxContainer2/TypeOptionButton" to="." method="_on_TypeOptionButton_item_selected"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Deduct90" to="." method="_on_quick_change_angle_pressed" binds= [ "-90" ]]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Deduct45" to="." method="_on_quick_change_angle_pressed" binds= [ "-45" ]]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Zero" to="." method="_on_quick_change_angle_pressed" binds= [ "0" ]]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Add45" to="." method="_on_quick_change_angle_pressed" binds= [ "+45" ]]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Add90" to="." method="_on_quick_change_angle_pressed" binds= [ "+90" ]]
[connection signal="value_changed" from="VBoxContainer/AngleOptions/AngleHSlider" to="." method="_on_HSlider_value_changed"]
[connection signal="value_changed" from="VBoxContainer/AngleOptions/AngleSpinBox" to="." method="_on_SpinBox_value_changed"]
[connection signal="timeout" from="WaitApply" to="." method="_on_WaitApply_timeout"]