diff options
Diffstat (limited to 'modules/gridmap/grid_map_editor_plugin.cpp')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 958 |
1 files changed, 430 insertions, 528 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index a5d2f84c68..a6a3a03503 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -27,59 +27,53 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "grid_map_editor_plugin.h" +#include "editor/editor_settings.h" #include "editor/plugins/spatial_editor_plugin.h" #include "scene/3d/camera.h" -#include "editor/editor_settings.h" -#include "os/keyboard.h" #include "geometry.h" +#include "os/keyboard.h" void GridMapEditor::_node_removed(Node *p_node) { - if(p_node==node) { - node=NULL; + if (p_node == node) { + node = NULL; hide(); theme_pallete->hide(); } - } - void GridMapEditor::_configure() { - if(!node) + if (!node) return; update_grid(); - } -void GridMapEditor::_menu_option(int p_option) { +void GridMapEditor::_menu_option(int p_option) { - - switch(p_option) { + switch (p_option) { case MENU_OPTION_CONFIGURE: { - } break; case MENU_OPTION_LOCK_VIEW: { - int index=options->get_popup()->get_item_index(MENU_OPTION_LOCK_VIEW); - lock_view=!options->get_popup()->is_item_checked(index); + int index = options->get_popup()->get_item_index(MENU_OPTION_LOCK_VIEW); + lock_view = !options->get_popup()->is_item_checked(index); - options->get_popup()->set_item_checked(index,lock_view); + options->get_popup()->set_item_checked(index, lock_view); } break; case MENU_OPTION_CLIP_DISABLED: case MENU_OPTION_CLIP_ABOVE: case MENU_OPTION_CLIP_BELOW: { - clip_mode=ClipMode(p_option-MENU_OPTION_CLIP_DISABLED); - for(int i=0;i<3;i++) { - - int index=options->get_popup()->get_item_index(MENU_OPTION_CLIP_DISABLED+i); - options->get_popup()->set_item_checked(index,i==clip_mode); + clip_mode = ClipMode(p_option - MENU_OPTION_CLIP_DISABLED); + for (int i = 0; i < 3; i++) { + int index = options->get_popup()->get_item_index(MENU_OPTION_CLIP_DISABLED + i); + options->get_popup()->set_item_checked(index, i == clip_mode); } _update_clip(); @@ -88,102 +82,100 @@ void GridMapEditor::_menu_option(int p_option) { case MENU_OPTION_Y_AXIS: case MENU_OPTION_Z_AXIS: { - int new_axis = p_option-MENU_OPTION_X_AXIS; - for(int i=0;i<3;i++) { - int idx=options->get_popup()->get_item_index(MENU_OPTION_X_AXIS+i); - options->get_popup()->set_item_checked(idx,i==new_axis); + int new_axis = p_option - MENU_OPTION_X_AXIS; + for (int i = 0; i < 3; i++) { + int idx = options->get_popup()->get_item_index(MENU_OPTION_X_AXIS + i); + options->get_popup()->set_item_checked(idx, i == new_axis); } - edit_axis=Vector3::Axis(new_axis); + edit_axis = Vector3::Axis(new_axis); update_grid(); _update_clip(); } break; case MENU_OPTION_CURSOR_ROTATE_Y: { Basis r; - if (input_action==INPUT_DUPLICATE) { + if (input_action == INPUT_DUPLICATE) { r.set_orthogonal_index(selection.duplicate_rot); - r.rotate(Vector3(0,1,0),-Math_PI/2.0); - selection.duplicate_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 1, 0), -Math_PI / 2.0); + selection.duplicate_rot = r.get_orthogonal_index(); _update_duplicate_indicator(); break; } r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(0,1,0),-Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 1, 0), -Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_ROTATE_X: { Basis r; - if (input_action==INPUT_DUPLICATE) { + if (input_action == INPUT_DUPLICATE) { r.set_orthogonal_index(selection.duplicate_rot); - r.rotate(Vector3(1,0,0),-Math_PI/2.0); - selection.duplicate_rot=r.get_orthogonal_index(); + r.rotate(Vector3(1, 0, 0), -Math_PI / 2.0); + selection.duplicate_rot = r.get_orthogonal_index(); _update_duplicate_indicator(); break; } r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(1,0,0),-Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(1, 0, 0), -Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_ROTATE_Z: { Basis r; - if (input_action==INPUT_DUPLICATE) { + if (input_action == INPUT_DUPLICATE) { r.set_orthogonal_index(selection.duplicate_rot); - r.rotate(Vector3(0,0,1),-Math_PI/2.0); - selection.duplicate_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 0, 1), -Math_PI / 2.0); + selection.duplicate_rot = r.get_orthogonal_index(); _update_duplicate_indicator(); break; } r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(0,0,1),-Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 0, 1), -Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_BACK_ROTATE_Y: { Basis r; r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(0,1,0),Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 1, 0), Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_BACK_ROTATE_X: { Basis r; r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(1,0,0),Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(1, 0, 0), Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_BACK_ROTATE_Z: { Basis r; r.set_orthogonal_index(cursor_rot); - r.rotate(Vector3(0,0,1),Math_PI/2.0); - cursor_rot=r.get_orthogonal_index(); + r.rotate(Vector3(0, 0, 1), Math_PI / 2.0); + cursor_rot = r.get_orthogonal_index(); _update_cursor_transform(); } break; case MENU_OPTION_CURSOR_CLEAR_ROTATION: { - if (input_action==INPUT_DUPLICATE) { - + if (input_action == INPUT_DUPLICATE) { - selection.duplicate_rot=0; + selection.duplicate_rot = 0; _update_duplicate_indicator(); break; } - cursor_rot=0; + cursor_rot = 0; _update_cursor_transform(); } break; - case MENU_OPTION_DUPLICATE_SELECTS: { int idx = options->get_popup()->get_item_index(MENU_OPTION_DUPLICATE_SELECTS); - options->get_popup()->set_item_checked( idx, !options->get_popup()->is_item_checked( idx ) ); + options->get_popup()->set_item_checked(idx, !options->get_popup()->is_item_checked(idx)); } break; case MENU_OPTION_SELECTION_MAKE_AREA: case MENU_OPTION_SELECTION_MAKE_EXTERIOR_CONNECTOR: { @@ -191,37 +183,34 @@ void GridMapEditor::_menu_option(int p_option) { if (!selection.active) break; int area = node->get_unused_area_id(); - Error err = node->create_area(area,Rect3(selection.begin,selection.end-selection.begin+Vector3(1,1,1))); - if (err!=OK) { - - + Error err = node->create_area(area, Rect3(selection.begin, selection.end - selection.begin + Vector3(1, 1, 1))); + if (err != OK) { } - if (p_option==MENU_OPTION_SELECTION_MAKE_EXTERIOR_CONNECTOR) { + if (p_option == MENU_OPTION_SELECTION_MAKE_EXTERIOR_CONNECTOR) { - node->area_set_exterior_portal(area,true); + node->area_set_exterior_portal(area, true); } _update_areas_display(); update_areas(); - } break; case MENU_OPTION_REMOVE_AREA: { - if (selected_area<1) + if (selected_area < 1) return; node->erase_area(selected_area); _update_areas_display(); update_areas(); } break; case MENU_OPTION_SELECTION_DUPLICATE: - if (!(selection.active && input_action==INPUT_NONE)) + if (!(selection.active && input_action == INPUT_NONE)) return; - if (last_mouseover==Vector3(-1,-1,-1)) //nono mouseovering anythin + if (last_mouseover == Vector3(-1, -1, -1)) //nono mouseovering anythin break; - input_action=INPUT_DUPLICATE; - selection.click=last_mouseover; - selection.current=last_mouseover; - selection.duplicate_rot=0; + input_action = INPUT_DUPLICATE; + selection.click = last_mouseover; + selection.current = last_mouseover; + selection.duplicate_rot = 0; _update_duplicate_indicator(); break; case MENU_OPTION_SELECTION_CLEAR: { @@ -230,28 +219,24 @@ void GridMapEditor::_menu_option(int p_option) { _delete_selection(); - } break; case MENU_OPTION_GRIDMAP_SETTINGS: { settings_dialog->popup_centered(settings_vbc->get_combined_minimum_size() + Size2(50, 50)); } break; - } } void GridMapEditor::_update_cursor_transform() { - cursor_transform=Transform(); - cursor_transform.origin=cursor_origin; + cursor_transform = Transform(); + cursor_transform.origin = cursor_origin; cursor_transform.basis.set_orthogonal_index(cursor_rot); cursor_transform = node->get_transform() * cursor_transform; - if (cursor_instance.is_valid()) { - VisualServer::get_singleton()->instance_set_transform(cursor_instance,cursor_transform); - VisualServer::get_singleton()->instance_set_visible(cursor_instance,cursor_visible); + VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform); + VisualServer::get_singleton()->instance_set_visible(cursor_instance, cursor_visible); } - } void GridMapEditor::_update_selection_transform() { @@ -260,93 +245,87 @@ void GridMapEditor::_update_selection_transform() { Transform xf; xf.basis.set_zero(); - VisualServer::get_singleton()->instance_set_transform(selection_instance,xf); + VisualServer::get_singleton()->instance_set_transform(selection_instance, xf); return; } Transform xf; - xf.scale(Vector3(1,1,1)*(Vector3(1,1,1)+(selection.end-selection.begin))*node->get_cell_size()); - xf.origin=selection.begin*node->get_cell_size(); - - VisualServer::get_singleton()->instance_set_transform(selection_instance,node->get_global_transform() * xf); + xf.scale(Vector3(1, 1, 1) * (Vector3(1, 1, 1) + (selection.end - selection.begin)) * node->get_cell_size()); + xf.origin = selection.begin * node->get_cell_size(); + VisualServer::get_singleton()->instance_set_transform(selection_instance, node->get_global_transform() * xf); } void GridMapEditor::_validate_selection() { if (!selection.active) return; - selection.begin=selection.click; - selection.end=selection.current; - - if (selection.begin.x>selection.end.x) - SWAP(selection.begin.x,selection.end.x); - if (selection.begin.y>selection.end.y) - SWAP(selection.begin.y,selection.end.y); - if (selection.begin.z>selection.end.z) - SWAP(selection.begin.z,selection.end.z); + selection.begin = selection.click; + selection.end = selection.current; + if (selection.begin.x > selection.end.x) + SWAP(selection.begin.x, selection.end.x); + if (selection.begin.y > selection.end.y) + SWAP(selection.begin.y, selection.end.y); + if (selection.begin.z > selection.end.z) + SWAP(selection.begin.z, selection.end.z); _update_selection_transform(); } -bool GridMapEditor::do_input_action(Camera* p_camera,const Point2& p_point,bool p_click) { +bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, bool p_click) { if (!spatial_editor) return false; - - if (selected_pallete<0 && input_action!=INPUT_COPY && input_action!=INPUT_SELECT && input_action!=INPUT_DUPLICATE) + if (selected_pallete < 0 && input_action != INPUT_COPY && input_action != INPUT_SELECT && input_action != INPUT_DUPLICATE) return false; Ref<MeshLibrary> theme = node->get_theme(); if (theme.is_null()) return false; - if (input_action!=INPUT_COPY && input_action!=INPUT_SELECT && input_action!=INPUT_DUPLICATE && !theme->has_item(selected_pallete)) + if (input_action != INPUT_COPY && input_action != INPUT_SELECT && input_action != INPUT_DUPLICATE && !theme->has_item(selected_pallete)) return false; Camera *camera = p_camera; Vector3 from = camera->project_ray_origin(p_point); Vector3 normal = camera->project_ray_normal(p_point); Transform local_xform = node->get_global_transform().affine_inverse(); - Vector<Plane> planes=camera->get_frustum(); - from=local_xform.xform(from); - normal=local_xform.basis.xform(normal).normalized(); - + Vector<Plane> planes = camera->get_frustum(); + from = local_xform.xform(from); + normal = local_xform.basis.xform(normal).normalized(); Plane p; - p.normal[edit_axis]=1.0; - p.d=edit_floor[edit_axis]*node->get_cell_size(); + p.normal[edit_axis] = 1.0; + p.d = edit_floor[edit_axis] * node->get_cell_size(); Vector3 inters; if (!p.intersects_segment(from, from + normal * settings_pick_distance->get_value(), &inters)) return false; - //make sure the intersection is inside the frustum planes, to avoid //painting on invisible regions - for(int i=0;i<planes.size();i++) { + for (int i = 0; i < planes.size(); i++) { Plane fp = local_xform.xform(planes[i]); if (fp.is_point_over(inters)) return false; } - int cell[3]; - float cell_size[3]={node->get_cell_size(),node->get_cell_size(),node->get_cell_size()}; + float cell_size[3] = { node->get_cell_size(), node->get_cell_size(), node->get_cell_size() }; - last_mouseover=Vector3(-1,-1,-1); + last_mouseover = Vector3(-1, -1, -1); - for(int i=0;i<3;i++) { + for (int i = 0; i < 3; i++) { - if (i==edit_axis) - cell[i]=edit_floor[i]; + if (i == edit_axis) + cell[i] = edit_floor[i]; else { - cell[i]=inters[i]/node->get_cell_size(); - if (inters[i]<0) - cell[i]-=1; //compensate negative - grid_ofs[i]=cell[i]*cell_size[i]; + cell[i] = inters[i] / node->get_cell_size(); + if (inters[i] < 0) + cell[i] -= 1; //compensate negative + grid_ofs[i] = cell[i] * cell_size[i]; } /*if (cell[i]<0 || cell[i]>=grid_size[i]) { @@ -357,68 +336,65 @@ bool GridMapEditor::do_input_action(Camera* p_camera,const Point2& p_point,bool }*/ } - last_mouseover=Vector3(cell[0],cell[1],cell[2]); - VS::get_singleton()->instance_set_transform(grid_instance[edit_axis],Transform(Basis(),grid_ofs)); - + last_mouseover = Vector3(cell[0], cell[1], cell[2]); + VS::get_singleton()->instance_set_transform(grid_instance[edit_axis], Transform(Basis(), grid_ofs)); if (cursor_instance.is_valid()) { - cursor_origin=(Vector3(cell[0],cell[1],cell[2])+Vector3(0.5*node->get_center_x(),0.5*node->get_center_y(),0.5*node->get_center_z()))*node->get_cell_size(); - cursor_visible=true; + cursor_origin = (Vector3(cell[0], cell[1], cell[2]) + Vector3(0.5 * node->get_center_x(), 0.5 * node->get_center_y(), 0.5 * node->get_center_z())) * node->get_cell_size(); + cursor_visible = true; _update_cursor_transform(); - } - if (input_action==INPUT_DUPLICATE) { + if (input_action == INPUT_DUPLICATE) { - selection.current=Vector3(cell[0],cell[1],cell[2]); + selection.current = Vector3(cell[0], cell[1], cell[2]); _update_duplicate_indicator(); - } else if (input_action==INPUT_SELECT) { + } else if (input_action == INPUT_SELECT) { - selection.current=Vector3(cell[0],cell[1],cell[2]); + selection.current = Vector3(cell[0], cell[1], cell[2]); if (p_click) - selection.click=selection.current; - selection.active=true; + selection.click = selection.current; + selection.active = true; _validate_selection(); return true; - } else if (input_action==INPUT_COPY) { + } else if (input_action == INPUT_COPY) { - int item=node->get_cell_item(cell[0],cell[1],cell[2]); - if (item>=0) { - selected_pallete=item; + int item = node->get_cell_item(cell[0], cell[1], cell[2]); + if (item >= 0) { + selected_pallete = item; theme_pallete->set_current(item); update_pallete(); _update_cursor_instance(); } return true; - } if (input_action==INPUT_PAINT) { + } + if (input_action == INPUT_PAINT) { SetItem si; - si.pos=Vector3(cell[0],cell[1],cell[2]); - si.new_value=selected_pallete; - si.new_orientation=cursor_rot; - si.old_value=node->get_cell_item(cell[0],cell[1],cell[2]); - si.old_orientation=node->get_cell_item_orientation(cell[0],cell[1],cell[2]); + si.pos = Vector3(cell[0], cell[1], cell[2]); + si.new_value = selected_pallete; + si.new_orientation = cursor_rot; + si.old_value = node->get_cell_item(cell[0], cell[1], cell[2]); + si.old_orientation = node->get_cell_item_orientation(cell[0], cell[1], cell[2]); set_items.push_back(si); - node->set_cell_item(cell[0],cell[1],cell[2],selected_pallete,cursor_rot); + node->set_cell_item(cell[0], cell[1], cell[2], selected_pallete, cursor_rot); return true; - } else if (input_action==INPUT_ERASE) { + } else if (input_action == INPUT_ERASE) { SetItem si; - si.pos=Vector3(cell[0],cell[1],cell[2]); - si.new_value=-1; - si.new_orientation=0; - si.old_value=node->get_cell_item(cell[0],cell[1],cell[2]); - si.old_orientation=node->get_cell_item_orientation(cell[0],cell[1],cell[2]); + si.pos = Vector3(cell[0], cell[1], cell[2]); + si.new_value = -1; + si.new_orientation = 0; + si.old_value = node->get_cell_item(cell[0], cell[1], cell[2]); + si.old_orientation = node->get_cell_item_orientation(cell[0], cell[1], cell[2]); set_items.push_back(si); - node->set_cell_item(cell[0],cell[1],cell[2],-1); + node->set_cell_item(cell[0], cell[1], cell[2], -1); return true; } - return false; - } void GridMapEditor::_delete_selection() { @@ -427,269 +403,253 @@ void GridMapEditor::_delete_selection() { return; undo_redo->create_action("GridMap Delete Selection"); - for(int i=selection.begin.x;i<=selection.end.x;i++) { + for (int i = selection.begin.x; i <= selection.end.x; i++) { - for(int j=selection.begin.y;j<=selection.end.y;j++) { + for (int j = selection.begin.y; j <= selection.end.y; j++) { - for(int k=selection.begin.z;k<=selection.end.z;k++) { + for (int k = selection.begin.z; k <= selection.end.z; k++) { - undo_redo->add_do_method(node,"set_cell_item",i,j,k,GridMap::INVALID_CELL_ITEM); - undo_redo->add_undo_method(node,"set_cell_item",i,j,k,node->get_cell_item(i,j,k),node->get_cell_item_orientation(i,j,k)); + undo_redo->add_do_method(node, "set_cell_item", i, j, k, GridMap::INVALID_CELL_ITEM); + undo_redo->add_undo_method(node, "set_cell_item", i, j, k, node->get_cell_item(i, j, k), node->get_cell_item_orientation(i, j, k)); } - } } undo_redo->commit_action(); - selection.active=false; + selection.active = false; _validate_selection(); - } void GridMapEditor::_update_duplicate_indicator() { - if (!selection.active || input_action!=INPUT_DUPLICATE) { + if (!selection.active || input_action != INPUT_DUPLICATE) { Transform xf; xf.basis.set_zero(); - VisualServer::get_singleton()->instance_set_transform(duplicate_instance,xf); + VisualServer::get_singleton()->instance_set_transform(duplicate_instance, xf); return; } Transform xf; - xf.scale(Vector3(1,1,1)*(Vector3(1,1,1)+(selection.end-selection.begin))*node->get_cell_size()); - xf.origin=(selection.begin+(selection.current-selection.click))*node->get_cell_size(); + xf.scale(Vector3(1, 1, 1) * (Vector3(1, 1, 1) + (selection.end - selection.begin)) * node->get_cell_size()); + xf.origin = (selection.begin + (selection.current - selection.click)) * node->get_cell_size(); Basis rot; rot.set_orthogonal_index(selection.duplicate_rot); xf.basis = rot * xf.basis; - VisualServer::get_singleton()->instance_set_transform(duplicate_instance,node->get_global_transform() * xf); - - + VisualServer::get_singleton()->instance_set_transform(duplicate_instance, node->get_global_transform() * xf); } -struct __Item { Vector3 pos; int rot; int item ; }; +struct __Item { + Vector3 pos; + int rot; + int item; +}; void GridMapEditor::_duplicate_paste() { if (!selection.active) return; int idx = options->get_popup()->get_item_index(MENU_OPTION_DUPLICATE_SELECTS); - bool reselect = options->get_popup()->is_item_checked( idx ); + bool reselect = options->get_popup()->is_item_checked(idx); - - - List< __Item > items; + List<__Item> items; Basis rot; rot.set_orthogonal_index(selection.duplicate_rot); - for(int i=selection.begin.x;i<=selection.end.x;i++) { + for (int i = selection.begin.x; i <= selection.end.x; i++) { - for(int j=selection.begin.y;j<=selection.end.y;j++) { + for (int j = selection.begin.y; j <= selection.end.y; j++) { - for(int k=selection.begin.z;k<=selection.end.z;k++) { + for (int k = selection.begin.z; k <= selection.end.z; k++) { - int itm = node->get_cell_item(i,j,k); - if (itm==GridMap::INVALID_CELL_ITEM) + int itm = node->get_cell_item(i, j, k); + if (itm == GridMap::INVALID_CELL_ITEM) continue; - int orientation = node->get_cell_item_orientation(i,j,k); + int orientation = node->get_cell_item_orientation(i, j, k); __Item item; - Vector3 rel=Vector3(i,j,k)-selection.begin; + Vector3 rel = Vector3(i, j, k) - selection.begin; rel = rot.xform(rel); Basis orm; orm.set_orthogonal_index(orientation); orm = rot * orm; - item.pos=selection.begin+rel; - item.item=itm; - item.rot=orm.get_orthogonal_index(); + item.pos = selection.begin + rel; + item.item = itm; + item.rot = orm.get_orthogonal_index(); items.push_back(item); } - } } - Vector3 ofs=selection.current-selection.click; + Vector3 ofs = selection.current - selection.click; if (items.size()) { undo_redo->create_action("GridMap Duplicate Selection"); - for(List< __Item >::Element *E=items.front();E;E=E->next()) { - __Item &it=E->get(); - Vector3 pos = it.pos+ofs; - - undo_redo->add_do_method(node,"set_cell_item",pos.x,pos.y,pos.z,it.item,it.rot); - undo_redo->add_undo_method(node,"set_cell_item",pos.x,pos.y,pos.z,node->get_cell_item(pos.x,pos.y,pos.z),node->get_cell_item_orientation(pos.x,pos.y,pos.z)); + for (List<__Item>::Element *E = items.front(); E; E = E->next()) { + __Item &it = E->get(); + Vector3 pos = it.pos + ofs; + undo_redo->add_do_method(node, "set_cell_item", pos.x, pos.y, pos.z, it.item, it.rot); + undo_redo->add_undo_method(node, "set_cell_item", pos.x, pos.y, pos.z, node->get_cell_item(pos.x, pos.y, pos.z), node->get_cell_item_orientation(pos.x, pos.y, pos.z)); } undo_redo->commit_action(); } - if (reselect) { - selection.begin+=ofs; - selection.end+=ofs; - selection.click=selection.begin; - selection.current=selection.end; + selection.begin += ofs; + selection.end += ofs; + selection.click = selection.begin; + selection.current = selection.end; _validate_selection(); } - } -bool GridMapEditor::forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) { +bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const InputEvent &p_event) { if (!node) { return false; } - if (edit_mode->get_selected()==0) { // regular click + if (edit_mode->get_selected() == 0) { // regular click switch (p_event.type) { case InputEvent::MOUSE_BUTTON: { - if (p_event.mouse_button.button_index==BUTTON_WHEEL_UP && (p_event.mouse_button.mod.command || p_event.mouse_button.mod.shift)) { + if (p_event.mouse_button.button_index == BUTTON_WHEEL_UP && (p_event.mouse_button.mod.command || p_event.mouse_button.mod.shift)) { if (p_event.mouse_button.pressed) - floor->set_value( floor->get_value() +1); + floor->set_value(floor->get_value() + 1); return true; //eaten - } else if (p_event.mouse_button.button_index==BUTTON_WHEEL_DOWN && (p_event.mouse_button.mod.command || p_event.mouse_button.mod.shift)) { + } else if (p_event.mouse_button.button_index == BUTTON_WHEEL_DOWN && (p_event.mouse_button.mod.command || p_event.mouse_button.mod.shift)) { if (p_event.mouse_button.pressed) - floor->set_value( floor->get_value() -1); + floor->set_value(floor->get_value() - 1); return true; } if (p_event.mouse_button.pressed) { - if (p_event.mouse_button.button_index==BUTTON_LEFT) { + if (p_event.mouse_button.button_index == BUTTON_LEFT) { - if (input_action==INPUT_DUPLICATE) { + if (input_action == INPUT_DUPLICATE) { //paste _duplicate_paste(); - input_action=INPUT_NONE; + input_action = INPUT_NONE; _update_duplicate_indicator(); } else if (p_event.mouse_button.mod.shift) { - input_action=INPUT_SELECT; + input_action = INPUT_SELECT; } else if (p_event.mouse_button.mod.command) - input_action=INPUT_COPY; + input_action = INPUT_COPY; else { - input_action=INPUT_PAINT; + input_action = INPUT_PAINT; set_items.clear(); } - } else if (p_event.mouse_button.button_index==BUTTON_RIGHT) - if (input_action==INPUT_DUPLICATE) { + } else if (p_event.mouse_button.button_index == BUTTON_RIGHT) + if (input_action == INPUT_DUPLICATE) { - input_action=INPUT_NONE; + input_action = INPUT_NONE; _update_duplicate_indicator(); } else { - input_action=INPUT_ERASE; + input_action = INPUT_ERASE; set_items.clear(); } else return false; - return do_input_action(p_camera,Point2(p_event.mouse_button.x,p_event.mouse_button.y),true); + return do_input_action(p_camera, Point2(p_event.mouse_button.x, p_event.mouse_button.y), true); } else { - if ( - (p_event.mouse_button.button_index==BUTTON_RIGHT && input_action==INPUT_ERASE) || - (p_event.mouse_button.button_index==BUTTON_LEFT && input_action==INPUT_PAINT) ) { + (p_event.mouse_button.button_index == BUTTON_RIGHT && input_action == INPUT_ERASE) || + (p_event.mouse_button.button_index == BUTTON_LEFT && input_action == INPUT_PAINT)) { if (set_items.size()) { undo_redo->create_action("GridMap Paint"); - for(List<SetItem>::Element *E=set_items.front();E;E=E->next()) { + for (List<SetItem>::Element *E = set_items.front(); E; E = E->next()) { - const SetItem &si=E->get(); - undo_redo->add_do_method(node,"set_cell_item",si.pos.x,si.pos.y,si.pos.z,si.new_value,si.new_orientation); + const SetItem &si = E->get(); + undo_redo->add_do_method(node, "set_cell_item", si.pos.x, si.pos.y, si.pos.z, si.new_value, si.new_orientation); } - for(List<SetItem>::Element *E=set_items.back();E;E=E->prev()) { + for (List<SetItem>::Element *E = set_items.back(); E; E = E->prev()) { - const SetItem &si=E->get(); - undo_redo->add_undo_method(node,"set_cell_item",si.pos.x,si.pos.y,si.pos.z,si.old_value,si.old_orientation); + const SetItem &si = E->get(); + undo_redo->add_undo_method(node, "set_cell_item", si.pos.x, si.pos.y, si.pos.z, si.old_value, si.old_orientation); } - undo_redo->commit_action(); } set_items.clear(); - input_action=INPUT_NONE; + input_action = INPUT_NONE; return true; - } - - - if (p_event.mouse_button.button_index==BUTTON_LEFT && input_action!=INPUT_NONE) { + if (p_event.mouse_button.button_index == BUTTON_LEFT && input_action != INPUT_NONE) { set_items.clear(); - input_action=INPUT_NONE; + input_action = INPUT_NONE; return true; } - if (p_event.mouse_button.button_index==BUTTON_RIGHT && (input_action==INPUT_ERASE || input_action==INPUT_DUPLICATE)) { - input_action=INPUT_NONE; + if (p_event.mouse_button.button_index == BUTTON_RIGHT && (input_action == INPUT_ERASE || input_action == INPUT_DUPLICATE)) { + input_action = INPUT_NONE; return true; } } } break; case InputEvent::MOUSE_MOTION: { - return do_input_action(p_camera,Point2(p_event.mouse_motion.x,p_event.mouse_motion.y),false); + return do_input_action(p_camera, Point2(p_event.mouse_motion.x, p_event.mouse_motion.y), false); } break; } - } else if (edit_mode->get_selected()==1) { + } else if (edit_mode->get_selected() == 1) { //area mode, select an area switch (p_event.type) { case InputEvent::MOUSE_BUTTON: { - if (p_event.mouse_button.button_index==BUTTON_LEFT && p_event.mouse_button.pressed) { + if (p_event.mouse_button.button_index == BUTTON_LEFT && p_event.mouse_button.pressed) { - Point2 point = Point2(p_event.mouse_motion.x,p_event.mouse_motion.y); + Point2 point = Point2(p_event.mouse_motion.x, p_event.mouse_motion.y); Camera *camera = p_camera; Vector3 from = camera->project_ray_origin(point); Vector3 normal = camera->project_ray_normal(point); Transform local_xform = node->get_global_transform().affine_inverse(); - from=local_xform.xform(from); - normal=local_xform.basis.xform(normal).normalized(); + from = local_xform.xform(from); + normal = local_xform.basis.xform(normal).normalized(); List<int> areas; node->get_area_list(&areas); - float min_d=1e10; - int min_area=-1; + float min_d = 1e10; + int min_area = -1; - - for(List<int>::Element *E=areas.front();E;E=E->next()) { + for (List<int>::Element *E = areas.front(); E; E = E->next()) { int area = E->get(); Rect3 aabb = node->area_get_bounds(area); - aabb.pos*=node->get_cell_size(); - aabb.size*=node->get_cell_size(); - + aabb.pos *= node->get_cell_size(); + aabb.size *= node->get_cell_size(); - Vector3 rclip,rnormal; - if (!aabb.intersects_segment(from,from+normal*10000,&rclip,&rnormal)) + Vector3 rclip, rnormal; + if (!aabb.intersects_segment(from, from + normal * 10000, &rclip, &rnormal)) continue; float d = normal.dot(rclip); - if (d<min_d) { - min_d=d; - min_area=area; + if (d < min_d) { + min_d = d; + min_area = area; } } - selected_area=min_area; + selected_area = min_area; update_areas(); - } } break; } - } - return false; } @@ -697,12 +657,11 @@ struct _CGMEItemSort { String name; int id; - _FORCE_INLINE_ bool operator<(const _CGMEItemSort& r_it) const { return name < r_it.name; } - + _FORCE_INLINE_ bool operator<(const _CGMEItemSort &r_it) const { return name < r_it.name; } }; void GridMapEditor::_set_display_mode(int p_mode) { - if (display_mode==p_mode) { + if (display_mode == p_mode) { return; } @@ -714,32 +673,32 @@ void GridMapEditor::_set_display_mode(int p_mode) { mode_thumbnail->set_pressed(true); } - display_mode=p_mode; + display_mode = p_mode; update_pallete(); } -void GridMapEditor::update_pallete() { +void GridMapEditor::update_pallete() { int selected = theme_pallete->get_current(); theme_pallete->clear(); if (display_mode == DISPLAY_THUMBNAIL) { theme_pallete->set_max_columns(0); theme_pallete->set_icon_mode(ItemList::ICON_MODE_TOP); - } else if (display_mode == DISPLAY_LIST){ + } else if (display_mode == DISPLAY_LIST) { theme_pallete->set_max_columns(1); theme_pallete->set_icon_mode(ItemList::ICON_MODE_LEFT); } - float min_size = EDITOR_DEF("editors/grid_map/preview_size",64); + float min_size = EDITOR_DEF("editors/grid_map/preview_size", 64); theme_pallete->set_fixed_icon_size(Size2(min_size, min_size)); - theme_pallete->set_fixed_column_width(min_size*3/2); + theme_pallete->set_fixed_column_width(min_size * 3 / 2); theme_pallete->set_max_text_lines(2); Ref<MeshLibrary> theme = node->get_theme(); if (theme.is_null()) { - last_theme=NULL; + last_theme = NULL; return; } @@ -747,65 +706,63 @@ void GridMapEditor::update_pallete() { ids = theme->get_item_list(); List<_CGMEItemSort> il; - for(int i=0;i<ids.size();i++) { + for (int i = 0; i < ids.size(); i++) { _CGMEItemSort is; - is.id=ids[i]; - is.name=theme->get_item_name(ids[i]); + is.id = ids[i]; + is.name = theme->get_item_name(ids[i]); il.push_back(is); } il.sort(); int item = 0; - for(List<_CGMEItemSort>::Element *E=il.front();E;E=E->next()) { + for (List<_CGMEItemSort>::Element *E = il.front(); E; E = E->next()) { int id = E->get().id; theme_pallete->add_item(""); - String name=theme->get_item_name(id); + String name = theme->get_item_name(id); Ref<Texture> preview = theme->get_item_preview(id); if (!preview.is_null()) { theme_pallete->set_item_icon(item, preview); theme_pallete->set_item_tooltip(item, name); } - if (name!="") { - theme_pallete->set_item_text(item,name); + if (name != "") { + theme_pallete->set_item_text(item, name); } theme_pallete->set_item_metadata(item, id); item++; } - if (selected!=-1) { + if (selected != -1) { theme_pallete->select(selected); } - last_theme=theme.operator->(); + last_theme = theme.operator->(); } - void GridMapEditor::_area_renamed() { - TreeItem * it = area_list->get_selected(); + TreeItem *it = area_list->get_selected(); int area = it->get_metadata(0); - if (area<1) + if (area < 1) return; - node->area_set_name(area,it->get_text(0)); + node->area_set_name(area, it->get_text(0)); } - void GridMapEditor::_area_selected() { - TreeItem * it = area_list->get_selected(); + TreeItem *it = area_list->get_selected(); int area = it->get_metadata(0); - if (area<1) + if (area < 1) return; - selected_area=area; + selected_area = area; } -void GridMapEditor::update_areas() { +void GridMapEditor::update_areas() { area_list->clear(); @@ -814,246 +771,221 @@ void GridMapEditor::update_areas() { TreeItem *root = area_list->create_item(NULL); area_list->set_hide_root(true); - TreeItem *selected=NULL; - + TreeItem *selected = NULL; - for (List<int>::Element *E=areas.front();E;E=E->next()) { + for (List<int>::Element *E = areas.front(); E; E = E->next()) { int area = E->get(); TreeItem *ti = area_list->create_item(root); - String name=node->area_get_name(area); + String name = node->area_get_name(area); - ti->set_metadata(0,area); - ti->set_text(0,name); - ti->set_editable(0,true); - if (area==selected_area) - selected=ti; + ti->set_metadata(0, area); + ti->set_text(0, name); + ti->set_editable(0, true); + if (area == selected_area) + selected = ti; } - if (selected) selected->select(0); - } void GridMapEditor::edit(GridMap *p_gridmap) { - node=p_gridmap; + node = p_gridmap; VS *vs = VS::get_singleton(); - last_mouseover=Vector3(-1,-1,-1); - input_action=INPUT_NONE; - selection.active=false; + last_mouseover = Vector3(-1, -1, -1); + input_action = INPUT_NONE; + selection.active = false; _update_selection_transform(); _update_duplicate_indicator(); - spatial_editor = editor->get_editor_plugin_screen()->cast_to<SpatialEditorPlugin>(); + spatial_editor = editor->get_editor_plugin_screen()->cast_to<SpatialEditorPlugin>(); if (!node) { set_process(false); - for(int i=0;i<3;i++) { - VisualServer::get_singleton()->instance_set_visible(grid_instance[i],false); - + for (int i = 0; i < 3; i++) { + VisualServer::get_singleton()->instance_set_visible(grid_instance[i], false); } - VisualServer::get_singleton()->instance_set_visible(cursor_instance,false); + VisualServer::get_singleton()->instance_set_visible(cursor_instance, false); _clear_areas(); return; } - update_pallete(); update_areas(); set_process(true); Vector3 edited_floor = p_gridmap->get_meta("_editor_floor_"); - clip_mode=p_gridmap->has_meta("_editor_clip_")?ClipMode(p_gridmap->get_meta("_editor_clip_").operator int()):CLIP_DISABLED; - - - - for(int i=0;i<3;i++) { - if (vs->mesh_get_surface_count(grid[i])>0) - vs->mesh_remove_surface(grid[i],0); - edit_floor[i]=edited_floor[i]; + clip_mode = p_gridmap->has_meta("_editor_clip_") ? ClipMode(p_gridmap->get_meta("_editor_clip_").operator int()) : CLIP_DISABLED; + for (int i = 0; i < 3; i++) { + if (vs->mesh_get_surface_count(grid[i]) > 0) + vs->mesh_remove_surface(grid[i], 0); + edit_floor[i] = edited_floor[i]; } { //update grids indicator_mat.instance(); - indicator_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED,true); - indicator_mat->set_flag(FixedSpatialMaterial::FLAG_SRGB_VERTEX_COLOR,true); - indicator_mat->set_flag(FixedSpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR,true); - indicator_mat->set_albedo(Color(0.8,0.5,0.1)); - + indicator_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED, true); + indicator_mat->set_flag(FixedSpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true); + indicator_mat->set_flag(FixedSpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true); + indicator_mat->set_albedo(Color(0.8, 0.5, 0.1)); Vector<Vector3> grid_points[3]; Vector<Color> grid_colors[3]; - float cell_size[3]={p_gridmap->get_cell_size(),p_gridmap->get_cell_size(),p_gridmap->get_cell_size()}; + float cell_size[3] = { p_gridmap->get_cell_size(), p_gridmap->get_cell_size(), p_gridmap->get_cell_size() }; - for(int i=0;i<3;i++) { + for (int i = 0; i < 3; i++) { Vector3 axis; - axis[i]=1; + axis[i] = 1; Vector3 axis_n1; - axis_n1[(i+1)%3]=cell_size[(i+1)%3]; + axis_n1[(i + 1) % 3] = cell_size[(i + 1) % 3]; Vector3 axis_n2; - axis_n2[(i+2)%3]=cell_size[(i+2)%3]; + axis_n2[(i + 2) % 3] = cell_size[(i + 2) % 3]; - for(int j=-GRID_CURSOR_SIZE;j<=GRID_CURSOR_SIZE;j++) { + for (int j = -GRID_CURSOR_SIZE; j <= GRID_CURSOR_SIZE; j++) { - for(int k=-GRID_CURSOR_SIZE;k<=GRID_CURSOR_SIZE;k++) { + for (int k = -GRID_CURSOR_SIZE; k <= GRID_CURSOR_SIZE; k++) { - Vector3 p = axis_n1*j + axis_n2 *k; - float trans = Math::pow(MAX(0,1.0-(Vector2(j,k).length()/GRID_CURSOR_SIZE)),2); + Vector3 p = axis_n1 * j + axis_n2 * k; + float trans = Math::pow(MAX(0, 1.0 - (Vector2(j, k).length() / GRID_CURSOR_SIZE)), 2); - Vector3 pj = axis_n1*(j+1) + axis_n2 *k; - float transj = Math::pow(MAX(0,1.0-(Vector2(j+1,k).length()/GRID_CURSOR_SIZE)),2); + Vector3 pj = axis_n1 * (j + 1) + axis_n2 * k; + float transj = Math::pow(MAX(0, 1.0 - (Vector2(j + 1, k).length() / GRID_CURSOR_SIZE)), 2); - Vector3 pk = axis_n1*j + axis_n2 *(k+1); - float transk = Math::pow(MAX(0,1.0-(Vector2(j,k+1).length()/GRID_CURSOR_SIZE)),2); + Vector3 pk = axis_n1 * j + axis_n2 * (k + 1); + float transk = Math::pow(MAX(0, 1.0 - (Vector2(j, k + 1).length() / GRID_CURSOR_SIZE)), 2); grid_points[i].push_back(p); grid_points[i].push_back(pk); - grid_colors[i].push_back(Color(1,1,1,trans)); - grid_colors[i].push_back(Color(1,1,1,transk)); + grid_colors[i].push_back(Color(1, 1, 1, trans)); + grid_colors[i].push_back(Color(1, 1, 1, transk)); grid_points[i].push_back(p); grid_points[i].push_back(pj); - grid_colors[i].push_back(Color(1,1,1,trans)); - grid_colors[i].push_back(Color(1,1,1,transj)); + grid_colors[i].push_back(Color(1, 1, 1, trans)); + grid_colors[i].push_back(Color(1, 1, 1, transj)); } - } Array d; d.resize(VS::ARRAY_MAX); - d[VS::ARRAY_VERTEX]=grid_points[i]; - d[VS::ARRAY_COLOR]=grid_colors[i]; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(grid[i],VisualServer::PRIMITIVE_LINES,d); - VisualServer::get_singleton()->mesh_surface_set_material(grid[i],0,indicator_mat->get_rid()); - - + d[VS::ARRAY_VERTEX] = grid_points[i]; + d[VS::ARRAY_COLOR] = grid_colors[i]; + VisualServer::get_singleton()->mesh_add_surface_from_arrays(grid[i], VisualServer::PRIMITIVE_LINES, d); + VisualServer::get_singleton()->mesh_surface_set_material(grid[i], 0, indicator_mat->get_rid()); } - } update_grid(); _update_clip(); _update_areas_display(); - - } void GridMapEditor::_update_clip() { - - node->set_meta("_editor_clip_",clip_mode); - if (clip_mode==CLIP_DISABLED) + node->set_meta("_editor_clip_", clip_mode); + if (clip_mode == CLIP_DISABLED) node->set_clip(false); else - node->set_clip(true,clip_mode==CLIP_ABOVE,edit_floor[edit_axis],edit_axis); + node->set_clip(true, clip_mode == CLIP_ABOVE, edit_floor[edit_axis], edit_axis); } - void GridMapEditor::update_grid() { - grid_xform.origin.x-=1; //force update in hackish way.. what do i care + grid_xform.origin.x -= 1; //force update in hackish way.. what do i care //VS *vs = VS::get_singleton(); - grid_ofs[edit_axis]=edit_floor[edit_axis]*node->get_cell_size(); - - edit_grid_xform.origin=grid_ofs; - edit_grid_xform.basis=Basis(); + grid_ofs[edit_axis] = edit_floor[edit_axis] * node->get_cell_size(); + edit_grid_xform.origin = grid_ofs; + edit_grid_xform.basis = Basis(); - for(int i=0;i<3;i++) { - VisualServer::get_singleton()->instance_set_visible(grid_instance[i],i==edit_axis); - + for (int i = 0; i < 3; i++) { + VisualServer::get_singleton()->instance_set_visible(grid_instance[i], i == edit_axis); } - updating=true; + updating = true; floor->set_value(edit_floor[edit_axis]); - updating=false; - + updating = false; } - - void GridMapEditor::_notification(int p_what) { - if (p_what==NOTIFICATION_ENTER_TREE) { + if (p_what == NOTIFICATION_ENTER_TREE) { - theme_pallete->connect("item_selected", this,"_item_selected_cbk"); - edit_mode->connect("item_selected", this,"_edit_mode_changed"); - area_list->connect("item_edited", this,"_area_renamed"); - area_list->connect("item_selected", this,"_area_selected"); - for(int i=0;i<3;i++) { + theme_pallete->connect("item_selected", this, "_item_selected_cbk"); + edit_mode->connect("item_selected", this, "_edit_mode_changed"); + area_list->connect("item_edited", this, "_area_renamed"); + area_list->connect("item_selected", this, "_area_selected"); + for (int i = 0; i < 3; i++) { - grid[i]=VS::get_singleton()->mesh_create(); - grid_instance[i]=VS::get_singleton()->instance_create2(grid[i],get_tree()->get_root()->get_world()->get_scenario()); + grid[i] = VS::get_singleton()->mesh_create(); + grid_instance[i] = VS::get_singleton()->instance_create2(grid[i], get_tree()->get_root()->get_world()->get_scenario()); } - selection_instance = VisualServer::get_singleton()->instance_create2(selection_mesh,get_tree()->get_root()->get_world()->get_scenario()); - duplicate_instance = VisualServer::get_singleton()->instance_create2(duplicate_mesh,get_tree()->get_root()->get_world()->get_scenario()); + selection_instance = VisualServer::get_singleton()->instance_create2(selection_mesh, get_tree()->get_root()->get_world()->get_scenario()); + duplicate_instance = VisualServer::get_singleton()->instance_create2(duplicate_mesh, get_tree()->get_root()->get_world()->get_scenario()); _update_selection_transform(); _update_duplicate_indicator(); - } else if (p_what==NOTIFICATION_EXIT_TREE) { + } else if (p_what == NOTIFICATION_EXIT_TREE) { - for(int i=0;i<3;i++) { + for (int i = 0; i < 3; i++) { VS::get_singleton()->free(grid_instance[i]); VS::get_singleton()->free(grid[i]); - grid_instance[i]=RID(); - grid[i]=RID(); + grid_instance[i] = RID(); + grid[i] = RID(); } VisualServer::get_singleton()->free(selection_instance); VisualServer::get_singleton()->free(duplicate_instance); - selection_instance=RID(); - duplicate_instance=RID(); + selection_instance = RID(); + duplicate_instance = RID(); - } else if (p_what==NOTIFICATION_PROCESS) { + } else if (p_what == NOTIFICATION_PROCESS) { Transform xf = node->get_global_transform(); - if (xf!=grid_xform) { - for(int i=0;i<3;i++) { - + if (xf != grid_xform) { + for (int i = 0; i < 3; i++) { - VS::get_singleton()->instance_set_transform(grid_instance[i],xf * edit_grid_xform); + VS::get_singleton()->instance_set_transform(grid_instance[i], xf * edit_grid_xform); } - grid_xform=xf; + grid_xform = xf; } Ref<MeshLibrary> cgmt = node->get_theme(); - if (cgmt.operator->()!=last_theme) + if (cgmt.operator->() != last_theme) update_pallete(); if (lock_view) { - EditorNode*editor = get_tree()->get_root()->get_child(0)->cast_to<EditorNode>(); + EditorNode *editor = get_tree()->get_root()->get_child(0)->cast_to<EditorNode>(); Plane p; - p.normal[edit_axis]=1.0; - p.d=edit_floor[edit_axis]*node->get_cell_size(); + p.normal[edit_axis] = 1.0; + p.d = edit_floor[edit_axis] * node->get_cell_size(); p = node->get_transform().xform(p); // plane to snap SpatialEditorPlugin *sep = editor->get_editor_plugin_screen()->cast_to<SpatialEditorPlugin>(); if (sep) sep->snap_cursor_to_plane(p); - //editor->get_editor_plugin_screen()->call("snap_cursor_to_plane",p); - + //editor->get_editor_plugin_screen()->call("snap_cursor_to_plane",p); } } - } void GridMapEditor::_update_cursor_instance() { @@ -1063,32 +995,30 @@ void GridMapEditor::_update_cursor_instance() { if (cursor_instance.is_valid()) VisualServer::get_singleton()->free(cursor_instance); - cursor_instance=RID(); + cursor_instance = RID(); - if (selected_pallete>=0) { + if (selected_pallete >= 0) { if (node && !node->get_theme().is_null()) { Ref<Mesh> mesh = node->get_theme()->get_item_mesh(selected_pallete); if (!mesh.is_null() && mesh->get_rid().is_valid()) { - cursor_instance=VisualServer::get_singleton()->instance_create2(mesh->get_rid(),get_tree()->get_root()->get_world()->get_scenario()); - VisualServer::get_singleton()->instance_set_transform(cursor_instance,cursor_transform); + cursor_instance = VisualServer::get_singleton()->instance_create2(mesh->get_rid(), get_tree()->get_root()->get_world()->get_scenario()); + VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform); } } } - } void GridMapEditor::_item_selected_cbk(int idx) { - selected_pallete=theme_pallete->get_item_metadata(idx); + selected_pallete = theme_pallete->get_item_metadata(idx); _update_cursor_instance(); - } void GridMapEditor::_clear_areas() { - for(int i=0;i<areas.size();i++) { + for (int i = 0; i < areas.size(); i++) { VisualServer::get_singleton()->free(areas[i].instance); VisualServer::get_singleton()->free(areas[i].mesh); @@ -1154,7 +1084,7 @@ void GridMapEditor::_update_areas_display() { void GridMapEditor::_edit_mode_changed(int p_what) { - if (p_what==0) { + if (p_what == 0) { theme_pallete->show(); area_list->hide(); @@ -1162,89 +1092,82 @@ void GridMapEditor::_edit_mode_changed(int p_what) { theme_pallete->hide(); area_list->show(); - } } void GridMapEditor::_floor_changed(float p_value) { - if (updating) return; - edit_floor[edit_axis]=p_value; - node->set_meta("_editor_floor_",Vector3(edit_floor[0],edit_floor[1],edit_floor[2])); + edit_floor[edit_axis] = p_value; + node->set_meta("_editor_floor_", Vector3(edit_floor[0], edit_floor[1], edit_floor[2])); update_grid(); _update_clip(); - } void GridMapEditor::_bind_methods() { - ClassDB::bind_method("_menu_option",&GridMapEditor::_menu_option); - ClassDB::bind_method("_configure",&GridMapEditor::_configure); - ClassDB::bind_method("_item_selected_cbk",&GridMapEditor::_item_selected_cbk); - ClassDB::bind_method("_edit_mode_changed",&GridMapEditor::_edit_mode_changed); - ClassDB::bind_method("_area_renamed",&GridMapEditor::_area_renamed); - ClassDB::bind_method("_area_selected",&GridMapEditor::_area_selected); - ClassDB::bind_method("_floor_changed",&GridMapEditor::_floor_changed); + ClassDB::bind_method("_menu_option", &GridMapEditor::_menu_option); + ClassDB::bind_method("_configure", &GridMapEditor::_configure); + ClassDB::bind_method("_item_selected_cbk", &GridMapEditor::_item_selected_cbk); + ClassDB::bind_method("_edit_mode_changed", &GridMapEditor::_edit_mode_changed); + ClassDB::bind_method("_area_renamed", &GridMapEditor::_area_renamed); + ClassDB::bind_method("_area_selected", &GridMapEditor::_area_selected); + ClassDB::bind_method("_floor_changed", &GridMapEditor::_floor_changed); - ClassDB::bind_method(D_METHOD("_set_display_mode","mode"), &GridMapEditor::_set_display_mode); + ClassDB::bind_method(D_METHOD("_set_display_mode", "mode"), &GridMapEditor::_set_display_mode); } - - GridMapEditor::GridMapEditor(EditorNode *p_editor) { + input_action = INPUT_NONE; + editor = p_editor; + undo_redo = p_editor->get_undo_redo(); - input_action=INPUT_NONE; - editor=p_editor; - undo_redo=p_editor->get_undo_redo(); - - int mw = EDITOR_DEF("editors/grid_map/palette_min_width",230); - Control *ec = memnew( Control); - ec->set_custom_minimum_size(Size2(mw,0)); + int mw = EDITOR_DEF("editors/grid_map/palette_min_width", 230); + Control *ec = memnew(Control); + ec->set_custom_minimum_size(Size2(mw, 0)); add_child(ec); - - spatial_editor_hb = memnew( HBoxContainer ); + spatial_editor_hb = memnew(HBoxContainer); SpatialEditor::get_singleton()->add_control_to_menu_panel(spatial_editor_hb); - options = memnew( MenuButton ); + options = memnew(MenuButton); spatial_editor_hb->add_child(options); spatial_editor_hb->hide(); options->set_text("Grid"); - options->get_popup()->add_check_item("Snap View",MENU_OPTION_LOCK_VIEW); + options->get_popup()->add_check_item("Snap View", MENU_OPTION_LOCK_VIEW); options->get_popup()->add_separator(); - options->get_popup()->add_item("Prev Level ("+keycode_get_string(KEY_MASK_CMD)+"Down Wheel)",MENU_OPTION_PREV_LEVEL); - options->get_popup()->add_item("Next Level ("+keycode_get_string(KEY_MASK_CMD)+"Up Wheel)",MENU_OPTION_NEXT_LEVEL); + options->get_popup()->add_item("Prev Level (" + keycode_get_string(KEY_MASK_CMD) + "Down Wheel)", MENU_OPTION_PREV_LEVEL); + options->get_popup()->add_item("Next Level (" + keycode_get_string(KEY_MASK_CMD) + "Up Wheel)", MENU_OPTION_NEXT_LEVEL); options->get_popup()->add_separator(); - options->get_popup()->add_check_item("Clip Disabled",MENU_OPTION_CLIP_DISABLED); - options->get_popup()->set_item_checked( options->get_popup()->get_item_index(MENU_OPTION_CLIP_DISABLED), true ); - options->get_popup()->add_check_item("Clip Above",MENU_OPTION_CLIP_ABOVE); - options->get_popup()->add_check_item("Clip Below",MENU_OPTION_CLIP_BELOW); + options->get_popup()->add_check_item("Clip Disabled", MENU_OPTION_CLIP_DISABLED); + options->get_popup()->set_item_checked(options->get_popup()->get_item_index(MENU_OPTION_CLIP_DISABLED), true); + options->get_popup()->add_check_item("Clip Above", MENU_OPTION_CLIP_ABOVE); + options->get_popup()->add_check_item("Clip Below", MENU_OPTION_CLIP_BELOW); options->get_popup()->add_separator(); - options->get_popup()->add_check_item("Edit X Axis",MENU_OPTION_X_AXIS,KEY_Z); - options->get_popup()->add_check_item("Edit Y Axis",MENU_OPTION_Y_AXIS,KEY_X); - options->get_popup()->add_check_item("Edit Z Axis",MENU_OPTION_Z_AXIS,KEY_C); - options->get_popup()->set_item_checked( options->get_popup()->get_item_index(MENU_OPTION_Y_AXIS), true ); + options->get_popup()->add_check_item("Edit X Axis", MENU_OPTION_X_AXIS, KEY_Z); + options->get_popup()->add_check_item("Edit Y Axis", MENU_OPTION_Y_AXIS, KEY_X); + options->get_popup()->add_check_item("Edit Z Axis", MENU_OPTION_Z_AXIS, KEY_C); + options->get_popup()->set_item_checked(options->get_popup()->get_item_index(MENU_OPTION_Y_AXIS), true); options->get_popup()->add_separator(); - options->get_popup()->add_item("Cursor Rotate X",MENU_OPTION_CURSOR_ROTATE_X,KEY_A); - options->get_popup()->add_item("Cursor Rotate Y",MENU_OPTION_CURSOR_ROTATE_Y,KEY_S); - options->get_popup()->add_item("Cursor Rotate Z",MENU_OPTION_CURSOR_ROTATE_Z,KEY_D); - options->get_popup()->add_item("Cursor Back Rotate X",MENU_OPTION_CURSOR_BACK_ROTATE_X,KEY_MASK_SHIFT+KEY_A); - options->get_popup()->add_item("Cursor Back Rotate Y",MENU_OPTION_CURSOR_BACK_ROTATE_Y,KEY_MASK_SHIFT+KEY_S); - options->get_popup()->add_item("Cursor Back Rotate Z",MENU_OPTION_CURSOR_BACK_ROTATE_Z,KEY_MASK_SHIFT+KEY_D); - options->get_popup()->add_item("Cursor Clear Rotation",MENU_OPTION_CURSOR_CLEAR_ROTATION,KEY_W); + options->get_popup()->add_item("Cursor Rotate X", MENU_OPTION_CURSOR_ROTATE_X, KEY_A); + options->get_popup()->add_item("Cursor Rotate Y", MENU_OPTION_CURSOR_ROTATE_Y, KEY_S); + options->get_popup()->add_item("Cursor Rotate Z", MENU_OPTION_CURSOR_ROTATE_Z, KEY_D); + options->get_popup()->add_item("Cursor Back Rotate X", MENU_OPTION_CURSOR_BACK_ROTATE_X, KEY_MASK_SHIFT + KEY_A); + options->get_popup()->add_item("Cursor Back Rotate Y", MENU_OPTION_CURSOR_BACK_ROTATE_Y, KEY_MASK_SHIFT + KEY_S); + options->get_popup()->add_item("Cursor Back Rotate Z", MENU_OPTION_CURSOR_BACK_ROTATE_Z, KEY_MASK_SHIFT + KEY_D); + options->get_popup()->add_item("Cursor Clear Rotation", MENU_OPTION_CURSOR_CLEAR_ROTATION, KEY_W); options->get_popup()->add_separator(); - options->get_popup()->add_check_item("Duplicate Selects",MENU_OPTION_DUPLICATE_SELECTS); + options->get_popup()->add_check_item("Duplicate Selects", MENU_OPTION_DUPLICATE_SELECTS); options->get_popup()->add_separator(); - options->get_popup()->add_item("Create Area",MENU_OPTION_SELECTION_MAKE_AREA,KEY_CONTROL+KEY_C); - options->get_popup()->add_item("Create Exterior Connector",MENU_OPTION_SELECTION_MAKE_EXTERIOR_CONNECTOR); - options->get_popup()->add_item("Erase Area",MENU_OPTION_REMOVE_AREA); + options->get_popup()->add_item("Create Area", MENU_OPTION_SELECTION_MAKE_AREA, KEY_CONTROL + KEY_C); + options->get_popup()->add_item("Create Exterior Connector", MENU_OPTION_SELECTION_MAKE_EXTERIOR_CONNECTOR); + options->get_popup()->add_item("Erase Area", MENU_OPTION_REMOVE_AREA); options->get_popup()->add_separator(); - options->get_popup()->add_item("Selection -> Duplicate",MENU_OPTION_SELECTION_DUPLICATE,KEY_MASK_SHIFT+KEY_INSERT); - options->get_popup()->add_item("Selection -> Clear",MENU_OPTION_SELECTION_CLEAR,KEY_MASK_SHIFT+KEY_DELETE); + options->get_popup()->add_item("Selection -> Duplicate", MENU_OPTION_SELECTION_DUPLICATE, KEY_MASK_SHIFT + KEY_INSERT); + options->get_popup()->add_item("Selection -> Clear", MENU_OPTION_SELECTION_CLEAR, KEY_MASK_SHIFT + KEY_DELETE); //options->get_popup()->add_separator(); //options->get_popup()->add_item("Configure",MENU_OPTION_CONFIGURE); @@ -1265,46 +1188,46 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { settings_pick_distance->set_value(EDITOR_DEF("editors/grid_map/pick_distance", 5000.0)); settings_vbc->add_margin_child("Pick Distance:", settings_pick_distance); - clip_mode=CLIP_DISABLED; - options->get_popup()->connect("id_pressed", this,"_menu_option"); + clip_mode = CLIP_DISABLED; + options->get_popup()->connect("id_pressed", this, "_menu_option"); - HBoxContainer *hb = memnew( HBoxContainer ); + HBoxContainer *hb = memnew(HBoxContainer); add_child(hb); hb->set_h_size_flags(SIZE_EXPAND_FILL); edit_mode = memnew(OptionButton); edit_mode->set_area_as_parent_rect(); - edit_mode->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,24); - edit_mode->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,14); + edit_mode->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_BEGIN, 24); + edit_mode->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 14); edit_mode->add_item("Tiles"); edit_mode->add_item("Areas"); hb->add_child(edit_mode); edit_mode->set_h_size_flags(SIZE_EXPAND_FILL); - mode_thumbnail = memnew( ToolButton ); + mode_thumbnail = memnew(ToolButton); mode_thumbnail->set_toggle_mode(true); mode_thumbnail->set_pressed(true); - mode_thumbnail->set_icon(p_editor->get_gui_base()->get_icon("FileThumbnail","EditorIcons")); + mode_thumbnail->set_icon(p_editor->get_gui_base()->get_icon("FileThumbnail", "EditorIcons")); hb->add_child(mode_thumbnail); mode_thumbnail->connect("pressed", this, "_set_display_mode", varray(DISPLAY_THUMBNAIL)); - mode_list = memnew( ToolButton ); + mode_list = memnew(ToolButton); mode_list->set_toggle_mode(true); mode_list->set_pressed(false); mode_list->set_icon(p_editor->get_gui_base()->get_icon("FileList", "EditorIcons")); hb->add_child(mode_list); mode_list->connect("pressed", this, "_set_display_mode", varray(DISPLAY_LIST)); - EDITOR_DEF("editors/grid_map/preview_size",64); + EDITOR_DEF("editors/grid_map/preview_size", 64); display_mode = DISPLAY_THUMBNAIL; - selected_area=-1; + selected_area = -1; - theme_pallete = memnew( ItemList ); + theme_pallete = memnew(ItemList); add_child(theme_pallete); theme_pallete->set_v_size_flags(SIZE_EXPAND_FILL); - area_list = memnew( Tree ); + area_list = memnew(Tree); add_child(area_list); area_list->set_v_size_flags(SIZE_EXPAND_FILL); area_list->hide(); @@ -1314,26 +1237,25 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { fl->set_text(" Floor: "); spatial_editor_hb->add_child(fl); - floor = memnew( SpinBox ); + floor = memnew(SpinBox); floor->set_min(-32767); floor->set_max(32767); floor->set_step(1); - floor->get_line_edit()->add_constant_override("minimum_spaces",16); + floor->get_line_edit()->add_constant_override("minimum_spaces", 16); spatial_editor_hb->add_child(floor); - floor->connect("value_changed",this,"_floor_changed"); - + floor->connect("value_changed", this, "_floor_changed"); - edit_axis=Vector3::AXIS_Y; - edit_floor[0]=-1; - edit_floor[1]=-1; - edit_floor[2]=-1; + edit_axis = Vector3::AXIS_Y; + edit_floor[0] = -1; + edit_floor[1] = -1; + edit_floor[2] = -1; - cursor_visible=false; - selected_pallete=-1; - lock_view=false; - cursor_rot=0; - last_mouseover=Vector3(-1,-1,-1); + cursor_visible = false; + selected_pallete = -1; + lock_view = false; + cursor_rot = 0; + last_mouseover = Vector3(-1, -1, -1); selection_mesh = VisualServer::get_singleton()->mesh_create(); duplicate_mesh = VisualServer::get_singleton()->mesh_create(); @@ -1341,45 +1263,43 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { { //selection mesh create - PoolVector<Vector3> lines; PoolVector<Vector3> triangles; - for (int i=0;i<6;i++) { - + for (int i = 0; i < 6; i++) { Vector3 face_points[4]; - for (int j=0;j<4;j++) { + for (int j = 0; j < 4; j++) { float v[3]; - v[0]=1.0; - v[1]=1-2*((j>>1)&1); - v[2]=v[1]*(1-2*(j&1)); + v[0] = 1.0; + v[1] = 1 - 2 * ((j >> 1) & 1); + v[2] = v[1] * (1 - 2 * (j & 1)); - for (int k=0;k<3;k++) { + for (int k = 0; k < 3; k++) { - if (i<3) - face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1); + if (i < 3) + face_points[j][(i + k) % 3] = v[k] * (i >= 3 ? -1 : 1); else - face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1); + face_points[3 - j][(i + k) % 3] = v[k] * (i >= 3 ? -1 : 1); } } - triangles.push_back(face_points[0]*0.5+Vector3(0.5,0.5,0.5)); - triangles.push_back(face_points[1]*0.5+Vector3(0.5,0.5,0.5)); - triangles.push_back(face_points[2]*0.5+Vector3(0.5,0.5,0.5)); + triangles.push_back(face_points[0] * 0.5 + Vector3(0.5, 0.5, 0.5)); + triangles.push_back(face_points[1] * 0.5 + Vector3(0.5, 0.5, 0.5)); + triangles.push_back(face_points[2] * 0.5 + Vector3(0.5, 0.5, 0.5)); - triangles.push_back(face_points[2]*0.5+Vector3(0.5,0.5,0.5)); - triangles.push_back(face_points[3]*0.5+Vector3(0.5,0.5,0.5)); - triangles.push_back(face_points[0]*0.5+Vector3(0.5,0.5,0.5)); + triangles.push_back(face_points[2] * 0.5 + Vector3(0.5, 0.5, 0.5)); + triangles.push_back(face_points[3] * 0.5 + Vector3(0.5, 0.5, 0.5)); + triangles.push_back(face_points[0] * 0.5 + Vector3(0.5, 0.5, 0.5)); } - for(int i=0;i<12;i++) { + for (int i = 0; i < 12; i++) { - Rect3 base(Vector3(0,0,0),Vector3(1,1,1)); - Vector3 a,b; - base.get_edge(i,a,b); + Rect3 base(Vector3(0, 0, 0), Vector3(1, 1, 1)); + Vector3 a, b; + base.get_edge(i, a, b); lines.push_back(a); lines.push_back(b); } @@ -1388,49 +1308,42 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { d.resize(VS::ARRAY_MAX); inner_mat.instance(); - inner_mat->set_albedo(Color(0.7,0.7,1.0,0.3)); - inner_mat->set_flag(FixedSpatialMaterial::FLAG_ONTOP,true); - inner_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED,true); - inner_mat->set_feature(FixedSpatialMaterial::FEATURE_TRANSPARENT,true); + inner_mat->set_albedo(Color(0.7, 0.7, 1.0, 0.3)); + inner_mat->set_flag(FixedSpatialMaterial::FLAG_ONTOP, true); + inner_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED, true); + inner_mat->set_feature(FixedSpatialMaterial::FEATURE_TRANSPARENT, true); - - d[VS::ARRAY_VERTEX]=triangles; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh,VS::PRIMITIVE_TRIANGLES,d); - VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh,0,inner_mat->get_rid()); + d[VS::ARRAY_VERTEX] = triangles; + VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, VS::PRIMITIVE_TRIANGLES, d); + VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh, 0, inner_mat->get_rid()); outer_mat.instance(); - outer_mat->set_albedo(Color(0.7,0.7,1.0,0.3)); - outer_mat->set_flag(FixedSpatialMaterial::FLAG_ONTOP,true); - outer_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED,true); + outer_mat->set_albedo(Color(0.7, 0.7, 1.0, 0.3)); + outer_mat->set_flag(FixedSpatialMaterial::FLAG_ONTOP, true); + outer_mat->set_flag(FixedSpatialMaterial::FLAG_UNSHADED, true); outer_mat->set_line_width(3.0); - outer_mat->set_feature(FixedSpatialMaterial::FEATURE_TRANSPARENT,true); - - - d[VS::ARRAY_VERTEX]=lines; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh,VS::PRIMITIVE_LINES,d); - VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh,1,outer_mat->get_rid()); + outer_mat->set_feature(FixedSpatialMaterial::FEATURE_TRANSPARENT, true); - d[VS::ARRAY_VERTEX]=triangles; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(duplicate_mesh,VS::PRIMITIVE_TRIANGLES,d); - VisualServer::get_singleton()->mesh_surface_set_material(duplicate_mesh,0,inner_mat->get_rid()); + d[VS::ARRAY_VERTEX] = lines; + VisualServer::get_singleton()->mesh_add_surface_from_arrays(selection_mesh, VS::PRIMITIVE_LINES, d); + VisualServer::get_singleton()->mesh_surface_set_material(selection_mesh, 1, outer_mat->get_rid()); - d[VS::ARRAY_VERTEX]=lines; - VisualServer::get_singleton()->mesh_add_surface_from_arrays(duplicate_mesh,VS::PRIMITIVE_LINES,d); - VisualServer::get_singleton()->mesh_surface_set_material(duplicate_mesh,1,outer_mat->get_rid()); + d[VS::ARRAY_VERTEX] = triangles; + VisualServer::get_singleton()->mesh_add_surface_from_arrays(duplicate_mesh, VS::PRIMITIVE_TRIANGLES, d); + VisualServer::get_singleton()->mesh_surface_set_material(duplicate_mesh, 0, inner_mat->get_rid()); + d[VS::ARRAY_VERTEX] = lines; + VisualServer::get_singleton()->mesh_add_surface_from_arrays(duplicate_mesh, VS::PRIMITIVE_LINES, d); + VisualServer::get_singleton()->mesh_surface_set_material(duplicate_mesh, 1, outer_mat->get_rid()); } - selection.active=false; - updating=false; - + selection.active = false; + updating = false; } - - - GridMapEditor::~GridMapEditor() { - for(int i=0;i<3;i++) { + for (int i = 0; i < 3; i++) { if (grid[i].is_valid()) VisualServer::get_singleton()->free(grid[i]); @@ -1440,12 +1353,10 @@ GridMapEditor::~GridMapEditor() { VisualServer::get_singleton()->free(cursor_instance); } - VisualServer::get_singleton()->free(selection_mesh); if (selection_instance.is_valid()) VisualServer::get_singleton()->free(selection_instance); - VisualServer::get_singleton()->free(duplicate_mesh); if (duplicate_instance.is_valid()) VisualServer::get_singleton()->free(duplicate_instance); @@ -1455,8 +1366,7 @@ GridMapEditor::~GridMapEditor() { void GridMapEditorPlugin::edit(Object *p_object) { - - gridmap_editor->edit(p_object?p_object->cast_to<GridMap>():NULL); + gridmap_editor->edit(p_object ? p_object->cast_to<GridMap>() : NULL); } bool GridMapEditorPlugin::handles(Object *p_object) const { @@ -1477,26 +1387,18 @@ void GridMapEditorPlugin::make_visible(bool p_visible) { gridmap_editor->edit(NULL); gridmap_editor->set_process(false); } - } - GridMapEditorPlugin::GridMapEditorPlugin(EditorNode *p_node) { - editor=p_node; - gridmap_editor = memnew( GridMapEditor(editor) ); + editor = p_node; + gridmap_editor = memnew(GridMapEditor(editor)); SpatialEditor::get_singleton()->get_palette_split()->add_child(gridmap_editor); - SpatialEditor::get_singleton()->get_palette_split()->move_child(gridmap_editor,0); + SpatialEditor::get_singleton()->get_palette_split()->move_child(gridmap_editor, 0); gridmap_editor->hide(); - - - } - -GridMapEditorPlugin::~GridMapEditorPlugin() -{ +GridMapEditorPlugin::~GridMapEditorPlugin() { } - |