godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +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

36
modules/gridmap/grid_map_editor_plugin.h
View File

@@ -29,10 +29,10 @@
#ifndef GRID_MAP_EDITOR_PLUGIN_H
#define GRID_MAP_EDITOR_PLUGIN_H
#include "editor/editor_plugin.h"
#include "editor/editor_node.h"
#include "grid_map.h"
#include "editor/editor_plugin.h"
#include "editor/pane_drag.h"
#include "grid_map.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
@@ -40,11 +40,11 @@
class SpatialEditorPlugin;
class GridMapEditor : public VBoxContainer {
OBJ_TYPE(GridMapEditor, VBoxContainer );
OBJ_TYPE(GridMapEditor, VBoxContainer);
enum {
GRID_CURSOR_SIZE=50
GRID_CURSOR_SIZE = 50
};
enum InputAction {
@@ -65,14 +65,14 @@ class GridMapEditor : public VBoxContainer {
};
enum DisplayMode {
DISPLAY_THUMBNAIL,
DISPLAY_LIST
DISPLAY_THUMBNAIL,
DISPLAY_LIST
};
UndoRedo *undo_redo;
InputAction input_action;
Panel *panel;
MenuButton * options;
MenuButton *options;
SpinBox *floor;
OptionButton *edit_mode;
ToolButton *mode_thumbnail;
@@ -94,7 +94,7 @@ class GridMapEditor : public VBoxContainer {
List<SetItem> set_items;
GridMap *node;
MeshLibrary* last_theme;
MeshLibrary *last_theme;
ClipMode clip_mode;
bool lock_view;
@@ -121,10 +121,8 @@ class GridMapEditor : public VBoxContainer {
bool updating;
struct Selection {
Vector3 click;
Vector3 current;
Vector3 begin;
@@ -144,7 +142,6 @@ class GridMapEditor : public VBoxContainer {
int selected_area;
int cursor_rot;
enum Menu {
MENU_OPTION_CONFIGURE,
@@ -176,7 +173,6 @@ class GridMapEditor : public VBoxContainer {
SpatialEditorPlugin *spatial_editor;
struct AreaDisplay {
RID mesh;
@@ -215,20 +211,18 @@ class GridMapEditor : public VBoxContainer {
void update_areas();
EditorNode *editor;
bool do_input_action(Camera* p_camera,const Point2& p_point,bool p_click);
bool do_input_action(Camera *p_camera, const Point2 &p_point, bool p_click);
friend class GridMapEditorPlugin;
friend class GridMapEditorPlugin;
Panel *theme_panel;
protected:
void _notification(int p_what);
void _node_removed(Node *p_node);
static void _bind_methods();
public:
bool forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event);
bool forward_spatial_input_event(Camera *p_camera, const InputEvent &p_event);
void edit(GridMap *p_gridmap);
GridMapEditor() {}
@@ -238,14 +232,13 @@ public:
class GridMapEditorPlugin : public EditorPlugin {
OBJ_TYPE( GridMapEditorPlugin, EditorPlugin );
OBJ_TYPE(GridMapEditorPlugin, EditorPlugin);
GridMapEditor *gridmap_editor;
EditorNode *editor;
public:
virtual bool forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) { return gridmap_editor->forward_spatial_input_event(p_camera,p_event); }
virtual bool forward_spatial_input_event(Camera *p_camera, const InputEvent &p_event) { return gridmap_editor->forward_spatial_input_event(p_camera, p_event); }
virtual String get_name() const { return "GridMap"; }
bool has_main_screen() const { return false; }
virtual void edit(Object *p_node);
@@ -254,7 +247,6 @@ public:
GridMapEditorPlugin(EditorNode *p_node);
~GridMapEditorPlugin();
};
#endif // CUBE_GRID_MAP_EDITOR_PLUGIN_H