Skip to content

Extend minimum/maximum zoom level of TextureRegion editor #79436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akien-mga merged 1 commit into from
Jan 29, 2024
Merged

Extend minimum/maximum zoom level of TextureRegion editor #79436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion editor/plugins/sprite_frames_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2178,7 +2178,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
min_thumbnail_zoom = 0.1f * MAX(1.0f, EDSCALE);
// Default the zoom to match the editor scale, but don't dezoom on editor scales below 100% to prevent pixel art from looking bad.
sheet_zoom = MAX(1.0f, EDSCALE);
max_sheet_zoom = 16.0f * MAX(1.0f, EDSCALE);
max_sheet_zoom = 128.0f * MAX(1.0f, EDSCALE);
min_sheet_zoom = 0.01f * MAX(1.0f, EDSCALE);
_zoom_reset();

Expand Down
7 changes: 6 additions & 1 deletion editor/plugins/texture_region_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ void TextureRegionEditor::_set_snap_sep_y(float p_val) {
}

void TextureRegionEditor::_zoom_on_position(float p_zoom, Point2 p_position) {
if (p_zoom < 0.25 || p_zoom > 8) {
if (p_zoom < min_draw_zoom || p_zoom > max_draw_zoom) {
return;
}

Expand Down Expand Up @@ -1166,6 +1166,11 @@ TextureRegionEditor::TextureRegionEditor() {

hb_grid->hide();

// Default the zoom to match the editor scale, but don't dezoom on editor scales below 100% to prevent pixel art from looking bad.
draw_zoom = MAX(1.0f, EDSCALE);
max_draw_zoom = 128.0f * MAX(1.0f, EDSCALE);
min_draw_zoom = 0.01f * MAX(1.0f, EDSCALE);

texture_preview = memnew(PanelContainer);
vb->add_child(texture_preview);
texture_preview->set_v_size_flags(Control::SIZE_EXPAND_FILL);
Expand Down
2 changes: 2 additions & 0 deletions editor/plugins/texture_region_editor_plugin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class TextureRegionEditor : public AcceptDialog {

Vector2 draw_ofs;
float draw_zoom = 1.0;
float min_draw_zoom = 1.0;
float max_draw_zoom = 1.0;
bool updating_scroll = false;

SnapMode snap_mode = SNAP_NONE;
Expand Down