godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +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

89
editor/scene_tree_editor.h
View File

@@ -29,30 +29,30 @@
#ifndef SCENE_TREE_EDITOR_H
#define SCENE_TREE_EDITOR_H
#include "scene/gui/tree.h"
#include "scene/gui/button.h"
#include "scene/gui/dialogs.h"
#include "undo_redo.h"
#include "editor_data.h"
#include "editor_settings.h"
#include "scene/gui/button.h"
#include "scene/gui/dialogs.h"
#include "scene/gui/tree.h"
#include "undo_redo.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class SceneTreeEditor : public Control {
OBJ_TYPE( SceneTreeEditor, Control );
OBJ_TYPE(SceneTreeEditor, Control);
EditorSelection *editor_selection;
enum {
BUTTON_SUBSCENE=0,
BUTTON_VISIBILITY=1,
BUTTON_SCRIPT=2,
BUTTON_LOCK=3,
BUTTON_GROUP=4,
BUTTON_WARNING=5,
BUTTON_SIGNALS=6,
BUTTON_GROUPS=7,
BUTTON_SUBSCENE = 0,
BUTTON_VISIBILITY = 1,
BUTTON_SCRIPT = 2,
BUTTON_LOCK = 3,
BUTTON_GROUP = 4,
BUTTON_WARNING = 5,
BUTTON_SIGNALS = 6,
BUTTON_GROUPS = 7,
};
enum {
@@ -79,18 +79,18 @@ class SceneTreeEditor : public Control {
int blocked;
void _compute_hash(Node *p_node,uint64_t &hash);
void _compute_hash(Node *p_node, uint64_t &hash);
bool _add_nodes(Node *p_node,TreeItem *p_parent);
bool _add_nodes(Node *p_node, TreeItem *p_parent);
void _test_update_tree();
void _update_tree();
void _tree_changed();
void _node_removed(Node *p_node);
TreeItem* _find(TreeItem *p_node,const NodePath& p_path);
TreeItem *_find(TreeItem *p_node, const NodePath &p_path);
void _notification(int p_what);
void _selected_changed();
void _rename_node(ObjectID p_node,const String& p_name);
void _rename_node(ObjectID p_node, const String &p_name);
void _cell_collapsed(Object *p_obj);
@@ -104,7 +104,7 @@ class SceneTreeEditor : public Control {
void _renamed();
UndoRedo *undo_redo;
Set<Node*> marked;
Set<Node *> marked;
bool marked_selectable;
bool marked_children_selectable;
bool display_foreign;
@@ -112,88 +112,79 @@ class SceneTreeEditor : public Control {
bool pending_test_update;
static void _bind_methods();
void _cell_button_pressed(Object *p_item,int p_column,int p_id);
void _cell_multi_selected(Object *p_object,int p_cel,bool p_selected);
void _cell_button_pressed(Object *p_item, int p_column, int p_id);
void _cell_multi_selected(Object *p_object, int p_cel, bool p_selected);
void _update_selection(TreeItem *item);
void _node_script_changed(Node *p_node);
void _node_visibility_changed(Node *p_node);
void _update_visibility_color(Node *p_node, TreeItem *p_item);
void _subscene_option(int p_idx);
void _node_replace_owner(Node* p_base,Node* p_node,Node* p_root);
void _node_replace_owner(Node *p_base, Node *p_node, Node *p_root);
void _selection_changed();
Node *get_scene_node();
Variant get_drag_data_fw(const Point2& p_point,Control* p_from);
bool can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const;
void drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from);
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
void _rmb_select(const Vector2& p_pos);
void _rmb_select(const Vector2 &p_pos);
void _warning_changed(Node* p_for_node);
void _warning_changed(Node *p_for_node);
void _editor_settings_changed();
Timer* update_timer;
Timer *update_timer;
List<StringName> *script_types;
bool _is_script_type(const StringName &p_type) const;
public:
void set_filter(const String& p_filter);
void set_filter(const String &p_filter);
String get_filter() const;
void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo=p_undo_redo; };
void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; };
void set_display_foreign_nodes(bool p_display);
bool get_display_foreign_nodes() const;
void set_marked(const Set<Node*>& p_marked,bool p_selectable=false,bool p_children_selectable=true);
void set_marked(Node *p_marked,bool p_selectable=false,bool p_children_selectable=true);
void set_selected(Node *p_node,bool p_emit_selected=true);
void set_marked(const Set<Node *> &p_marked, bool p_selectable = false, bool p_children_selectable = true);
void set_marked(Node *p_marked, bool p_selectable = false, bool p_children_selectable = true);
void set_selected(Node *p_node, bool p_emit_selected = true);
Node *get_selected();
void set_can_rename(bool p_can_rename) { can_rename=p_can_rename; }
void set_can_rename(bool p_can_rename) { can_rename = p_can_rename; }
void set_editor_selection(EditorSelection *p_selection);
void set_show_enabled_subscene(bool p_show) { show_enabled_subscene=p_show; }
void set_show_enabled_subscene(bool p_show) { show_enabled_subscene = p_show; }
void update_tree() { _update_tree(); }
Tree *get_scene_tree() { return tree; }
Tree* get_scene_tree() { return tree; }
SceneTreeEditor(bool p_label=true,bool p_can_rename=false, bool p_can_open_instance=false);
SceneTreeEditor(bool p_label = true, bool p_can_rename = false, bool p_can_open_instance = false);
~SceneTreeEditor();
};
class SceneTreeDialog : public ConfirmationDialog {
OBJ_TYPE( SceneTreeDialog, ConfirmationDialog );
OBJ_TYPE(SceneTreeDialog, ConfirmationDialog);
SceneTreeEditor *tree;
// Button *select;
// Button *cancel;
// Button *select;
// Button *cancel;
void update_tree();
void _select();
void _cancel();
protected:
void _notification(int p_what);
static void _bind_methods();
public:
public:
SceneTreeEditor *get_scene_tree() { return tree; }
SceneTreeDialog();
~SceneTreeDialog();
};
#endif