You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-11 13:10:58 +00:00
A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde
@@ -28,12 +28,12 @@
|
||||
/*************************************************************************/
|
||||
#include "tile_set_editor_plugin.h"
|
||||
|
||||
#include "scene/2d/sprite.h"
|
||||
#include "scene/2d/physics_body_2d.h"
|
||||
#include "scene/2d/sprite.h"
|
||||
|
||||
void TileSetEditor::edit(const Ref<TileSet>& p_tileset) {
|
||||
void TileSetEditor::edit(const Ref<TileSet> &p_tileset) {
|
||||
|
||||
tileset=p_tileset;
|
||||
tileset = p_tileset;
|
||||
}
|
||||
|
||||
void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_merge) {
|
||||
@@ -41,85 +41,80 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
|
||||
if (!p_merge)
|
||||
p_library->clear();
|
||||
|
||||
for(int i=0;i<scene->get_child_count();i++) {
|
||||
|
||||
for (int i = 0; i < scene->get_child_count(); i++) {
|
||||
|
||||
Node *child = scene->get_child(i);
|
||||
|
||||
|
||||
if (!child->cast_to<Sprite>()) {
|
||||
if (child->get_child_count()>0) {
|
||||
child=child->get_child(0);
|
||||
if (child->get_child_count() > 0) {
|
||||
child = child->get_child(0);
|
||||
if (!child->cast_to<Sprite>()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
} else
|
||||
continue;
|
||||
|
||||
|
||||
}
|
||||
|
||||
Sprite *mi = child->cast_to<Sprite>();
|
||||
Ref<Texture> texture=mi->get_texture();
|
||||
Ref<CanvasItemMaterial> material=mi->get_material();
|
||||
Ref<Texture> texture = mi->get_texture();
|
||||
Ref<CanvasItemMaterial> material = mi->get_material();
|
||||
|
||||
if (texture.is_null())
|
||||
continue;
|
||||
|
||||
int id = p_library->find_tile_by_name(mi->get_name());
|
||||
if (id<0) {
|
||||
if (id < 0) {
|
||||
|
||||
id=p_library->get_last_unused_tile_id();
|
||||
id = p_library->get_last_unused_tile_id();
|
||||
p_library->create_tile(id);
|
||||
p_library->tile_set_name(id,mi->get_name());
|
||||
p_library->tile_set_name(id, mi->get_name());
|
||||
}
|
||||
|
||||
p_library->tile_set_texture(id,texture);
|
||||
p_library->tile_set_material(id,material);
|
||||
p_library->tile_set_texture(id, texture);
|
||||
p_library->tile_set_material(id, material);
|
||||
|
||||
p_library->tile_set_modulate(id,mi->get_modulate());
|
||||
p_library->tile_set_modulate(id, mi->get_modulate());
|
||||
|
||||
Vector2 phys_offset;
|
||||
Size2 s;
|
||||
|
||||
if (mi->is_region()) {
|
||||
s=mi->get_region_rect().size;
|
||||
p_library->tile_set_region(id,mi->get_region_rect());
|
||||
s = mi->get_region_rect().size;
|
||||
p_library->tile_set_region(id, mi->get_region_rect());
|
||||
} else {
|
||||
const int frame = mi->get_frame();
|
||||
const int hframes = mi->get_hframes();
|
||||
s=texture->get_size()/Size2(hframes,mi->get_vframes());
|
||||
p_library->tile_set_region(id,Rect2(Vector2(frame%hframes,frame/hframes)*s,s));
|
||||
}
|
||||
|
||||
if (mi->is_centered()) {
|
||||
phys_offset+=-s/2;
|
||||
s = texture->get_size() / Size2(hframes, mi->get_vframes());
|
||||
p_library->tile_set_region(id, Rect2(Vector2(frame % hframes, frame / hframes) * s, s));
|
||||
}
|
||||
|
||||
Vector<Ref<Shape2D> >collisions;
|
||||
if (mi->is_centered()) {
|
||||
phys_offset += -s / 2;
|
||||
}
|
||||
|
||||
Vector<Ref<Shape2D> > collisions;
|
||||
Ref<NavigationPolygon> nav_poly;
|
||||
Ref<OccluderPolygon2D> occluder;
|
||||
|
||||
for(int j=0;j<mi->get_child_count();j++) {
|
||||
for (int j = 0; j < mi->get_child_count(); j++) {
|
||||
|
||||
Node *child2 = mi->get_child(j);
|
||||
|
||||
if (child2->cast_to<NavigationPolygonInstance>())
|
||||
nav_poly=child2->cast_to<NavigationPolygonInstance>()->get_navigation_polygon();
|
||||
nav_poly = child2->cast_to<NavigationPolygonInstance>()->get_navigation_polygon();
|
||||
|
||||
if (child2->cast_to<LightOccluder2D>())
|
||||
occluder=child2->cast_to<LightOccluder2D>()->get_occluder_polygon();
|
||||
occluder = child2->cast_to<LightOccluder2D>()->get_occluder_polygon();
|
||||
|
||||
if (!child2->cast_to<StaticBody2D>())
|
||||
continue;
|
||||
StaticBody2D *sb = child2->cast_to<StaticBody2D>();
|
||||
int shape_count = sb->get_shape_count();
|
||||
if (shape_count==0)
|
||||
if (shape_count == 0)
|
||||
continue;
|
||||
for (int shape_index=0; shape_index<shape_count; ++shape_index)
|
||||
{
|
||||
Ref<Shape2D> collision=sb->get_shape(shape_index);
|
||||
for (int shape_index = 0; shape_index < shape_count; ++shape_index) {
|
||||
Ref<Shape2D> collision = sb->get_shape(shape_index);
|
||||
if (collision.is_valid()) {
|
||||
collisions.push_back(collision);
|
||||
}
|
||||
@@ -128,58 +123,53 @@ void TileSetEditor::_import_scene(Node *scene, Ref<TileSet> p_library, bool p_me
|
||||
|
||||
if (collisions.size()) {
|
||||
|
||||
p_library->tile_set_shapes(id,collisions);
|
||||
p_library->tile_set_shape_offset(id,-phys_offset);
|
||||
p_library->tile_set_shapes(id, collisions);
|
||||
p_library->tile_set_shape_offset(id, -phys_offset);
|
||||
} else {
|
||||
p_library->tile_set_shape_offset(id,Vector2());
|
||||
|
||||
p_library->tile_set_shape_offset(id, Vector2());
|
||||
}
|
||||
|
||||
p_library->tile_set_texture_offset(id,mi->get_offset());
|
||||
p_library->tile_set_navigation_polygon(id,nav_poly);
|
||||
p_library->tile_set_light_occluder(id,occluder);
|
||||
p_library->tile_set_occluder_offset(id,-phys_offset);
|
||||
p_library->tile_set_navigation_polygon_offset(id,-phys_offset);
|
||||
|
||||
|
||||
p_library->tile_set_texture_offset(id, mi->get_offset());
|
||||
p_library->tile_set_navigation_polygon(id, nav_poly);
|
||||
p_library->tile_set_light_occluder(id, occluder);
|
||||
p_library->tile_set_occluder_offset(id, -phys_offset);
|
||||
p_library->tile_set_navigation_polygon_offset(id, -phys_offset);
|
||||
}
|
||||
}
|
||||
|
||||
void TileSetEditor::_menu_confirm() {
|
||||
|
||||
switch(option) {
|
||||
switch (option) {
|
||||
|
||||
case MENU_OPTION_MERGE_FROM_SCENE:
|
||||
case MENU_OPTION_CREATE_FROM_SCENE: {
|
||||
|
||||
|
||||
EditorNode *en = editor;
|
||||
Node * scene = en->get_edited_scene();
|
||||
Node *scene = en->get_edited_scene();
|
||||
if (!scene)
|
||||
break;
|
||||
|
||||
_import_scene(scene,tileset,option==MENU_OPTION_MERGE_FROM_SCENE);
|
||||
|
||||
_import_scene(scene, tileset, option == MENU_OPTION_MERGE_FROM_SCENE);
|
||||
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
void TileSetEditor::_name_dialog_confirm(const String& name) {
|
||||
void TileSetEditor::_name_dialog_confirm(const String &name) {
|
||||
|
||||
switch (option) {
|
||||
|
||||
case MENU_OPTION_REMOVE_ITEM: {
|
||||
|
||||
int id=tileset->find_tile_by_name(name);
|
||||
int id = tileset->find_tile_by_name(name);
|
||||
|
||||
if (id<0 && name.is_valid_integer())
|
||||
id=name.to_int();
|
||||
if (id < 0 && name.is_valid_integer())
|
||||
id = name.to_int();
|
||||
|
||||
if (tileset->has_tile(id)) {
|
||||
tileset->remove_tile(id);
|
||||
} else {
|
||||
err_dialog->set_text(TTR("Could not find tile:")+" " + name);
|
||||
err_dialog->set_text(TTR("Could not find tile:") + " " + name);
|
||||
err_dialog->popup_centered(Size2(300, 60));
|
||||
}
|
||||
} break;
|
||||
@@ -188,8 +178,8 @@ void TileSetEditor::_name_dialog_confirm(const String& name) {
|
||||
|
||||
void TileSetEditor::_menu_cbk(int p_option) {
|
||||
|
||||
option=p_option;
|
||||
switch(p_option) {
|
||||
option = p_option;
|
||||
switch (p_option) {
|
||||
|
||||
case MENU_OPTION_ADD_ITEM: {
|
||||
|
||||
@@ -204,57 +194,54 @@ void TileSetEditor::_menu_cbk(int p_option) {
|
||||
case MENU_OPTION_CREATE_FROM_SCENE: {
|
||||
|
||||
cd->set_text(TTR("Create from scene?"));
|
||||
cd->popup_centered(Size2(300,60));
|
||||
cd->popup_centered(Size2(300, 60));
|
||||
} break;
|
||||
case MENU_OPTION_MERGE_FROM_SCENE: {
|
||||
|
||||
cd->set_text(TTR("Merge from scene?"));
|
||||
cd->popup_centered(Size2(300,60));
|
||||
cd->popup_centered(Size2(300, 60));
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
Error TileSetEditor::update_library_file(Node *p_base_scene, Ref<TileSet> ml, bool p_merge) {
|
||||
|
||||
|
||||
Error TileSetEditor::update_library_file(Node *p_base_scene, Ref<TileSet> ml,bool p_merge) {
|
||||
|
||||
_import_scene(p_base_scene,ml,p_merge);
|
||||
_import_scene(p_base_scene, ml, p_merge);
|
||||
return OK;
|
||||
|
||||
}
|
||||
|
||||
void TileSetEditor::_bind_methods() {
|
||||
|
||||
ClassDB::bind_method("_menu_cbk",&TileSetEditor::_menu_cbk);
|
||||
ClassDB::bind_method("_menu_confirm",&TileSetEditor::_menu_confirm);
|
||||
ClassDB::bind_method("_name_dialog_confirm",&TileSetEditor::_name_dialog_confirm);
|
||||
ClassDB::bind_method("_menu_cbk", &TileSetEditor::_menu_cbk);
|
||||
ClassDB::bind_method("_menu_confirm", &TileSetEditor::_menu_confirm);
|
||||
ClassDB::bind_method("_name_dialog_confirm", &TileSetEditor::_name_dialog_confirm);
|
||||
}
|
||||
|
||||
TileSetEditor::TileSetEditor(EditorNode *p_editor) {
|
||||
|
||||
Panel *panel = memnew( Panel );
|
||||
Panel *panel = memnew(Panel);
|
||||
panel->set_area_as_parent_rect();
|
||||
add_child(panel);
|
||||
MenuButton * options = memnew( MenuButton );
|
||||
MenuButton *options = memnew(MenuButton);
|
||||
panel->add_child(options);
|
||||
options->set_pos(Point2(1,1));
|
||||
options->set_pos(Point2(1, 1));
|
||||
options->set_text("Theme");
|
||||
options->get_popup()->add_item(TTR("Add Item"),MENU_OPTION_ADD_ITEM);
|
||||
options->get_popup()->add_item(TTR("Remove Item"),MENU_OPTION_REMOVE_ITEM);
|
||||
options->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM);
|
||||
options->get_popup()->add_item(TTR("Remove Item"), MENU_OPTION_REMOVE_ITEM);
|
||||
options->get_popup()->add_separator();
|
||||
options->get_popup()->add_item(TTR("Create from Scene"),MENU_OPTION_CREATE_FROM_SCENE);
|
||||
options->get_popup()->add_item(TTR("Merge from Scene"),MENU_OPTION_MERGE_FROM_SCENE);
|
||||
options->get_popup()->connect("id_pressed", this,"_menu_cbk");
|
||||
editor=p_editor;
|
||||
options->get_popup()->add_item(TTR("Create from Scene"), MENU_OPTION_CREATE_FROM_SCENE);
|
||||
options->get_popup()->add_item(TTR("Merge from Scene"), MENU_OPTION_MERGE_FROM_SCENE);
|
||||
options->get_popup()->connect("id_pressed", this, "_menu_cbk");
|
||||
editor = p_editor;
|
||||
cd = memnew(ConfirmationDialog);
|
||||
add_child(cd);
|
||||
cd->get_ok()->connect("pressed", this,"_menu_confirm");
|
||||
cd->get_ok()->connect("pressed", this, "_menu_confirm");
|
||||
|
||||
nd = memnew(EditorNameDialog);
|
||||
add_child(nd);
|
||||
nd->set_hide_on_ok(true);
|
||||
nd->get_line_edit()->set_margin(MARGIN_TOP,28);
|
||||
nd->connect("name_confirmed", this,"_name_dialog_confirm");
|
||||
nd->get_line_edit()->set_margin(MARGIN_TOP, 28);
|
||||
nd->connect("name_confirmed", this, "_name_dialog_confirm");
|
||||
|
||||
err_dialog = memnew(AcceptDialog);
|
||||
add_child(err_dialog);
|
||||
@@ -264,18 +251,18 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) {
|
||||
void TileSetEditorPlugin::edit(Object *p_node) {
|
||||
|
||||
if (p_node && p_node->cast_to<TileSet>()) {
|
||||
tileset_editor->edit( p_node->cast_to<TileSet>() );
|
||||
tileset_editor->edit(p_node->cast_to<TileSet>());
|
||||
tileset_editor->show();
|
||||
} else
|
||||
tileset_editor->hide();
|
||||
}
|
||||
|
||||
bool TileSetEditorPlugin::handles(Object *p_node) const{
|
||||
bool TileSetEditorPlugin::handles(Object *p_node) const {
|
||||
|
||||
return p_node->is_class("TileSet");
|
||||
}
|
||||
|
||||
void TileSetEditorPlugin::make_visible(bool p_visible){
|
||||
void TileSetEditorPlugin::make_visible(bool p_visible) {
|
||||
|
||||
if (p_visible)
|
||||
tileset_editor->show();
|
||||
@@ -285,13 +272,12 @@ void TileSetEditorPlugin::make_visible(bool p_visible){
|
||||
|
||||
TileSetEditorPlugin::TileSetEditorPlugin(EditorNode *p_node) {
|
||||
|
||||
tileset_editor = memnew( TileSetEditor(p_node) );
|
||||
tileset_editor = memnew(TileSetEditor(p_node));
|
||||
|
||||
p_node->get_viewport()->add_child(tileset_editor);
|
||||
tileset_editor->set_area_as_parent_rect();
|
||||
tileset_editor->set_anchor( MARGIN_RIGHT, Control::ANCHOR_END );
|
||||
tileset_editor->set_anchor( MARGIN_BOTTOM, Control::ANCHOR_BEGIN );
|
||||
tileset_editor->set_end( Point2(0,22) );
|
||||
tileset_editor->set_anchor(MARGIN_RIGHT, Control::ANCHOR_END);
|
||||
tileset_editor->set_anchor(MARGIN_BOTTOM, Control::ANCHOR_BEGIN);
|
||||
tileset_editor->set_end(Point2(0, 22));
|
||||
tileset_editor->hide();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user