Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #11274 from Rubonnek/keep-argument-names-consistent

Browse source 
Renamed function arguments to keep them consistent between declaration and implementation
This commit is contained in:
Rémi Verschelde 2017-09-17 12:53:48 +02:00 • committed by GitHub
commit c74bab66aa
16 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.h
View file

@ -317,7 +317,7 @@ class CanvasItemEditor : public VBoxContainer {
void _prepare_drag(const Point2 &p_click_pos);
DragType _get_anchor_handle_drag_type(const Point2 &p_click, Vector2 &r_point);
float _anchor_snap(float anchor, bool *snapped = NULL, float p_opposite_anchor = -1);
float _anchor_snap(float p_anchor, bool *p_snapped = NULL, float p_opposite_anchor = -1);
Vector2 _anchor_to_position(Control *p_control, Vector2 anchor);
Vector2 _position_to_anchor(Control *p_control, Vector2 position);

6
editor/plugins/navigation_mesh_editor_plugin.h
View file

@ -56,7 +56,7 @@ class NavigationMeshEditor : public Control {
protected:
void _node_removed(Node *p_node);
static void _bind_methods();
void _notification(int p_what);
void _notification(int p_option);
public:
void edit(NavigationMeshInstance *p_nav_mesh_instance);
@ -74,8 +74,8 @@ class NavigationMeshEditorPlugin : public EditorPlugin {
public:
virtual String get_name() const { return "NavigationMesh"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
virtual bool handles(Object *p_node) const;
virtual void edit(Object *p_object);
virtual bool handles(Object *p_object) const;
virtual void make_visible(bool p_visible);
NavigationMeshEditorPlugin(EditorNode *p_node);

2
editor/plugins/navigation_mesh_generator.h
View file

@ -56,7 +56,7 @@ protected:
rcPolyMeshDetail *detail_mesh, Vector<float> &verticies, Vector<int> &indices);
public:
static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_base);
static void bake(Ref<NavigationMesh> p_nav_mesh, Node *p_node);
static void clear(Ref<NavigationMesh> p_nav_mesh);
};