You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-06 12:20:30 +00:00
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
This commit is contained in:
@@ -39,11 +39,8 @@
|
||||
#include "spatial_editor_plugin.h"
|
||||
|
||||
void Polygon3DEditor::_notification(int p_what) {
|
||||
|
||||
switch (p_what) {
|
||||
|
||||
case NOTIFICATION_READY: {
|
||||
|
||||
button_create->set_icon(get_icon("Edit", "EditorIcons"));
|
||||
button_edit->set_icon(get_icon("MovePoint", "EditorIcons"));
|
||||
button_edit->set_pressed(true);
|
||||
@@ -64,7 +61,6 @@ void Polygon3DEditor::_notification(int p_what) {
|
||||
}
|
||||
}
|
||||
void Polygon3DEditor::_node_removed(Node *p_node) {
|
||||
|
||||
if (p_node == node) {
|
||||
node = NULL;
|
||||
if (imgeom->get_parent() == p_node)
|
||||
@@ -75,17 +71,13 @@ void Polygon3DEditor::_node_removed(Node *p_node) {
|
||||
}
|
||||
|
||||
void Polygon3DEditor::_menu_option(int p_option) {
|
||||
|
||||
switch (p_option) {
|
||||
|
||||
case MODE_CREATE: {
|
||||
|
||||
mode = MODE_CREATE;
|
||||
button_create->set_pressed(true);
|
||||
button_edit->set_pressed(false);
|
||||
} break;
|
||||
case MODE_EDIT: {
|
||||
|
||||
mode = MODE_EDIT;
|
||||
button_create->set_pressed(false);
|
||||
button_edit->set_pressed(true);
|
||||
@@ -94,7 +86,6 @@ void Polygon3DEditor::_menu_option(int p_option) {
|
||||
}
|
||||
|
||||
void Polygon3DEditor::_wip_close() {
|
||||
|
||||
undo_redo->create_action(TTR("Create Polygon3D"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", node->call("get_polygon"));
|
||||
undo_redo->add_do_method(node, "set_polygon", wip);
|
||||
@@ -110,7 +101,6 @@ void Polygon3DEditor::_wip_close() {
|
||||
}
|
||||
|
||||
bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<InputEvent> &p_event) {
|
||||
|
||||
if (!node)
|
||||
return false;
|
||||
|
||||
@@ -123,7 +113,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
Ref<InputEventMouseButton> mb = p_event;
|
||||
|
||||
if (mb.is_valid()) {
|
||||
|
||||
Vector2 gpoint = mb->get_position();
|
||||
Vector3 ray_from = p_camera->project_ray_origin(gpoint);
|
||||
Vector3 ray_dir = p_camera->project_ray_normal(gpoint);
|
||||
@@ -147,13 +136,9 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
real_t grab_threshold = EDITOR_GET("editors/poly_editor/point_grab_radius");
|
||||
|
||||
switch (mode) {
|
||||
|
||||
case MODE_CREATE: {
|
||||
|
||||
if (mb->get_button_index() == BUTTON_LEFT && mb->is_pressed()) {
|
||||
|
||||
if (!wip_active) {
|
||||
|
||||
wip.clear();
|
||||
wip.push_back(cpoint);
|
||||
wip_active = true;
|
||||
@@ -163,14 +148,12 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
edited_point = 1;
|
||||
return true;
|
||||
} else {
|
||||
|
||||
if (wip.size() > 1 && p_camera->unproject_position(gt.xform(Vector3(wip[0].x, wip[0].y, depth))).distance_to(gpoint) < grab_threshold) {
|
||||
//wip closed
|
||||
_wip_close();
|
||||
|
||||
return true;
|
||||
} else {
|
||||
|
||||
wip.push_back(cpoint);
|
||||
edited_point = wip.size();
|
||||
snap_ignore = false;
|
||||
@@ -185,14 +168,10 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
} break;
|
||||
|
||||
case MODE_EDIT: {
|
||||
|
||||
if (mb->get_button_index() == BUTTON_LEFT) {
|
||||
if (mb->is_pressed()) {
|
||||
|
||||
if (mb->get_control()) {
|
||||
|
||||
if (poly.size() < 3) {
|
||||
|
||||
undo_redo->create_action(TTR("Edit Poly"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", poly);
|
||||
poly.push_back(cpoint);
|
||||
@@ -208,7 +187,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 points[2] = {
|
||||
p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth))),
|
||||
p_camera->unproject_position(gt.xform(Vector3(poly[(i + 1) % poly.size()].x, poly[(i + 1) % poly.size()].y, depth)))
|
||||
@@ -227,7 +205,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
pre_move_edit = poly;
|
||||
poly.insert(closest_idx + 1, cpoint);
|
||||
edited_point = closest_idx + 1;
|
||||
@@ -239,14 +216,12 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
|
||||
//look for points to move
|
||||
|
||||
int closest_idx = -1;
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 cp = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
|
||||
|
||||
real_t d = cp.distance_to(gpoint);
|
||||
@@ -258,7 +233,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
pre_move_edit = poly;
|
||||
edited_point = closest_idx;
|
||||
edited_point_pos = poly[closest_idx];
|
||||
@@ -268,11 +242,9 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
snap_ignore = false;
|
||||
|
||||
if (edited_point != -1) {
|
||||
|
||||
//apply
|
||||
|
||||
ERR_FAIL_INDEX_V(edited_point, poly.size(), false);
|
||||
@@ -290,12 +262,10 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
}
|
||||
if (mb->get_button_index() == BUTTON_RIGHT && mb->is_pressed() && edited_point == -1) {
|
||||
|
||||
int closest_idx = -1;
|
||||
Vector2 closest_pos;
|
||||
real_t closest_dist = 1e10;
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 cp = p_camera->unproject_position(gt.xform(Vector3(poly[i].x, poly[i].y, depth)));
|
||||
|
||||
real_t d = cp.distance_to(gpoint);
|
||||
@@ -307,7 +277,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
|
||||
if (closest_idx >= 0) {
|
||||
|
||||
undo_redo->create_action(TTR("Edit Poly (Remove Point)"));
|
||||
undo_redo->add_undo_method(node, "set_polygon", poly);
|
||||
poly.remove(closest_idx);
|
||||
@@ -327,7 +296,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
|
||||
if (mm.is_valid()) {
|
||||
if (edited_point != -1 && (wip_active || mm->get_button_mask() & BUTTON_MASK_LEFT)) {
|
||||
|
||||
Vector2 gpoint = mm->get_position();
|
||||
|
||||
Vector3 ray_from = p_camera->project_ray_origin(gpoint);
|
||||
@@ -361,7 +329,6 @@ bool Polygon3DEditor::forward_spatial_gui_input(Camera *p_camera, const Ref<Inpu
|
||||
}
|
||||
|
||||
float Polygon3DEditor::_get_depth() {
|
||||
|
||||
if (bool(node->call("_has_editable_3d_polygon_no_depth")))
|
||||
return 0;
|
||||
|
||||
@@ -369,7 +336,6 @@ float Polygon3DEditor::_get_depth() {
|
||||
}
|
||||
|
||||
void Polygon3DEditor::_polygon_draw() {
|
||||
|
||||
if (!node)
|
||||
return;
|
||||
|
||||
@@ -389,7 +355,6 @@ void Polygon3DEditor::_polygon_draw() {
|
||||
Rect2 rect;
|
||||
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 p, p2;
|
||||
p = i == edited_point ? edited_point_pos : poly[i];
|
||||
if ((wip_active && i == poly.size() - 1) || (((i + 1) % poly.size()) == edited_point))
|
||||
@@ -474,11 +439,9 @@ void Polygon3DEditor::_polygon_draw() {
|
||||
a.resize(Mesh::ARRAY_MAX);
|
||||
PoolVector<Vector3> va;
|
||||
{
|
||||
|
||||
va.resize(poly.size());
|
||||
PoolVector<Vector3>::Write w = va.write();
|
||||
for (int i = 0; i < poly.size(); i++) {
|
||||
|
||||
Vector2 p, p2;
|
||||
p = i == edited_point ? edited_point_pos : poly[i];
|
||||
|
||||
@@ -492,9 +455,7 @@ void Polygon3DEditor::_polygon_draw() {
|
||||
}
|
||||
|
||||
void Polygon3DEditor::edit(Node *p_collision_polygon) {
|
||||
|
||||
if (p_collision_polygon) {
|
||||
|
||||
node = Object::cast_to<Spatial>(p_collision_polygon);
|
||||
//Enable the pencil tool if the polygon is empty
|
||||
if (Vector<Vector2>(node->call("get_polygon")).size() == 0) {
|
||||
@@ -519,14 +480,12 @@ void Polygon3DEditor::edit(Node *p_collision_polygon) {
|
||||
}
|
||||
|
||||
void Polygon3DEditor::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_menu_option"), &Polygon3DEditor::_menu_option);
|
||||
ClassDB::bind_method(D_METHOD("_polygon_draw"), &Polygon3DEditor::_polygon_draw);
|
||||
ClassDB::bind_method(D_METHOD("_node_removed"), &Polygon3DEditor::_node_removed);
|
||||
}
|
||||
|
||||
Polygon3DEditor::Polygon3DEditor(EditorNode *p_editor) {
|
||||
|
||||
node = NULL;
|
||||
editor = p_editor;
|
||||
undo_redo = EditorNode::get_undo_redo();
|
||||
@@ -575,33 +534,27 @@ Polygon3DEditor::Polygon3DEditor(EditorNode *p_editor) {
|
||||
}
|
||||
|
||||
Polygon3DEditor::~Polygon3DEditor() {
|
||||
|
||||
memdelete(imgeom);
|
||||
}
|
||||
|
||||
void Polygon3DEditorPlugin::edit(Object *p_object) {
|
||||
|
||||
collision_polygon_editor->edit(Object::cast_to<Node>(p_object));
|
||||
}
|
||||
|
||||
bool Polygon3DEditorPlugin::handles(Object *p_object) const {
|
||||
|
||||
return Object::cast_to<Spatial>(p_object) && bool(p_object->call("_is_editable_3d_polygon"));
|
||||
}
|
||||
|
||||
void Polygon3DEditorPlugin::make_visible(bool p_visible) {
|
||||
|
||||
if (p_visible) {
|
||||
collision_polygon_editor->show();
|
||||
} else {
|
||||
|
||||
collision_polygon_editor->hide();
|
||||
collision_polygon_editor->edit(NULL);
|
||||
}
|
||||
}
|
||||
|
||||
Polygon3DEditorPlugin::Polygon3DEditorPlugin(EditorNode *p_node) {
|
||||
|
||||
editor = p_node;
|
||||
collision_polygon_editor = memnew(Polygon3DEditor(p_node));
|
||||
SpatialEditor::get_singleton()->add_control_to_menu_panel(collision_polygon_editor);
|
||||
|
||||
Reference in New Issue
Block a user