mirror of
https://github.com/tonytins/CozyPixelStudio.git
synced 2025-06-25 17:14:42 -04:00
Added play button and zoom slider for the small canvas preview
May also be a solution for the age old issue #25.
This commit is contained in:
OverloadedOrama
parent
ebc9eab773
commit
7269b45fc5
10 changed files with 173 additions and 35 deletions
|
|
@ -1,9 +1,15 @@
|
|||
extends Node2D
|
||||
|
||||
|
||||
var frame : int = 0
|
||||
onready var animation_timer : Timer = $AnimationTimer
|
||||
|
||||
func _draw() -> void:
|
||||
var current_project : Project = Global.current_project
|
||||
var frame : int = current_project.current_frame
|
||||
$AnimationTimer.wait_time = Global.animation_timer.wait_time
|
||||
|
||||
if animation_timer.is_stopped():
|
||||
frame = current_project.current_frame
|
||||
var current_cels : Array = current_project.frames[frame].cels
|
||||
|
||||
# Draw current frame layers
|
||||
|
|
@ -11,3 +17,13 @@ func _draw() -> void:
|
|||
var modulate_color := Color(1, 1, 1, current_cels[i].opacity)
|
||||
if i < current_project.layers.size() and current_project.layers[i].visible:
|
||||
draw_texture(current_cels[i].image_texture, Vector2.ZERO, modulate_color)
|
||||
|
||||
|
||||
func _on_AnimationTimer_timeout() -> void:
|
||||
var current_project : Project = Global.current_project
|
||||
|
||||
if frame < current_project.frames.size() - 1:
|
||||
frame += 1
|
||||
else:
|
||||
frame = 0
|
||||
update()
|
||||
|
|
|
|||
|
|
@ -4,3 +4,6 @@
|
|||
|
||||
[node name="CanvasPreview" type="Node2D"]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="AnimationTimer" type="Timer" parent="."]
|
||||
[connection signal="timeout" from="AnimationTimer" to="." method="_on_AnimationTimer_timeout"]
|
||||
|
|
|
|||
20
src/UI/CanvasPreviewContainer.gd
Normal file
20
src/UI/CanvasPreviewContainer.gd
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
extends HBoxContainer
|
||||
|
||||
|
||||
onready var canvas_preview = $PreviewContainer/PreviewViewportContainer/Viewport/CanvasPreview
|
||||
onready var camera : Camera2D = $PreviewContainer/PreviewViewportContainer/Viewport/CameraPreview
|
||||
onready var play_button : Button = $SettingsContainer/VBoxContainer/PlayButton
|
||||
|
||||
|
||||
func _on_PreviewZoomSlider_value_changed(value : float) -> void:
|
||||
camera.zoom = -Vector2(value, value)
|
||||
camera.save_values_to_project()
|
||||
|
||||
|
||||
func _on_PlayButton_toggled(button_pressed : bool) -> void:
|
||||
if button_pressed:
|
||||
canvas_preview.animation_timer.start()
|
||||
Global.change_button_texturerect(play_button.get_child(0), "pause.png")
|
||||
else:
|
||||
canvas_preview.animation_timer.stop()
|
||||
Global.change_button_texturerect(play_button.get_child(0), "play.png")
|
||||
102
src/UI/CanvasPreviewContainer.tscn
Normal file
102
src/UI/CanvasPreviewContainer.tscn
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
[gd_scene load_steps=8 format=2]
|
||||
|
||||
[ext_resource path="res://src/UI/CanvasPreview.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://src/UI/TransparentChecker.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://src/UI/CanvasPreviewContainer.gd" type="Script" id=3]
|
||||
[ext_resource path="res://src/CameraMovement.gd" type="Script" id=4]
|
||||
[ext_resource path="res://src/Shaders/TransparentChecker.shader" type="Shader" id=5]
|
||||
[ext_resource path="res://assets/graphics/dark_themes/timeline/play.png" type="Texture" id=7]
|
||||
|
||||
[sub_resource type="ShaderMaterial" id=1]
|
||||
shader = ExtResource( 5 )
|
||||
shader_param/size = 10.0
|
||||
shader_param/color1 = Color( 0.7, 0.7, 0.7, 1 )
|
||||
shader_param/color2 = Color( 1, 1, 1, 1 )
|
||||
|
||||
[node name="CanvasPreviewContainer" type="HBoxContainer"]
|
||||
margin_right = 332.0
|
||||
margin_bottom = 164.0
|
||||
size_flags_horizontal = 4
|
||||
script = ExtResource( 3 )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="SettingsContainer" type="PanelContainer" parent="."]
|
||||
margin_right = 34.0
|
||||
margin_bottom = 164.0
|
||||
|
||||
[node name="VBoxContainer" type="VBoxContainer" parent="SettingsContainer"]
|
||||
margin_left = 7.0
|
||||
margin_top = 7.0
|
||||
margin_right = 27.0
|
||||
margin_bottom = 157.0
|
||||
|
||||
[node name="PreviewZoomSlider" type="VSlider" parent="SettingsContainer/VBoxContainer"]
|
||||
margin_right = 16.0
|
||||
margin_bottom = 126.0
|
||||
mouse_default_cursor_shape = 2
|
||||
size_flags_vertical = 3
|
||||
step = 0.01
|
||||
|
||||
[node name="PlayButton" type="Button" parent="SettingsContainer/VBoxContainer" groups=[
|
||||
"UIButtons",
|
||||
]]
|
||||
margin_top = 130.0
|
||||
margin_right = 20.0
|
||||
margin_bottom = 150.0
|
||||
rect_min_size = Vector2( 20, 0 )
|
||||
mouse_default_cursor_shape = 2
|
||||
toggle_mode = true
|
||||
|
||||
[node name="TextureRect" type="TextureRect" parent="SettingsContainer/VBoxContainer/PlayButton"]
|
||||
anchor_left = 0.5
|
||||
anchor_top = 0.5
|
||||
anchor_right = 0.5
|
||||
anchor_bottom = 0.5
|
||||
margin_left = -3.5
|
||||
margin_top = -6.0
|
||||
margin_right = 3.5
|
||||
margin_bottom = 6.0
|
||||
mouse_default_cursor_shape = 2
|
||||
texture = ExtResource( 7 )
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="PreviewContainer" type="PanelContainer" parent="."]
|
||||
margin_left = 38.0
|
||||
margin_right = 332.0
|
||||
margin_bottom = 164.0
|
||||
size_flags_horizontal = 4
|
||||
|
||||
[node name="PreviewViewportContainer" type="ViewportContainer" parent="PreviewContainer"]
|
||||
margin_left = 7.0
|
||||
margin_top = 7.0
|
||||
margin_right = 287.0
|
||||
margin_bottom = 157.0
|
||||
rect_min_size = Vector2( 0, 150 )
|
||||
|
||||
[node name="Viewport" type="Viewport" parent="PreviewContainer/PreviewViewportContainer"]
|
||||
size = Vector2( 280, 150 )
|
||||
transparent_bg = true
|
||||
handle_input_locally = false
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="TransparentChecker" parent="PreviewContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 2 )]
|
||||
material = SubResource( 1 )
|
||||
|
||||
[node name="CanvasPreview" parent="PreviewContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 1 )]
|
||||
|
||||
[node name="CameraPreview" type="Camera2D" parent="PreviewContainer/PreviewViewportContainer/Viewport"]
|
||||
offset = Vector2( 32, 32 )
|
||||
current = true
|
||||
zoom = Vector2( 0.15, 0.15 )
|
||||
script = ExtResource( 4 )
|
||||
|
||||
[node name="Panel" type="Panel" parent="."]
|
||||
margin_left = 336.0
|
||||
margin_right = 336.0
|
||||
margin_bottom = 164.0
|
||||
[connection signal="value_changed" from="SettingsContainer/VBoxContainer/PreviewZoomSlider" to="." method="_on_PreviewZoomSlider_value_changed"]
|
||||
[connection signal="toggled" from="SettingsContainer/VBoxContainer/PlayButton" to="." method="_on_PlayButton_toggled"]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=23 format=2]
|
||||
[gd_scene load_steps=24 format=2]
|
||||
|
||||
[ext_resource path="res://src/UI/ToolButtons.gd" type="Script" id=1]
|
||||
[ext_resource path="res://src/UI/CanvasPreview.tscn" type="PackedScene" id=2]
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
[ext_resource path="res://assets/graphics/dark_themes/tools/eraser_r.png" type="Texture" id=13]
|
||||
[ext_resource path="res://assets/graphics/dark_themes/tools/pencil_l.png" type="Texture" id=14]
|
||||
[ext_resource path="res://assets/graphics/dark_themes/tools/lightendarken.png" type="Texture" id=15]
|
||||
[ext_resource path="res://src/UI/CanvasPreviewContainer.tscn" type="PackedScene" id=16]
|
||||
[ext_resource path="res://src/UI/ColorAndToolOptions.tscn" type="PackedScene" id=17]
|
||||
[ext_resource path="res://src/UI/Timeline/AnimationTimeline.tscn" type="PackedScene" id=18]
|
||||
[ext_resource path="res://src/Canvas.tscn" type="PackedScene" id=19]
|
||||
|
|
@ -339,47 +340,24 @@ __meta__ = {
|
|||
"_edit_use_anchors_": false
|
||||
}
|
||||
|
||||
[node name="PanelContainer" type="PanelContainer" parent="RightPanel/PreviewAndPalettes"]
|
||||
margin_left = 8.0
|
||||
margin_right = 322.0
|
||||
margin_bottom = 164.0
|
||||
size_flags_horizontal = 4
|
||||
|
||||
[node name="PreviewViewportContainer" type="ViewportContainer" parent="RightPanel/PreviewAndPalettes/PanelContainer"]
|
||||
margin_left = 7.0
|
||||
margin_top = 7.0
|
||||
margin_right = 307.0
|
||||
margin_bottom = 157.0
|
||||
rect_min_size = Vector2( 0, 150 )
|
||||
|
||||
[node name="Viewport" type="Viewport" parent="RightPanel/PreviewAndPalettes/PanelContainer/PreviewViewportContainer"]
|
||||
size = Vector2( 300, 150 )
|
||||
transparent_bg = true
|
||||
handle_input_locally = false
|
||||
render_target_update_mode = 3
|
||||
|
||||
[node name="TransparentChecker" parent="RightPanel/PreviewAndPalettes/PanelContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 5 )]
|
||||
|
||||
[node name="CanvasPreview" parent="RightPanel/PreviewAndPalettes/PanelContainer/PreviewViewportContainer/Viewport" instance=ExtResource( 2 )]
|
||||
|
||||
[node name="CameraPreview" type="Camera2D" parent="RightPanel/PreviewAndPalettes/PanelContainer/PreviewViewportContainer/Viewport"]
|
||||
offset = Vector2( 32, 32 )
|
||||
current = true
|
||||
zoom = Vector2( 0.15, 0.15 )
|
||||
script = ExtResource( 7 )
|
||||
[node name="CanvasPreviewContainer" parent="RightPanel/PreviewAndPalettes" instance=ExtResource( 16 )]
|
||||
margin_right = 336.0
|
||||
|
||||
[node name="ToolAndPaletteVSplit" type="VSplitContainer" parent="RightPanel/PreviewAndPalettes"]
|
||||
margin_top = 168.0
|
||||
margin_right = 330.0
|
||||
margin_right = 336.0
|
||||
margin_bottom = 676.0
|
||||
size_flags_vertical = 3
|
||||
custom_constants/autohide = 0
|
||||
|
||||
[node name="ColorAndToolOptions" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 17 )]
|
||||
margin_right = 336.0
|
||||
margin_bottom = 248.0
|
||||
|
||||
[node name="PalettePanelContainer" parent="RightPanel/PreviewAndPalettes/ToolAndPaletteVSplit" instance=ExtResource( 20 )]
|
||||
margin_left = 18.0
|
||||
margin_top = 260.0
|
||||
margin_right = 318.0
|
||||
margin_bottom = 508.0
|
||||
[connection signal="reposition_active_tab_request" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_reposition_active_tab_request"]
|
||||
[connection signal="tab_changed" from="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" to="CanvasAndTimeline/ViewportAndRulers/TabsContainer/Tabs" method="_on_Tabs_tab_changed"]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue