huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-03-13 14:55:18 +00:00
Code Issues Wiki Activity

Changed zoom fit to frame algorithm, again

Browse source 
Put the new code in a new fit_to_frame() method inside CameraMovement.gd. The old code did not work properly for images with width larger than their height.
This commit is contained in:
OverloadedOrama 2020-05-10 15:46:21 +03:00
parent 74c238b0f5
commit b4ae097d14
3 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/CameraMovement.gd
View file

@ -159,3 +159,29 @@ func zoom_camera(dir : int) -> void:
func _on_tween_step(_object: Object, _key: NodePath, _elapsed: float, _value: Object) -> void: func _on_tween_step(_object: Object, _key: NodePath, _elapsed: float, _value: Object) -> void:
Global.horizontal_ruler.update() Global.horizontal_ruler.update()
Global.vertical_ruler.update() Global.vertical_ruler.update()
func fit_to_frame() -> void:
viewport_container = get_parent().get_parent()
var h_ratio := viewport_container.rect_size.x / Global.canvas.size.x
var v_ratio := viewport_container.rect_size.y / Global.canvas.size.y
var ratio := min(h_ratio, v_ratio)
if ratio == 0:
ratio = 0.1 # Set it to a non-zero value just in case
# If the ratio is 0, it means that the viewport container is hidden
# in that case, use the other viewport to get the ratio
if name == "Camera2D":
h_ratio = Global.second_viewport.rect_size.x / Global.canvas.size.x
v_ratio = Global.second_viewport.rect_size.y / Global.canvas.size.y
ratio = min(h_ratio, v_ratio)
elif name == "Camera2D2":
h_ratio = Global.main_viewport.rect_size.x / Global.canvas.size.x
v_ratio = Global.main_viewport.rect_size.y / Global.canvas.size.y
ratio = min(h_ratio, v_ratio)
zoom = Vector2(1 / ratio, 1 / ratio)
offset = Global.canvas.size / 2
if name == "Camera2D":
Global.zoom_level_label.text = str(round(100 / Global.camera.zoom.x)) + " %"
Global.horizontal_ruler.update()
Global.vertical_ruler.update()

16
src/Canvas.gd
View file

@ -539,19 +539,9 @@ func camera_zoom() -> void:
Global.camera2.zoom_max = Vector2.ONE Global.camera2.zoom_max = Vector2.ONE
Global.camera_preview.zoom_max = Vector2.ONE Global.camera_preview.zoom_max = Vector2.ONE
var smaller_viewport_axis = min(Global.main_viewport.rect_size.x, Global.main_viewport.rect_size.y) Global.camera.fit_to_frame()
Global.camera.zoom = Vector2(bigger_canvas_axis, bigger_canvas_axis) / smaller_viewport_axis Global.camera2.fit_to_frame()
Global.camera2.zoom = Vector2(bigger_canvas_axis, bigger_canvas_axis) * 0.002 Global.camera_preview.fit_to_frame()
Global.camera_preview.zoom = Vector2(bigger_canvas_axis, bigger_canvas_axis) * 0.007
Global.zoom_level_label.text = str(round(100 / Global.camera.zoom.x)) + " %"
# Set camera offset to the center of canvas
Global.camera.offset = size / 2
Global.camera2.offset = size / 2
Global.camera_preview.offset = size / 2
Global.horizontal_ruler.update()
Global.vertical_ruler.update()
Global.transparent_checker._ready() # To update the rect size Global.transparent_checker._ready() # To update the rect size

8
src/Main.gd
View file

@ -791,13 +791,7 @@ func _on_RightZoomModeOptions_item_selected(ID : int) -> void:
func _on_FitToFrameButton_pressed() -> void: func _on_FitToFrameButton_pressed() -> void:
var bigger_canvas_axis = max(Global.canvas.size.x, Global.canvas.size.y) Global.camera.fit_to_frame()
var smaller_viewport_axis = min(Global.main_viewport.rect_size.x, Global.main_viewport.rect_size.y)
Global.camera.zoom = Vector2(bigger_canvas_axis, bigger_canvas_axis) / smaller_viewport_axis
Global.camera.offset = Global.canvas.size / 2
Global.zoom_level_label.text = str(round(100 / Global.camera.zoom.x)) + " %"
Global.horizontal_ruler.update()
Global.vertical_ruler.update()
func _on_100ZoomButton_pressed() -> void: func _on_100ZoomButton_pressed() -> void: