Zero initialize all pointer class and struct members

This prevents the pitfall of UB when checking if they have been
assigned something valid by comparing to nullptr.
This commit is contained in:
Rémi Verschelde
2022-04-04 15:06:57 +02:00
parent 53317bbe14
commit f8ab79e68a
258 changed files with 2398 additions and 2421 deletions

View File

@@ -40,9 +40,9 @@ class CanvasItemEditor;
class AbstractPolygon2DEditor : public HBoxContainer {
GDCLASS(AbstractPolygon2DEditor, HBoxContainer);
Button *button_create;
Button *button_edit;
Button *button_delete;
Button *button_create = nullptr;
Button *button_edit = nullptr;
Button *button_delete = nullptr;
struct Vertex {
Vertex() {}
@@ -85,9 +85,9 @@ class AbstractPolygon2DEditor : public HBoxContainer {
bool _polygon_editing_enabled;
CanvasItemEditor *canvas_item_editor;
Panel *panel;
ConfirmationDialog *create_resource;
CanvasItemEditor *canvas_item_editor = nullptr;
Panel *panel = nullptr;
ConfirmationDialog *create_resource = nullptr;
protected:
enum {
@@ -99,7 +99,7 @@ protected:
int mode;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
virtual void _menu_option(int p_option);
void _wip_changed();
@@ -149,7 +149,7 @@ public:
class AbstractPolygon2DEditorPlugin : public EditorPlugin {
GDCLASS(AbstractPolygon2DEditorPlugin, EditorPlugin);
AbstractPolygon2DEditor *polygon_editor;
AbstractPolygon2DEditor *polygon_editor = nullptr;
String klass;
public:

View File

@@ -45,36 +45,36 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
Ref<AnimationNodeBlendSpace1D> blend_space;
HBoxContainer *goto_parent_hb;
Button *goto_parent;
HBoxContainer *goto_parent_hb = nullptr;
Button *goto_parent = nullptr;
PanelContainer *panel;
Button *tool_blend;
Button *tool_select;
Button *tool_create;
VSeparator *tool_erase_sep;
Button *tool_erase;
Button *snap;
SpinBox *snap_value;
PanelContainer *panel = nullptr;
Button *tool_blend = nullptr;
Button *tool_select = nullptr;
Button *tool_create = nullptr;
VSeparator *tool_erase_sep = nullptr;
Button *tool_erase = nullptr;
Button *snap = nullptr;
SpinBox *snap_value = nullptr;
LineEdit *label_value;
SpinBox *max_value;
SpinBox *min_value;
LineEdit *label_value = nullptr;
SpinBox *max_value = nullptr;
SpinBox *min_value = nullptr;
HBoxContainer *edit_hb;
SpinBox *edit_value;
Button *open_editor;
HBoxContainer *edit_hb = nullptr;
SpinBox *edit_value = nullptr;
Button *open_editor = nullptr;
int selected_point;
Control *blend_space_draw;
Control *blend_space_draw = nullptr;
PanelContainer *error_panel;
Label *error_label;
PanelContainer *error_panel = nullptr;
Label *error_label = nullptr;
bool updating;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
static AnimationNodeBlendSpace1DEditor *singleton;
@@ -87,8 +87,8 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
void _labels_changed(String);
void _snap_toggled();
PopupMenu *menu;
PopupMenu *animations_menu;
PopupMenu *menu = nullptr;
PopupMenu *animations_menu = nullptr;
Vector<String> animations_to_add;
float add_point_pos;
Vector<real_t> points;
@@ -108,7 +108,7 @@ class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
void _edit_point_pos(double);
void _open_editor();
EditorFileDialog *open_file;
EditorFileDialog *open_file = nullptr;
Ref<AnimationNode> file_loaded;
void _file_opened(const String &p_file);

View File

@@ -45,43 +45,43 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
Ref<AnimationNodeBlendSpace2D> blend_space;
PanelContainer *panel;
Button *tool_blend;
Button *tool_select;
Button *tool_create;
Button *tool_triangle;
VSeparator *tool_erase_sep;
Button *tool_erase;
Button *snap;
SpinBox *snap_x;
SpinBox *snap_y;
OptionButton *interpolation;
PanelContainer *panel = nullptr;
Button *tool_blend = nullptr;
Button *tool_select = nullptr;
Button *tool_create = nullptr;
Button *tool_triangle = nullptr;
VSeparator *tool_erase_sep = nullptr;
Button *tool_erase = nullptr;
Button *snap = nullptr;
SpinBox *snap_x = nullptr;
SpinBox *snap_y = nullptr;
OptionButton *interpolation = nullptr;
Button *auto_triangles;
Button *auto_triangles = nullptr;
LineEdit *label_x;
LineEdit *label_y;
SpinBox *max_x_value;
SpinBox *min_x_value;
SpinBox *max_y_value;
SpinBox *min_y_value;
LineEdit *label_x = nullptr;
LineEdit *label_y = nullptr;
SpinBox *max_x_value = nullptr;
SpinBox *min_x_value = nullptr;
SpinBox *max_y_value = nullptr;
SpinBox *min_y_value = nullptr;
HBoxContainer *edit_hb;
SpinBox *edit_x;
SpinBox *edit_y;
Button *open_editor;
HBoxContainer *edit_hb = nullptr;
SpinBox *edit_x = nullptr;
SpinBox *edit_y = nullptr;
Button *open_editor = nullptr;
int selected_point;
int selected_triangle;
Control *blend_space_draw;
Control *blend_space_draw = nullptr;
PanelContainer *error_panel;
Label *error_label;
PanelContainer *error_panel = nullptr;
Label *error_label = nullptr;
bool updating;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
static AnimationNodeBlendSpace2DEditor *singleton;
@@ -94,8 +94,8 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
void _labels_changed(String);
void _snap_toggled();
PopupMenu *menu;
PopupMenu *animations_menu;
PopupMenu *menu = nullptr;
PopupMenu *animations_menu = nullptr;
Vector<String> animations_to_add;
Vector2 add_point_pos;
Vector<Vector2> points;
@@ -123,7 +123,7 @@ class AnimationNodeBlendSpace2DEditor : public AnimationTreeNodeEditorPlugin {
StringName get_blend_position_path() const;
EditorFileDialog *open_file;
EditorFileDialog *open_file = nullptr;
Ref<AnimationNode> file_loaded;
void _file_opened(const String &p_file);

View File

@@ -47,19 +47,19 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
GDCLASS(AnimationNodeBlendTreeEditor, AnimationTreeNodeEditorPlugin);
Ref<AnimationNodeBlendTree> blend_tree;
GraphEdit *graph;
MenuButton *add_node;
GraphEdit *graph = nullptr;
MenuButton *add_node = nullptr;
Vector2 position_from_popup_menu;
bool use_position_from_popup_menu;
PanelContainer *error_panel;
Label *error_label;
PanelContainer *error_panel = nullptr;
Label *error_label = nullptr;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
AcceptDialog *filter_dialog;
Tree *filters;
CheckBox *filter_enabled;
AcceptDialog *filter_dialog = nullptr;
Tree *filters = nullptr;
CheckBox *filter_enabled = nullptr;
Map<StringName, ProgressBar *> animations;
Vector<EditorProperty *> visible_properties;
@@ -122,7 +122,7 @@ class AnimationNodeBlendTreeEditor : public AnimationTreeNodeEditorPlugin {
void _update_editor_settings();
void _update_theme();
EditorFileDialog *open_file;
EditorFileDialog *open_file = nullptr;
Ref<AnimationNode> file_loaded;
void _file_opened(const String &p_file);

View File

@@ -46,8 +46,8 @@ class AnimationPlayerEditorPlugin;
class AnimationPlayerEditor : public VBoxContainer {
GDCLASS(AnimationPlayerEditor, VBoxContainer);
AnimationPlayerEditorPlugin *plugin;
AnimationPlayer *player;
AnimationPlayerEditorPlugin *plugin = nullptr;
AnimationPlayer *player = nullptr;
enum {
TOOL_NEW_ANIM,
@@ -88,31 +88,31 @@ class AnimationPlayerEditor : public VBoxContainer {
RESOURCE_SAVE
};
OptionButton *animation;
Button *stop;
Button *play;
Button *play_from;
Button *play_bw;
Button *play_bw_from;
Button *autoplay;
OptionButton *animation = nullptr;
Button *stop = nullptr;
Button *play = nullptr;
Button *play_from = nullptr;
Button *play_bw = nullptr;
Button *play_bw_from = nullptr;
Button *autoplay = nullptr;
MenuButton *tool_anim;
Button *onion_toggle;
MenuButton *onion_skinning;
Button *pin;
SpinBox *frame;
LineEdit *scale;
LineEdit *name;
Label *name_title;
UndoRedo *undo_redo;
MenuButton *tool_anim = nullptr;
Button *onion_toggle = nullptr;
MenuButton *onion_skinning = nullptr;
Button *pin = nullptr;
SpinBox *frame = nullptr;
LineEdit *scale = nullptr;
LineEdit *name = nullptr;
Label *name_title = nullptr;
UndoRedo *undo_redo = nullptr;
Ref<Texture2D> autoplay_icon;
Ref<Texture2D> reset_icon;
Ref<ImageTexture> autoplay_reset_icon;
bool last_active;
float timeline_position;
EditorFileDialog *file;
ConfirmationDialog *delete_dialog;
EditorFileDialog *file = nullptr;
ConfirmationDialog *delete_dialog = nullptr;
struct BlendEditor {
AcceptDialog *dialog = nullptr;
@@ -121,14 +121,14 @@ class AnimationPlayerEditor : public VBoxContainer {
} blend_editor;
ConfirmationDialog *name_dialog;
ConfirmationDialog *error_dialog;
ConfirmationDialog *name_dialog = nullptr;
ConfirmationDialog *error_dialog = nullptr;
int name_dialog_op = TOOL_NEW_ANIM;
bool updating;
bool updating_blends;
AnimationTrackEditor *track_editor;
AnimationTrackEditor *track_editor = nullptr;
static AnimationPlayerEditor *singleton;
// Onion skinning.
@@ -250,7 +250,7 @@ public:
class AnimationPlayerEditorPlugin : public EditorPlugin {
GDCLASS(AnimationPlayerEditorPlugin, EditorPlugin);
AnimationPlayerEditor *anim_editor;
AnimationPlayerEditor *anim_editor = nullptr;
protected:
void _notification(int p_what);

View File

@@ -47,36 +47,36 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
Ref<AnimationNodeStateMachine> state_machine;
Button *tool_select;
Button *tool_create;
Button *tool_connect;
Popup *name_edit_popup;
LineEdit *name_edit;
Button *tool_select = nullptr;
Button *tool_create = nullptr;
Button *tool_connect = nullptr;
Popup *name_edit_popup = nullptr;
LineEdit *name_edit = nullptr;
HBoxContainer *tool_erase_hb;
Button *tool_erase;
Button *tool_autoplay;
Button *tool_end;
HBoxContainer *tool_erase_hb = nullptr;
Button *tool_erase = nullptr;
Button *tool_autoplay = nullptr;
Button *tool_end = nullptr;
OptionButton *transition_mode;
OptionButton *play_mode;
OptionButton *transition_mode = nullptr;
OptionButton *play_mode = nullptr;
PanelContainer *panel;
PanelContainer *panel = nullptr;
StringName selected_node;
HScrollBar *h_scroll;
VScrollBar *v_scroll;
HScrollBar *h_scroll = nullptr;
VScrollBar *v_scroll = nullptr;
Control *state_machine_draw;
Control *state_machine_play_pos;
Control *state_machine_draw = nullptr;
Control *state_machine_play_pos = nullptr;
PanelContainer *error_panel;
Label *error_label;
PanelContainer *error_panel = nullptr;
Label *error_label = nullptr;
bool updating;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
static AnimationNodeStateMachineEditor *singleton;
@@ -87,8 +87,8 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
void _update_graph();
PopupMenu *menu;
PopupMenu *animations_menu;
PopupMenu *menu = nullptr;
PopupMenu *animations_menu = nullptr;
Vector<String> animations_to_add;
Vector2 add_node_pos;
@@ -166,7 +166,7 @@ class AnimationNodeStateMachineEditor : public AnimationTreeNodeEditorPlugin {
float error_time;
String error_text;
EditorFileDialog *open_file;
EditorFileDialog *open_file = nullptr;
Ref<AnimationNode> file_loaded;
void _file_opened(const String &p_file);

View File

@@ -52,11 +52,11 @@ public:
class AnimationTreeEditor : public VBoxContainer {
GDCLASS(AnimationTreeEditor, VBoxContainer);
ScrollContainer *path_edit;
HBoxContainer *path_hb;
ScrollContainer *path_edit = nullptr;
HBoxContainer *path_hb = nullptr;
AnimationTree *tree;
MarginContainer *editor_base;
AnimationTree *tree = nullptr;
MarginContainer *editor_base = nullptr;
Vector<String> button_path;
Vector<String> edited_path;
@@ -96,8 +96,8 @@ public:
class AnimationTreeEditorPlugin : public EditorPlugin {
GDCLASS(AnimationTreeEditorPlugin, EditorPlugin);
AnimationTreeEditor *anim_tree_editor;
Button *button;
AnimationTreeEditor *anim_tree_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "AnimationTree"; }

View File

@@ -53,12 +53,12 @@
class EditorAssetLibraryItem : public PanelContainer {
GDCLASS(EditorAssetLibraryItem, PanelContainer);
TextureButton *icon;
LinkButton *title;
LinkButton *category;
LinkButton *author;
TextureButton *icon = nullptr;
LinkButton *title = nullptr;
LinkButton *category = nullptr;
LinkButton *author = nullptr;
TextureRect *stars[5];
Label *price;
Label *price = nullptr;
int asset_id;
int category_id;
@@ -83,11 +83,11 @@ public:
class EditorAssetLibraryItemDescription : public ConfirmationDialog {
GDCLASS(EditorAssetLibraryItemDescription, ConfirmationDialog);
EditorAssetLibraryItem *item;
RichTextLabel *description;
ScrollContainer *previews;
HBoxContainer *preview_hb;
PanelContainer *previews_bg;
EditorAssetLibraryItem *item = nullptr;
RichTextLabel *description = nullptr;
ScrollContainer *previews = nullptr;
HBoxContainer *preview_hb = nullptr;
PanelContainer *previews_bg = nullptr;
struct Preview {
int id = 0;
@@ -98,7 +98,7 @@ class EditorAssetLibraryItemDescription : public ConfirmationDialog {
};
Vector<Preview> preview_images;
TextureRect *preview;
TextureRect *preview = nullptr;
void set_image(int p_type, int p_index, const Ref<Texture2D> &p_image);
@@ -130,19 +130,19 @@ public:
class EditorAssetLibraryItemDownload : public MarginContainer {
GDCLASS(EditorAssetLibraryItemDownload, MarginContainer);
PanelContainer *panel;
TextureRect *icon;
Label *title;
ProgressBar *progress;
Button *install_button;
Button *retry_button;
TextureButton *dismiss_button;
PanelContainer *panel = nullptr;
TextureRect *icon = nullptr;
Label *title = nullptr;
ProgressBar *progress = nullptr;
Button *install_button = nullptr;
Button *retry_button = nullptr;
TextureButton *dismiss_button = nullptr;
AcceptDialog *download_error;
HTTPRequest *download;
AcceptDialog *download_error = nullptr;
HTTPRequest *download = nullptr;
String host;
String sha256;
Label *status;
Label *status = nullptr;
int prev_status;
@@ -150,7 +150,7 @@ class EditorAssetLibraryItemDownload : public MarginContainer {
bool external_install;
EditorAssetInstaller *asset_installer;
EditorAssetInstaller *asset_installer = nullptr;
void _close();
void _make_request();
@@ -176,35 +176,35 @@ class EditorAssetLibrary : public PanelContainer {
String host;
EditorFileDialog *asset_open;
EditorAssetInstaller *asset_installer;
EditorFileDialog *asset_open = nullptr;
EditorAssetInstaller *asset_installer = nullptr;
void _asset_open();
void _asset_file_selected(const String &p_file);
void _update_repository_options();
PanelContainer *library_scroll_bg;
ScrollContainer *library_scroll;
VBoxContainer *library_vb;
Label *library_loading;
Label *library_error;
LineEdit *filter;
Timer *filter_debounce_timer;
OptionButton *categories;
OptionButton *repository;
OptionButton *sort;
HBoxContainer *error_hb;
TextureRect *error_tr;
Label *error_label;
MenuButton *support;
PanelContainer *library_scroll_bg = nullptr;
ScrollContainer *library_scroll = nullptr;
VBoxContainer *library_vb = nullptr;
Label *library_loading = nullptr;
Label *library_error = nullptr;
LineEdit *filter = nullptr;
Timer *filter_debounce_timer = nullptr;
OptionButton *categories = nullptr;
OptionButton *repository = nullptr;
OptionButton *sort = nullptr;
HBoxContainer *error_hb = nullptr;
TextureRect *error_tr = nullptr;
Label *error_label = nullptr;
MenuButton *support = nullptr;
HBoxContainer *contents;
HBoxContainer *contents = nullptr;
HBoxContainer *asset_top_page;
GridContainer *asset_items;
HBoxContainer *asset_bottom_page;
HBoxContainer *asset_top_page = nullptr;
GridContainer *asset_items = nullptr;
HBoxContainer *asset_bottom_page = nullptr;
HTTPRequest *request;
HTTPRequest *request = nullptr;
bool templates_only;
bool initial_loading;
@@ -260,7 +260,7 @@ class EditorAssetLibrary : public PanelContainer {
HBoxContainer *_make_pages(int p_page, int p_page_count, int p_page_len, int p_total_items, int p_current_items);
//
EditorAssetLibraryItemDescription *description;
EditorAssetLibraryItemDescription *description = nullptr;
//
enum RequestType {
@@ -273,8 +273,8 @@ class EditorAssetLibrary : public PanelContainer {
RequestType requesting;
Dictionary category_map;
ScrollContainer *downloads_scroll;
HBoxContainer *downloads_hb;
ScrollContainer *downloads_scroll = nullptr;
HBoxContainer *downloads_hb = nullptr;
void _install_asset();
@@ -315,7 +315,7 @@ public:
class AssetLibraryEditorPlugin : public EditorPlugin {
GDCLASS(AssetLibraryEditorPlugin, EditorPlugin);
EditorAssetLibrary *addon_library;
EditorAssetLibrary *addon_library = nullptr;
public:
virtual String get_name() const override { return "AssetLib"; }

View File

@@ -75,7 +75,7 @@ public:
class AudioStreamEditorPlugin : public EditorPlugin {
GDCLASS(AudioStreamEditorPlugin, EditorPlugin);
AudioStreamEditor *audio_editor;
AudioStreamEditor *audio_editor = nullptr;
public:
virtual String get_name() const override { return "Audio"; }

View File

@@ -37,9 +37,9 @@
class Camera3DEditor : public Control {
GDCLASS(Camera3DEditor, Control);
Panel *panel;
Button *preview;
Node *node;
Panel *panel = nullptr;
Button *preview = nullptr;
Node *node = nullptr;
void _pressed();

View File

@@ -183,16 +183,16 @@ private:
bool selection_menu_additive_selection;
Tool tool = TOOL_SELECT;
Control *viewport;
Control *viewport_scrollable;
Control *viewport = nullptr;
Control *viewport_scrollable = nullptr;
HScrollBar *h_scroll;
VScrollBar *v_scroll;
HBoxContainer *hb;
HScrollBar *h_scroll = nullptr;
VScrollBar *v_scroll = nullptr;
HBoxContainer *hb = nullptr;
// Used for secondary menu items which are displayed depending on the currently selected node
// (such as MeshInstance's "Mesh" menu).
PanelContainer *context_menu_container;
HBoxContainer *hbc_context_menu;
PanelContainer *context_menu_container = nullptr;
HBoxContainer *hbc_context_menu = nullptr;
Transform2D transform;
GridVisibility grid_visibility = GRID_VISIBILITY_SHOW_WHEN_SNAPPING;
@@ -293,47 +293,47 @@ private:
};
List<PoseClipboard> pose_clipboard;
Button *select_button;
Button *select_button = nullptr;
Button *move_button;
Button *scale_button;
Button *rotate_button;
Button *move_button = nullptr;
Button *scale_button = nullptr;
Button *rotate_button = nullptr;
Button *list_select_button;
Button *pivot_button;
Button *pan_button;
Button *list_select_button = nullptr;
Button *pivot_button = nullptr;
Button *pan_button = nullptr;
Button *ruler_button;
Button *ruler_button = nullptr;
Button *smart_snap_button;
Button *grid_snap_button;
MenuButton *snap_config_menu;
PopupMenu *smartsnap_config_popup;
Button *smart_snap_button = nullptr;
Button *grid_snap_button = nullptr;
MenuButton *snap_config_menu = nullptr;
PopupMenu *smartsnap_config_popup = nullptr;
Button *lock_button;
Button *unlock_button;
Button *lock_button = nullptr;
Button *unlock_button = nullptr;
Button *group_button;
Button *ungroup_button;
Button *group_button = nullptr;
Button *ungroup_button = nullptr;
MenuButton *skeleton_menu;
Button *override_camera_button;
MenuButton *view_menu;
PopupMenu *grid_menu;
HBoxContainer *animation_hb;
MenuButton *animation_menu;
MenuButton *skeleton_menu = nullptr;
Button *override_camera_button = nullptr;
MenuButton *view_menu = nullptr;
PopupMenu *grid_menu = nullptr;
HBoxContainer *animation_hb = nullptr;
MenuButton *animation_menu = nullptr;
Button *key_loc_button;
Button *key_rot_button;
Button *key_scale_button;
Button *key_insert_button;
Button *key_auto_insert_button;
Button *key_loc_button = nullptr;
Button *key_rot_button = nullptr;
Button *key_scale_button = nullptr;
Button *key_insert_button = nullptr;
Button *key_auto_insert_button = nullptr;
PopupMenu *selection_menu;
PopupMenu *add_node_menu;
PopupMenu *selection_menu = nullptr;
PopupMenu *add_node_menu = nullptr;
Control *top_ruler;
Control *left_ruler;
Control *top_ruler = nullptr;
Control *left_ruler = nullptr;
Point2 drag_start_origin;
DragType drag_type = DRAG_NONE;
@@ -374,9 +374,9 @@ private:
void _find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_node, List<CanvasItem *> *r_items, const Transform2D &p_parent_xform = Transform2D(), const Transform2D &p_canvas_xform = Transform2D());
bool _select_click_on_item(CanvasItem *item, Point2 p_click_pos, bool p_append);
ConfirmationDialog *snap_dialog;
ConfirmationDialog *snap_dialog = nullptr;
CanvasItem *ref_item;
CanvasItem *ref_item = nullptr;
void _save_canvas_item_state(List<CanvasItem *> p_canvas_items, bool save_bones = false);
void _restore_canvas_item_state(List<CanvasItem *> p_canvas_items, bool restore_bones = false);
@@ -400,7 +400,7 @@ private:
void _prepare_grid_menu();
void _on_grid_menu_id_pressed(int p_id);
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
List<CanvasItem *> _get_edited_canvas_items(bool retrieve_locked = false, bool remove_canvas_item_if_parent_in_selection = true);
Rect2 _get_encompassing_rect_from_list(List<CanvasItem *> p_list);
@@ -476,8 +476,8 @@ private:
const SnapTarget p_snap_target, List<const CanvasItem *> p_exceptions,
const Node *p_current);
VBoxContainer *controls_vb;
EditorZoomWidget *zoom_widget;
VBoxContainer *controls_vb = nullptr;
EditorZoomWidget *zoom_widget = nullptr;
void _update_zoom(real_t p_zoom);
void _shortcut_zoom_set(real_t p_zoom);
void _zoom_on_position(real_t p_zoom, Point2 p_position = Point2());
@@ -488,9 +488,9 @@ private:
void _update_override_camera_button(bool p_game_running);
HSplitContainer *left_panel_split;
HSplitContainer *right_panel_split;
VSplitContainer *bottom_split;
HSplitContainer *left_panel_split = nullptr;
HSplitContainer *right_panel_split = nullptr;
VSplitContainer *bottom_split = nullptr;
void _update_context_menu_stylebox();
@@ -555,7 +555,7 @@ public:
void focus_selection();
EditorSelection *editor_selection;
EditorSelection *editor_selection = nullptr;
CanvasItemEditor();
};
@@ -563,7 +563,7 @@ public:
class CanvasItemEditorPlugin : public EditorPlugin {
GDCLASS(CanvasItemEditorPlugin, EditorPlugin);
CanvasItemEditor *canvas_item_editor;
CanvasItemEditor *canvas_item_editor = nullptr;
public:
virtual String get_name() const override { return "2D"; }
@@ -589,18 +589,18 @@ class CanvasItemEditorViewport : public Control {
Vector<String> texture_node_types;
Vector<String> selected_files;
Node *target_node;
Node *target_node = nullptr;
Point2 drop_pos;
EditorData *editor_data;
CanvasItemEditor *canvas_item_editor;
Control *preview_node;
AcceptDialog *accept;
AcceptDialog *selector;
Label *selector_label;
Label *label;
Label *label_desc;
VBoxContainer *btn_group;
EditorData *editor_data = nullptr;
CanvasItemEditor *canvas_item_editor = nullptr;
Control *preview_node = nullptr;
AcceptDialog *accept = nullptr;
AcceptDialog *selector = nullptr;
Label *selector_label = nullptr;
Label *label = nullptr;
Label *label_desc = nullptr;
VBoxContainer *btn_group = nullptr;
Ref<ButtonGroup> button_group;
void _on_mouse_exit();

View File

@@ -37,7 +37,7 @@
class CollisionPolygon2DEditor : public AbstractPolygon2DEditor {
GDCLASS(CollisionPolygon2DEditor, AbstractPolygon2DEditor);
CollisionPolygon2D *node;
CollisionPolygon2D *node = nullptr;
protected:
virtual Node2D *_get_node() const override;

View File

@@ -61,9 +61,9 @@ class CollisionShape2DEditor : public Control {
Point2(1, -1),
};
UndoRedo *undo_redo;
CanvasItemEditor *canvas_item_editor;
CollisionShape2D *node;
UndoRedo *undo_redo = nullptr;
CanvasItemEditor *canvas_item_editor = nullptr;
CollisionShape2D *node = nullptr;
Vector<Point2> handles;
@@ -96,7 +96,7 @@ public:
class CollisionShape2DEditorPlugin : public EditorPlugin {
GDCLASS(CollisionShape2DEditorPlugin, EditorPlugin);
CollisionShape2DEditor *collision_shape_2d_editor;
CollisionShape2DEditor *collision_shape_2d_editor = nullptr;
public:
virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return collision_shape_2d_editor->forward_canvas_gui_input(p_event); }

View File

@@ -70,7 +70,7 @@ public:
class EditorPropertyAnchorsPreset : public EditorProperty {
GDCLASS(EditorPropertyAnchorsPreset, EditorProperty);
OptionButton *options;
OptionButton *options = nullptr;
void _option_selected(int p_which);
@@ -94,9 +94,9 @@ class EditorPropertySizeFlags : public EditorProperty {
SIZE_FLAGS_PRESET_CUSTOM,
};
OptionButton *flag_presets;
CheckBox *flag_expand;
VBoxContainer *flag_options;
OptionButton *flag_presets = nullptr;
CheckBox *flag_expand = nullptr;
VBoxContainer *flag_options = nullptr;
Vector<CheckBox *> flag_checks;
bool vertical = false;
@@ -128,8 +128,8 @@ public:
class ControlEditorToolbar : public HBoxContainer {
GDCLASS(ControlEditorToolbar, HBoxContainer);
UndoRedo *undo_redo;
EditorSelection *editor_selection;
UndoRedo *undo_redo = nullptr;
EditorSelection *editor_selection = nullptr;
enum MenuOption {
ANCHORS_AND_OFFSETS_PRESET_TOP_LEFT,
@@ -198,12 +198,12 @@ class ControlEditorToolbar : public HBoxContainer {
CONTAINERS_V_PRESET_SHRINK_END,
};
MenuButton *anchor_presets_menu;
PopupMenu *anchors_popup;
MenuButton *container_h_presets_menu;
MenuButton *container_v_presets_menu;
MenuButton *anchor_presets_menu = nullptr;
PopupMenu *anchors_popup = nullptr;
MenuButton *container_h_presets_menu = nullptr;
MenuButton *container_v_presets_menu = nullptr;
Button *anchor_mode_button;
Button *anchor_mode_button = nullptr;
bool anchors_mode = false;
@@ -239,7 +239,7 @@ public:
class ControlEditorPlugin : public EditorPlugin {
GDCLASS(ControlEditorPlugin, EditorPlugin);
ControlEditorToolbar *toolbar;
ControlEditorToolbar *toolbar = nullptr;
public:
virtual String get_name() const override { return "Control"; }

View File

@@ -55,22 +55,22 @@ class CPUParticles2DEditorPlugin : public EditorPlugin {
EMISSION_MODE_BORDER_DIRECTED
};
CPUParticles2D *particles;
CPUParticles2D *particles = nullptr;
EditorFileDialog *file;
EditorFileDialog *file = nullptr;
HBoxContainer *toolbar;
MenuButton *menu;
HBoxContainer *toolbar = nullptr;
MenuButton *menu = nullptr;
SpinBox *epoints;
SpinBox *epoints = nullptr;
ConfirmationDialog *emission_mask;
OptionButton *emission_mask_mode;
CheckBox *emission_colors;
ConfirmationDialog *emission_mask = nullptr;
OptionButton *emission_mask_mode = nullptr;
CheckBox *emission_colors = nullptr;
String source_emission_file;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
void _file_selected(const String &p_file);
void _menu_callback(int p_idx);
void _generate_emission_mask();

View File

@@ -44,7 +44,7 @@ class CPUParticles3DEditor : public GPUParticles3DEditorBase {
};
CPUParticles3D *node;
CPUParticles3D *node = nullptr;
void _menu_option(int);
@@ -65,7 +65,7 @@ public:
class CPUParticles3DEditorPlugin : public EditorPlugin {
GDCLASS(CPUParticles3DEditorPlugin, EditorPlugin);
CPUParticles3DEditor *particles_editor;
CPUParticles3DEditor *particles_editor = nullptr;
public:
virtual String get_name() const override { return "CPUParticles3D"; }

View File

@@ -99,8 +99,8 @@ private:
Transform2D _world_to_view;
Ref<Curve> _curve_ref;
PopupMenu *_context_menu;
PopupMenu *_presets_menu;
PopupMenu *_context_menu = nullptr;
PopupMenu *_presets_menu = nullptr;
Array _undo_data;
bool _has_undo_data;

View File

@@ -41,9 +41,9 @@ class DebuggerEditorPlugin : public EditorPlugin {
GDCLASS(DebuggerEditorPlugin, EditorPlugin);
private:
MenuButton *debug_menu;
EditorFileServer *file_server;
PopupMenu *instances_menu;
MenuButton *debug_menu = nullptr;
EditorFileServer *file_server = nullptr;
PopupMenu *instances_menu = nullptr;
enum MenuOptions {
RUN_FILE_SERVER,

View File

@@ -56,26 +56,26 @@ class GPUParticles2DEditorPlugin : public EditorPlugin {
EMISSION_MODE_BORDER_DIRECTED
};
GPUParticles2D *particles;
GPUParticles2D *particles = nullptr;
List<GPUParticles2D *> selected_particles;
EditorFileDialog *file;
EditorFileDialog *file = nullptr;
HBoxContainer *toolbar;
MenuButton *menu;
HBoxContainer *toolbar = nullptr;
MenuButton *menu = nullptr;
SpinBox *epoints;
SpinBox *epoints = nullptr;
ConfirmationDialog *generate_visibility_rect;
SpinBox *generate_seconds;
ConfirmationDialog *generate_visibility_rect = nullptr;
SpinBox *generate_seconds = nullptr;
ConfirmationDialog *emission_mask;
OptionButton *emission_mask_mode;
CheckBox *emission_colors;
ConfirmationDialog *emission_mask = nullptr;
OptionButton *emission_mask_mode = nullptr;
CheckBox *emission_colors = nullptr;
String source_emission_file;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
void _file_selected(const String &p_file);
void _menu_callback(int p_idx);
void _generate_visibility_rect();

View File

@@ -41,16 +41,16 @@ class GPUParticles3DEditorBase : public Control {
GDCLASS(GPUParticles3DEditorBase, Control);
protected:
Node3D *base_node;
Panel *panel;
MenuButton *options;
HBoxContainer *particles_editor_hb;
Node3D *base_node = nullptr;
Panel *panel = nullptr;
MenuButton *options = nullptr;
HBoxContainer *particles_editor_hb = nullptr;
SceneTreeDialog *emission_tree_dialog;
SceneTreeDialog *emission_tree_dialog = nullptr;
ConfirmationDialog *emission_dialog;
SpinBox *emission_amount;
OptionButton *emission_fill;
ConfirmationDialog *emission_dialog = nullptr;
SpinBox *emission_amount = nullptr;
OptionButton *emission_fill = nullptr;
Vector<Face3> geometry;
@@ -67,9 +67,9 @@ public:
class GPUParticles3DEditor : public GPUParticles3DEditorBase {
GDCLASS(GPUParticles3DEditor, GPUParticles3DEditorBase);
ConfirmationDialog *generate_aabb;
SpinBox *generate_seconds;
GPUParticles3D *node;
ConfirmationDialog *generate_aabb = nullptr;
SpinBox *generate_seconds = nullptr;
GPUParticles3D *node = nullptr;
enum Menu {
MENU_OPTION_GENERATE_AABB,
@@ -101,7 +101,7 @@ public:
class GPUParticles3DEditorPlugin : public EditorPlugin {
GDCLASS(GPUParticles3DEditorPlugin, EditorPlugin);
GPUParticles3DEditor *particles_editor;
GPUParticles3DEditor *particles_editor = nullptr;
public:
virtual String get_name() const override { return "GPUParticles3D"; }

View File

@@ -41,12 +41,12 @@ class EditorFileDialog;
class GPUParticlesCollisionSDF3DEditorPlugin : public EditorPlugin {
GDCLASS(GPUParticlesCollisionSDF3DEditorPlugin, EditorPlugin);
GPUParticlesCollisionSDF3D *col_sdf;
GPUParticlesCollisionSDF3D *col_sdf = nullptr;
HBoxContainer *bake_hb;
Button *bake;
HBoxContainer *bake_hb = nullptr;
Button *bake = nullptr;
EditorFileDialog *probe_file;
EditorFileDialog *probe_file = nullptr;
static EditorProgress *tmp_progress;
static void bake_func_begin(int p_steps);

View File

@@ -65,9 +65,9 @@ class GradientReverseButton : public BaseButton {
class EditorInspectorPluginGradient : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
GradientEditor *editor;
HBoxContainer *gradient_tools_hbox;
GradientReverseButton *reverse_btn;
GradientEditor *editor = nullptr;
HBoxContainer *gradient_tools_hbox = nullptr;
GradientReverseButton *reverse_btn = nullptr;
void _reverse_button_pressed();

View File

@@ -38,11 +38,11 @@
class InputEventConfigContainer : public HBoxContainer {
GDCLASS(InputEventConfigContainer, HBoxContainer);
Label *input_event_text;
Button *open_config_button;
Label *input_event_text = nullptr;
Button *open_config_button = nullptr;
Ref<InputEvent> input_event;
InputEventConfigurationDialog *config_dialog;
InputEventConfigurationDialog *config_dialog = nullptr;
void _config_dialog_confirmed();
void _configure_pressed();

View File

@@ -37,7 +37,7 @@
class LightOccluder2DEditor : public AbstractPolygon2DEditor {
GDCLASS(LightOccluder2DEditor, AbstractPolygon2DEditor);
LightOccluder2D *node;
LightOccluder2D *node = nullptr;
Ref<OccluderPolygon2D> _ensure_occluder() const;

View File

@@ -41,11 +41,11 @@ class EditorFileDialog;
class LightmapGIEditorPlugin : public EditorPlugin {
GDCLASS(LightmapGIEditorPlugin, EditorPlugin);
LightmapGI *lightmap;
LightmapGI *lightmap = nullptr;
Button *bake;
Button *bake = nullptr;
EditorFileDialog *file_dialog;
EditorFileDialog *file_dialog = nullptr;
static EditorProgress *tmp_progress;
static bool bake_func_step(float p_progress, const String &p_description, void *, bool p_refresh);
static void bake_func_end(uint64_t p_time_started);

View File

@@ -37,7 +37,7 @@
class Line2DEditor : public AbstractPolygon2DEditor {
GDCLASS(Line2DEditor, AbstractPolygon2DEditor);
Line2D *node;
Line2D *node = nullptr;
protected:
virtual Node2D *_get_node() const override;

View File

@@ -44,17 +44,17 @@ class MeshEditor : public SubViewportContainer {
float rot_x;
float rot_y;
SubViewport *viewport;
MeshInstance3D *mesh_instance;
Node3D *rotation;
DirectionalLight3D *light1;
DirectionalLight3D *light2;
Camera3D *camera;
SubViewport *viewport = nullptr;
MeshInstance3D *mesh_instance = nullptr;
Node3D *rotation = nullptr;
DirectionalLight3D *light1 = nullptr;
DirectionalLight3D *light2 = nullptr;
Camera3D *camera = nullptr;
Ref<Mesh> mesh;
TextureButton *light_1_switch;
TextureButton *light_2_switch;
TextureButton *light_1_switch = nullptr;
TextureButton *light_2_switch = nullptr;
void _button_pressed(Node *p_button);
bool first_enter;

View File

@@ -51,17 +51,17 @@ class MeshInstance3DEditor : public Control {
MENU_OPTION_DEBUG_UV2,
};
MeshInstance3D *node;
MeshInstance3D *node = nullptr;
MenuButton *options;
MenuButton *options = nullptr;
ConfirmationDialog *outline_dialog;
SpinBox *outline_size;
ConfirmationDialog *outline_dialog = nullptr;
SpinBox *outline_size = nullptr;
AcceptDialog *err_dialog;
AcceptDialog *err_dialog = nullptr;
AcceptDialog *debug_uv_dialog;
Control *debug_uv;
AcceptDialog *debug_uv_dialog = nullptr;
Control *debug_uv = nullptr;
Vector<Vector2> uv_lines;
void _menu_option(int p_option);
@@ -84,7 +84,7 @@ public:
class MeshInstance3DEditorPlugin : public EditorPlugin {
GDCLASS(MeshInstance3DEditorPlugin, EditorPlugin);
MeshInstance3DEditor *mesh_editor;
MeshInstance3DEditor *mesh_editor = nullptr;
public:
virtual String get_name() const override { return "MeshInstance3D"; }

View File

@@ -43,10 +43,10 @@ class MeshLibraryEditor : public Control {
Ref<MeshLibrary> mesh_library;
MenuButton *menu;
ConfirmationDialog *cd_remove;
ConfirmationDialog *cd_update;
EditorFileDialog *file;
MenuButton *menu = nullptr;
ConfirmationDialog *cd_remove = nullptr;
ConfirmationDialog *cd_update = nullptr;
EditorFileDialog *file = nullptr;
bool apply_xforms;
int to_erase;
@@ -81,7 +81,7 @@ public:
class MeshLibraryEditorPlugin : public EditorPlugin {
GDCLASS(MeshLibraryEditorPlugin, EditorPlugin);
MeshLibraryEditor *mesh_library_editor;
MeshLibraryEditor *mesh_library_editor = nullptr;
public:
virtual String get_name() const override { return "MeshLibrary"; }

View File

@@ -43,26 +43,26 @@ class MultiMeshEditor : public Control {
friend class MultiMeshEditorPlugin;
AcceptDialog *err_dialog;
MenuButton *options;
MultiMeshInstance3D *_last_pp_node;
AcceptDialog *err_dialog = nullptr;
MenuButton *options = nullptr;
MultiMeshInstance3D *_last_pp_node = nullptr;
bool browsing_source;
Panel *panel;
MultiMeshInstance3D *node;
Panel *panel = nullptr;
MultiMeshInstance3D *node = nullptr;
LineEdit *surface_source;
LineEdit *mesh_source;
LineEdit *surface_source = nullptr;
LineEdit *mesh_source = nullptr;
SceneTreeDialog *std;
SceneTreeDialog *std = nullptr;
ConfirmationDialog *populate_dialog;
OptionButton *populate_axis;
HSlider *populate_rotate_random;
HSlider *populate_tilt_random;
SpinBox *populate_scale_random;
SpinBox *populate_scale;
SpinBox *populate_amount;
ConfirmationDialog *populate_dialog = nullptr;
OptionButton *populate_axis = nullptr;
HSlider *populate_rotate_random = nullptr;
HSlider *populate_tilt_random = nullptr;
SpinBox *populate_scale_random = nullptr;
SpinBox *populate_scale = nullptr;
SpinBox *populate_amount = nullptr;
enum Menu {
MENU_OPTION_POPULATE
@@ -85,7 +85,7 @@ public:
class MultiMeshEditorPlugin : public EditorPlugin {
GDCLASS(MultiMeshEditorPlugin, EditorPlugin);
MultiMeshEditor *multimesh_editor;
MultiMeshEditor *multimesh_editor = nullptr;
public:
virtual String get_name() const override { return "MultiMesh"; }

View File

@@ -37,7 +37,7 @@
class NavigationPolygonEditor : public AbstractPolygon2DEditor {
GDCLASS(NavigationPolygonEditor, AbstractPolygon2DEditor);
NavigationRegion2D *node;
NavigationRegion2D *node = nullptr;
Ref<NavigationPolygon> _ensure_navpoly() const;

View File

@@ -70,14 +70,14 @@ class EditorNode3DGizmo : public Node3DGizmo {
bool valid;
bool hidden;
Vector<Instance> instances;
Node3D *spatial_node;
Node3D *spatial_node = nullptr;
void _set_spatial_node(Node *p_node) { set_spatial_node(Object::cast_to<Node3D>(p_node)); }
protected:
static void _bind_methods();
EditorNode3DGizmoPlugin *gizmo_plugin;
EditorNode3DGizmoPlugin *gizmo_plugin = nullptr;
GDVIRTUAL0(_redraw)
GDVIRTUAL2RC(String, _get_handle_name, int, bool)
@@ -618,7 +618,7 @@ public:
class Joint3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(Joint3DGizmoPlugin, EditorNode3DGizmoPlugin);
Timer *update_timer;
Timer *update_timer = nullptr;
uint64_t update_idx = 0;
void incremental_update_gizmos();

View File

@@ -190,27 +190,27 @@ private:
ViewType view_type;
void _menu_option(int p_option);
void _set_auto_orthogonal();
Node3D *preview_node;
AABB *preview_bounds;
Node3D *preview_node = nullptr;
AABB *preview_bounds = nullptr;
Vector<String> selected_files;
AcceptDialog *accept;
AcceptDialog *accept = nullptr;
Node *target_node;
Node *target_node = nullptr;
Point2 drop_pos;
EditorData *editor_data;
EditorSelection *editor_selection;
UndoRedo *undo_redo;
EditorData *editor_data = nullptr;
EditorSelection *editor_selection = nullptr;
UndoRedo *undo_redo = nullptr;
CheckBox *preview_camera;
SubViewportContainer *subviewport_container;
CheckBox *preview_camera = nullptr;
SubViewportContainer *subviewport_container = nullptr;
MenuButton *view_menu;
PopupMenu *display_submenu;
MenuButton *view_menu = nullptr;
PopupMenu *display_submenu = nullptr;
Control *surface;
SubViewport *viewport;
Camera3D *camera;
Control *surface = nullptr;
SubViewport *viewport = nullptr;
Camera3D *camera = nullptr;
bool transforming;
bool orthogonal;
bool auto_orthogonal;
@@ -221,17 +221,17 @@ private:
real_t freelook_speed;
Vector2 previous_mouse_position;
Label *info_label;
Label *cinema_label;
Label *locked_label;
Label *zoom_limit_label;
Label *info_label = nullptr;
Label *cinema_label = nullptr;
Label *locked_label = nullptr;
Label *zoom_limit_label = nullptr;
VBoxContainer *top_right_vbox;
ViewportRotationControl *rotation_control;
Gradient *frame_time_gradient;
Label *cpu_time_label;
Label *gpu_time_label;
Label *fps_label;
VBoxContainer *top_right_vbox = nullptr;
ViewportRotationControl *rotation_control = nullptr;
Gradient *frame_time_gradient = nullptr;
Label *cpu_time_label = nullptr;
Label *gpu_time_label = nullptr;
Label *fps_label = nullptr;
struct _RayResult {
Node3D *item = nullptr;
@@ -274,7 +274,7 @@ private:
bool clicked_wants_append;
bool selection_in_progress = false;
PopupMenu *selection_menu;
PopupMenu *selection_menu = nullptr;
enum NavigationZoomStyle {
NAVIGATION_ZOOM_VERTICAL,
@@ -375,9 +375,9 @@ private:
void _sinput(const Ref<InputEvent> &p_event);
void _update_freelook(real_t delta);
Node3DEditor *spatial_editor;
Node3DEditor *spatial_editor = nullptr;
Camera3D *previewing;
Camera3D *previewing = nullptr;
Camera3D *preview = nullptr;
bool previewing_cinema;
@@ -455,7 +455,7 @@ public:
Transform3D original_local;
Transform3D last_xform; // last transform
bool last_xform_dirty;
Node3D *sp;
Node3D *sp = nullptr;
RID sbox_instance;
RID sbox_instance_offset;
RID sbox_instance_xray;
@@ -537,13 +537,13 @@ public:
};
private:
EditorSelection *editor_selection;
EditorSelection *editor_selection = nullptr;
Node3DEditorViewportContainer *viewport_base;
Node3DEditorViewportContainer *viewport_base = nullptr;
Node3DEditorViewport *viewports[VIEWPORTS_COUNT];
VSplitContainer *shader_split;
HSplitContainer *left_panel_split;
HSplitContainer *right_panel_split;
VSplitContainer *shader_split = nullptr;
HSplitContainer *left_panel_split = nullptr;
HSplitContainer *right_panel_split = nullptr;
/////
@@ -588,7 +588,7 @@ private:
Ref<StandardMaterial3D> cursor_material;
// Scene drag and drop support
Node3D *preview_node;
Node3D *preview_node = nullptr;
AABB preview_bounds;
struct Gizmo {
@@ -628,31 +628,31 @@ private:
Button *tool_button[TOOL_MAX];
Button *tool_option_button[TOOL_OPT_MAX];
MenuButton *transform_menu;
PopupMenu *gizmos_menu;
MenuButton *view_menu;
MenuButton *transform_menu = nullptr;
PopupMenu *gizmos_menu = nullptr;
MenuButton *view_menu = nullptr;
AcceptDialog *accept;
AcceptDialog *accept = nullptr;
ConfirmationDialog *snap_dialog;
ConfirmationDialog *xform_dialog;
ConfirmationDialog *settings_dialog;
ConfirmationDialog *snap_dialog = nullptr;
ConfirmationDialog *xform_dialog = nullptr;
ConfirmationDialog *settings_dialog = nullptr;
bool snap_enabled;
bool snap_key_enabled;
LineEdit *snap_translate;
LineEdit *snap_rotate;
LineEdit *snap_scale;
LineEdit *snap_translate = nullptr;
LineEdit *snap_rotate = nullptr;
LineEdit *snap_scale = nullptr;
LineEdit *xform_translate[3];
LineEdit *xform_rotate[3];
LineEdit *xform_scale[3];
OptionButton *xform_type;
OptionButton *xform_type = nullptr;
VBoxContainer *settings_vbc;
SpinBox *settings_fov;
SpinBox *settings_znear;
SpinBox *settings_zfar;
VBoxContainer *settings_vbc = nullptr;
SpinBox *settings_fov = nullptr;
SpinBox *settings_znear = nullptr;
SpinBox *settings_zfar = nullptr;
void _snap_changed();
void _snap_update();
@@ -662,14 +662,14 @@ private:
void _menu_gizmo_toggled(int p_option);
void _update_camera_override_button(bool p_game_running);
void _update_camera_override_viewport(Object *p_viewport);
HBoxContainer *hbc_menu;
HBoxContainer *hbc_menu = nullptr;
// Used for secondary menu items which are displayed depending on the currently selected node
// (such as MeshInstance's "Mesh" menu).
PanelContainer *context_menu_container;
HBoxContainer *hbc_context_menu;
PanelContainer *context_menu_container = nullptr;
HBoxContainer *hbc_context_menu = nullptr;
void _generate_selection_boxes();
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
int camera_override_viewport_id;
@@ -683,13 +683,13 @@ private:
void _toggle_maximize_view(Object *p_viewport);
Node *custom_camera;
Node *custom_camera = nullptr;
Object *_get_editor_data(Object *p_what);
Ref<Environment> viewport_environment;
Node3D *selected;
Node3D *selected = nullptr;
void _request_gizmo(Object *p_obj);
void _set_subgizmo_selection(Object *p_obj, Ref<Node3DGizmo> p_gizmo, int p_id, Transform3D p_transform = Transform3D());
@@ -712,18 +712,18 @@ private:
uint32_t world_env_count = 0;
uint32_t directional_light_count = 0;
Button *sun_button;
Label *sun_state;
Label *sun_title;
VBoxContainer *sun_vb;
Popup *sun_environ_popup;
Control *sun_direction;
EditorSpinSlider *sun_angle_altitude;
EditorSpinSlider *sun_angle_azimuth;
ColorPickerButton *sun_color;
EditorSpinSlider *sun_energy;
EditorSpinSlider *sun_max_distance;
Button *sun_add_to_scene;
Button *sun_button = nullptr;
Label *sun_state = nullptr;
Label *sun_title = nullptr;
VBoxContainer *sun_vb = nullptr;
Popup *sun_environ_popup = nullptr;
Control *sun_direction = nullptr;
EditorSpinSlider *sun_angle_altitude = nullptr;
EditorSpinSlider *sun_angle_azimuth = nullptr;
ColorPickerButton *sun_color = nullptr;
EditorSpinSlider *sun_energy = nullptr;
EditorSpinSlider *sun_max_distance = nullptr;
Button *sun_add_to_scene = nullptr;
void _sun_direction_draw();
void _sun_direction_input(const Ref<InputEvent> &p_event);
@@ -734,23 +734,23 @@ private:
Ref<Shader> sun_direction_shader;
Ref<ShaderMaterial> sun_direction_material;
Button *environ_button;
Label *environ_state;
Label *environ_title;
VBoxContainer *environ_vb;
ColorPickerButton *environ_sky_color;
ColorPickerButton *environ_ground_color;
EditorSpinSlider *environ_energy;
Button *environ_ao_button;
Button *environ_glow_button;
Button *environ_tonemap_button;
Button *environ_gi_button;
Button *environ_add_to_scene;
Button *environ_button = nullptr;
Label *environ_state = nullptr;
Label *environ_title = nullptr;
VBoxContainer *environ_vb = nullptr;
ColorPickerButton *environ_sky_color = nullptr;
ColorPickerButton *environ_ground_color = nullptr;
EditorSpinSlider *environ_energy = nullptr;
Button *environ_ao_button = nullptr;
Button *environ_glow_button = nullptr;
Button *environ_tonemap_button = nullptr;
Button *environ_gi_button = nullptr;
Button *environ_add_to_scene = nullptr;
Button *sun_environ_settings;
Button *sun_environ_settings = nullptr;
DirectionalLight3D *preview_sun;
WorldEnvironment *preview_environment;
DirectionalLight3D *preview_sun = nullptr;
WorldEnvironment *preview_environment = nullptr;
Ref<Environment> environment;
Ref<ProceduralSkyMaterial> sky_material;
@@ -868,7 +868,7 @@ public:
class Node3DEditorPlugin : public EditorPlugin {
GDCLASS(Node3DEditorPlugin, EditorPlugin);
Node3DEditor *spatial_editor;
Node3DEditor *spatial_editor = nullptr;
public:
Node3DEditor *get_spatial_editor() { return spatial_editor; }

View File

@@ -40,11 +40,11 @@ class EditorFileDialog;
class OccluderInstance3DEditorPlugin : public EditorPlugin {
GDCLASS(OccluderInstance3DEditorPlugin, EditorPlugin);
OccluderInstance3D *occluder_instance;
OccluderInstance3D *occluder_instance = nullptr;
Button *bake;
Button *bake = nullptr;
EditorFileDialog *file_dialog;
EditorFileDialog *file_dialog = nullptr;
void _bake_select_file(const String &p_file);
void _bake();

View File

@@ -38,7 +38,7 @@
class OpenTypeFeaturesEditor : public EditorProperty {
GDCLASS(OpenTypeFeaturesEditor, EditorProperty);
EditorSpinSlider *spin;
EditorSpinSlider *spin = nullptr;
bool setting = true;
void _value_changed(double p_val);
Button *button = nullptr;

View File

@@ -40,14 +40,14 @@ class CanvasItemEditor;
class Path2DEditor : public HBoxContainer {
GDCLASS(Path2DEditor, HBoxContainer);
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
CanvasItemEditor *canvas_item_editor;
Panel *panel;
Path2D *node;
CanvasItemEditor *canvas_item_editor = nullptr;
Panel *panel = nullptr;
Path2D *node = nullptr;
HBoxContainer *base_hb;
Separator *sep;
HBoxContainer *base_hb = nullptr;
Separator *sep = nullptr;
enum Mode {
MODE_CREATE,
@@ -58,12 +58,12 @@ class Path2DEditor : public HBoxContainer {
};
Mode mode;
Button *curve_create;
Button *curve_edit;
Button *curve_edit_curve;
Button *curve_del;
Button *curve_close;
MenuButton *handle_menu;
Button *curve_create = nullptr;
Button *curve_edit = nullptr;
Button *curve_edit_curve = nullptr;
Button *curve_del = nullptr;
Button *curve_close = nullptr;
MenuButton *handle_menu = nullptr;
bool mirror_handle_angle;
bool mirror_handle_length;
@@ -110,7 +110,7 @@ public:
class Path2DEditorPlugin : public EditorPlugin {
GDCLASS(Path2DEditorPlugin, EditorPlugin);
Path2DEditor *path2d_editor;
Path2DEditor *path2d_editor = nullptr;
public:
virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) override { return path2d_editor->forward_gui_input(p_event); }

View File

@@ -40,7 +40,7 @@
class Path3DGizmo : public EditorNode3DGizmo {
GDCLASS(Path3DGizmo, EditorNode3DGizmo);
Path3D *path;
Path3D *path = nullptr;
mutable Vector3 original;
mutable float orig_in_length;
mutable float orig_out_length;
@@ -70,14 +70,14 @@ public:
class Path3DEditorPlugin : public EditorPlugin {
GDCLASS(Path3DEditorPlugin, EditorPlugin);
Separator *sep;
Button *curve_create;
Button *curve_edit;
Button *curve_del;
Button *curve_close;
MenuButton *handle_menu;
Separator *sep = nullptr;
Button *curve_create = nullptr;
Button *curve_edit = nullptr;
Button *curve_del = nullptr;
Button *curve_close = nullptr;
MenuButton *handle_menu = nullptr;
Path3D *path;
Path3D *path = nullptr;
void _update_theme();

View File

@@ -39,8 +39,8 @@
class PhysicalBone3DEditor : public Object {
GDCLASS(PhysicalBone3DEditor, Object);
HBoxContainer *spatial_editor_hb;
Button *button_transform_joint;
HBoxContainer *spatial_editor_hb = nullptr;
Button *button_transform_joint = nullptr;
PhysicalBone3D *selected = nullptr;

View File

@@ -68,38 +68,38 @@ class Polygon2DEditor : public AbstractPolygon2DEditor {
Button *uv_edit_mode[4];
Ref<ButtonGroup> uv_edit_group;
Polygon2D *node;
Polygon2D *node = nullptr;
UVMode uv_mode;
AcceptDialog *uv_edit;
AcceptDialog *uv_edit = nullptr;
Button *uv_button[UV_MODE_MAX];
Button *b_snap_enable;
Button *b_snap_grid;
Panel *uv_edit_draw;
HSlider *uv_zoom;
SpinBox *uv_zoom_value;
HScrollBar *uv_hscroll;
VScrollBar *uv_vscroll;
MenuButton *uv_menu;
TextureRect *uv_icon_zoom;
Button *b_snap_enable = nullptr;
Button *b_snap_grid = nullptr;
Panel *uv_edit_draw = nullptr;
HSlider *uv_zoom = nullptr;
SpinBox *uv_zoom_value = nullptr;
HScrollBar *uv_hscroll = nullptr;
VScrollBar *uv_vscroll = nullptr;
MenuButton *uv_menu = nullptr;
TextureRect *uv_icon_zoom = nullptr;
Ref<ViewPanner> uv_panner;
void _uv_scroll_callback(Vector2 p_scroll_vec, bool p_alt);
void _uv_pan_callback(Vector2 p_scroll_vec);
void _uv_zoom_callback(Vector2 p_scroll_vec, Vector2 p_origin, bool p_alt);
VBoxContainer *bone_scroll_main_vb;
ScrollContainer *bone_scroll;
VBoxContainer *bone_scroll_vb;
Button *sync_bones;
HSlider *bone_paint_strength;
SpinBox *bone_paint_radius;
Label *bone_paint_radius_label;
VBoxContainer *bone_scroll_main_vb = nullptr;
ScrollContainer *bone_scroll = nullptr;
VBoxContainer *bone_scroll_vb = nullptr;
Button *sync_bones = nullptr;
HSlider *bone_paint_strength = nullptr;
SpinBox *bone_paint_radius = nullptr;
Label *bone_paint_radius_label = nullptr;
bool bone_painting;
int bone_painting_bone;
Vector<float> prev_weights;
Vector2 bone_paint_pos;
AcceptDialog *grid_settings;
AcceptDialog *grid_settings = nullptr;
void _sync_bones();
void _update_bone_list();
@@ -123,9 +123,9 @@ class Polygon2DEditor : public AbstractPolygon2DEditor {
Vector2 uv_drag_from;
bool updating_uv_scroll;
AcceptDialog *error;
AcceptDialog *error = nullptr;
Button *button_uv;
Button *button_uv = nullptr;
bool use_snap;
bool snap_show_grid;

View File

@@ -41,7 +41,7 @@ class CanvasItemEditor;
class Polygon3DEditor : public HBoxContainer {
GDCLASS(Polygon3DEditor, HBoxContainer);
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
enum Mode {
MODE_CREATE,
MODE_EDIT,
@@ -50,21 +50,21 @@ class Polygon3DEditor : public HBoxContainer {
Mode mode;
Button *button_create;
Button *button_edit;
Button *button_create = nullptr;
Button *button_edit = nullptr;
Ref<StandardMaterial3D> line_material;
Ref<StandardMaterial3D> handle_material;
Panel *panel;
Node3D *node;
Panel *panel = nullptr;
Node3D *node = nullptr;
Ref<Resource> node_resource;
Ref<ImmediateMesh> imesh;
MeshInstance3D *imgeom;
MeshInstance3D *pointsm;
MeshInstance3D *imgeom = nullptr;
MeshInstance3D *pointsm = nullptr;
Ref<ArrayMesh> m;
MenuButton *options;
MenuButton *options = nullptr;
int edited_point;
Vector2 edited_point_pos;
@@ -98,7 +98,7 @@ public:
class Polygon3DEditorPlugin : public EditorPlugin {
GDCLASS(Polygon3DEditorPlugin, EditorPlugin);
Polygon3DEditor *polygon_editor;
Polygon3DEditor *polygon_editor = nullptr;
public:
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override { return polygon_editor->forward_spatial_gui_input(p_camera, p_event); }

View File

@@ -51,7 +51,7 @@ private:
Ref<SceneReplicationConfig> config;
NodePath deleting;
Tree *tree;
Tree *tree = nullptr;
bool keying = false;
Ref<Texture2D> _get_class_icon(const Node *p_node);
@@ -84,7 +84,7 @@ class ReplicationEditorPlugin : public EditorPlugin {
GDCLASS(ReplicationEditorPlugin, EditorPlugin);
private:
ReplicationEditor *repl_editor;
ReplicationEditor *repl_editor = nullptr;
void _node_removed(Node *p_node);
void _keying_changed();

View File

@@ -47,16 +47,16 @@ class ResourcePreloaderEditor : public PanelContainer {
BUTTON_REMOVE
};
Button *load;
Button *paste;
Tree *tree;
Button *load = nullptr;
Button *paste = nullptr;
Tree *tree = nullptr;
bool loading_scene;
EditorFileDialog *file;
EditorFileDialog *file = nullptr;
AcceptDialog *dialog;
AcceptDialog *dialog = nullptr;
ResourcePreloader *preloader;
ResourcePreloader *preloader = nullptr;
void _load_pressed();
void _files_load_request(const Vector<String> &p_paths);
@@ -66,7 +66,7 @@ class ResourcePreloaderEditor : public PanelContainer {
void _cell_button_pressed(Object *p_item, int p_column, int p_id);
void _item_edited();
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
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;
@@ -87,8 +87,8 @@ public:
class ResourcePreloaderEditorPlugin : public EditorPlugin {
GDCLASS(ResourcePreloaderEditorPlugin, EditorPlugin);
ResourcePreloaderEditor *preloader_editor;
Button *button;
ResourcePreloaderEditor *preloader_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "ResourcePreloader"; }

View File

@@ -38,12 +38,12 @@
class EditorPropertyRootMotion : public EditorProperty {
GDCLASS(EditorPropertyRootMotion, EditorProperty);
Button *assign;
Button *clear;
Button *assign = nullptr;
Button *clear = nullptr;
NodePath base_hint;
ConfirmationDialog *filter_dialog;
Tree *filters;
ConfirmationDialog *filter_dialog = nullptr;
Tree *filters = nullptr;
void _confirmed();
void _node_assign();

View File

@@ -102,8 +102,8 @@ public:
class ScriptEditorQuickOpen : public ConfirmationDialog {
GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog);
LineEdit *search_box;
Tree *search_options;
LineEdit *search_box = nullptr;
Tree *search_options = nullptr;
String function;
void _update_search();
@@ -242,55 +242,55 @@ class ScriptEditor : public PanelContainer {
DISPLAY_FULL_PATH,
};
HBoxContainer *menu_hb;
MenuButton *file_menu;
MenuButton *edit_menu;
MenuButton *script_search_menu;
MenuButton *debug_menu;
PopupMenu *context_menu;
Timer *autosave_timer;
HBoxContainer *menu_hb = nullptr;
MenuButton *file_menu = nullptr;
MenuButton *edit_menu = nullptr;
MenuButton *script_search_menu = nullptr;
MenuButton *debug_menu = nullptr;
PopupMenu *context_menu = nullptr;
Timer *autosave_timer = nullptr;
uint64_t idle;
PopupMenu *recent_scripts;
PopupMenu *theme_submenu;
PopupMenu *recent_scripts = nullptr;
PopupMenu *theme_submenu = nullptr;
Button *help_search;
Button *site_search;
EditorHelpSearch *help_search_dialog;
Button *help_search = nullptr;
Button *site_search = nullptr;
EditorHelpSearch *help_search_dialog = nullptr;
ItemList *script_list;
HSplitContainer *script_split;
ItemList *members_overview;
LineEdit *filter_scripts;
LineEdit *filter_methods;
VBoxContainer *scripts_vbox;
VBoxContainer *overview_vbox;
HBoxContainer *buttons_hbox;
Label *filename;
Button *members_overview_alphabeta_sort_button;
ItemList *script_list = nullptr;
HSplitContainer *script_split = nullptr;
ItemList *members_overview = nullptr;
LineEdit *filter_scripts = nullptr;
LineEdit *filter_methods = nullptr;
VBoxContainer *scripts_vbox = nullptr;
VBoxContainer *overview_vbox = nullptr;
HBoxContainer *buttons_hbox = nullptr;
Label *filename = nullptr;
Button *members_overview_alphabeta_sort_button = nullptr;
bool members_overview_enabled;
ItemList *help_overview;
ItemList *help_overview = nullptr;
bool help_overview_enabled;
VSplitContainer *list_split;
TabContainer *tab_container;
EditorFileDialog *file_dialog;
AcceptDialog *error_dialog;
ConfirmationDialog *erase_tab_confirm;
ScriptCreateDialog *script_create_dialog;
Button *scripts_visible;
FindReplaceBar *find_replace_bar;
VSplitContainer *list_split = nullptr;
TabContainer *tab_container = nullptr;
EditorFileDialog *file_dialog = nullptr;
AcceptDialog *error_dialog = nullptr;
ConfirmationDialog *erase_tab_confirm = nullptr;
ScriptCreateDialog *script_create_dialog = nullptr;
Button *scripts_visible = nullptr;
FindReplaceBar *find_replace_bar = nullptr;
String current_theme;
TextureRect *script_icon;
Label *script_name_label;
TextureRect *script_icon = nullptr;
Label *script_name_label = nullptr;
Button *script_back;
Button *script_forward;
Button *script_back = nullptr;
Button *script_forward = nullptr;
FindInFilesDialog *find_in_files_dialog;
FindInFilesPanel *find_in_files;
Button *find_in_files_button;
FindInFilesDialog *find_in_files_dialog = nullptr;
FindInFilesPanel *find_in_files = nullptr;
Button *find_in_files_button = nullptr;
enum {
SCRIPT_EDITOR_FUNC_MAX = 32,
@@ -320,8 +320,8 @@ class ScriptEditor : public PanelContainer {
bool _has_script_tab() const;
void _prepare_file_menu();
Tree *disk_changed_list;
ConfirmationDialog *disk_changed;
Tree *disk_changed_list = nullptr;
ConfirmationDialog *disk_changed = nullptr;
bool restoring_layout;
@@ -361,7 +361,7 @@ class ScriptEditor : public PanelContainer {
void _update_selected_editor_menu();
EditorScriptCodeCompletionCache *completion_cache;
EditorScriptCodeCompletionCache *completion_cache = nullptr;
void _editor_stop();
@@ -528,7 +528,7 @@ public:
class ScriptEditorPlugin : public EditorPlugin {
GDCLASS(ScriptEditorPlugin, EditorPlugin);
ScriptEditor *script_editor;
ScriptEditor *script_editor = nullptr;
public:
virtual String get_name() const override { return "Script"; }

View File

@@ -108,19 +108,19 @@ class ShaderEditor : public PanelContainer {
HELP_DOCS,
};
MenuButton *edit_menu;
MenuButton *search_menu;
PopupMenu *bookmarks_menu;
MenuButton *help_menu;
PopupMenu *context_menu;
MenuButton *edit_menu = nullptr;
MenuButton *search_menu = nullptr;
PopupMenu *bookmarks_menu = nullptr;
MenuButton *help_menu = nullptr;
PopupMenu *context_menu = nullptr;
RichTextLabel *warnings_panel = nullptr;
uint64_t idle;
GotoLineDialog *goto_line_dialog;
ConfirmationDialog *erase_tab_confirm;
ConfirmationDialog *disk_changed;
GotoLineDialog *goto_line_dialog = nullptr;
ConfirmationDialog *erase_tab_confirm = nullptr;
ConfirmationDialog *disk_changed = nullptr;
ShaderTextEditor *shader_editor;
ShaderTextEditor *shader_editor = nullptr;
void _menu_option(int p_option);
mutable Ref<Shader> shader;
@@ -161,8 +161,8 @@ class ShaderEditorPlugin : public EditorPlugin {
GDCLASS(ShaderEditorPlugin, EditorPlugin);
bool _2d;
ShaderEditor *shader_editor;
Button *button;
ShaderEditor *shader_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "Shader"; }

View File

@@ -48,10 +48,10 @@ class ShaderFileEditor : public PanelContainer {
Ref<RDShaderFile> shader_file;
HBoxContainer *stage_hb;
ItemList *versions;
HBoxContainer *stage_hb = nullptr;
ItemList *versions = nullptr;
Button *stages[RD::SHADER_STAGE_MAX];
RichTextLabel *error_text;
RichTextLabel *error_text = nullptr;
void _update_version(const StringName &p_version_txt, const RenderingDevice::ShaderStage p_stage);
void _version_selected(int p_stage);
@@ -74,8 +74,8 @@ public:
class ShaderFileEditorPlugin : public EditorPlugin {
GDCLASS(ShaderFileEditorPlugin, EditorPlugin);
ShaderFileEditor *shader_editor;
Button *button;
ShaderFileEditor *shader_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "ShaderFile"; }

View File

@@ -43,10 +43,10 @@ class Skeleton2DEditor : public Control {
MENU_OPTION_MAKE_REST,
};
Skeleton2D *node;
Skeleton2D *node = nullptr;
MenuButton *options;
AcceptDialog *err_dialog;
MenuButton *options = nullptr;
AcceptDialog *err_dialog = nullptr;
void _menu_option(int p_option);
@@ -65,7 +65,7 @@ public:
class Skeleton2DEditorPlugin : public EditorPlugin {
GDCLASS(Skeleton2DEditorPlugin, EditorPlugin);
Skeleton2DEditor *sprite_editor;
Skeleton2DEditor *sprite_editor = nullptr;
public:
virtual String get_name() const override { return "Skeleton2D"; }

View File

@@ -60,10 +60,10 @@ class BoneTransformEditor : public VBoxContainer {
Rect2 background_rects[5];
Skeleton3D *skeleton;
Skeleton3D *skeleton = nullptr;
// String property;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
bool toggle_enabled = false;
bool updating = false;
@@ -108,26 +108,26 @@ class Skeleton3DEditor : public VBoxContainer {
Transform3D relative_rest; // Relative to skeleton node.
};
EditorInspectorPluginSkeleton *editor_plugin;
EditorInspectorPluginSkeleton *editor_plugin = nullptr;
Skeleton3D *skeleton;
Skeleton3D *skeleton = nullptr;
Tree *joint_tree = nullptr;
BoneTransformEditor *rest_editor = nullptr;
BoneTransformEditor *pose_editor = nullptr;
VSeparator *separator;
VSeparator *separator = nullptr;
MenuButton *skeleton_options = nullptr;
Button *edit_mode_button;
Button *edit_mode_button = nullptr;
bool edit_mode = false;
HBoxContainer *animation_hb;
Button *key_loc_button;
Button *key_rot_button;
Button *key_scale_button;
Button *key_insert_button;
Button *key_insert_all_button;
HBoxContainer *animation_hb = nullptr;
Button *key_loc_button = nullptr;
Button *key_rot_button = nullptr;
Button *key_scale_button = nullptr;
Button *key_insert_button = nullptr;
Button *key_insert_all_button = nullptr;
EditorFileDialog *file_dialog = nullptr;
@@ -163,7 +163,7 @@ class Skeleton3DEditor : public VBoxContainer {
void set_bone_options_enabled(const bool p_bone_options_enabled);
// Handle.
MeshInstance3D *handles_mesh_instance;
MeshInstance3D *handles_mesh_instance = nullptr;
Ref<ImmediateMesh> handles_mesh;
Ref<ShaderMaterial> handle_material;
Ref<Shader> handle_shader;
@@ -220,7 +220,7 @@ class EditorInspectorPluginSkeleton : public EditorInspectorPlugin {
friend class Skeleton3DEditorPlugin;
Skeleton3DEditor *skel_editor;
Skeleton3DEditor *skel_editor = nullptr;
public:
virtual bool can_handle(Object *p_object) override;
@@ -230,7 +230,7 @@ public:
class Skeleton3DEditorPlugin : public EditorPlugin {
GDCLASS(Skeleton3DEditorPlugin, EditorPlugin);
EditorInspectorPluginSkeleton *skeleton_plugin;
EditorInspectorPluginSkeleton *skeleton_plugin = nullptr;
public:
virtual EditorPlugin::AfterGUIInput forward_spatial_gui_input(Camera3D *p_camera, const Ref<InputEvent> &p_event) override;

View File

@@ -38,9 +38,9 @@ class SkeletonIK3D;
class SkeletonIK3DEditorPlugin : public EditorPlugin {
GDCLASS(SkeletonIK3DEditorPlugin, EditorPlugin);
SkeletonIK3D *skeleton_ik;
SkeletonIK3D *skeleton_ik = nullptr;
Button *play_btn;
Button *play_btn = nullptr;
void _play();

View File

@@ -47,16 +47,16 @@ class Sprite2DEditor : public Control {
Menu selected_menu_item;
Sprite2D *node;
Sprite2D *node = nullptr;
MenuButton *options;
MenuButton *options = nullptr;
ConfirmationDialog *outline_dialog;
ConfirmationDialog *outline_dialog = nullptr;
AcceptDialog *err_dialog;
AcceptDialog *err_dialog = nullptr;
ConfirmationDialog *debug_uv_dialog;
Control *debug_uv;
ConfirmationDialog *debug_uv_dialog = nullptr;
Control *debug_uv = nullptr;
Vector<Vector2> uv_lines;
Vector<Vector<Vector2>> outline_lines;
Vector<Vector<Vector2>> computed_outline_lines;
@@ -64,10 +64,10 @@ class Sprite2DEditor : public Control {
Vector<Vector2> computed_uv;
Vector<int> computed_indices;
SpinBox *simplification;
SpinBox *grow_pixels;
SpinBox *shrink_pixels;
Button *update_preview;
SpinBox *simplification = nullptr;
SpinBox *grow_pixels = nullptr;
SpinBox *shrink_pixels = nullptr;
Button *update_preview = nullptr;
void _menu_option(int p_option);
@@ -98,7 +98,7 @@ public:
class Sprite2DEditorPlugin : public EditorPlugin {
GDCLASS(Sprite2DEditorPlugin, EditorPlugin);
Sprite2DEditor *sprite_editor;
Sprite2DEditor *sprite_editor = nullptr;
public:
virtual String get_name() const override { return "Sprite2D"; }

View File

@@ -48,48 +48,48 @@ class EditorFileDialog;
class SpriteFramesEditor : public HSplitContainer {
GDCLASS(SpriteFramesEditor, HSplitContainer);
Button *load;
Button *load_sheet;
Button *_delete;
Button *copy;
Button *paste;
Button *empty;
Button *empty2;
Button *move_up;
Button *move_down;
Button *zoom_out;
Button *zoom_reset;
Button *zoom_in;
ItemList *tree;
Button *load = nullptr;
Button *load_sheet = nullptr;
Button *_delete = nullptr;
Button *copy = nullptr;
Button *paste = nullptr;
Button *empty = nullptr;
Button *empty2 = nullptr;
Button *move_up = nullptr;
Button *move_down = nullptr;
Button *zoom_out = nullptr;
Button *zoom_reset = nullptr;
Button *zoom_in = nullptr;
ItemList *tree = nullptr;
bool loading_scene;
int sel;
Button *new_anim;
Button *remove_anim;
Button *new_anim = nullptr;
Button *remove_anim = nullptr;
Tree *animations;
SpinBox *anim_speed;
CheckButton *anim_loop;
Tree *animations = nullptr;
SpinBox *anim_speed = nullptr;
CheckButton *anim_loop = nullptr;
EditorFileDialog *file;
EditorFileDialog *file = nullptr;
AcceptDialog *dialog;
AcceptDialog *dialog = nullptr;
SpriteFrames *frames;
SpriteFrames *frames = nullptr;
StringName edited_anim;
ConfirmationDialog *delete_dialog;
ConfirmationDialog *delete_dialog = nullptr;
ConfirmationDialog *split_sheet_dialog;
ScrollContainer *split_sheet_scroll;
TextureRect *split_sheet_preview;
SpinBox *split_sheet_h;
SpinBox *split_sheet_v;
Button *split_sheet_zoom_out;
Button *split_sheet_zoom_reset;
Button *split_sheet_zoom_in;
EditorFileDialog *file_split_sheet;
ConfirmationDialog *split_sheet_dialog = nullptr;
ScrollContainer *split_sheet_scroll = nullptr;
TextureRect *split_sheet_preview = nullptr;
SpinBox *split_sheet_h = nullptr;
SpinBox *split_sheet_v = nullptr;
Button *split_sheet_zoom_out = nullptr;
Button *split_sheet_zoom_reset = nullptr;
Button *split_sheet_zoom_in = nullptr;
EditorFileDialog *file_split_sheet = nullptr;
Set<int> frames_selected;
Set<int> frames_toggled_by_mouse_hover;
int last_frame_selected;
@@ -129,7 +129,7 @@ class SpriteFramesEditor : public HSplitContainer {
bool updating;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
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;
@@ -164,8 +164,8 @@ public:
class SpriteFramesEditorPlugin : public EditorPlugin {
GDCLASS(SpriteFramesEditorPlugin, EditorPlugin);
SpriteFramesEditor *frames_editor;
Button *button;
SpriteFramesEditor *frames_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "SpriteFrames"; }

View File

@@ -40,7 +40,7 @@
class StyleBoxPreview : public VBoxContainer {
GDCLASS(StyleBoxPreview, VBoxContainer);
Control *preview;
Control *preview = nullptr;
Ref<StyleBox> stylebox;
void _sb_changed();

View File

@@ -100,7 +100,7 @@ public:
class TextControlEditorPlugin : public EditorPlugin {
GDCLASS(TextControlEditorPlugin, EditorPlugin);
TextControlEditor *text_ctl_editor;
TextControlEditor *text_ctl_editor = nullptr;
public:
virtual String get_name() const override { return "TextControlFontEditor"; }

View File

@@ -39,14 +39,14 @@
class Texture3DEditor : public Control {
GDCLASS(Texture3DEditor, Control);
SpinBox *layer;
Label *info;
SpinBox *layer = nullptr;
Label *info = nullptr;
Ref<Texture3D> texture;
Ref<Shader> shader;
Ref<ShaderMaterial> material;
Control *texture_rect;
Control *texture_rect = nullptr;
void _make_shaders();

View File

@@ -39,8 +39,8 @@
class TextureLayeredEditor : public Control {
GDCLASS(TextureLayeredEditor, Control);
SpinBox *layer;
Label *info;
SpinBox *layer = nullptr;
Label *info = nullptr;
Ref<TextureLayered> texture;
Ref<Shader> shaders[3];
@@ -48,7 +48,7 @@ class TextureLayeredEditor : public Control {
float x_rot = 0;
float y_rot = 0;
Control *texture_rect;
Control *texture_rect = nullptr;
void _make_shaders();

View File

@@ -52,23 +52,23 @@ class TextureRegionEditor : public VBoxContainer {
};
friend class TextureRegionEditorPlugin;
OptionButton *snap_mode_button;
Button *zoom_in;
Button *zoom_reset;
Button *zoom_out;
HBoxContainer *hb_grid; //For showing/hiding the grid controls when changing the SnapMode
SpinBox *sb_step_y;
SpinBox *sb_step_x;
SpinBox *sb_off_y;
SpinBox *sb_off_x;
SpinBox *sb_sep_y;
SpinBox *sb_sep_x;
Panel *edit_draw;
OptionButton *snap_mode_button = nullptr;
Button *zoom_in = nullptr;
Button *zoom_reset = nullptr;
Button *zoom_out = nullptr;
HBoxContainer *hb_grid = nullptr; //For showing/hiding the grid controls when changing the SnapMode
SpinBox *sb_step_y = nullptr;
SpinBox *sb_step_x = nullptr;
SpinBox *sb_off_y = nullptr;
SpinBox *sb_off_x = nullptr;
SpinBox *sb_sep_y = nullptr;
SpinBox *sb_sep_x = nullptr;
Panel *edit_draw = nullptr;
VScrollBar *vscroll;
HScrollBar *hscroll;
VScrollBar *vscroll = nullptr;
HScrollBar *hscroll = nullptr;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
Vector2 draw_ofs;
float draw_zoom;
@@ -79,9 +79,9 @@ class TextureRegionEditor : public VBoxContainer {
Vector2 snap_step;
Vector2 snap_separation;
Sprite2D *node_sprite_2d;
Sprite3D *node_sprite_3d;
NinePatchRect *node_ninepatch;
Sprite2D *node_sprite_2d = nullptr;
Sprite3D *node_sprite_3d = nullptr;
NinePatchRect *node_ninepatch = nullptr;
Ref<StyleBoxTexture> obj_styleBox;
Ref<AtlasTexture> atlas_tex;
@@ -146,8 +146,8 @@ class TextureRegionEditorPlugin : public EditorPlugin {
GDCLASS(TextureRegionEditorPlugin, EditorPlugin);
bool manually_hidden;
Button *texture_region_button;
TextureRegionEditor *region_editor;
Button *texture_region_button = nullptr;
TextureRegionEditor *region_editor = nullptr;
protected:
static void _bind_methods();

View File

@@ -75,9 +75,9 @@ class ThemeItemImportTree : public VBoxContainer {
Map<ThemeItem, ItemCheckedState> selected_items;
LineEdit *import_items_filter;
LineEdit *import_items_filter = nullptr;
Tree *import_items_tree;
Tree *import_items_tree = nullptr;
List<TreeItem *> tree_color_items;
List<TreeItem *> tree_constant_items;
List<TreeItem *> tree_font_items;
@@ -92,57 +92,57 @@ class ThemeItemImportTree : public VBoxContainer {
IMPORT_ITEM_DATA = 2,
};
TextureRect *select_colors_icon;
Label *select_colors_label;
Button *select_all_colors_button;
Button *select_full_colors_button;
Button *deselect_all_colors_button;
Label *total_selected_colors_label;
TextureRect *select_colors_icon = nullptr;
Label *select_colors_label = nullptr;
Button *select_all_colors_button = nullptr;
Button *select_full_colors_button = nullptr;
Button *deselect_all_colors_button = nullptr;
Label *total_selected_colors_label = nullptr;
TextureRect *select_constants_icon;
Label *select_constants_label;
Button *select_all_constants_button;
Button *select_full_constants_button;
Button *deselect_all_constants_button;
Label *total_selected_constants_label;
TextureRect *select_constants_icon = nullptr;
Label *select_constants_label = nullptr;
Button *select_all_constants_button = nullptr;
Button *select_full_constants_button = nullptr;
Button *deselect_all_constants_button = nullptr;
Label *total_selected_constants_label = nullptr;
TextureRect *select_fonts_icon;
Label *select_fonts_label;
Button *select_all_fonts_button;
Button *select_full_fonts_button;
Button *deselect_all_fonts_button;
Label *total_selected_fonts_label;
TextureRect *select_fonts_icon = nullptr;
Label *select_fonts_label = nullptr;
Button *select_all_fonts_button = nullptr;
Button *select_full_fonts_button = nullptr;
Button *deselect_all_fonts_button = nullptr;
Label *total_selected_fonts_label = nullptr;
TextureRect *select_font_sizes_icon;
Label *select_font_sizes_label;
Button *select_all_font_sizes_button;
Button *select_full_font_sizes_button;
Button *deselect_all_font_sizes_button;
Label *total_selected_font_sizes_label;
TextureRect *select_font_sizes_icon = nullptr;
Label *select_font_sizes_label = nullptr;
Button *select_all_font_sizes_button = nullptr;
Button *select_full_font_sizes_button = nullptr;
Button *deselect_all_font_sizes_button = nullptr;
Label *total_selected_font_sizes_label = nullptr;
TextureRect *select_icons_icon;
Label *select_icons_label;
Button *select_all_icons_button;
Button *select_full_icons_button;
Button *deselect_all_icons_button;
Label *total_selected_icons_label;
TextureRect *select_icons_icon = nullptr;
Label *select_icons_label = nullptr;
Button *select_all_icons_button = nullptr;
Button *select_full_icons_button = nullptr;
Button *deselect_all_icons_button = nullptr;
Label *total_selected_icons_label = nullptr;
TextureRect *select_styleboxes_icon;
Label *select_styleboxes_label;
Button *select_all_styleboxes_button;
Button *select_full_styleboxes_button;
Button *deselect_all_styleboxes_button;
Label *total_selected_styleboxes_label;
TextureRect *select_styleboxes_icon = nullptr;
Label *select_styleboxes_label = nullptr;
Button *select_all_styleboxes_button = nullptr;
Button *select_full_styleboxes_button = nullptr;
Button *deselect_all_styleboxes_button = nullptr;
Label *total_selected_styleboxes_label = nullptr;
HBoxContainer *select_icons_warning_hb;
TextureRect *select_icons_warning_icon;
Label *select_icons_warning;
HBoxContainer *select_icons_warning_hb = nullptr;
TextureRect *select_icons_warning_icon = nullptr;
Label *select_icons_warning = nullptr;
Button *import_collapse_types_button;
Button *import_expand_types_button;
Button *import_select_all_button;
Button *import_select_full_button;
Button *import_deselect_all_button;
Button *import_collapse_types_button = nullptr;
Button *import_expand_types_button = nullptr;
Button *import_select_all_button = nullptr;
Button *import_select_full_button = nullptr;
Button *import_deselect_all_button = nullptr;
void _update_items_tree();
void _toggle_type_items(bool p_collapse);
@@ -186,31 +186,31 @@ class ThemeTypeEditor;
class ThemeItemEditorDialog : public AcceptDialog {
GDCLASS(ThemeItemEditorDialog, AcceptDialog);
ThemeTypeEditor *theme_type_editor;
ThemeTypeEditor *theme_type_editor = nullptr;
Ref<Theme> edited_theme;
TabContainer *tc;
TabContainer *tc = nullptr;
enum TypesTreeAction {
TYPES_TREE_REMOVE_ITEM,
};
Tree *edit_type_list;
LineEdit *edit_add_type_value;
Tree *edit_type_list = nullptr;
LineEdit *edit_add_type_value = nullptr;
String edited_item_type;
Button *edit_items_add_color;
Button *edit_items_add_constant;
Button *edit_items_add_font;
Button *edit_items_add_font_size;
Button *edit_items_add_icon;
Button *edit_items_add_stylebox;
Button *edit_items_remove_class;
Button *edit_items_remove_custom;
Button *edit_items_remove_all;
Tree *edit_items_tree;
Label *edit_items_message;
Button *edit_items_add_color = nullptr;
Button *edit_items_add_constant = nullptr;
Button *edit_items_add_font = nullptr;
Button *edit_items_add_font_size = nullptr;
Button *edit_items_add_icon = nullptr;
Button *edit_items_add_stylebox = nullptr;
Button *edit_items_remove_class = nullptr;
Button *edit_items_remove_custom = nullptr;
Button *edit_items_remove_all = nullptr;
Tree *edit_items_tree = nullptr;
Label *edit_items_message = nullptr;
enum ItemsTreeAction {
ITEMS_TREE_RENAME_ITEM,
@@ -218,10 +218,10 @@ class ThemeItemEditorDialog : public AcceptDialog {
ITEMS_TREE_REMOVE_DATA_TYPE,
};
ConfirmationDialog *edit_theme_item_dialog;
VBoxContainer *edit_theme_item_old_vb;
Label *theme_item_old_name;
LineEdit *theme_item_name;
ConfirmationDialog *edit_theme_item_dialog = nullptr;
VBoxContainer *edit_theme_item_old_vb = nullptr;
Label *theme_item_old_name = nullptr;
LineEdit *theme_item_name = nullptr;
enum ItemPopupMode {
CREATE_THEME_ITEM,
@@ -233,15 +233,15 @@ class ThemeItemEditorDialog : public AcceptDialog {
String edit_item_old_name;
Theme::DataType edit_item_data_type = Theme::DATA_TYPE_MAX;
ThemeItemImportTree *import_default_theme_items;
ThemeItemImportTree *import_editor_theme_items;
ThemeItemImportTree *import_other_theme_items;
ThemeItemImportTree *import_default_theme_items = nullptr;
ThemeItemImportTree *import_editor_theme_items = nullptr;
ThemeItemImportTree *import_other_theme_items = nullptr;
LineEdit *import_another_theme_value;
Button *import_another_theme_button;
EditorFileDialog *import_another_theme_dialog;
LineEdit *import_another_theme_value = nullptr;
Button *import_another_theme_button = nullptr;
EditorFileDialog *import_another_theme_dialog = nullptr;
ConfirmationDialog *confirm_closing_dialog;
ConfirmationDialog *confirm_closing_dialog = nullptr;
void ok_pressed() override;
void _close_dialog();
@@ -288,9 +288,9 @@ class ThemeTypeDialog : public ConfirmationDialog {
String pre_submitted_value;
LineEdit *add_type_filter;
ItemList *add_type_options;
ConfirmationDialog *add_type_confirmation;
LineEdit *add_type_filter = nullptr;
ItemList *add_type_options = nullptr;
ConfirmationDialog *add_type_confirmation = nullptr;
void _dialog_about_to_show();
void ok_pressed() override;
@@ -332,22 +332,22 @@ class ThemeTypeEditor : public MarginContainer {
LeadingStylebox leading_stylebox;
OptionButton *theme_type_list;
Button *add_type_button;
OptionButton *theme_type_list = nullptr;
Button *add_type_button = nullptr;
CheckButton *show_default_items_button;
CheckButton *show_default_items_button = nullptr;
TabContainer *data_type_tabs;
VBoxContainer *color_items_list;
VBoxContainer *constant_items_list;
VBoxContainer *font_items_list;
VBoxContainer *font_size_items_list;
VBoxContainer *icon_items_list;
VBoxContainer *stylebox_items_list;
TabContainer *data_type_tabs = nullptr;
VBoxContainer *color_items_list = nullptr;
VBoxContainer *constant_items_list = nullptr;
VBoxContainer *font_items_list = nullptr;
VBoxContainer *font_size_items_list = nullptr;
VBoxContainer *icon_items_list = nullptr;
VBoxContainer *stylebox_items_list = nullptr;
LineEdit *type_variation_edit;
Button *type_variation_button;
Label *type_variation_locked;
LineEdit *type_variation_edit = nullptr;
Button *type_variation_button = nullptr;
Label *type_variation_locked = nullptr;
enum TypeDialogMode {
ADD_THEME_TYPE,
@@ -355,10 +355,10 @@ class ThemeTypeEditor : public MarginContainer {
};
TypeDialogMode add_type_mode = ADD_THEME_TYPE;
ThemeTypeDialog *add_type_dialog;
ThemeTypeDialog *add_type_dialog = nullptr;
Vector<Control *> focusables;
Timer *update_debounce_timer;
Timer *update_debounce_timer = nullptr;
VBoxContainer *_create_item_list(Theme::DataType p_data_type);
void _update_type_list();
@@ -417,15 +417,15 @@ class ThemeEditor : public VBoxContainer {
Ref<Theme> theme;
TabBar *preview_tabs;
PanelContainer *preview_tabs_content;
Button *add_preview_button;
EditorFileDialog *preview_scene_dialog;
TabBar *preview_tabs = nullptr;
PanelContainer *preview_tabs_content = nullptr;
Button *add_preview_button = nullptr;
EditorFileDialog *preview_scene_dialog = nullptr;
ThemeTypeEditor *theme_type_editor;
ThemeTypeEditor *theme_type_editor = nullptr;
Label *theme_name;
ThemeItemEditorDialog *theme_edit_dialog;
Label *theme_name = nullptr;
ThemeItemEditorDialog *theme_edit_dialog = nullptr;
void _theme_save_button_cbk(bool p_save_as);
void _theme_edit_button_cbk();
@@ -452,8 +452,8 @@ public:
class ThemeEditorPlugin : public EditorPlugin {
GDCLASS(ThemeEditorPlugin, EditorPlugin);
ThemeEditor *theme_editor;
Button *button;
ThemeEditor *theme_editor = nullptr;
Button *button = nullptr;
public:
virtual String get_name() const override { return "Theme"; }

View File

@@ -41,10 +41,10 @@
class ThemeEditorPreview : public VBoxContainer {
GDCLASS(ThemeEditorPreview, VBoxContainer);
ScrollContainer *preview_container;
ColorRect *preview_bg;
MarginContainer *preview_overlay;
Control *picker_overlay;
ScrollContainer *preview_container = nullptr;
ColorRect *preview_bg = nullptr;
MarginContainer *preview_overlay = nullptr;
Control *picker_overlay = nullptr;
Control *hovered_control = nullptr;
struct ThemeCache {
@@ -69,9 +69,9 @@ class ThemeEditorPreview : public VBoxContainer {
void _reset_picker_overlay();
protected:
HBoxContainer *preview_toolbar;
MarginContainer *preview_content;
Button *picker_button;
HBoxContainer *preview_toolbar = nullptr;
MarginContainer *preview_content = nullptr;
Button *picker_button = nullptr;
void add_preview_overlay(Control *p_overlay);
@@ -96,7 +96,7 @@ class SceneThemeEditorPreview : public ThemeEditorPreview {
Ref<PackedScene> loaded_scene;
Button *reload_scene_button;
Button *reload_scene_button = nullptr;
void _reload_scene();

View File

@@ -49,19 +49,19 @@ private:
LocalVector<Map<Vector2i, Vector2i>> merged_mapping;
Ref<TileSet> tile_set;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
// Settings.
int next_line_after_column = 30;
// GUI.
ItemList *atlas_merging_atlases_list;
EditorPropertyVector2i *texture_region_size_editor_property;
EditorPropertyInteger *columns_editor_property;
TextureRect *preview;
Label *select_2_atlases_label;
EditorFileDialog *editor_file_dialog;
Button *merge_button;
ItemList *atlas_merging_atlases_list = nullptr;
EditorPropertyVector2i *texture_region_size_editor_property = nullptr;
EditorPropertyInteger *columns_editor_property = nullptr;
TextureRect *preview = nullptr;
Label *select_2_atlases_label = nullptr;
EditorFileDialog *editor_file_dialog = nullptr;
Button *merge_button = nullptr;
void _property_changed(const StringName &p_property, const Variant &p_value, const String &p_field, bool p_changing);

View File

@@ -45,8 +45,8 @@ class TileAtlasView : public Control {
GDCLASS(TileAtlasView, Control);
private:
TileSet *tile_set;
TileSetAtlasSource *tile_set_atlas_source;
TileSet *tile_set = nullptr;
TileSetAtlasSource *tile_set_atlas_source = nullptr;
int source_id = TileSet::INVALID_SOURCE;
enum DragType {
@@ -55,9 +55,9 @@ private:
};
DragType drag_type = DRAG_TYPE_NONE;
float previous_zoom = 1.0;
EditorZoomWidget *zoom_widget;
Button *button_center_view;
CenterContainer *center_container;
EditorZoomWidget *zoom_widget = nullptr;
Button *button_center_view = nullptr;
CenterContainer *center_container = nullptr;
Vector2 panning;
void _update_zoom_and_panning(bool p_zoom_on_mouse_pos = false);
void _zoom_widget_changed();
@@ -72,41 +72,41 @@ private:
Map<Vector2, Map<int, Rect2i>> alternative_tiles_rect_cache;
void _update_alternative_tiles_rect_cache();
MarginContainer *margin_container;
MarginContainer *margin_container = nullptr;
int margin_container_paddings[4] = { 0, 0, 0, 0 };
HBoxContainer *hbox;
Label *missing_source_label;
HBoxContainer *hbox = nullptr;
Label *missing_source_label = nullptr;
// Background
Control *background_left;
Control *background_left = nullptr;
void _draw_background_left();
Control *background_right;
Control *background_right = nullptr;
void _draw_background_right();
// Left side.
Control *base_tiles_root_control;
Control *base_tiles_root_control = nullptr;
void _base_tiles_root_control_gui_input(const Ref<InputEvent> &p_event);
Control *base_tiles_drawing_root;
Control *base_tiles_drawing_root = nullptr;
Control *base_tiles_draw;
Control *base_tiles_draw = nullptr;
void _draw_base_tiles();
Control *base_tiles_texture_grid;
Control *base_tiles_texture_grid = nullptr;
void _draw_base_tiles_texture_grid();
Control *base_tiles_shape_grid;
Control *base_tiles_shape_grid = nullptr;
void _draw_base_tiles_shape_grid();
Size2i _compute_base_tiles_control_size();
// Right side.
Control *alternative_tiles_root_control;
Control *alternative_tiles_root_control = nullptr;
void _alternative_tiles_root_control_gui_input(const Ref<InputEvent> &p_event);
Control *alternative_tiles_drawing_root;
Control *alternative_tiles_drawing_root = nullptr;
Control *alternatives_draw;
Control *alternatives_draw = nullptr;
void _draw_alternatives();
Size2i _compute_alternative_tiles_control_size();

View File

@@ -93,7 +93,7 @@ private:
bool multiple_polygon_mode = false;
bool use_undo_redo = true;
UndoRedo *editor_undo_redo;
UndoRedo *editor_undo_redo = nullptr;
// UI
int hovered_polygon_index = -1;
@@ -113,20 +113,20 @@ private:
Vector2 drag_last_pos;
PackedVector2Array drag_old_polygon;
HBoxContainer *toolbar;
HBoxContainer *toolbar = nullptr;
Ref<ButtonGroup> tools_button_group;
Button *button_create;
Button *button_edit;
Button *button_delete;
Button *button_pixel_snap;
MenuButton *button_advanced_menu;
Button *button_create = nullptr;
Button *button_edit = nullptr;
Button *button_delete = nullptr;
Button *button_pixel_snap = nullptr;
MenuButton *button_advanced_menu = nullptr;
Vector<Point2> in_creation_polygon;
Panel *panel;
Control *base_control;
EditorZoomWidget *editor_zoom_widget;
Button *button_center_view;
Panel *panel = nullptr;
Control *base_control = nullptr;
EditorZoomWidget *editor_zoom_widget = nullptr;
Button *button_center_view = nullptr;
Vector2 panning;
Ref<Texture2D> background_texture;
@@ -188,12 +188,12 @@ class TileDataDefaultEditor : public TileDataEditor {
private:
// Toolbar
HBoxContainer *toolbar = memnew(HBoxContainer);
Button *picker_button;
Button *picker_button = nullptr;
// UI
Ref<Texture2D> tile_bool_checked;
Ref<Texture2D> tile_bool_unchecked;
Label *label;
Label *label = nullptr;
EditorProperty *property_editor = nullptr;
@@ -214,7 +214,7 @@ private:
protected:
DummyObject *dummy_object = memnew(DummyObject);
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
StringName type;
String property;
@@ -268,7 +268,7 @@ private:
int occlusion_layer = -1;
// UI
GenericTilePolygonEditor *polygon_editor;
GenericTilePolygonEditor *polygon_editor = nullptr;
void _polygon_changed(PackedVector2Array p_polygon);
@@ -279,7 +279,7 @@ private:
virtual void _setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, Map<TileMapCell, Variant> p_previous_values, Variant p_new_value) override;
protected:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
virtual void _tile_set_changed() override;
@@ -299,7 +299,7 @@ class TileDataCollisionEditor : public TileDataDefaultEditor {
int physics_layer = -1;
// UI
GenericTilePolygonEditor *polygon_editor;
GenericTilePolygonEditor *polygon_editor = nullptr;
DummyObject *dummy_object = memnew(DummyObject);
Map<StringName, EditorProperty *> property_editors;
@@ -314,7 +314,7 @@ class TileDataCollisionEditor : public TileDataDefaultEditor {
virtual void _setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, Map<TileMapCell, Variant> p_previous_values, Variant p_new_value) override;
protected:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
virtual void _tile_set_changed() override;
@@ -335,7 +335,7 @@ class TileDataTerrainsEditor : public TileDataEditor {
private:
// Toolbar
HBoxContainer *toolbar = memnew(HBoxContainer);
Button *picker_button;
Button *picker_button = nullptr;
// Painting state.
enum DragType {
@@ -352,7 +352,7 @@ private:
Variant drag_painted_value;
// UI
Label *label;
Label *label = nullptr;
DummyObject *dummy_object = memnew(DummyObject);
EditorPropertyEnum *terrain_set_property_editor = nullptr;
EditorPropertyEnum *terrain_property_editor = nullptr;
@@ -366,7 +366,7 @@ protected:
void _notification(int p_what);
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
public:
virtual Control *get_toolbar() override { return toolbar; };
@@ -388,7 +388,7 @@ private:
PackedVector2Array navigation_polygon;
// UI
GenericTilePolygonEditor *polygon_editor;
GenericTilePolygonEditor *polygon_editor = nullptr;
void _polygon_changed(PackedVector2Array p_polygon);
@@ -399,7 +399,7 @@ private:
virtual void _setup_undo_redo_action(TileSetAtlasSource *p_tile_set_atlas_source, Map<TileMapCell, Variant> p_previous_values, Variant p_new_value) override;
protected:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
virtual void _tile_set_changed() override;

View File

@@ -51,8 +51,8 @@ class UndoRedo;
class TileMapEditorPlugin : public Object {
public:
struct TabData {
Control *toolbar;
Control *panel;
Control *toolbar = nullptr;
Control *panel = nullptr;
};
virtual Vector<TabData> get_tabs() const {
@@ -69,33 +69,33 @@ class TileMapEditorTilesPlugin : public TileMapEditorPlugin {
GDCLASS(TileMapEditorTilesPlugin, TileMapEditorPlugin);
private:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
ObjectID tile_map_id;
int tile_map_layer = -1;
virtual void edit(ObjectID p_tile_map_id, int p_tile_map_layer) override;
///// Toolbar /////
HBoxContainer *toolbar;
HBoxContainer *toolbar = nullptr;
Ref<ButtonGroup> tool_buttons_group;
Button *select_tool_button;
Button *paint_tool_button;
Button *line_tool_button;
Button *rect_tool_button;
Button *bucket_tool_button;
Button *select_tool_button = nullptr;
Button *paint_tool_button = nullptr;
Button *line_tool_button = nullptr;
Button *rect_tool_button = nullptr;
Button *bucket_tool_button = nullptr;
HBoxContainer *tools_settings;
HBoxContainer *tools_settings = nullptr;
VSeparator *tools_settings_vsep;
Button *picker_button;
Button *erase_button;
VSeparator *tools_settings_vsep = nullptr;
Button *picker_button = nullptr;
Button *erase_button = nullptr;
VSeparator *tools_settings_vsep_2;
CheckBox *bucket_contiguous_checkbox;
CheckBox *random_tile_checkbox;
VSeparator *tools_settings_vsep_2 = nullptr;
CheckBox *bucket_contiguous_checkbox = nullptr;
CheckBox *random_tile_checkbox = nullptr;
float scattering = 0.0;
Label *scatter_label;
SpinBox *scatter_spinbox;
Label *scatter_label = nullptr;
SpinBox *scatter_spinbox = nullptr;
void _on_random_tile_checkbox_toggled(bool p_pressed);
void _on_scattering_spinbox_changed(double p_value);
@@ -148,12 +148,12 @@ private:
void _tab_changed();
///// Bottom panel tiles ////
VBoxContainer *tiles_bottom_panel;
Label *missing_source_label;
Label *invalid_source_label;
VBoxContainer *tiles_bottom_panel = nullptr;
Label *missing_source_label = nullptr;
Label *invalid_source_label = nullptr;
ItemList *sources_list;
MenuButton *source_sort_button;
ItemList *sources_list = nullptr;
MenuButton *source_sort_button = nullptr;
Ref<Texture2D> missing_atlas_texture_icon;
void _update_tile_set_sources_list();
@@ -162,18 +162,18 @@ private:
// Atlas sources.
TileMapCell hovered_tile;
TileAtlasView *tile_atlas_view;
HSplitContainer *atlas_sources_split_container;
TileAtlasView *tile_atlas_view = nullptr;
HSplitContainer *atlas_sources_split_container = nullptr;
bool tile_set_dragging_selection = false;
Vector2i tile_set_drag_start_mouse_pos;
Control *tile_atlas_control;
Control *tile_atlas_control = nullptr;
void _tile_atlas_control_mouse_exited();
void _tile_atlas_control_gui_input(const Ref<InputEvent> &p_event);
void _tile_atlas_control_draw();
Control *alternative_tiles_control;
Control *alternative_tiles_control = nullptr;
void _tile_alternatives_control_draw();
void _tile_alternatives_control_mouse_exited();
void _tile_alternatives_control_gui_input(const Ref<InputEvent> &p_event);
@@ -182,7 +182,7 @@ private:
void _set_source_sort(int p_sort);
// Scenes collection sources.
ItemList *scene_tiles_list;
ItemList *scene_tiles_list = nullptr;
void _update_scenes_collection_view();
void _scene_thumbnail_done(const String &p_path, const Ref<Texture2D> &p_preview, const Ref<Texture2D> &p_small_preview, Variant p_ud);
@@ -190,9 +190,9 @@ private:
void _scenes_list_nothing_selected();
///// Bottom panel patterns ////
VBoxContainer *patterns_bottom_panel;
ItemList *patterns_item_list;
Label *patterns_help_label;
VBoxContainer *patterns_bottom_panel = nullptr;
ItemList *patterns_item_list = nullptr;
Label *patterns_help_label = nullptr;
void _patterns_item_list_gui_input(const Ref<InputEvent> &p_event);
void _pattern_preview_done(Ref<TileMapPattern> p_pattern, Ref<Texture2D> p_texture);
bool select_last_pattern = false;
@@ -220,32 +220,32 @@ class TileMapEditorTerrainsPlugin : public TileMapEditorPlugin {
GDCLASS(TileMapEditorTerrainsPlugin, TileMapEditorPlugin);
private:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
ObjectID tile_map_id;
int tile_map_layer = -1;
virtual void edit(ObjectID p_tile_map_id, int p_tile_map_layer) override;
// Toolbar.
HBoxContainer *toolbar;
HBoxContainer *toolbar = nullptr;
Ref<ButtonGroup> tool_buttons_group;
Button *paint_tool_button;
Button *line_tool_button;
Button *rect_tool_button;
Button *bucket_tool_button;
Button *paint_tool_button = nullptr;
Button *line_tool_button = nullptr;
Button *rect_tool_button = nullptr;
Button *bucket_tool_button = nullptr;
HBoxContainer *tools_settings;
HBoxContainer *tools_settings = nullptr;
VSeparator *tools_settings_vsep;
Button *picker_button;
Button *erase_button;
VSeparator *tools_settings_vsep = nullptr;
Button *picker_button = nullptr;
Button *erase_button = nullptr;
VSeparator *tools_settings_vsep_2;
CheckBox *bucket_contiguous_checkbox;
VSeparator *tools_settings_vsep_2 = nullptr;
CheckBox *bucket_contiguous_checkbox = nullptr;
void _update_toolbar();
// Main vbox.
VBoxContainer *main_vbox_container;
VBoxContainer *main_vbox_container = nullptr;
// TileMap editing.
bool has_mouse = false;
@@ -278,8 +278,8 @@ private:
void _update_selection();
// Bottom panel.
Tree *terrains_tree;
ItemList *terrains_tile_list;
Tree *terrains_tree = nullptr;
ItemList *terrains_tile_list = nullptr;
// Cache.
LocalVector<LocalVector<Set<TileSet::TerrainsPattern>>> per_terrain_terrains_patterns;
@@ -306,7 +306,7 @@ class TileMapEditor : public VBoxContainer {
GDCLASS(TileMapEditor, VBoxContainer);
private:
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
bool tileset_changed_needs_update = false;
ObjectID tile_map_id;
int tile_map_layer = -1;
@@ -315,24 +315,24 @@ private:
Vector<TileMapEditorPlugin *> tile_map_editor_plugins;
// Toolbar.
HBoxContainer *tile_map_toolbar;
HBoxContainer *tile_map_toolbar = nullptr;
PopupMenu *layers_selection_popup;
Button *layers_selection_button;
Button *toogle_highlight_selected_layer_button;
PopupMenu *layers_selection_popup = nullptr;
Button *layers_selection_button = nullptr;
Button *toogle_highlight_selected_layer_button = nullptr;
void _layers_selection_button_draw();
void _layers_selection_button_pressed();
void _layers_selection_id_pressed(int p_id);
Button *toggle_grid_button;
Button *toggle_grid_button = nullptr;
void _on_grid_toggled(bool p_pressed);
MenuButton *advanced_menu_button;
MenuButton *advanced_menu_button = nullptr;
void _advanced_menu_button_id_pressed(int p_id);
// Bottom panel.
Label *missing_tileset_label;
TabBar *tabs_bar;
Label *missing_tileset_label = nullptr;
TabBar *tabs_bar = nullptr;
LocalVector<TileMapEditorPlugin::TabData> tabs_data;
LocalVector<TileMapEditorPlugin *> tabs_plugins;
void _update_bottom_panel();

View File

@@ -43,24 +43,24 @@ private:
int commited_actions_count = 0;
Ref<TileSet> tile_set;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
TileMapCell from;
TileMapCell to;
// GUI
ItemList *source_level_list;
ItemList *coords_level_list;
ItemList *alternative_level_list;
ItemList *source_level_list = nullptr;
ItemList *coords_level_list = nullptr;
ItemList *alternative_level_list = nullptr;
EditorPropertyInteger *source_from_property_editor;
EditorPropertyVector2i *coords_from_property_editor;
EditorPropertyInteger *alternative_from_property_editor;
EditorPropertyInteger *source_to_property_editor;
EditorPropertyVector2i *coords_to_property_editor;
EditorPropertyInteger *alternative_to_property_editor;
EditorPropertyInteger *source_from_property_editor = nullptr;
EditorPropertyVector2i *coords_from_property_editor = nullptr;
EditorPropertyInteger *alternative_from_property_editor = nullptr;
EditorPropertyInteger *source_to_property_editor = nullptr;
EditorPropertyVector2i *coords_to_property_editor = nullptr;
EditorPropertyInteger *alternative_to_property_editor = nullptr;
PopupMenu *popup_menu;
PopupMenu *popup_menu = nullptr;
void _right_clicked(int p_item, Vector2 p_local_mouse_pos, Object *p_item_list);
void _menu_id_pressed(int p_id);
void _delete_selected_bindings();

View File

@@ -85,7 +85,7 @@ public:
GDCLASS(AtlasTileProxyObject, Object);
private:
TileSetAtlasSourceEditor *tiles_set_atlas_source_editor;
TileSetAtlasSourceEditor *tiles_set_atlas_source_editor = nullptr;
TileSetAtlasSource *tile_set_atlas_source = nullptr;
Set<TileSelection> tiles = Set<TileSelection>();
@@ -114,16 +114,16 @@ private:
TileSetAtlasSource *tile_set_atlas_source = nullptr;
int tile_set_atlas_source_id = TileSet::INVALID_SOURCE;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
bool tile_set_changed_needs_update = false;
// -- Properties painting --
VBoxContainer *tile_data_painting_editor_container;
Label *tile_data_editors_label;
Button *tile_data_editor_dropdown_button;
Popup *tile_data_editors_popup;
Tree *tile_data_editors_tree;
VBoxContainer *tile_data_painting_editor_container = nullptr;
Label *tile_data_editors_label = nullptr;
Button *tile_data_editor_dropdown_button = nullptr;
Popup *tile_data_editors_popup = nullptr;
Tree *tile_data_editors_tree = nullptr;
void _tile_data_editor_dropdown_button_draw();
void _tile_data_editor_dropdown_button_pressed();
@@ -135,21 +135,21 @@ private:
void _tile_data_editors_tree_selected();
// -- Inspector --
AtlasTileProxyObject *tile_proxy_object;
Label *tile_inspector_label;
EditorInspector *tile_inspector;
Label *tile_inspector_no_tile_selected_label;
AtlasTileProxyObject *tile_proxy_object = nullptr;
Label *tile_inspector_label = nullptr;
EditorInspector *tile_inspector = nullptr;
Label *tile_inspector_no_tile_selected_label = nullptr;
String selected_property;
void _inspector_property_selected(String p_property);
TileSetAtlasSourceProxyObject *atlas_source_proxy_object;
Label *atlas_source_inspector_label;
EditorInspector *atlas_source_inspector;
TileSetAtlasSourceProxyObject *atlas_source_proxy_object = nullptr;
Label *atlas_source_inspector_label = nullptr;
EditorInspector *atlas_source_inspector = nullptr;
// -- Atlas view --
HBoxContainer *toolbox;
Label *tile_atlas_view_missing_source_label;
TileAtlasView *tile_atlas_view;
HBoxContainer *toolbox = nullptr;
Label *tile_atlas_view_missing_source_label = nullptr;
TileAtlasView *tile_atlas_view = nullptr;
// Dragging
enum DragType {
@@ -202,17 +202,17 @@ private:
// Tool buttons.
Ref<ButtonGroup> tools_button_group;
Button *tool_setup_atlas_source_button;
Button *tool_select_button;
Button *tool_paint_button;
Label *tool_tile_id_label;
Button *tool_setup_atlas_source_button = nullptr;
Button *tool_select_button = nullptr;
Button *tool_paint_button = nullptr;
Label *tool_tile_id_label = nullptr;
// Tool settings.
HBoxContainer *tool_settings;
VSeparator *tool_settings_vsep;
HBoxContainer *tool_settings_tile_data_toolbar_container;
Button *tools_settings_erase_button;
MenuButton *tool_advanced_menu_buttom;
HBoxContainer *tool_settings = nullptr;
VSeparator *tool_settings_vsep = nullptr;
HBoxContainer *tool_settings_tile_data_toolbar_container = nullptr;
Button *tools_settings_erase_button = nullptr;
MenuButton *tool_advanced_menu_buttom = nullptr;
// Selection.
Set<TileSelection> selection;
@@ -223,12 +223,12 @@ private:
// A control on the tile atlas to draw and handle input events.
Vector2i hovered_base_tile_coords = TileSetSource::INVALID_ATLAS_COORDS;
PopupMenu *base_tile_popup_menu;
PopupMenu *empty_base_tile_popup_menu;
PopupMenu *base_tile_popup_menu = nullptr;
PopupMenu *empty_base_tile_popup_menu = nullptr;
Ref<Texture2D> resize_handle;
Ref<Texture2D> resize_handle_disabled;
Control *tile_atlas_control;
Control *tile_atlas_control_unscaled;
Control *tile_atlas_control = nullptr;
Control *tile_atlas_control_unscaled = nullptr;
void _tile_atlas_control_draw();
void _tile_atlas_control_unscaled_draw();
void _tile_atlas_control_mouse_exited();
@@ -238,9 +238,9 @@ private:
// A control over the alternative tiles.
Vector3i hovered_alternative_tile_coords = Vector3i(TileSetSource::INVALID_ATLAS_COORDS.x, TileSetSource::INVALID_ATLAS_COORDS.y, TileSetSource::INVALID_TILE_ALTERNATIVE);
PopupMenu *alternative_tile_popup_menu;
Control *alternative_tiles_control;
Control *alternative_tiles_control_unscaled;
PopupMenu *alternative_tile_popup_menu = nullptr;
Control *alternative_tiles_control = nullptr;
Control *alternative_tiles_control_unscaled = nullptr;
void _tile_alternatives_control_draw();
void _tile_alternatives_control_unscaled_draw();
void _tile_alternatives_control_mouse_exited();
@@ -264,7 +264,7 @@ private:
// -- Misc --
void _auto_create_tiles();
void _auto_remove_tiles();
AcceptDialog *confirm_auto_create_tiles;
AcceptDialog *confirm_auto_create_tiles = nullptr;
void _tile_set_changed();
void _tile_proxy_object_changed(String p_what);
@@ -293,7 +293,7 @@ class EditorPropertyTilePolygon : public EditorProperty {
void _add_focusable_children(Node *p_node);
GenericTilePolygonEditor *generic_tile_polygon_editor;
GenericTilePolygonEditor *generic_tile_polygon_editor = nullptr;
void _polygons_changed();
public:

View File

@@ -47,18 +47,18 @@ class TileSetEditor : public VBoxContainer {
private:
Ref<TileSet> tile_set;
bool tile_set_changed_needs_update = false;
HSplitContainer *split_container;
HSplitContainer *split_container = nullptr;
// TabBar.
HBoxContainer *tile_set_toolbar;
TabBar *tabs_bar;
HBoxContainer *tile_set_toolbar = nullptr;
TabBar *tabs_bar = nullptr;
// Tiles.
Label *no_source_selected_label;
TileSetAtlasSourceEditor *tile_set_atlas_source_editor;
TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor;
Label *no_source_selected_label = nullptr;
TileSetAtlasSourceEditor *tile_set_atlas_source_editor = nullptr;
TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
void _drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
bool _can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
@@ -66,11 +66,11 @@ private:
void _update_sources_list(int force_selected_id = -1);
// Sources management.
Button *sources_delete_button;
MenuButton *sources_add_button;
MenuButton *source_sort_button;
MenuButton *sources_advanced_menu_button;
ItemList *sources_list;
Button *sources_delete_button = nullptr;
MenuButton *sources_add_button = nullptr;
MenuButton *source_sort_button = nullptr;
MenuButton *sources_advanced_menu_button = nullptr;
ItemList *sources_list = nullptr;
Ref<Texture2D> missing_texture_texture;
void _source_selected(int p_source_index);
void _source_delete_pressed();
@@ -78,12 +78,12 @@ private:
void _sources_advanced_menu_id_pressed(int p_id_pressed);
void _set_source_sort(int p_sort);
AtlasMergingDialog *atlas_merging_dialog;
TileProxiesManagerDialog *tile_proxies_manager_dialog;
AtlasMergingDialog *atlas_merging_dialog = nullptr;
TileProxiesManagerDialog *tile_proxies_manager_dialog = nullptr;
// Patterns.
ItemList *patterns_item_list;
Label *patterns_help_label;
ItemList *patterns_item_list = nullptr;
Label *patterns_help_label = nullptr;
void _patterns_item_list_gui_input(const Ref<InputEvent> &p_event);
void _pattern_preview_done(Ref<TileMapPattern> p_pattern, Ref<Texture2D> p_texture);
bool select_last_pattern = false;

View File

@@ -70,7 +70,7 @@ private:
GDCLASS(SceneTileProxyObject, Object);
private:
TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor;
TileSetScenesCollectionSourceEditor *tile_set_scenes_collection_source_editor = nullptr;
TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
int source_id;
@@ -97,23 +97,23 @@ private:
TileSetScenesCollectionSource *tile_set_scenes_collection_source = nullptr;
int tile_set_source_id = -1;
UndoRedo *undo_redo;
UndoRedo *undo_redo = nullptr;
bool tile_set_scenes_collection_source_changed_needs_update = false;
// Source inspector.
TileSetScenesCollectionProxyObject *scenes_collection_source_proxy_object;
Label *scenes_collection_source_inspector_label;
EditorInspector *scenes_collection_source_inspector;
TileSetScenesCollectionProxyObject *scenes_collection_source_proxy_object = nullptr;
Label *scenes_collection_source_inspector_label = nullptr;
EditorInspector *scenes_collection_source_inspector = nullptr;
// Tile inspector.
SceneTileProxyObject *tile_proxy_object;
Label *tile_inspector_label;
EditorInspector *tile_inspector;
SceneTileProxyObject *tile_proxy_object = nullptr;
Label *tile_inspector_label = nullptr;
EditorInspector *tile_inspector = nullptr;
ItemList *scene_tiles_list;
Button *scene_tile_add_button;
Button *scene_tile_delete_button;
ItemList *scene_tiles_list = nullptr;
Button *scene_tile_add_button = nullptr;
Button *scene_tile_delete_button = nullptr;
void _tile_set_scenes_collection_source_changed();
void _scenes_collection_source_proxy_object_changed(String p_what);

View File

@@ -57,11 +57,11 @@ private:
ObjectID tile_map_id;
Ref<TileSet> tile_set;
Button *tilemap_editor_button;
TileMapEditor *tilemap_editor;
Button *tilemap_editor_button = nullptr;
TileMapEditor *tilemap_editor = nullptr;
Button *tileset_editor_button;
TileSetEditor *tileset_editor;
Button *tileset_editor_button = nullptr;
TileSetEditor *tileset_editor = nullptr;
void _update_editors();

View File

@@ -57,48 +57,48 @@ private:
int staged_files_count;
List<StringName> available_addons;
PopupMenu *version_control_actions;
ConfirmationDialog *metadata_dialog;
OptionButton *metadata_selection;
AcceptDialog *set_up_dialog;
VBoxContainer *set_up_vbc;
HBoxContainer *set_up_hbc;
Label *set_up_vcs_label;
OptionButton *set_up_choice;
PanelContainer *set_up_init_settings;
Button *set_up_init_button;
RichTextLabel *set_up_vcs_status;
Button *set_up_ok_button;
PopupMenu *version_control_actions = nullptr;
ConfirmationDialog *metadata_dialog = nullptr;
OptionButton *metadata_selection = nullptr;
AcceptDialog *set_up_dialog = nullptr;
VBoxContainer *set_up_vbc = nullptr;
HBoxContainer *set_up_hbc = nullptr;
Label *set_up_vcs_label = nullptr;
OptionButton *set_up_choice = nullptr;
PanelContainer *set_up_init_settings = nullptr;
Button *set_up_init_button = nullptr;
RichTextLabel *set_up_vcs_status = nullptr;
Button *set_up_ok_button = nullptr;
HashMap<ChangeType, String> change_type_to_strings;
HashMap<ChangeType, Color> change_type_to_color;
VBoxContainer *version_commit_dock;
VBoxContainer *commit_box_vbc;
HSplitContainer *stage_tools;
Tree *stage_files;
TreeItem *new_files;
TreeItem *modified_files;
TreeItem *renamed_files;
TreeItem *deleted_files;
TreeItem *typechange_files;
Label *staging_area_label;
HSplitContainer *stage_buttons;
Button *stage_all_button;
Button *stage_selected_button;
Button *refresh_button;
TextEdit *commit_message;
Button *commit_button;
Label *commit_status;
VBoxContainer *version_commit_dock = nullptr;
VBoxContainer *commit_box_vbc = nullptr;
HSplitContainer *stage_tools = nullptr;
Tree *stage_files = nullptr;
TreeItem *new_files = nullptr;
TreeItem *modified_files = nullptr;
TreeItem *renamed_files = nullptr;
TreeItem *deleted_files = nullptr;
TreeItem *typechange_files = nullptr;
Label *staging_area_label = nullptr;
HSplitContainer *stage_buttons = nullptr;
Button *stage_all_button = nullptr;
Button *stage_selected_button = nullptr;
Button *refresh_button = nullptr;
TextEdit *commit_message = nullptr;
Button *commit_button = nullptr;
Label *commit_status = nullptr;
PanelContainer *version_control_dock;
Button *version_control_dock_button;
VBoxContainer *diff_vbc;
HBoxContainer *diff_hbc;
Button *diff_refresh_button;
Label *diff_file_name;
Label *diff_heading;
RichTextLabel *diff;
PanelContainer *version_control_dock = nullptr;
Button *version_control_dock_button = nullptr;
VBoxContainer *diff_vbc = nullptr;
HBoxContainer *diff_hbc = nullptr;
Button *diff_refresh_button = nullptr;
Label *diff_file_name = nullptr;
Label *diff_heading = nullptr;
RichTextLabel *diff = nullptr;
void _populate_available_vcs_names();
void _create_vcs_metadata_files();

View File

@@ -41,12 +41,12 @@ struct EditorProgress;
class VoxelGIEditorPlugin : public EditorPlugin {
GDCLASS(VoxelGIEditorPlugin, EditorPlugin);
VoxelGI *voxel_gi;
VoxelGI *voxel_gi = nullptr;
HBoxContainer *bake_hb;
Button *bake;
HBoxContainer *bake_hb = nullptr;
Button *bake = nullptr;
EditorFileDialog *probe_file;
EditorFileDialog *probe_file = nullptr;
static EditorProgress *tmp_progress;
static void bake_func_begin(int p_steps);