aboutsummaryrefslogtreecommitdiff
path: root/editor/plugins/texture_region_editor_plugin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'editor/plugins/texture_region_editor_plugin.cpp')
-rw-r--r--editor/plugins/texture_region_editor_plugin.cpp749
1 files changed, 360 insertions, 389 deletions
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp
index aabf93857..5e992d3ec 100644
--- a/editor/plugins/texture_region_editor_plugin.cpp
+++ b/editor/plugins/texture_region_editor_plugin.cpp
@@ -31,149 +31,148 @@
#include "texture_region_editor_plugin.h"
#include "core/core_string_names.h"
-#include "scene/gui/check_box.h"
#include "os/input.h"
#include "os/keyboard.h"
+#include "scene/gui/check_box.h"
-void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to){
- Vector2 line = (to-from).normalized() * 10;
+void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to) {
+ Vector2 line = (to - from).normalized() * 10;
while ((to - from).length_squared() > 200) {
- edit_draw->draw_line(from, from + line,Color(0.97, 0.2, 0.2),2);
- from += line*2;
+ edit_draw->draw_line(from, from + line, Color(0.97, 0.2, 0.2), 2);
+ from += line * 2;
}
}
-void TextureRegionEditor::_region_draw()
-{
+void TextureRegionEditor::_region_draw() {
Ref<Texture> base_tex = NULL;
- if(node_sprite)
+ if (node_sprite)
base_tex = node_sprite->get_texture();
- else if(node_patch9)
+ else if (node_patch9)
base_tex = node_patch9->get_texture();
- else if(obj_styleBox.is_valid())
+ else if (obj_styleBox.is_valid())
base_tex = obj_styleBox->get_texture();
- else if(atlas_tex.is_valid())
+ else if (atlas_tex.is_valid())
base_tex = atlas_tex->get_atlas();
if (base_tex.is_null())
return;
Transform2D mtx;
- mtx.elements[2]=-draw_ofs;
- mtx.scale_basis(Vector2(draw_zoom,draw_zoom));
+ mtx.elements[2] = -draw_ofs;
+ mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
- VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),mtx);
- edit_draw->draw_texture(base_tex,Point2());
- VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),Transform2D());
+ VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), mtx);
+ edit_draw->draw_texture(base_tex, Point2());
+ VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(), Transform2D());
if (snap_mode == SNAP_GRID) {
Size2 s = edit_draw->get_size();
int last_cell;
- if (snap_step.x!=0) {
+ if (snap_step.x != 0) {
if (snap_separation.x == 0)
- for(int i=0;i<s.width;i++) {
- int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/snap_step.x));
- if (i==0)
- last_cell=cell;
- if (last_cell!=cell)
- edit_draw->draw_line(Point2(i,0),Point2(i,s.height),Color(0.3,0.7,1,0.3));
- last_cell=cell;
+ for (int i = 0; i < s.width; i++) {
+ int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i, 0)).x - snap_offset.x) / snap_step.x));
+ if (i == 0)
+ last_cell = cell;
+ if (last_cell != cell)
+ edit_draw->draw_line(Point2(i, 0), Point2(i, s.height), Color(0.3, 0.7, 1, 0.3));
+ last_cell = cell;
}
else
- for(int i=0;i<s.width;i++) {
- int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/(snap_step.x+snap_separation.x)));
- if (i==0)
- last_cell=cell;
- if (last_cell!=cell)
- edit_draw->draw_rect(Rect2(i-snap_separation.x*draw_zoom,0,snap_separation.x*draw_zoom,s.height),Color(0.3,0.7,1,0.3));
- last_cell=cell;
+ for (int i = 0; i < s.width; i++) {
+ int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i, 0)).x - snap_offset.x) / (snap_step.x + snap_separation.x)));
+ if (i == 0)
+ last_cell = cell;
+ if (last_cell != cell)
+ edit_draw->draw_rect(Rect2(i - snap_separation.x * draw_zoom, 0, snap_separation.x * draw_zoom, s.height), Color(0.3, 0.7, 1, 0.3));
+ last_cell = cell;
}
}
- if (snap_step.y!=0) {
+ if (snap_step.y != 0) {
if (snap_separation.y == 0)
- for(int i=0;i<s.height;i++) {
- int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/snap_step.y));
- if (i==0)
- last_cell=cell;
- if (last_cell!=cell)
- edit_draw->draw_line(Point2(0,i),Point2(s.width,i),Color(0.3,0.7,1,0.3));
- last_cell=cell;
+ for (int i = 0; i < s.height; i++) {
+ int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0, i)).y - snap_offset.y) / snap_step.y));
+ if (i == 0)
+ last_cell = cell;
+ if (last_cell != cell)
+ edit_draw->draw_line(Point2(0, i), Point2(s.width, i), Color(0.3, 0.7, 1, 0.3));
+ last_cell = cell;
}
else
- for(int i=0;i<s.height;i++) {
- int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/(snap_step.y+snap_separation.y)));
- if (i==0)
- last_cell=cell;
- if (last_cell!=cell)
- edit_draw->draw_rect(Rect2(0,i-snap_separation.y*draw_zoom,s.width,snap_separation.y*draw_zoom),Color(0.3,0.7,1,0.3));
- last_cell=cell;
+ for (int i = 0; i < s.height; i++) {
+ int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0, i)).y - snap_offset.y) / (snap_step.y + snap_separation.y)));
+ if (i == 0)
+ last_cell = cell;
+ if (last_cell != cell)
+ edit_draw->draw_rect(Rect2(0, i - snap_separation.y * draw_zoom, s.width, snap_separation.y * draw_zoom), Color(0.3, 0.7, 1, 0.3));
+ last_cell = cell;
}
}
} else if (snap_mode == SNAP_AUTOSLICE) {
- for (List<Rect2>::Element *E = autoslice_cache.front();E;E=E->next()) {
+ for (List<Rect2>::Element *E = autoslice_cache.front(); E; E = E->next()) {
Rect2 r = E->get();
- Vector2 endpoints[4]={
+ Vector2 endpoints[4] = {
mtx.basis_xform(r.pos),
- mtx.basis_xform(r.pos+Vector2(r.size.x,0)),
- mtx.basis_xform(r.pos+r.size),
- mtx.basis_xform(r.pos+Vector2(0,r.size.y))
+ mtx.basis_xform(r.pos + Vector2(r.size.x, 0)),
+ mtx.basis_xform(r.pos + r.size),
+ mtx.basis_xform(r.pos + Vector2(0, r.size.y))
};
- for(int i=0;i<4;i++) {
- int next = (i+1)%4;
- edit_draw->draw_line(endpoints[i]-draw_ofs, endpoints[next]-draw_ofs, Color(0.3,0.7,1,1) , 2);
+ for (int i = 0; i < 4; i++) {
+ int next = (i + 1) % 4;
+ edit_draw->draw_line(endpoints[i] - draw_ofs, endpoints[next] - draw_ofs, Color(0.3, 0.7, 1, 1), 2);
}
}
}
- Ref<Texture> select_handle = get_icon("EditorHandle","EditorIcons");
+ Ref<Texture> select_handle = get_icon("EditorHandle", "EditorIcons");
- Rect2 scroll_rect(Point2(),mtx.basis_xform(base_tex->get_size()));
+ Rect2 scroll_rect(Point2(), mtx.basis_xform(base_tex->get_size()));
scroll_rect.expand_to(mtx.basis_xform(edit_draw->get_size()));
- Vector2 endpoints[4]={
+ Vector2 endpoints[4] = {
mtx.basis_xform(rect.pos),
- mtx.basis_xform(rect.pos+Vector2(rect.size.x,0)),
- mtx.basis_xform(rect.pos+rect.size),
- mtx.basis_xform(rect.pos+Vector2(0,rect.size.y))
+ mtx.basis_xform(rect.pos + Vector2(rect.size.x, 0)),
+ mtx.basis_xform(rect.pos + rect.size),
+ mtx.basis_xform(rect.pos + Vector2(0, rect.size.y))
};
- Color color(0.9,0.5,0.5);
- for(int i=0;i<4;i++) {
+ Color color(0.9, 0.5, 0.5);
+ for (int i = 0; i < 4; i++) {
- int prev = (i+3)%4;
- int next = (i+1)%4;
+ int prev = (i + 3) % 4;
+ int next = (i + 1) % 4;
Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
- ofs*=1.4144*(select_handle->get_size().width/2);
+ ofs *= 1.4144 * (select_handle->get_size().width / 2);
- edit_draw->draw_line(endpoints[i]-draw_ofs, endpoints[next]-draw_ofs, color , 2);
+ edit_draw->draw_line(endpoints[i] - draw_ofs, endpoints[next] - draw_ofs, color, 2);
if (snap_mode != SNAP_AUTOSLICE)
- edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+ edit_draw->draw_texture(select_handle, (endpoints[i] + ofs - (select_handle->get_size() / 2)).floor() - draw_ofs);
- ofs = (endpoints[next]-endpoints[i])/2;
- ofs += (endpoints[next]-endpoints[i]).tangent().normalized()*(select_handle->get_size().width/2);
+ ofs = (endpoints[next] - endpoints[i]) / 2;
+ ofs += (endpoints[next] - endpoints[i]).tangent().normalized() * (select_handle->get_size().width / 2);
if (snap_mode != SNAP_AUTOSLICE)
- edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+ edit_draw->draw_texture(select_handle, (endpoints[i] + ofs - (select_handle->get_size() / 2)).floor() - draw_ofs);
scroll_rect.expand_to(endpoints[i]);
}
- scroll_rect=scroll_rect.grow(200);
- updating_scroll=true;
+ scroll_rect = scroll_rect.grow(200);
+ updating_scroll = true;
hscroll->set_min(scroll_rect.pos.x);
- hscroll->set_max(scroll_rect.pos.x+scroll_rect.size.x);
+ hscroll->set_max(scroll_rect.pos.x + scroll_rect.size.x);
hscroll->set_page(edit_draw->get_size().x);
hscroll->set_value(draw_ofs.x);
hscroll->set_step(0.001);
vscroll->set_min(scroll_rect.pos.y);
- vscroll->set_max(scroll_rect.pos.y+scroll_rect.size.y);
+ vscroll->set_max(scroll_rect.pos.y + scroll_rect.size.y);
vscroll->set_page(edit_draw->get_size().y);
vscroll->set_value(draw_ofs.y);
vscroll->set_step(0.001);
- updating_scroll=false;
+ updating_scroll = false;
float margins[4];
if (node_patch9 || obj_styleBox.is_valid()) {
@@ -189,40 +188,40 @@ void TextureRegionEditor::_region_draw()
margins[3] = obj_styleBox->get_margin_size(MARGIN_RIGHT);
}
Vector2 pos[4] = {
- mtx.basis_xform(Vector2(0,margins[0]))+Vector2(0,endpoints[0].y-draw_ofs.y),
- -mtx.basis_xform(Vector2(0,margins[1]))+Vector2(0,endpoints[2].y-draw_ofs.y),
- mtx.basis_xform(Vector2(margins[2],0))+Vector2(endpoints[0].x-draw_ofs.x,0),
- -mtx.basis_xform(Vector2(margins[3],0))+Vector2(endpoints[2].x-draw_ofs.x,0)};
+ mtx.basis_xform(Vector2(0, margins[0])) + Vector2(0, endpoints[0].y - draw_ofs.y),
+ -mtx.basis_xform(Vector2(0, margins[1])) + Vector2(0, endpoints[2].y - draw_ofs.y),
+ mtx.basis_xform(Vector2(margins[2], 0)) + Vector2(endpoints[0].x - draw_ofs.x, 0),
+ -mtx.basis_xform(Vector2(margins[3], 0)) + Vector2(endpoints[2].x - draw_ofs.x, 0)
+ };
- draw_margin_line(edit_draw,pos[0],pos[0]+Vector2(edit_draw->get_size().x,0));
- draw_margin_line(edit_draw,pos[1],pos[1]+Vector2(edit_draw->get_size().x,0));
- draw_margin_line(edit_draw,pos[2],pos[2]+Vector2(0,edit_draw->get_size().y));
- draw_margin_line(edit_draw,pos[3],pos[3]+Vector2(0,edit_draw->get_size().y));
+ draw_margin_line(edit_draw, pos[0], pos[0] + Vector2(edit_draw->get_size().x, 0));
+ draw_margin_line(edit_draw, pos[1], pos[1] + Vector2(edit_draw->get_size().x, 0));
+ draw_margin_line(edit_draw, pos[2], pos[2] + Vector2(0, edit_draw->get_size().y));
+ draw_margin_line(edit_draw, pos[3], pos[3] + Vector2(0, edit_draw->get_size().y));
}
}
-void TextureRegionEditor::_region_input(const InputEvent& p_input)
-{
+void TextureRegionEditor::_region_input(const InputEvent &p_input) {
Transform2D mtx;
- mtx.elements[2]=-draw_ofs;
- mtx.scale_basis(Vector2(draw_zoom,draw_zoom));
+ mtx.elements[2] = -draw_ofs;
+ mtx.scale_basis(Vector2(draw_zoom, draw_zoom));
- Vector2 endpoints[8]={
- mtx.xform(rect.pos)+Vector2(-4,-4),
- mtx.xform(rect.pos+Vector2(rect.size.x/2,0))+Vector2(0,-4),
- mtx.xform(rect.pos+Vector2(rect.size.x,0))+Vector2(4,-4),
- mtx.xform(rect.pos+Vector2(rect.size.x,rect.size.y/2))+Vector2(4,0),
- mtx.xform(rect.pos+rect.size)+Vector2(4,4),
- mtx.xform(rect.pos+Vector2(rect.size.x/2,rect.size.y))+Vector2(0,4),
- mtx.xform(rect.pos+Vector2(0,rect.size.y))+Vector2(-4,4),
- mtx.xform(rect.pos+Vector2(0,rect.size.y/2))+Vector2(-4,0)
+ Vector2 endpoints[8] = {
+ mtx.xform(rect.pos) + Vector2(-4, -4),
+ mtx.xform(rect.pos + Vector2(rect.size.x / 2, 0)) + Vector2(0, -4),
+ mtx.xform(rect.pos + Vector2(rect.size.x, 0)) + Vector2(4, -4),
+ mtx.xform(rect.pos + Vector2(rect.size.x, rect.size.y / 2)) + Vector2(4, 0),
+ mtx.xform(rect.pos + rect.size) + Vector2(4, 4),
+ mtx.xform(rect.pos + Vector2(rect.size.x / 2, rect.size.y)) + Vector2(0, 4),
+ mtx.xform(rect.pos + Vector2(0, rect.size.y)) + Vector2(-4, 4),
+ mtx.xform(rect.pos + Vector2(0, rect.size.y / 2)) + Vector2(-4, 0)
};
- if (p_input.type==InputEvent::MOUSE_BUTTON) {
+ if (p_input.type == InputEvent::MOUSE_BUTTON) {
- const InputEventMouseButton &mb=p_input.mouse_button;
+ const InputEventMouseButton &mb = p_input.mouse_button;
- if (mb.button_index==BUTTON_LEFT) {
+ if (mb.button_index == BUTTON_LEFT) {
if (mb.pressed) {
if (node_patch9 || obj_styleBox.is_valid()) {
@@ -240,10 +239,11 @@ void TextureRegionEditor::_region_input(const InputEvent& p_input)
margins[3] = obj_styleBox->get_margin_size(MARGIN_RIGHT);
}
Vector2 pos[4] = {
- mtx.basis_xform(rect.pos+Vector2(0,margins[0]))-draw_ofs,
- mtx.basis_xform(rect.pos+rect.size-Vector2(0,margins[1]))-draw_ofs,
- mtx.basis_xform(rect.pos+Vector2(margins[2],0))-draw_ofs,
- mtx.basis_xform(rect.pos+rect.size-Vector2(margins[3],0))-draw_ofs};
+ mtx.basis_xform(rect.pos + Vector2(0, margins[0])) - draw_ofs,
+ mtx.basis_xform(rect.pos + rect.size - Vector2(0, margins[1])) - draw_ofs,
+ mtx.basis_xform(rect.pos + Vector2(margins[2], 0)) - draw_ofs,
+ mtx.basis_xform(rect.pos + rect.size - Vector2(margins[3], 0)) - draw_ofs
+ };
if (Math::abs(mb.y - pos[0].y) < 8) {
edited_margin = 0;
prev_margin = margins[0];
@@ -258,132 +258,130 @@ void TextureRegionEditor::_region_input(const InputEvent& p_input)
prev_margin = margins[3];
}
if (edited_margin >= 0) {
- drag_from=Vector2(mb.x,mb.y);
- drag=true;
+ drag_from = Vector2(mb.x, mb.y);
+ drag = true;
}
}
- if ( edited_margin < 0 && snap_mode == SNAP_AUTOSLICE) {
- Vector2 point = mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
- for (List<Rect2>::Element *E=autoslice_cache.front();E;E=E->next()) {
+ if (edited_margin < 0 && snap_mode == SNAP_AUTOSLICE) {
+ Vector2 point = mtx.affine_inverse().xform(Vector2(mb.x, mb.y));
+ for (List<Rect2>::Element *E = autoslice_cache.front(); E; E = E->next()) {
if (E->get().has_point(point)) {
rect = E->get();
- if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)&&!(Input::get_singleton()->is_key_pressed(KEY_SHIFT|KEY_ALT))) {
+ if (Input::get_singleton()->is_key_pressed(KEY_CONTROL) && !(Input::get_singleton()->is_key_pressed(KEY_SHIFT | KEY_ALT))) {
Rect2 r;
- if(node_sprite )
- r=node_sprite->get_region_rect();
- else if(node_patch9)
- r=node_patch9->get_region_rect();
- else if(obj_styleBox.is_valid())
- r=obj_styleBox->get_region_rect();
- else if(atlas_tex.is_valid())
- r =atlas_tex->get_region();
+ if (node_sprite)
+ r = node_sprite->get_region_rect();
+ else if (node_patch9)
+ r = node_patch9->get_region_rect();
+ else if (obj_styleBox.is_valid())
+ r = obj_styleBox->get_region_rect();
+ else if (atlas_tex.is_valid())
+ r = atlas_tex->get_region();
rect.expand_to(r.pos);
- rect.expand_to(r.pos+r.size);
+ rect.expand_to(r.pos + r.size);
}
undo_redo->create_action("Set Region Rect");
- if(node_sprite){
- undo_redo->add_do_method(node_sprite ,"set_region_rect",rect);
- undo_redo->add_undo_method(node_sprite,"set_region_rect",node_sprite->get_region_rect());
- } else if(node_patch9){
- undo_redo->add_do_method(node_patch9 ,"set_region_rect",rect);
- undo_redo->add_undo_method(node_patch9,"set_region_rect",node_patch9->get_region_rect());
+ if (node_sprite) {
+ undo_redo->add_do_method(node_sprite, "set_region_rect", rect);
+ undo_redo->add_undo_method(node_sprite, "set_region_rect", node_sprite->get_region_rect());
+ } else if (node_patch9) {
+ undo_redo->add_do_method(node_patch9, "set_region_rect", rect);
+ undo_redo->add_undo_method(node_patch9, "set_region_rect", node_patch9->get_region_rect());
} else if (obj_styleBox.is_valid()) {
- undo_redo->add_do_method(obj_styleBox.ptr(),"set_region_rect",rect);
- undo_redo->add_undo_method(obj_styleBox.ptr(),"set_region_rect",obj_styleBox->get_region_rect());
+ undo_redo->add_do_method(obj_styleBox.ptr(), "set_region_rect", rect);
+ undo_redo->add_undo_method(obj_styleBox.ptr(), "set_region_rect", obj_styleBox->get_region_rect());
} else if (atlas_tex.is_valid()) {
- undo_redo->add_do_method(atlas_tex.ptr(),"set_region",rect);
- undo_redo->add_undo_method(atlas_tex.ptr(),"set_region",atlas_tex->get_region());
+ undo_redo->add_do_method(atlas_tex.ptr(), "set_region", rect);
+ undo_redo->add_undo_method(atlas_tex.ptr(), "set_region", atlas_tex->get_region());
}
- undo_redo->add_do_method(edit_draw,"update");
- undo_redo->add_undo_method(edit_draw,"update");
+ undo_redo->add_do_method(edit_draw, "update");
+ undo_redo->add_undo_method(edit_draw, "update");
undo_redo->commit_action();
break;
}
}
} else if (edited_margin < 0) {
- drag_from=mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
+ drag_from = mtx.affine_inverse().xform(Vector2(mb.x, mb.y));
if (snap_mode == SNAP_PIXEL)
- drag_from = drag_from.snapped(Vector2(1,1));
+ drag_from = drag_from.snapped(Vector2(1, 1));
else if (snap_mode == SNAP_GRID)
- drag_from=snap_point(drag_from);
- drag=true;
- if(node_sprite )
- rect_prev=node_sprite->get_region_rect();
- else if(node_patch9)
- rect_prev=node_patch9->get_region_rect();
- else if(obj_styleBox.is_valid())
- rect_prev=obj_styleBox->get_region_rect();
- else if(atlas_tex.is_valid())
- rect_prev=atlas_tex->get_region();
+ drag_from = snap_point(drag_from);
+ drag = true;
+ if (node_sprite)
+ rect_prev = node_sprite->get_region_rect();
+ else if (node_patch9)
+ rect_prev = node_patch9->get_region_rect();
+ else if (obj_styleBox.is_valid())
+ rect_prev = obj_styleBox->get_region_rect();
+ else if (atlas_tex.is_valid())
+ rect_prev = atlas_tex->get_region();
- for (int i=0; i<8;i++) {
- Vector2 tuv=endpoints[i];
- if (tuv.distance_to(Vector2(mb.x,mb.y))<8) {
- drag_index=i;
+ for (int i = 0; i < 8; i++) {
+ Vector2 tuv = endpoints[i];
+ if (tuv.distance_to(Vector2(mb.x, mb.y)) < 8) {
+ drag_index = i;
}
}
- if (drag_index==-1) {
+ if (drag_index == -1) {
creating = true;
- rect = Rect2(drag_from,Size2());
+ rect = Rect2(drag_from, Size2());
}
}
} else if (drag) {
if (edited_margin >= 0) {
undo_redo->create_action("Set Margin");
- static Margin m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+ static Margin m[4] = { MARGIN_TOP, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT };
if (node_patch9) {
- undo_redo->add_do_method(node_patch9 ,"set_patch_margin",m[edited_margin],node_patch9->get_patch_margin(m[edited_margin]));
- undo_redo->add_undo_method(node_patch9,"set_patch_margin",m[edited_margin],prev_margin);
+ undo_redo->add_do_method(node_patch9, "set_patch_margin", m[edited_margin], node_patch9->get_patch_margin(m[edited_margin]));
+ undo_redo->add_undo_method(node_patch9, "set_patch_margin", m[edited_margin], prev_margin);
} else if (obj_styleBox.is_valid()) {
- undo_redo->add_do_method(obj_styleBox.ptr() ,"set_margin_size",m[edited_margin],obj_styleBox->get_margin_size(m[edited_margin]));
- undo_redo->add_undo_method(obj_styleBox.ptr(),"set_margin_size",m[edited_margin],prev_margin);
+ undo_redo->add_do_method(obj_styleBox.ptr(), "set_margin_size", m[edited_margin], obj_styleBox->get_margin_size(m[edited_margin]));
+ undo_redo->add_undo_method(obj_styleBox.ptr(), "set_margin_size", m[edited_margin], prev_margin);
obj_styleBox->emit_signal(CoreStringNames::get_singleton()->changed);
}
edited_margin = -1;
} else {
undo_redo->create_action("Set Region Rect");
- if(node_sprite){
- undo_redo->add_do_method(node_sprite ,"set_region_rect",node_sprite->get_region_rect());
- undo_redo->add_undo_method(node_sprite,"set_region_rect",rect_prev);
- }
- else if(atlas_tex.is_valid()){
- undo_redo->add_do_method(atlas_tex.ptr() ,"set_region",atlas_tex->get_region());
- undo_redo->add_undo_method(atlas_tex.ptr(),"set_region",rect_prev);
- }
- else if(node_patch9){
+ if (node_sprite) {
+ undo_redo->add_do_method(node_sprite, "set_region_rect", node_sprite->get_region_rect());
+ undo_redo->add_undo_method(node_sprite, "set_region_rect", rect_prev);
+ } else if (atlas_tex.is_valid()) {
+ undo_redo->add_do_method(atlas_tex.ptr(), "set_region", atlas_tex->get_region());
+ undo_redo->add_undo_method(atlas_tex.ptr(), "set_region", rect_prev);
+ } else if (node_patch9) {
// FIXME: Is this intentional?
- } else if(node_patch9){
- undo_redo->add_do_method(node_patch9 ,"set_region_rect",node_patch9->get_region_rect());
- undo_redo->add_undo_method(node_patch9,"set_region_rect",rect_prev);
+ } else if (node_patch9) {
+ undo_redo->add_do_method(node_patch9, "set_region_rect", node_patch9->get_region_rect());
+ undo_redo->add_undo_method(node_patch9, "set_region_rect", rect_prev);
} else if (obj_styleBox.is_valid()) {
- undo_redo->add_do_method(obj_styleBox.ptr() ,"set_region_rect",obj_styleBox->get_region_rect());
- undo_redo->add_undo_method(obj_styleBox.ptr(),"set_region_rect",rect_prev);
+ undo_redo->add_do_method(obj_styleBox.ptr(), "set_region_rect", obj_styleBox->get_region_rect());
+ undo_redo->add_undo_method(obj_styleBox.ptr(), "set_region_rect", rect_prev);
}
drag_index = -1;
}
- undo_redo->add_do_method(edit_draw,"update");
- undo_redo->add_undo_method(edit_draw,"update");
+ undo_redo->add_do_method(edit_draw, "update");
+ undo_redo->add_undo_method(edit_draw, "update");
undo_redo->commit_action();
- drag=false;
+ drag = false;
creating = false;
}
- } else if (mb.button_index==BUTTON_RIGHT && mb.pressed) {
+ } else if (mb.button_index == BUTTON_RIGHT && mb.pressed) {
if (drag) {
- drag=false;
+ drag = false;
if (edited_margin >= 0) {
- static Margin m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+ static Margin m[4] = { MARGIN_TOP, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT };
if (node_patch9)
- node_patch9->set_patch_margin(m[edited_margin],prev_margin);
+ node_patch9->set_patch_margin(m[edited_margin], prev_margin);
if (obj_styleBox.is_valid())
- obj_styleBox->set_margin_size(m[edited_margin],prev_margin);
+ obj_styleBox->set_margin_size(m[edited_margin], prev_margin);
edited_margin = -1;
} else {
apply_rect(rect_prev);
- rect=rect_prev;
+ rect = rect_prev;
edit_draw->update();
drag_index = -1;
}
@@ -393,124 +391,120 @@ void TextureRegionEditor::_region_input(const InputEvent& p_input)
} else if (mb.button_index == BUTTON_WHEEL_DOWN && mb.pressed) {
_zoom_out();
}
- } else if (p_input.type==InputEvent::MOUSE_MOTION) {
+ } else if (p_input.type == InputEvent::MOUSE_MOTION) {
- const InputEventMouseMotion &mm=p_input.mouse_motion;
+ const InputEventMouseMotion &mm = p_input.mouse_motion;
- if (mm.button_mask&BUTTON_MASK_MIDDLE || Input::get_singleton()->is_key_pressed(KEY_SPACE)) {
+ if (mm.button_mask & BUTTON_MASK_MIDDLE || Input::get_singleton()->is_key_pressed(KEY_SPACE)) {
- Vector2 draged(mm.relative_x,mm.relative_y);
- hscroll->set_value( hscroll->get_value()-draged.x );
- vscroll->set_value( vscroll->get_value()-draged.y );
+ Vector2 draged(mm.relative_x, mm.relative_y);
+ hscroll->set_value(hscroll->get_value() - draged.x);
+ vscroll->set_value(vscroll->get_value() - draged.y);
} else if (drag) {
if (edited_margin >= 0) {
float new_margin;
if (edited_margin == 0)
- new_margin = prev_margin + (mm.y-drag_from.y) / draw_zoom;
+ new_margin = prev_margin + (mm.y - drag_from.y) / draw_zoom;
else if (edited_margin == 1)
- new_margin = prev_margin - (mm.y-drag_from.y) / draw_zoom;
+ new_margin = prev_margin - (mm.y - drag_from.y) / draw_zoom;
else if (edited_margin == 2)
- new_margin = prev_margin + (mm.x-drag_from.x) / draw_zoom;
+ new_margin = prev_margin + (mm.x - drag_from.x) / draw_zoom;
else if (edited_margin == 3)
- new_margin = prev_margin - (mm.x-drag_from.x) / draw_zoom;
+ new_margin = prev_margin - (mm.x - drag_from.x) / draw_zoom;
if (new_margin < 0)
new_margin = 0;
- static Margin m[4] = {MARGIN_TOP,MARGIN_BOTTOM,MARGIN_LEFT,MARGIN_RIGHT};
+ static Margin m[4] = { MARGIN_TOP, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT };
if (node_patch9)
- node_patch9->set_patch_margin(m[edited_margin],new_margin);
+ node_patch9->set_patch_margin(m[edited_margin], new_margin);
if (obj_styleBox.is_valid())
- obj_styleBox->set_margin_size(m[edited_margin],new_margin);
+ obj_styleBox->set_margin_size(m[edited_margin], new_margin);
} else {
- Vector2 new_pos = mtx.affine_inverse().xform(Vector2(mm.x,mm.y));
+ Vector2 new_pos = mtx.affine_inverse().xform(Vector2(mm.x, mm.y));
if (snap_mode == SNAP_PIXEL)
- new_pos = new_pos.snapped(Vector2(1,1));
+ new_pos = new_pos.snapped(Vector2(1, 1));
else if (snap_mode == SNAP_GRID)
- new_pos=snap_point(new_pos);
+ new_pos = snap_point(new_pos);
if (creating) {
- rect = Rect2(drag_from,Size2());
+ rect = Rect2(drag_from, Size2());
rect.expand_to(new_pos);
apply_rect(rect);
edit_draw->update();
return;
}
- switch(drag_index) {
- case 0: {
- Vector2 p=rect_prev.pos+rect_prev.size;
- rect = Rect2(p,Size2());
+ switch (drag_index) {
+ case 0: {
+ Vector2 p = rect_prev.pos + rect_prev.size;
+ rect = Rect2(p, Size2());
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 1: {
- Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
- rect = Rect2(p,Size2(rect_prev.size.x,0));
+ case 1: {
+ Vector2 p = rect_prev.pos + Vector2(0, rect_prev.size.y);
+ rect = Rect2(p, Size2(rect_prev.size.x, 0));
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 2: {
- Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
- rect = Rect2(p,Size2());
+ case 2: {
+ Vector2 p = rect_prev.pos + Vector2(0, rect_prev.size.y);
+ rect = Rect2(p, Size2());
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 3: {
- Vector2 p=rect_prev.pos;
- rect = Rect2(p,Size2(0,rect_prev.size.y));
+ case 3: {
+ Vector2 p = rect_prev.pos;
+ rect = Rect2(p, Size2(0, rect_prev.size.y));
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 4: {
- Vector2 p=rect_prev.pos;
- rect = Rect2(p,Size2());
+ case 4: {
+ Vector2 p = rect_prev.pos;
+ rect = Rect2(p, Size2());
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 5: {
- Vector2 p=rect_prev.pos;
- rect = Rect2(p,Size2(rect_prev.size.x,0));
+ case 5: {
+ Vector2 p = rect_prev.pos;
+ rect = Rect2(p, Size2(rect_prev.size.x, 0));
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 6: {
- Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
- rect = Rect2(p,Size2());
+ case 6: {
+ Vector2 p = rect_prev.pos + Vector2(rect_prev.size.x, 0);
+ rect = Rect2(p, Size2());
rect.expand_to(new_pos);
apply_rect(rect);
} break;
- case 7: {
- Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
- rect = Rect2(p,Size2(0,rect_prev.size.y));
+ case 7: {
+ Vector2 p = rect_prev.pos + Vector2(rect_prev.size.x, 0);
+ rect = Rect2(p, Size2(0, rect_prev.size.y));
rect.expand_to(new_pos);
apply_rect(rect);
} break;
-
}
}
edit_draw->update();
}
-
}
}
-void TextureRegionEditor::_scroll_changed(float)
-{
+void TextureRegionEditor::_scroll_changed(float) {
if (updating_scroll)
return;
- draw_ofs.x=hscroll->get_value();
- draw_ofs.y=vscroll->get_value();
+ draw_ofs.x = hscroll->get_value();
+ draw_ofs.y = vscroll->get_value();
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_mode(int p_mode)
-{
- snap_mode_button->get_popup()->set_item_checked(snap_mode,false);
+void TextureRegionEditor::_set_snap_mode(int p_mode) {
+ snap_mode_button->get_popup()->set_item_checked(snap_mode, false);
snap_mode = p_mode;
snap_mode_button->set_text(snap_mode_button->get_popup()->get_item_text(p_mode));
- snap_mode_button->get_popup()->set_item_checked(snap_mode,true);
+ snap_mode_button->get_popup()->set_item_checked(snap_mode, true);
if (snap_mode == SNAP_GRID)
hb_grid->show();
@@ -520,91 +514,80 @@ void TextureRegionEditor::_set_snap_mode(int p_mode)
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_off_x(float p_val)
-{
- snap_offset.x=p_val;
+void TextureRegionEditor::_set_snap_off_x(float p_val) {
+ snap_offset.x = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_off_y(float p_val)
-{
- snap_offset.y=p_val;
+void TextureRegionEditor::_set_snap_off_y(float p_val) {
+ snap_offset.y = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_step_x(float p_val)
-{
- snap_step.x=p_val;
+void TextureRegionEditor::_set_snap_step_x(float p_val) {
+ snap_step.x = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_step_y(float p_val)
-{
- snap_step.y=p_val;
+void TextureRegionEditor::_set_snap_step_y(float p_val) {
+ snap_step.y = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_sep_x(float p_val)
-{
+void TextureRegionEditor::_set_snap_sep_x(float p_val) {
snap_separation.x = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_set_snap_sep_y(float p_val)
-{
+void TextureRegionEditor::_set_snap_sep_y(float p_val) {
snap_separation.y = p_val;
edit_draw->update();
}
-void TextureRegionEditor::_zoom_in()
-{
+void TextureRegionEditor::_zoom_in() {
if (draw_zoom < 8) {
draw_zoom *= 2;
edit_draw->update();
}
}
-void TextureRegionEditor::_zoom_reset()
-{
+void TextureRegionEditor::_zoom_reset() {
if (draw_zoom == 1) return;
draw_zoom = 1;
edit_draw->update();
}
-void TextureRegionEditor::_zoom_out()
-{
+void TextureRegionEditor::_zoom_out() {
if (draw_zoom > 0.25) {
draw_zoom /= 2;
edit_draw->update();
}
}
-void TextureRegionEditor::apply_rect(const Rect2& rect){
- if(node_sprite)
+void TextureRegionEditor::apply_rect(const Rect2 &rect) {
+ if (node_sprite)
node_sprite->set_region_rect(rect);
- else if(node_patch9)
+ else if (node_patch9)
node_patch9->set_region_rect(rect);
- else if(obj_styleBox.is_valid())
+ else if (obj_styleBox.is_valid())
obj_styleBox->set_region_rect(rect);
- else if(atlas_tex.is_valid())
+ else if (atlas_tex.is_valid())
atlas_tex->set_region(rect);
}
-void TextureRegionEditor::_notification(int p_what)
-{
- switch(p_what) {
- case NOTIFICATION_READY: {
+void TextureRegionEditor::_notification(int p_what) {
+ switch (p_what) {
+ case NOTIFICATION_READY: {
zoom_out->set_icon(get_icon("ZoomLess", "EditorIcons"));
zoom_reset->set_icon(get_icon("ZoomReset", "EditorIcons"));
zoom_in->set_icon(get_icon("ZoomMore", "EditorIcons"));
- icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
+ icon_zoom->set_texture(get_icon("Zoom", "EditorIcons"));
} break;
}
}
-void TextureRegionEditor::_node_removed(Object *p_obj)
-{
- if(p_obj == node_sprite || p_obj == node_patch9 || p_obj == obj_styleBox.ptr() || p_obj == atlas_tex.ptr()) {
+void TextureRegionEditor::_node_removed(Object *p_obj) {
+ if (p_obj == node_sprite || p_obj == node_patch9 || p_obj == obj_styleBox.ptr() || p_obj == atlas_tex.ptr()) {
node_patch9 = NULL;
node_sprite = NULL;
obj_styleBox = Ref<StyleBox>(NULL);
@@ -613,35 +596,33 @@ void TextureRegionEditor::_node_removed(Object *p_obj)
}
}
-void TextureRegionEditor::_bind_methods()
-{
- ClassDB::bind_method(D_METHOD("_edit_region"),&TextureRegionEditor::_edit_region);
- ClassDB::bind_method(D_METHOD("_region_draw"),&TextureRegionEditor::_region_draw);
- ClassDB::bind_method(D_METHOD("_region_input"),&TextureRegionEditor::_region_input);
- ClassDB::bind_method(D_METHOD("_scroll_changed"),&TextureRegionEditor::_scroll_changed);
- ClassDB::bind_method(D_METHOD("_node_removed"),&TextureRegionEditor::_node_removed);
- ClassDB::bind_method(D_METHOD("_set_snap_mode"),&TextureRegionEditor::_set_snap_mode);
- ClassDB::bind_method(D_METHOD("_set_snap_off_x"),&TextureRegionEditor::_set_snap_off_x);
- ClassDB::bind_method(D_METHOD("_set_snap_off_y"),&TextureRegionEditor::_set_snap_off_y);
- ClassDB::bind_method(D_METHOD("_set_snap_step_x"),&TextureRegionEditor::_set_snap_step_x);
- ClassDB::bind_method(D_METHOD("_set_snap_step_y"),&TextureRegionEditor::_set_snap_step_y);
- ClassDB::bind_method(D_METHOD("_set_snap_sep_x"),&TextureRegionEditor::_set_snap_sep_x);
- ClassDB::bind_method(D_METHOD("_set_snap_sep_y"),&TextureRegionEditor::_set_snap_sep_y);
- ClassDB::bind_method(D_METHOD("_zoom_in"),&TextureRegionEditor::_zoom_in);
- ClassDB::bind_method(D_METHOD("_zoom_reset"),&TextureRegionEditor::_zoom_reset);
- ClassDB::bind_method(D_METHOD("_zoom_out"),&TextureRegionEditor::_zoom_out);
+void TextureRegionEditor::_bind_methods() {
+ ClassDB::bind_method(D_METHOD("_edit_region"), &TextureRegionEditor::_edit_region);
+ ClassDB::bind_method(D_METHOD("_region_draw"), &TextureRegionEditor::_region_draw);
+ ClassDB::bind_method(D_METHOD("_region_input"), &TextureRegionEditor::_region_input);
+ ClassDB::bind_method(D_METHOD("_scroll_changed"), &TextureRegionEditor::_scroll_changed);
+ ClassDB::bind_method(D_METHOD("_node_removed"), &TextureRegionEditor::_node_removed);
+ ClassDB::bind_method(D_METHOD("_set_snap_mode"), &TextureRegionEditor::_set_snap_mode);
+ ClassDB::bind_method(D_METHOD("_set_snap_off_x"), &TextureRegionEditor::_set_snap_off_x);
+ ClassDB::bind_method(D_METHOD("_set_snap_off_y"), &TextureRegionEditor::_set_snap_off_y);
+ ClassDB::bind_method(D_METHOD("_set_snap_step_x"), &TextureRegionEditor::_set_snap_step_x);
+ ClassDB::bind_method(D_METHOD("_set_snap_step_y"), &TextureRegionEditor::_set_snap_step_y);
+ ClassDB::bind_method(D_METHOD("_set_snap_sep_x"), &TextureRegionEditor::_set_snap_sep_x);
+ ClassDB::bind_method(D_METHOD("_set_snap_sep_y"), &TextureRegionEditor::_set_snap_sep_y);
+ ClassDB::bind_method(D_METHOD("_zoom_in"), &TextureRegionEditor::_zoom_in);
+ ClassDB::bind_method(D_METHOD("_zoom_reset"), &TextureRegionEditor::_zoom_reset);
+ ClassDB::bind_method(D_METHOD("_zoom_out"), &TextureRegionEditor::_zoom_out);
}
-void TextureRegionEditor::edit(Object *p_obj)
-{
- if (node_sprite && node_sprite->is_connected("texture_changed",this,"_edit_region"))
- node_sprite->disconnect("texture_changed",this,"_edit_region");
- if (node_patch9 && node_patch9->is_connected("texture_changed",this,"_edit_region"))
- node_patch9->disconnect("texture_changed",this,"_edit_region");
- if (obj_styleBox.is_valid() && obj_styleBox->is_connected("texture_changed",this,"_edit_region"))
- obj_styleBox->disconnect("texture_changed",this,"_edit_region");
- if (atlas_tex.is_valid() && atlas_tex->is_connected("atlas_changed",this,"_edit_region"))
- atlas_tex->disconnect("atlas_changed",this,"_edit_region");
+void TextureRegionEditor::edit(Object *p_obj) {
+ if (node_sprite && node_sprite->is_connected("texture_changed", this, "_edit_region"))
+ node_sprite->disconnect("texture_changed", this, "_edit_region");
+ if (node_patch9 && node_patch9->is_connected("texture_changed", this, "_edit_region"))
+ node_patch9->disconnect("texture_changed", this, "_edit_region");
+ if (obj_styleBox.is_valid() && obj_styleBox->is_connected("texture_changed", this, "_edit_region"))
+ obj_styleBox->disconnect("texture_changed", this, "_edit_region");
+ if (atlas_tex.is_valid() && atlas_tex->is_connected("atlas_changed", this, "_edit_region"))
+ atlas_tex->disconnect("atlas_changed", this, "_edit_region");
if (p_obj) {
node_sprite = p_obj->cast_to<Sprite>();
node_patch9 = p_obj->cast_to<NinePatchRect>();
@@ -649,22 +630,22 @@ void TextureRegionEditor::edit(Object *p_obj)
obj_styleBox = Ref<StyleBoxTexture>(p_obj->cast_to<StyleBoxTexture>());
if (p_obj->cast_to<AtlasTexture>()) {
atlas_tex = Ref<AtlasTexture>(p_obj->cast_to<AtlasTexture>());
- atlas_tex->connect("atlas_changed",this,"_edit_region");
+ atlas_tex->connect("atlas_changed", this, "_edit_region");
} else {
- p_obj->connect("texture_changed",this,"_edit_region");
+ p_obj->connect("texture_changed", this, "_edit_region");
}
p_obj->add_change_receptor(this);
- p_obj->connect("tree_exited",this,"_node_removed",varray(p_obj),CONNECT_ONESHOT);
+ p_obj->connect("tree_exited", this, "_node_removed", varray(p_obj), CONNECT_ONESHOT);
_edit_region();
} else {
- if(node_sprite)
- node_sprite->disconnect("tree_exited",this,"_node_removed");
- else if(node_patch9)
- node_patch9->disconnect("tree_exited",this,"_node_removed");
- else if(obj_styleBox.is_valid())
- obj_styleBox->disconnect("tree_exited",this,"_node_removed");
- else if(atlas_tex.is_valid())
- atlas_tex->disconnect("tree_exited",this,"_node_removed");
+ if (node_sprite)
+ node_sprite->disconnect("tree_exited", this, "_node_removed");
+ else if (node_patch9)
+ node_patch9->disconnect("tree_exited", this, "_node_removed");
+ else if (obj_styleBox.is_valid())
+ obj_styleBox->disconnect("tree_exited", this, "_node_removed");
+ else if (atlas_tex.is_valid())
+ atlas_tex->disconnect("tree_exited", this, "_node_removed");
node_sprite = NULL;
node_patch9 = NULL;
@@ -680,16 +661,15 @@ void TextureRegionEditor::_changed_callback(Object *p_changed, const char *p_pro
}
}
-void TextureRegionEditor::_edit_region()
-{
+void TextureRegionEditor::_edit_region() {
Ref<Texture> texture = NULL;
- if(node_sprite )
+ if (node_sprite)
texture = node_sprite->get_texture();
- else if(node_patch9 )
+ else if (node_patch9)
texture = node_patch9->get_texture();
- else if(obj_styleBox.is_valid())
+ else if (obj_styleBox.is_valid())
texture = obj_styleBox->get_texture();
- else if(atlas_tex.is_valid())
+ else if (atlas_tex.is_valid())
texture = atlas_tex->get_atlas();
if (texture.is_null()) {
@@ -703,30 +683,30 @@ void TextureRegionEditor::_edit_region()
bm.create_from_image_alpha(i);
for (int y = 0; y < i.get_height(); y++) {
for (int x = 0; x < i.get_width(); x++) {
- if (bm.get_bit(Point2(x,y))) {
+ if (bm.get_bit(Point2(x, y))) {
bool found = false;
- for (List<Rect2>::Element *E = autoslice_cache.front(); E; E=E->next()) {
+ for (List<Rect2>::Element *E = autoslice_cache.front(); E; E = E->next()) {
Rect2 grown = E->get().grow(1.5);
- if (grown.has_point(Point2(x,y))) {
- E->get().expand_to(Point2(x,y));
- E->get().expand_to(Point2(x+1,y+1));
- x = E->get().pos.x+E->get().size.x-1;
+ if (grown.has_point(Point2(x, y))) {
+ E->get().expand_to(Point2(x, y));
+ E->get().expand_to(Point2(x + 1, y + 1));
+ x = E->get().pos.x + E->get().size.x - 1;
bool merged = true;
while (merged) {
merged = false;
bool queue_erase = false;
- for (List<Rect2>::Element *F = autoslice_cache.front(); F; F=F->next()) {
- if (queue_erase){
+ for (List<Rect2>::Element *F = autoslice_cache.front(); F; F = F->next()) {
+ if (queue_erase) {
autoslice_cache.erase(F->prev());
queue_erase = false;
}
- if (F==E)
+ if (F == E)
continue;
if (E->get().grow(1).intersects(F->get())) {
E->get().expand_to(F->get().pos);
- E->get().expand_to(F->get().pos+F->get().size);
+ E->get().expand_to(F->get().pos + F->get().size);
if (F->prev()) {
- F=F->prev();
+ F = F->prev();
autoslice_cache.erase(F->next());
} else {
queue_erase = true;
@@ -741,7 +721,7 @@ void TextureRegionEditor::_edit_region()
}
}
if (!found) {
- Rect2 new_rect(x,y,1,1);
+ Rect2 new_rect(x, y, 1, 1);
autoslice_cache.push_back(new_rect);
}
}
@@ -749,12 +729,11 @@ void TextureRegionEditor::_edit_region()
}
}
-
- if(node_sprite )
+ if (node_sprite)
rect = node_sprite->get_region_rect();
- else if(node_patch9 )
+ else if (node_patch9)
rect = node_patch9->get_region_rect();
- else if(obj_styleBox.is_valid())
+ else if (obj_styleBox.is_valid())
rect = obj_styleBox->get_region_rect();
else if (atlas_tex.is_valid())
rect = atlas_tex->get_region();
@@ -764,13 +743,13 @@ void TextureRegionEditor::_edit_region()
inline float _snap_scalar(float p_offset, float p_step, float separation, float p_target) {
if (p_step != 0) {
- float a = Math::stepify(p_target - p_offset, p_step+separation) + p_offset;
+ float a = Math::stepify(p_target - p_offset, p_step + separation) + p_offset;
float b = a;
if (p_target >= 0)
b -= separation;
else
b += p_step;
- return (Math::abs(p_target-a) < Math::abs(p_target-b)) ? a : b;
+ return (Math::abs(p_target - a) < Math::abs(p_target - b)) ? a : b;
}
return p_target;
}
@@ -784,48 +763,47 @@ Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const {
return p_target;
}
-TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
-{
+TextureRegionEditor::TextureRegionEditor(EditorNode *p_editor) {
node_sprite = NULL;
node_patch9 = NULL;
obj_styleBox = Ref<StyleBoxTexture>(NULL);
atlas_tex = Ref<AtlasTexture>(NULL);
- editor=p_editor;
+ editor = p_editor;
undo_redo = editor->get_undo_redo();
- snap_step=Vector2(10,10);
- snap_separation = Vector2(0,0);
+ snap_step = Vector2(10, 10);
+ snap_separation = Vector2(0, 0);
edited_margin = -1;
drag_index = -1;
- drag=false;
+ drag = false;
- VBoxContainer *main_vb = memnew( VBoxContainer );
+ VBoxContainer *main_vb = memnew(VBoxContainer);
add_child(main_vb);
main_vb->set_area_as_parent_rect(0);
- HBoxContainer *hb_tools = memnew( HBoxContainer );
+ HBoxContainer *hb_tools = memnew(HBoxContainer);
main_vb->add_child(hb_tools);
- hb_tools->add_child(memnew( Label(TTR("Snap Mode:")) ));
+ hb_tools->add_child(memnew(Label(TTR("Snap Mode:"))));
- snap_mode_button = memnew( MenuButton );
+ snap_mode_button = memnew(MenuButton);
hb_tools->add_child(snap_mode_button);
snap_mode_button->set_text(TTR("<None>"));
PopupMenu *p = snap_mode_button->get_popup();
- p->add_item(TTR("<None>"),0);
- p->add_item(TTR("Pixel Snap"),1);
- p->add_item(TTR("Grid Snap"),2);
- p->add_item(TTR("Auto Slice"),3);
+ p->add_item(TTR("<None>"), 0);
+ p->add_item(TTR("Pixel Snap"), 1);
+ p->add_item(TTR("Grid Snap"), 2);
+ p->add_item(TTR("Auto Slice"), 3);
for (int i = 0; i < 4; i++)
- p->set_item_as_checkable(i,true);
- p->set_item_checked(0,true);
+ p->set_item_as_checkable(i, true);
+ p->set_item_checked(0, true);
p->connect("id_pressed", this, "_set_snap_mode");
- hb_grid = memnew( HBoxContainer );
+ hb_grid = memnew(HBoxContainer);
hb_tools->add_child(hb_grid);
- hb_grid->add_child( memnew( VSeparator ));
+ hb_grid->add_child(memnew(VSeparator));
- hb_grid->add_child( memnew( Label(TTR("Offset:")) ) );
+ hb_grid->add_child(memnew(Label(TTR("Offset:"))));
- sb_off_x = memnew( SpinBox );
+ sb_off_x = memnew(SpinBox);
sb_off_x->set_min(-256);
sb_off_x->set_max(256);
sb_off_x->set_step(1);
@@ -834,7 +812,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
sb_off_x->connect("value_changed", this, "_set_snap_off_x");
hb_grid->add_child(sb_off_x);
- sb_off_y = memnew( SpinBox );
+ sb_off_y = memnew(SpinBox);
sb_off_y->set_min(-256);
sb_off_y->set_max(256);
sb_off_y->set_step(1);
@@ -843,10 +821,10 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
sb_off_y->connect("value_changed", this, "_set_snap_off_y");
hb_grid->add_child(sb_off_y);
- hb_grid->add_child( memnew( VSeparator ));
- hb_grid->add_child( memnew( Label(TTR("Step:")) ) );
+ hb_grid->add_child(memnew(VSeparator));
+ hb_grid->add_child(memnew(Label(TTR("Step:"))));
- sb_step_x = memnew( SpinBox );
+ sb_step_x = memnew(SpinBox);
sb_step_x->set_min(-256);
sb_step_x->set_max(256);
sb_step_x->set_step(1);
@@ -855,7 +833,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
sb_step_x->connect("value_changed", this, "_set_snap_step_x");
hb_grid->add_child(sb_step_x);
- sb_step_y = memnew( SpinBox );
+ sb_step_y = memnew(SpinBox);
sb_step_y->set_min(-256);
sb_step_y->set_max(256);
sb_step_y->set_step(1);
@@ -864,10 +842,10 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
sb_step_y->connect("value_changed", this, "_set_snap_step_y");
hb_grid->add_child(sb_step_y);
- hb_grid->add_child( memnew( VSeparator ));
- hb_grid->add_child( memnew( Label(TTR("Separation:")) ) );
+ hb_grid->add_child(memnew(VSeparator));
+ hb_grid->add_child(memnew(Label(TTR("Separation:"))));
- sb_sep_x = memnew( SpinBox );
+ sb_sep_x = memnew(SpinBox);
sb_sep_x->set_min(0);
sb_sep_x->set_max(256);
sb_sep_x->set_step(1);
@@ -876,7 +854,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
sb_sep_x->connect("value_changed", this, "_set_snap_sep_x");
hb_grid->add_child(sb_sep_x);
- sb_sep_y = memnew( SpinBox );
+ sb_sep_y = memnew(SpinBox);
sb_sep_y->set_min(0);
sb_sep_y->set_max(256);
sb_sep_y->set_step(1);
@@ -887,60 +865,56 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
hb_grid->hide();
- HBoxContainer *main_hb = memnew( HBoxContainer );
+ HBoxContainer *main_hb = memnew(HBoxContainer);
main_vb->add_child(main_hb);
- edit_draw = memnew( Control );
+ edit_draw = memnew(Control);
main_hb->add_child(edit_draw);
main_hb->set_v_size_flags(SIZE_EXPAND_FILL);
edit_draw->set_h_size_flags(SIZE_EXPAND_FILL);
- Control * separator = memnew( Control );
+ Control *separator = memnew(Control);
separator->set_h_size_flags(Control::SIZE_EXPAND_FILL);
hb_tools->add_child(separator);
- icon_zoom = memnew( TextureRect );
+ icon_zoom = memnew(TextureRect);
hb_tools->add_child(icon_zoom);
- zoom_out = memnew( ToolButton );
+ zoom_out = memnew(ToolButton);
zoom_out->connect("pressed", this, "_zoom_out");
hb_tools->add_child(zoom_out);
- zoom_reset = memnew( ToolButton );
+ zoom_reset = memnew(ToolButton);
zoom_reset->connect("pressed", this, "_zoom_reset");
hb_tools->add_child(zoom_reset);
- zoom_in = memnew( ToolButton );
+ zoom_in = memnew(ToolButton);
zoom_in->connect("pressed", this, "_zoom_in");
hb_tools->add_child(zoom_in);
- vscroll = memnew( VScrollBar);
+ vscroll = memnew(VScrollBar);
main_hb->add_child(vscroll);
- vscroll->connect("value_changed",this,"_scroll_changed");
- hscroll = memnew( HScrollBar );
+ vscroll->connect("value_changed", this, "_scroll_changed");
+ hscroll = memnew(HScrollBar);
main_vb->add_child(hscroll);
- hscroll->connect("value_changed",this,"_scroll_changed");
+ hscroll->connect("value_changed", this, "_scroll_changed");
- edit_draw->connect("draw",this,"_region_draw");
- edit_draw->connect("gui_input",this,"_region_input");
- draw_zoom=1.0;
- updating_scroll=false;
+ edit_draw->connect("draw", this, "_region_draw");
+ edit_draw->connect("gui_input", this, "_region_input");
+ draw_zoom = 1.0;
+ updating_scroll = false;
edit_draw->set_clip_contents(true);
-
}
-void TextureRegionEditorPlugin::edit(Object *p_node)
-{
+void TextureRegionEditorPlugin::edit(Object *p_node) {
region_editor->edit(p_node);
}
-bool TextureRegionEditorPlugin::handles(Object *p_obj) const
-{
+bool TextureRegionEditorPlugin::handles(Object *p_obj) const {
return p_obj->is_class("Sprite") || p_obj->is_class("Patch9Rect") || p_obj->is_class("StyleBoxTexture") || p_obj->is_class("AtlasTexture");
}
-void TextureRegionEditorPlugin::make_visible(bool p_visible)
-{
+void TextureRegionEditorPlugin::make_visible(bool p_visible) {
if (p_visible) {
region_button->show();
if (region_button->is_pressed())
@@ -952,21 +926,20 @@ void TextureRegionEditorPlugin::make_visible(bool p_visible)
}
}
-
Dictionary TextureRegionEditorPlugin::get_state() const {
Dictionary state;
- state["zoom"]=region_editor->draw_zoom;
- state["snap_offset"]=region_editor->snap_offset;
- state["snap_step"]=region_editor->snap_step;
- state["snap_separation"]=region_editor->snap_separation;
- state["snap_mode"]=region_editor->snap_mode;
+ state["zoom"] = region_editor->draw_zoom;
+ state["snap_offset"] = region_editor->snap_offset;
+ state["snap_step"] = region_editor->snap_step;
+ state["snap_separation"] = region_editor->snap_separation;
+ state["snap_mode"] = region_editor->snap_mode;
return state;
}
-void TextureRegionEditorPlugin::set_state(const Dictionary& p_state){
+void TextureRegionEditorPlugin::set_state(const Dictionary &p_state) {
- Dictionary state=p_state;
+ Dictionary state = p_state;
if (state.has("zoom")) {
region_editor->draw_zoom = p_state["zoom"];
}
@@ -995,18 +968,16 @@ void TextureRegionEditorPlugin::set_state(const Dictionary& p_state){
if (state.has("snap_mode")) {
region_editor->_set_snap_mode(state["snap_mode"]);
}
-
}
-TextureRegionEditorPlugin::TextureRegionEditorPlugin(EditorNode *p_node)
-{
+TextureRegionEditorPlugin::TextureRegionEditorPlugin(EditorNode *p_node) {
editor = p_node;
- region_editor = memnew ( TextureRegionEditor(p_node) );
+ region_editor = memnew(TextureRegionEditor(p_node));
region_button = p_node->add_bottom_panel_item(TTR("Texture Region"), region_editor);
region_button->set_tooltip(TTR("Texture Region Editor"));
- region_editor->set_custom_minimum_size(Size2(0,200));
+ region_editor->set_custom_minimum_size(Size2(0, 200));
region_editor->hide();
region_button->hide();
}
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-11-10 18:56:58 +0000