Bring that Whole New World to the Old Continent too

Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.

1 files changed, 52 insertions, 63 deletions

diff --git a/editor/plugins/shader_graph_editor_plugin.h b/editor/plugins/shader_graph_editor_plugin.h
index 115242fb9..70735c4b9 100644
--- a/editor/plugins/shader_graph_editor_plugin.h
+++ b/editor/plugins/shader_graph_editor_plugin.h
@@ -29,87 +29,81 @@
 #ifndef SHADER_GRAPH_EDITOR_PLUGIN_H
 #define SHADER_GRAPH_EDITOR_PLUGIN_H
 
-
-#include "editor/editor_plugin.h"
 #include "editor/editor_node.h"
-#include "scene/resources/shader.h"
-#include "scene/gui/tree.h"
+#include "editor/editor_plugin.h"
+#include "editor/property_editor.h"
 #include "scene/gui/button.h"
 #include "scene/gui/graph_edit.h"
 #include "scene/gui/popup.h"
-#include "editor/property_editor.h"
+#include "scene/gui/tree.h"
+#include "scene/resources/shader.h"
 #include "scene/resources/shader_graph.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
 
-
 class GraphColorRampEdit : public Control {
 
-	OBJ_TYPE(GraphColorRampEdit,Control);
-
+	OBJ_TYPE(GraphColorRampEdit, Control);
 
 	struct Point {
 
 		float offset;
 		Color color;
-		bool operator<(const Point& p_ponit) const {
-			return offset<p_ponit.offset;
+		bool operator<(const Point &p_ponit) const {
+			return offset < p_ponit.offset;
 		}
 	};
 
 	PopupPanel *popup;
 	ColorPicker *picker;
 
-
 	bool grabbing;
 	int grabbed;
 	float grabbed_at;
 	Vector<Point> points;
 
-	void _color_changed(const Color& p_color);
+	void _color_changed(const Color &p_color);
 
 protected:
-	void _input_event(const InputEvent& p_event);
+	void _input_event(const InputEvent &p_event);
 	void _notification(int p_what);
 	static void _bind_methods();
-public:
 
-	void set_ramp(const Vector<float>& p_offsets,const Vector<Color>& p_colors);
+public:
+	void set_ramp(const Vector<float> &p_offsets, const Vector<Color> &p_colors);
 	Vector<float> get_offsets() const;
 	Vector<Color> get_colors() const;
 	virtual Size2 get_minimum_size() const;
 	GraphColorRampEdit();
 };
 
-
 class GraphCurveMapEdit : public Control {
 
-	OBJ_TYPE(GraphCurveMapEdit,Control);
-
+	OBJ_TYPE(GraphCurveMapEdit, Control);
 
 	struct Point {
 
 		float offset;
 		float height;
-		bool operator<(const Point& p_ponit) const {
-			return offset<p_ponit.offset;
+		bool operator<(const Point &p_ponit) const {
+			return offset < p_ponit.offset;
 		}
 	};
 
-
 	bool grabbing;
 	int grabbed;
 	Vector<Point> points;
 
-	void _plot_curve(const Vector2& p_a,const Vector2& p_b,const Vector2& p_c,const Vector2& p_d);
+	void _plot_curve(const Vector2 &p_a, const Vector2 &p_b, const Vector2 &p_c, const Vector2 &p_d);
+
 protected:
-	void _input_event(const InputEvent& p_event);
+	void _input_event(const InputEvent &p_event);
 	void _notification(int p_what);
 	static void _bind_methods();
-public:
 
-	void set_points(const Vector<Vector2>& p_points);
+public:
+	void set_points(const Vector<Vector2> &p_points);
 	Vector<Vector2> get_points() const;
 	virtual Size2 get_minimum_size() const;
 	GraphCurveMapEdit();
@@ -117,9 +111,7 @@ public:
 
 class ShaderGraphView : public Control {
 
-	OBJ_TYPE(ShaderGraphView,Control);
-
-
+	OBJ_TYPE(ShaderGraphView, Control);
 
 	CustomPropertyEditor *ped_popup;
 	bool block_update;
@@ -135,29 +127,27 @@ class ShaderGraphView : public Control {
 	void _update_graph();
 	void _create_node(int p_id);
 
-
 	ToolButton *make_label(String text, Variant::Type v_type = Variant::NIL);
-	ToolButton *make_editor(String text, GraphNode* gn, int p_id, int param, Variant::Type type, String p_hint="");
+	ToolButton *make_editor(String text, GraphNode *gn, int p_id, int param, Variant::Type type, String p_hint = "");
 
-	void _connection_request(const String& p_from, int p_from_slot,const String& p_to,int p_to_slot);
-	void _disconnection_request(const String& p_from, int p_from_slot,const String& p_to,int p_to_slot);
+	void _connection_request(const String &p_from, int p_from_slot, const String &p_to, int p_to_slot);
+	void _disconnection_request(const String &p_from, int p_from_slot, const String &p_to, int p_to_slot);
 
 	void _node_removed(int p_id);
 	void _begin_node_move();
-	void _node_moved(const Vector2& p_from, const Vector2& p_to,int p_id);
+	void _node_moved(const Vector2 &p_from, const Vector2 &p_to, int p_id);
 	void _end_node_move();
-	void _move_node(int p_id,const Vector2& p_to);
+	void _move_node(int p_id, const Vector2 &p_to);
 	void _duplicate_nodes_request();
 	void _duplicate_nodes(const Array &p_nodes);
 	void _delete_nodes_request();
 
+	void _default_changed(int p_id, Node *p_button, int p_param, int v_type, String p_hint);
 
-	void _default_changed(int p_id, Node* p_button, int p_param, int v_type, String p_hint);
-
-	void _scalar_const_changed(double p_value,int p_id);
+	void _scalar_const_changed(double p_value, int p_id);
 	void _vec_const_changed(double p_value, int p_id, Array p_arr);
-	void _rgb_const_changed(const Color& p_color, int p_id);
-	void _xform_const_changed(int p_id,Node* p_button);
+	void _rgb_const_changed(const Color &p_color, int p_id);
+	void _xform_const_changed(int p_id, Node *p_button);
 	void _scalar_op_changed(int p_op, int p_id);
 	void _vec_op_changed(int p_op, int p_id);
 	void _vec_scalar_op_changed(int p_op, int p_id);
@@ -165,78 +155,77 @@ class ShaderGraphView : public Control {
 	void _xform_inv_rev_changed(bool p_enabled, int p_id);
 	void _scalar_func_changed(int p_func, int p_id);
 	void _vec_func_changed(int p_func, int p_id);
-	void _scalar_input_changed(double p_value,int p_id);
+	void _scalar_input_changed(double p_value, int p_id);
 	void _vec_input_changed(double p_value, int p_id, Array p_arr);
-	void _xform_input_changed(int p_id,Node* p_button);
-	void _rgb_input_changed(const Color& p_color, int p_id);
-	void _tex_input_change(int p_id,Node* p_button);
+	void _xform_input_changed(int p_id, Node *p_button);
+	void _rgb_input_changed(const Color &p_color, int p_id);
+	void _tex_input_change(int p_id, Node *p_button);
 	void _cube_input_change(int p_id);
-	void _input_name_changed(const String& p_name,int p_id,Node* p_line_edit);
-	void _tex_edited(int p_id,Node* p_button);
-	void _cube_edited(int p_id,Node* p_button);
+	void _input_name_changed(const String &p_name, int p_id, Node *p_line_edit);
+	void _tex_edited(int p_id, Node *p_button);
+	void _cube_edited(int p_id, Node *p_button);
 	void _variant_edited();
-	void _comment_edited(int p_id,Node* p_button);
-	void _color_ramp_changed(int p_id,Node* p_ramp);
-	void _curve_changed(int p_id,Node* p_curve);
+	void _comment_edited(int p_id, Node *p_button);
+	void _color_ramp_changed(int p_id, Node *p_ramp);
+	void _curve_changed(int p_id, Node *p_curve);
 	void _sg_updated();
-	Map<int,GraphNode*> node_map;
+	Map<int, GraphNode *> node_map;
+
+	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);
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
-public:
 
+public:
 	void add_node(int p_type, const Vector2 &location);
 	GraphEdit *get_graph_edit() { return graph_edit; }
 	void set_graph(Ref<ShaderGraph> p_graph);
 
-	ShaderGraphView(ShaderGraph::ShaderType p_type=ShaderGraph::SHADER_TYPE_FRAGMENT);
+	ShaderGraphView(ShaderGraph::ShaderType p_type = ShaderGraph::SHADER_TYPE_FRAGMENT);
 };
 
 class ShaderGraphEditor : public VBoxContainer {
 
-	OBJ_TYPE(ShaderGraphEditor,VBoxContainer);
+	OBJ_TYPE(ShaderGraphEditor, VBoxContainer);
 
 	PopupMenu *popup;
 	TabContainer *tabs;
 	ShaderGraphView *graph_edits[ShaderGraph::SHADER_TYPE_MAX];
-	static const char* node_names[ShaderGraph::NODE_TYPE_MAX];
+	static const char *node_names[ShaderGraph::NODE_TYPE_MAX];
 	Vector2 next_location;
 
 	bool _2d;
 	void _add_node(int p_type);
 	void _popup_requested(const Vector2 &p_position);
+
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
-public:
 
+public:
 	void edit(Ref<ShaderGraph> p_shader);
 	ShaderGraphEditor(bool p_2d);
 };
 
 class ShaderGraphEditorPlugin : public EditorPlugin {
 
-	OBJ_TYPE( ShaderGraphEditorPlugin, EditorPlugin );
+	OBJ_TYPE(ShaderGraphEditorPlugin, EditorPlugin);
 
 	bool _2d;
 	ShaderGraphEditor *shader_editor;
 	EditorNode *editor;
 
 public:
-
 	virtual String get_name() const { return "ShaderGraph"; }
 	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);
 
-	ShaderGraphEditorPlugin(EditorNode *p_node,bool p_2d);
+	ShaderGraphEditorPlugin(EditorNode *p_node, bool p_2d);
 	~ShaderGraphEditorPlugin();
-
 };
 #endif
-