huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-31 07:29:49 +00:00
Code Issues Wiki Activity

Fix crash due to division by zero when locking two or three ValueSliders and one of them has the value of 0 and the user attempts to change it

Browse source
This commit is contained in:
Emmanouil Papadeas 2024-03-16 19:03:41 +02:00
parent 9a5eb9720d
commit 3b8c63c4a6
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -30,6 +30,7 @@ Built using Godot 3.5.2
- Optimize canvas drawing by only updating it when the image(s) have changed. [ac6a4db43d9296ebc03e639d8199dd3878a25d86](https://github.com/Orama-Interactive/Pixelorama/commit/ac6a4db43d9296ebc03e639d8199dd3878a25d86) - Optimize canvas drawing by only updating it when the image(s) have changed. [ac6a4db43d9296ebc03e639d8199dd3878a25d86](https://github.com/Orama-Interactive/Pixelorama/commit/ac6a4db43d9296ebc03e639d8199dd3878a25d86)
- Fix bug where using shortcuts to switch between frames also moved the selection, causing deletions. - Fix bug where using shortcuts to switch between frames also moved the selection, causing deletions.
- Pxo files can now be loaded from the Open menu option in the Web version. [3dcc51705a999145e53a8e6d4de217dc03b0f147](https://github.com/Orama-Interactive/Pixelorama/commit/3dcc51705a999145e53a8e6d4de217dc03b0f147) - Pxo files can now be loaded from the Open menu option in the Web version. [3dcc51705a999145e53a8e6d4de217dc03b0f147](https://github.com/Orama-Interactive/Pixelorama/commit/3dcc51705a999145e53a8e6d4de217dc03b0f147)
- Fixed crash due to division by zero when locking two or three ValueSliders, and one of them has the value of 0 and the user attempts to change it.
- Fixed exporting selected layers not including the non-selected frames. - Fixed exporting selected layers not including the non-selected frames.
- The ellipse tool no longer produces gaps with large sizes. [4f3a7a305a264e0d2fe86c201af76eca4b2fea0a](https://github.com/Orama-Interactive/Pixelorama/commit/4f3a7a305a264e0d2fe86c201af76eca4b2fea0a) - The ellipse tool no longer produces gaps with large sizes. [4f3a7a305a264e0d2fe86c201af76eca4b2fea0a](https://github.com/Orama-Interactive/Pixelorama/commit/4f3a7a305a264e0d2fe86c201af76eca4b2fea0a)
- Fix "visible layers" option on the export dialog producing wrong results. [346d1f071a8c6b1defb1072d39aea9c642f1ef59](https://github.com/Orama-Interactive/Pixelorama/commit/346d1f071a8c6b1defb1072d39aea9c642f1ef59) - Fix "visible layers" option on the export dialog producing wrong results. [346d1f071a8c6b1defb1072d39aea9c642f1ef59](https://github.com/Orama-Interactive/Pixelorama/commit/346d1f071a8c6b1defb1072d39aea9c642f1ef59)

2
project.godot
View file

@ -343,7 +343,7 @@ config/icon="res://assets/graphics/icons/icon.png"
config/macos_native_icon="res://assets/graphics/icons/icon.icns" config/macos_native_icon="res://assets/graphics/icons/icon.icns"
config/windows_native_icon="res://assets/graphics/icons/icon.ico" config/windows_native_icon="res://assets/graphics/icons/icon.ico"
config/custom_user_dir_name.X11="pixelorama" config/custom_user_dir_name.X11="pixelorama"
config/Version="v0.11.4-rc3" config/Version="v0.11.4-rc2"
config/ExtensionsAPI_Version=3 config/ExtensionsAPI_Version=3
config/Pxo_Version=2 config/Pxo_Version=2

2
src/UI/Nodes/ValueSliderV2.gd
View file

@ -48,6 +48,7 @@ func _gcd(a: int, b: int) -> int:
func _on_X_value_changed(val: float) -> void: func _on_X_value_changed(val: float) -> void:
value.x = val value.x = val
if _locked_ratio: if _locked_ratio:
if not is_zero_approx(ratio.x):
self.value.y = max(min_value.y, (value.x / ratio.x) * ratio.y) self.value.y = max(min_value.y, (value.x / ratio.x) * ratio.y)
if _can_emit_signal: if _can_emit_signal:
emit_signal("value_changed", value) emit_signal("value_changed", value)
@ -56,6 +57,7 @@ func _on_X_value_changed(val: float) -> void:
func _on_Y_value_changed(val: float) -> void: func _on_Y_value_changed(val: float) -> void:
value.y = val value.y = val
if _locked_ratio: if _locked_ratio:
if not is_zero_approx(ratio.y):
self.value.x = max(min_value.x, (value.y / ratio.y) * ratio.x) self.value.x = max(min_value.x, (value.y / ratio.y) * ratio.x)
if _can_emit_signal: if _can_emit_signal:
emit_signal("value_changed", value) emit_signal("value_changed", value)

3
src/UI/Nodes/ValueSliderV3.gd
View file

@ -50,6 +50,7 @@ func _gcd(a: int, b: int) -> int:
func _on_X_value_changed(val: float) -> void: func _on_X_value_changed(val: float) -> void:
value.x = val value.x = val
if _locked_ratio: if _locked_ratio:
if not is_zero_approx(ratio.x):
self.value.y = max(min_value.y, (value.x / ratio.x) * ratio.y) self.value.y = max(min_value.y, (value.x / ratio.x) * ratio.y)
self.value.z = max(min_value.z, (value.x / ratio.x) * ratio.z) self.value.z = max(min_value.z, (value.x / ratio.x) * ratio.z)
if _can_emit_signal: if _can_emit_signal:
@ -59,6 +60,7 @@ func _on_X_value_changed(val: float) -> void:
func _on_Y_value_changed(val: float) -> void: func _on_Y_value_changed(val: float) -> void:
value.y = val value.y = val
if _locked_ratio: if _locked_ratio:
if not is_zero_approx(ratio.y):
self.value.x = max(min_value.x, (value.y / ratio.y) * ratio.x) self.value.x = max(min_value.x, (value.y / ratio.y) * ratio.x)
self.value.z = max(min_value.z, (value.y / ratio.y) * ratio.z) self.value.z = max(min_value.z, (value.y / ratio.y) * ratio.z)
if _can_emit_signal: if _can_emit_signal:
@ -68,6 +70,7 @@ func _on_Y_value_changed(val: float) -> void:
func _on_Z_value_changed(val: float) -> void: func _on_Z_value_changed(val: float) -> void:
value.z = val value.z = val
if _locked_ratio: if _locked_ratio:
if not is_zero_approx(ratio.z):
self.value.x = max(min_value.x, (value.z / ratio.z) * ratio.x) self.value.x = max(min_value.x, (value.z / ratio.z) * ratio.x)
self.value.y = max(min_value.y, (value.z / ratio.z) * ratio.y) self.value.y = max(min_value.y, (value.z / ratio.z) * ratio.y)
if _can_emit_signal: if _can_emit_signal: