Implement ctrl+MMB drag zooming #71
Conversation
DeMastah
commented
Oct 10, 2021
DeMastah
commented
- Remove (unwanted?) shift of InfiniteCanvas in main scene
- Fix 'enable_intput' and 'disable_intput" function name typos
- Improve contrast between text and background on color button
* Remove (unwanted?) shift of InfiniteCanvas in main scene * Fix 'enable_intput' and 'disable_intput" function name typos * Improve contrast between text and background on color button
|
Thanks for the PR! I'm going to check it out soon. |
| _mouse_wheel_counter = MAX_MOUSE_WHEEL_LEVEL | ||
| _current_zoom_level = 1.0 + _mouse_wheel_counter * _calc_zoom_increment() | ||
| func _do_zoom_scroll(step: int) -> void: | ||
| # NOTE: This *should* make zooming using scroll after having dragged "snap" |
There was a problem hiding this comment.
That's normal. You can check in _input if an event is pressed (in this case that would mean the start of the scroll i guess) or not pressed (end of scroll). That way _do_zoom_scroll will only get called once.
Like so:
if event.pressed:
_do_zoom_scroll(1)
|
|
||
| export var zoom_curve: Curve | ||
| var _is_input_enabled := true |
There was a problem hiding this comment.
Since we don't use the curve anymore i guess you can delete the zoom_curve.tres file completly.
| @@ -74,7 +74,8 @@ func enable_tool(tool_type: int) -> void: | |||
| # ------------------------------------------------------------------------------------------------- | |||
| func set_brush_color(color: Color) -> void: | |||
| _color_button.get("custom_styles/normal").bg_color = color | |||
| var text_color := color.inverted() | |||
| var lum := color.r * 0.2126 + color.g * 0.7152 + color.b * 0.0722 | |||
| var zoom_center = anchor - offset | ||
| var ratio = 1.0 - _current_zoom_level/old_zoom | ||
| var ratio = 1.0 - target_zoom/_current_zoom_level |
There was a problem hiding this comment.
Please add spaces between the operands and division sign
| return zoom_curve.interpolate(progress) | ||
| func _to_nearest_zoom_step(zoom_level: float) -> float: | ||
| zoom_level = clamp(zoom_level, MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL) | ||
| zoom_level = round(log(zoom_level)/log(ZOOM_INCREMENT)) |
|
Just pushed some changes. I realize that zooming using the scroll wheel feels slower (half as fast, I guess) now that it doesn't register twice. Fortunately, that can be remedied by simply increasing |
|
Great work, thanks! |
