godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
editor/plugins/tile_set_editor_plugin.h
View File

@@ -29,16 +29,13 @@
#ifndef TILE_SET_EDITOR_PLUGIN_H
#define TILE_SET_EDITOR_PLUGIN_H
#include "scene/resources/tile_set.h"
#include "editor/editor_node.h"
#include "editor/editor_name_dialog.h"
#include "editor/editor_node.h"
#include "scene/resources/tile_set.h"
class TileSetEditor : public Control {
OBJ_TYPE( TileSetEditor, Control );
OBJ_TYPE(TileSetEditor, Control);
Ref<TileSet> tileset;
@@ -59,43 +56,35 @@ class TileSetEditor : public Control {
int option;
void _menu_cbk(int p_option);
void _menu_confirm();
void _name_dialog_confirm(const String& name);
void _name_dialog_confirm(const String &name);
static void _import_scene(Node *p_scene, Ref<TileSet> p_library, bool p_merge);
protected:
static void _bind_methods();
public:
void edit(const Ref<TileSet>& p_tileset);
static Error update_library_file(Node *p_base_scene, Ref<TileSet> ml,bool p_merge=true);
public:
void edit(const Ref<TileSet> &p_tileset);
static Error update_library_file(Node *p_base_scene, Ref<TileSet> ml, bool p_merge = true);
TileSetEditor(EditorNode *p_editor);
};
class TileSetEditorPlugin : public EditorPlugin {
OBJ_TYPE( TileSetEditorPlugin, EditorPlugin );
OBJ_TYPE(TileSetEditorPlugin, EditorPlugin);
TileSetEditor *tileset_editor;
EditorNode *editor;
public:
virtual String get_name() const { return "TileSet"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
virtual bool handles(Object *p_node) const;
virtual void make_visible(bool p_visible);
TileSetEditorPlugin(EditorNode *p_node);
};
#endif // TILE_SET_EDITOR_PLUGIN_H