Made use of semicolons more consitent, fixed formatting

This commit is contained in:
JohnJLight 2019-03-19 14:35:57 -04:00 committed by Rémi Verschelde
parent 43a9b8c76c
commit 38d3bfe971
143 changed files with 463 additions and 380 deletions

View file

@ -694,7 +694,7 @@ VARIANT_ENUM_CAST(_Thread::Priority);
class _ClassDB : public Object { class _ClassDB : public Object {
GDCLASS(_ClassDB, Object) GDCLASS(_ClassDB, Object);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -779,7 +779,7 @@ public:
class _JSON; class _JSON;
class JSONParseResult : public Reference { class JSONParseResult : public Reference {
GDCLASS(JSONParseResult, Reference) GDCLASS(JSONParseResult, Reference);
friend class _JSON; friend class _JSON;
@ -807,7 +807,7 @@ public:
}; };
class _JSON : public Object { class _JSON : public Object {
GDCLASS(_JSON, Object) GDCLASS(_JSON, Object);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -94,7 +94,8 @@ public:
class ResourceImporter : public Reference { class ResourceImporter : public Reference {
GDCLASS(ResourceImporter, Reference) GDCLASS(ResourceImporter, Reference);
public: public:
virtual String get_importer_name() const = 0; virtual String get_importer_name() const = 0;
virtual String get_visible_name() const = 0; virtual String get_visible_name() const = 0;

View file

@ -62,7 +62,7 @@ public:
class ResourceFormatLoader : public Reference { class ResourceFormatLoader : public Reference {
GDCLASS(ResourceFormatLoader, Reference) GDCLASS(ResourceFormatLoader, Reference);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -38,7 +38,7 @@
*/ */
class ResourceFormatSaver : public Reference { class ResourceFormatSaver : public Reference {
GDCLASS(ResourceFormatSaver, Reference) GDCLASS(ResourceFormatSaver, Reference);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -42,7 +42,7 @@
class AStar : public Reference { class AStar : public Reference {
GDCLASS(AStar, Reference) GDCLASS(AStar, Reference);
uint64_t pass; uint64_t pass;

View file

@ -34,7 +34,8 @@
#include "core/reference.h" #include "core/reference.h"
class Expression : public Reference { class Expression : public Reference {
GDCLASS(Expression, Reference) GDCLASS(Expression, Reference);
public: public:
enum BuiltinFunc { enum BuiltinFunc {
MATH_SIN, MATH_SIN,

View file

@ -173,7 +173,7 @@ enum MidiMessageList {
*/ */
class InputEvent : public Resource { class InputEvent : public Resource {
GDCLASS(InputEvent, Resource) GDCLASS(InputEvent, Resource);
int device; int device;
@ -210,7 +210,7 @@ public:
}; };
class InputEventWithModifiers : public InputEvent { class InputEventWithModifiers : public InputEvent {
GDCLASS(InputEventWithModifiers, InputEvent) GDCLASS(InputEventWithModifiers, InputEvent);
bool shift; bool shift;
bool alt; bool alt;
@ -256,7 +256,7 @@ public:
class InputEventKey : public InputEventWithModifiers { class InputEventKey : public InputEventWithModifiers {
GDCLASS(InputEventKey, InputEventWithModifiers) GDCLASS(InputEventKey, InputEventWithModifiers);
bool pressed; /// otherwise release bool pressed; /// otherwise release
@ -295,7 +295,7 @@ public:
class InputEventMouse : public InputEventWithModifiers { class InputEventMouse : public InputEventWithModifiers {
GDCLASS(InputEventMouse, InputEventWithModifiers) GDCLASS(InputEventMouse, InputEventWithModifiers);
int button_mask; int button_mask;
@ -320,7 +320,7 @@ public:
class InputEventMouseButton : public InputEventMouse { class InputEventMouseButton : public InputEventMouse {
GDCLASS(InputEventMouseButton, InputEventMouse) GDCLASS(InputEventMouseButton, InputEventMouse);
float factor; float factor;
int button_index; int button_index;
@ -354,7 +354,7 @@ public:
class InputEventMouseMotion : public InputEventMouse { class InputEventMouseMotion : public InputEventMouse {
GDCLASS(InputEventMouseMotion, InputEventMouse) GDCLASS(InputEventMouseMotion, InputEventMouse);
Vector2 relative; Vector2 relative;
Vector2 speed; Vector2 speed;
@ -378,7 +378,7 @@ public:
class InputEventJoypadMotion : public InputEvent { class InputEventJoypadMotion : public InputEvent {
GDCLASS(InputEventJoypadMotion, InputEvent) GDCLASS(InputEventJoypadMotion, InputEvent);
int axis; ///< Joypad axis int axis; ///< Joypad axis
float axis_value; ///< -1 to 1 float axis_value; ///< -1 to 1
@ -403,7 +403,7 @@ public:
}; };
class InputEventJoypadButton : public InputEvent { class InputEventJoypadButton : public InputEvent {
GDCLASS(InputEventJoypadButton, InputEvent) GDCLASS(InputEventJoypadButton, InputEvent);
int button_index; int button_index;
bool pressed; bool pressed;
@ -431,7 +431,7 @@ public:
}; };
class InputEventScreenTouch : public InputEvent { class InputEventScreenTouch : public InputEvent {
GDCLASS(InputEventScreenTouch, InputEvent) GDCLASS(InputEventScreenTouch, InputEvent);
int index; int index;
Vector2 pos; Vector2 pos;
bool pressed; bool pressed;
@ -457,7 +457,7 @@ public:
class InputEventScreenDrag : public InputEvent { class InputEventScreenDrag : public InputEvent {
GDCLASS(InputEventScreenDrag, InputEvent) GDCLASS(InputEventScreenDrag, InputEvent);
int index; int index;
Vector2 pos; Vector2 pos;
Vector2 relative; Vector2 relative;
@ -487,7 +487,7 @@ public:
class InputEventAction : public InputEvent { class InputEventAction : public InputEvent {
GDCLASS(InputEventAction, InputEvent) GDCLASS(InputEventAction, InputEvent);
StringName action; StringName action;
bool pressed; bool pressed;
@ -519,7 +519,7 @@ public:
class InputEventGesture : public InputEventWithModifiers { class InputEventGesture : public InputEventWithModifiers {
GDCLASS(InputEventGesture, InputEventWithModifiers) GDCLASS(InputEventGesture, InputEventWithModifiers);
Vector2 pos; Vector2 pos;
@ -533,7 +533,7 @@ public:
class InputEventMagnifyGesture : public InputEventGesture { class InputEventMagnifyGesture : public InputEventGesture {
GDCLASS(InputEventMagnifyGesture, InputEventGesture) GDCLASS(InputEventMagnifyGesture, InputEventGesture);
real_t factor; real_t factor;
protected: protected:
@ -551,7 +551,7 @@ public:
class InputEventPanGesture : public InputEventGesture { class InputEventPanGesture : public InputEventGesture {
GDCLASS(InputEventPanGesture, InputEventGesture) GDCLASS(InputEventPanGesture, InputEventGesture);
Vector2 delta; Vector2 delta;
protected: protected:
@ -568,7 +568,7 @@ public:
}; };
class InputEventMIDI : public InputEvent { class InputEventMIDI : public InputEvent {
GDCLASS(InputEventMIDI, InputEvent) GDCLASS(InputEventMIDI, InputEvent);
int channel; int channel;
int message; int message;

View file

@ -35,7 +35,7 @@
class AnimationBezierTrackEdit : public Control { class AnimationBezierTrackEdit : public Control {
GDCLASS(AnimationBezierTrackEdit, Control) GDCLASS(AnimationBezierTrackEdit, Control);
enum HandleMode { enum HandleMode {
HANDLE_MODE_FREE, HANDLE_MODE_FREE,

View file

@ -50,7 +50,7 @@
#include "scene_tree_editor.h" #include "scene_tree_editor.h"
class AnimationTimelineEdit : public Range { class AnimationTimelineEdit : public Range {
GDCLASS(AnimationTimelineEdit, Range) GDCLASS(AnimationTimelineEdit, Range);
Ref<Animation> animation; Ref<Animation> animation;
int name_limit; int name_limit;
@ -123,7 +123,7 @@ class AnimationTrackEditor;
class AnimationTrackEdit : public Control { class AnimationTrackEdit : public Control {
GDCLASS(AnimationTrackEdit, Control) GDCLASS(AnimationTrackEdit, Control);
enum { enum {
MENU_CALL_MODE_CONTINUOUS, MENU_CALL_MODE_CONTINUOUS,
@ -237,7 +237,8 @@ public:
}; };
class AnimationTrackEditPlugin : public Reference { class AnimationTrackEditPlugin : public Reference {
GDCLASS(AnimationTrackEditPlugin, Reference) GDCLASS(AnimationTrackEditPlugin, Reference);
public: public:
virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage); virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
virtual AnimationTrackEdit *create_audio_track_edit(); virtual AnimationTrackEdit *create_audio_track_edit();
@ -248,7 +249,7 @@ class AnimationTrackKeyEdit;
class AnimationBezierTrackEdit; class AnimationBezierTrackEdit;
class AnimationTrackEditGroup : public Control { class AnimationTrackEditGroup : public Control {
GDCLASS(AnimationTrackEditGroup, Control) GDCLASS(AnimationTrackEditGroup, Control);
Ref<Texture> icon; Ref<Texture> icon;
String node_name; String node_name;
NodePath node; NodePath node;
@ -271,7 +272,7 @@ public:
}; };
class AnimationTrackEditor : public VBoxContainer { class AnimationTrackEditor : public VBoxContainer {
GDCLASS(AnimationTrackEditor, VBoxContainer) GDCLASS(AnimationTrackEditor, VBoxContainer);
enum { enum {
EDIT_COPY_TRACKS, EDIT_COPY_TRACKS,

View file

@ -34,7 +34,7 @@
#include "editor/animation_track_editor.h" #include "editor/animation_track_editor.h"
class AnimationTrackEditBool : public AnimationTrackEdit { class AnimationTrackEditBool : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditBool, AnimationTrackEdit) GDCLASS(AnimationTrackEditBool, AnimationTrackEdit);
Ref<Texture> icon_checked; Ref<Texture> icon_checked;
Ref<Texture> icon_unchecked; Ref<Texture> icon_unchecked;
@ -46,7 +46,7 @@ public:
}; };
class AnimationTrackEditColor : public AnimationTrackEdit { class AnimationTrackEditColor : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditColor, AnimationTrackEdit) GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);
public: public:
virtual int get_key_height() const; virtual int get_key_height() const;
@ -57,7 +57,7 @@ public:
}; };
class AnimationTrackEditAudio : public AnimationTrackEdit { class AnimationTrackEditAudio : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit) GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit);
ObjectID id; ObjectID id;
@ -78,7 +78,7 @@ public:
}; };
class AnimationTrackEditSpriteFrame : public AnimationTrackEdit { class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit) GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
ObjectID id; ObjectID id;
@ -92,7 +92,7 @@ public:
}; };
class AnimationTrackEditSubAnim : public AnimationTrackEdit { class AnimationTrackEditSubAnim : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit) GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit);
ObjectID id; ObjectID id;
@ -106,7 +106,7 @@ public:
}; };
class AnimationTrackEditTypeAudio : public AnimationTrackEdit { class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit) GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit);
void _preview_changed(ObjectID p_which); void _preview_changed(ObjectID p_which);
@ -134,7 +134,7 @@ public:
}; };
class AnimationTrackEditTypeAnimation : public AnimationTrackEdit { class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit) GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit);
ObjectID id; ObjectID id;
@ -149,7 +149,7 @@ public:
}; };
class AnimationTrackEditVolumeDB : public AnimationTrackEdit { class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit) GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);
public: public:
virtual void draw_bg(int p_clip_left, int p_clip_right); virtual void draw_bg(int p_clip_left, int p_clip_right);
@ -159,7 +159,8 @@ public:
}; };
class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin { class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {
GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin) GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin);
public: public:
virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage); virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
virtual AnimationTrackEdit *create_audio_track_edit(); virtual AnimationTrackEdit *create_audio_track_edit();

View file

@ -36,7 +36,7 @@
#include "servers/audio/audio_stream.h" #include "servers/audio/audio_stream.h"
class AudioStreamPreview : public Reference { class AudioStreamPreview : public Reference {
GDCLASS(AudioStreamPreview, Reference) GDCLASS(AudioStreamPreview, Reference);
friend class AudioStream; friend class AudioStream;
Vector<uint8_t> preview; Vector<uint8_t> preview;
float length; float length;
@ -52,7 +52,7 @@ public:
}; };
class AudioStreamPreviewGenerator : public Node { class AudioStreamPreviewGenerator : public Node {
GDCLASS(AudioStreamPreviewGenerator, Node) GDCLASS(AudioStreamPreviewGenerator, Node);
static AudioStreamPreviewGenerator *singleton; static AudioStreamPreviewGenerator *singleton;

View file

@ -44,7 +44,7 @@
class CreateDialog : public ConfirmationDialog { class CreateDialog : public ConfirmationDialog {
GDCLASS(CreateDialog, ConfirmationDialog) GDCLASS(CreateDialog, ConfirmationDialog);
Vector<String> favorite_list; Vector<String> favorite_list;
Tree *favorites; Tree *favorites;

View file

@ -52,7 +52,7 @@ class EditorAudioBuses;
class EditorAudioBus : public PanelContainer { class EditorAudioBus : public PanelContainer {
GDCLASS(EditorAudioBus, PanelContainer) GDCLASS(EditorAudioBus, PanelContainer);
Ref<Texture> disabled_vu; Ref<Texture> disabled_vu;
LineEdit *track_name; LineEdit *track_name;
@ -155,7 +155,7 @@ public:
class EditorAudioBuses : public VBoxContainer { class EditorAudioBuses : public VBoxContainer {
GDCLASS(EditorAudioBuses, VBoxContainer) GDCLASS(EditorAudioBuses, VBoxContainer);
HBoxContainer *top_hb; HBoxContainer *top_hb;

View file

@ -44,7 +44,8 @@ struct EditorProgress;
class EditorExportPreset : public Reference { class EditorExportPreset : public Reference {
GDCLASS(EditorExportPreset, Reference) GDCLASS(EditorExportPreset, Reference);
public: public:
enum ExportFilter { enum ExportFilter {
EXPORT_ALL_RESOURCES, EXPORT_ALL_RESOURCES,
@ -152,7 +153,7 @@ struct SharedObject {
class EditorExportPlatform : public Reference { class EditorExportPlatform : public Reference {
GDCLASS(EditorExportPlatform, Reference) GDCLASS(EditorExportPlatform, Reference);
public: public:
typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total); typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total);
@ -272,7 +273,7 @@ public:
}; };
class EditorExportPlugin : public Reference { class EditorExportPlugin : public Reference {
GDCLASS(EditorExportPlugin, Reference) GDCLASS(EditorExportPlugin, Reference);
friend class EditorExportPlatform; friend class EditorExportPlatform;
@ -388,7 +389,7 @@ public:
class EditorExportPlatformPC : public EditorExportPlatform { class EditorExportPlatformPC : public EditorExportPlatform {
GDCLASS(EditorExportPlatformPC, EditorExportPlatform) GDCLASS(EditorExportPlatformPC, EditorExportPlatform);
Ref<ImageTexture> logo; Ref<ImageTexture> logo;
String name; String name;
@ -440,7 +441,7 @@ public:
class EditorExportTextSceneToBinaryPlugin : public EditorExportPlugin { class EditorExportTextSceneToBinaryPlugin : public EditorExportPlugin {
GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin) GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin);
public: public:
virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features); virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features);

View file

@ -48,7 +48,8 @@ public:
class EditorProperty : public Container { class EditorProperty : public Container {
GDCLASS(EditorProperty, Container) GDCLASS(EditorProperty, Container);
private: private:
String label; String label;
int text_size; int text_size;
@ -167,7 +168,7 @@ public:
}; };
class EditorInspectorPlugin : public Reference { class EditorInspectorPlugin : public Reference {
GDCLASS(EditorInspectorPlugin, Reference) GDCLASS(EditorInspectorPlugin, Reference);
friend class EditorInspector; friend class EditorInspector;
struct AddedEditor { struct AddedEditor {

View file

@ -60,7 +60,8 @@ class EditorToolAddons;
class ScriptEditor; class ScriptEditor;
class EditorInterface : public Node { class EditorInterface : public Node {
GDCLASS(EditorInterface, Node) GDCLASS(EditorInterface, Node);
protected: protected:
static void _bind_methods(); static void _bind_methods();
static EditorInterface *singleton; static EditorInterface *singleton;

View file

@ -42,7 +42,7 @@
class EditorProfiler : public VBoxContainer { class EditorProfiler : public VBoxContainer {
GDCLASS(EditorProfiler, VBoxContainer) GDCLASS(EditorProfiler, VBoxContainer);
public: public:
struct Metric { struct Metric {

View file

@ -599,7 +599,8 @@ EditorPropertyFlags::EditorPropertyFlags() {
///////////////////// LAYERS ///////////////////////// ///////////////////// LAYERS /////////////////////////
class EditorPropertyLayersGrid : public Control { class EditorPropertyLayersGrid : public Control {
GDCLASS(EditorPropertyLayersGrid, Control) GDCLASS(EditorPropertyLayersGrid, Control);
public: public:
uint32_t value; uint32_t value;
Vector<Rect2> flag_rects; Vector<Rect2> flag_rects;

View file

@ -40,7 +40,7 @@
#include "scene/gui/color_picker.h" #include "scene/gui/color_picker.h"
class EditorPropertyNil : public EditorProperty { class EditorPropertyNil : public EditorProperty {
GDCLASS(EditorPropertyNil, EditorProperty) GDCLASS(EditorPropertyNil, EditorProperty);
LineEdit *text; LineEdit *text;
public: public:
@ -49,7 +49,7 @@ public:
}; };
class EditorPropertyText : public EditorProperty { class EditorPropertyText : public EditorProperty {
GDCLASS(EditorPropertyText, EditorProperty) GDCLASS(EditorPropertyText, EditorProperty);
LineEdit *text; LineEdit *text;
bool updating; bool updating;
@ -66,7 +66,7 @@ public:
}; };
class EditorPropertyMultilineText : public EditorProperty { class EditorPropertyMultilineText : public EditorProperty {
GDCLASS(EditorPropertyMultilineText, EditorProperty) GDCLASS(EditorPropertyMultilineText, EditorProperty);
TextEdit *text; TextEdit *text;
AcceptDialog *big_text_dialog; AcceptDialog *big_text_dialog;
@ -87,7 +87,7 @@ public:
}; };
class EditorPropertyTextEnum : public EditorProperty { class EditorPropertyTextEnum : public EditorProperty {
GDCLASS(EditorPropertyTextEnum, EditorProperty) GDCLASS(EditorPropertyTextEnum, EditorProperty);
OptionButton *options; OptionButton *options;
void _option_selected(int p_which); void _option_selected(int p_which);
@ -102,7 +102,7 @@ public:
}; };
class EditorPropertyPath : public EditorProperty { class EditorPropertyPath : public EditorProperty {
GDCLASS(EditorPropertyPath, EditorProperty) GDCLASS(EditorPropertyPath, EditorProperty);
Vector<String> extensions; Vector<String> extensions;
bool folder; bool folder;
bool global; bool global;
@ -127,7 +127,8 @@ public:
}; };
class EditorPropertyClassName : public EditorProperty { class EditorPropertyClassName : public EditorProperty {
GDCLASS(EditorPropertyClassName, EditorProperty) GDCLASS(EditorPropertyClassName, EditorProperty);
private: private:
CreateDialog *dialog; CreateDialog *dialog;
Button *property; Button *property;
@ -146,7 +147,8 @@ public:
}; };
class EditorPropertyMember : public EditorProperty { class EditorPropertyMember : public EditorProperty {
GDCLASS(EditorPropertyMember, EditorProperty) GDCLASS(EditorPropertyMember, EditorProperty);
public: public:
enum Type { enum Type {
MEMBER_METHOD_OF_VARIANT_TYPE, ///< a method of a type MEMBER_METHOD_OF_VARIANT_TYPE, ///< a method of a type
@ -179,7 +181,7 @@ public:
}; };
class EditorPropertyCheck : public EditorProperty { class EditorPropertyCheck : public EditorProperty {
GDCLASS(EditorPropertyCheck, EditorProperty) GDCLASS(EditorPropertyCheck, EditorProperty);
CheckBox *checkbox; CheckBox *checkbox;
void _checkbox_pressed(); void _checkbox_pressed();
@ -193,7 +195,7 @@ public:
}; };
class EditorPropertyEnum : public EditorProperty { class EditorPropertyEnum : public EditorProperty {
GDCLASS(EditorPropertyEnum, EditorProperty) GDCLASS(EditorPropertyEnum, EditorProperty);
OptionButton *options; OptionButton *options;
void _option_selected(int p_which); void _option_selected(int p_which);
@ -209,7 +211,7 @@ public:
}; };
class EditorPropertyFlags : public EditorProperty { class EditorPropertyFlags : public EditorProperty {
GDCLASS(EditorPropertyFlags, EditorProperty) GDCLASS(EditorPropertyFlags, EditorProperty);
VBoxContainer *vbox; VBoxContainer *vbox;
Vector<CheckBox *> flags; Vector<CheckBox *> flags;
Vector<int> flag_indices; Vector<int> flag_indices;
@ -228,7 +230,8 @@ public:
class EditorPropertyLayersGrid; class EditorPropertyLayersGrid;
class EditorPropertyLayers : public EditorProperty { class EditorPropertyLayers : public EditorProperty {
GDCLASS(EditorPropertyLayers, EditorProperty) GDCLASS(EditorPropertyLayers, EditorProperty);
public: public:
enum LayerType { enum LayerType {
LAYER_PHYSICS_2D, LAYER_PHYSICS_2D,
@ -257,7 +260,7 @@ public:
}; };
class EditorPropertyInteger : public EditorProperty { class EditorPropertyInteger : public EditorProperty {
GDCLASS(EditorPropertyInteger, EditorProperty) GDCLASS(EditorPropertyInteger, EditorProperty);
EditorSpinSlider *spin; EditorSpinSlider *spin;
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val);
@ -272,7 +275,7 @@ public:
}; };
class EditorPropertyObjectID : public EditorProperty { class EditorPropertyObjectID : public EditorProperty {
GDCLASS(EditorPropertyObjectID, EditorProperty) GDCLASS(EditorPropertyObjectID, EditorProperty);
Button *edit; Button *edit;
String base_type; String base_type;
void _edit_pressed(); void _edit_pressed();
@ -287,7 +290,7 @@ public:
}; };
class EditorPropertyFloat : public EditorProperty { class EditorPropertyFloat : public EditorProperty {
GDCLASS(EditorPropertyFloat, EditorProperty) GDCLASS(EditorPropertyFloat, EditorProperty);
EditorSpinSlider *spin; EditorSpinSlider *spin;
bool setting; bool setting;
void _value_changed(double p_val); void _value_changed(double p_val);
@ -302,7 +305,7 @@ public:
}; };
class EditorPropertyEasing : public EditorProperty { class EditorPropertyEasing : public EditorProperty {
GDCLASS(EditorPropertyEasing, EditorProperty) GDCLASS(EditorPropertyEasing, EditorProperty);
Control *easing_draw; Control *easing_draw;
PopupMenu *preset; PopupMenu *preset;
bool full; bool full;
@ -335,7 +338,7 @@ public:
}; };
class EditorPropertyVector2 : public EditorProperty { class EditorPropertyVector2 : public EditorProperty {
GDCLASS(EditorPropertyVector2, EditorProperty) GDCLASS(EditorPropertyVector2, EditorProperty);
EditorSpinSlider *spin[2]; EditorSpinSlider *spin[2];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -351,7 +354,7 @@ public:
}; };
class EditorPropertyRect2 : public EditorProperty { class EditorPropertyRect2 : public EditorProperty {
GDCLASS(EditorPropertyRect2, EditorProperty) GDCLASS(EditorPropertyRect2, EditorProperty);
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -367,7 +370,7 @@ public:
}; };
class EditorPropertyVector3 : public EditorProperty { class EditorPropertyVector3 : public EditorProperty {
GDCLASS(EditorPropertyVector3, EditorProperty) GDCLASS(EditorPropertyVector3, EditorProperty);
EditorSpinSlider *spin[3]; EditorSpinSlider *spin[3];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -383,7 +386,7 @@ public:
}; };
class EditorPropertyPlane : public EditorProperty { class EditorPropertyPlane : public EditorProperty {
GDCLASS(EditorPropertyPlane, EditorProperty) GDCLASS(EditorPropertyPlane, EditorProperty);
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -399,7 +402,7 @@ public:
}; };
class EditorPropertyQuat : public EditorProperty { class EditorPropertyQuat : public EditorProperty {
GDCLASS(EditorPropertyQuat, EditorProperty) GDCLASS(EditorPropertyQuat, EditorProperty);
EditorSpinSlider *spin[4]; EditorSpinSlider *spin[4];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -415,7 +418,7 @@ public:
}; };
class EditorPropertyAABB : public EditorProperty { class EditorPropertyAABB : public EditorProperty {
GDCLASS(EditorPropertyAABB, EditorProperty) GDCLASS(EditorPropertyAABB, EditorProperty);
EditorSpinSlider *spin[6]; EditorSpinSlider *spin[6];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -431,7 +434,7 @@ public:
}; };
class EditorPropertyTransform2D : public EditorProperty { class EditorPropertyTransform2D : public EditorProperty {
GDCLASS(EditorPropertyTransform2D, EditorProperty) GDCLASS(EditorPropertyTransform2D, EditorProperty);
EditorSpinSlider *spin[6]; EditorSpinSlider *spin[6];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -447,7 +450,7 @@ public:
}; };
class EditorPropertyBasis : public EditorProperty { class EditorPropertyBasis : public EditorProperty {
GDCLASS(EditorPropertyBasis, EditorProperty) GDCLASS(EditorPropertyBasis, EditorProperty);
EditorSpinSlider *spin[9]; EditorSpinSlider *spin[9];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -463,7 +466,7 @@ public:
}; };
class EditorPropertyTransform : public EditorProperty { class EditorPropertyTransform : public EditorProperty {
GDCLASS(EditorPropertyTransform, EditorProperty) GDCLASS(EditorPropertyTransform, EditorProperty);
EditorSpinSlider *spin[12]; EditorSpinSlider *spin[12];
bool setting; bool setting;
void _value_changed(double p_val, const String &p_name); void _value_changed(double p_val, const String &p_name);
@ -479,7 +482,7 @@ public:
}; };
class EditorPropertyColor : public EditorProperty { class EditorPropertyColor : public EditorProperty {
GDCLASS(EditorPropertyColor, EditorProperty) GDCLASS(EditorPropertyColor, EditorProperty);
ColorPickerButton *picker; ColorPickerButton *picker;
void _color_changed(const Color &p_color); void _color_changed(const Color &p_color);
void _popup_closed(); void _popup_closed();
@ -494,7 +497,7 @@ public:
}; };
class EditorPropertyNodePath : public EditorProperty { class EditorPropertyNodePath : public EditorProperty {
GDCLASS(EditorPropertyNodePath, EditorProperty) GDCLASS(EditorPropertyNodePath, EditorProperty);
Button *assign; Button *assign;
Button *clear; Button *clear;
SceneTreeDialog *scene_tree; SceneTreeDialog *scene_tree;
@ -517,7 +520,7 @@ public:
}; };
class EditorPropertyRID : public EditorProperty { class EditorPropertyRID : public EditorProperty {
GDCLASS(EditorPropertyRID, EditorProperty) GDCLASS(EditorPropertyRID, EditorProperty);
Label *label; Label *label;
public: public:
@ -526,7 +529,7 @@ public:
}; };
class EditorPropertyResource : public EditorProperty { class EditorPropertyResource : public EditorProperty {
GDCLASS(EditorPropertyResource, EditorProperty) GDCLASS(EditorPropertyResource, EditorProperty);
enum MenuOption { enum MenuOption {
@ -605,7 +608,7 @@ public:
/// \brief The EditorInspectorDefaultPlugin class /// \brief The EditorInspectorDefaultPlugin class
/// ///
class EditorInspectorDefaultPlugin : public EditorInspectorPlugin { class EditorInspectorDefaultPlugin : public EditorInspectorPlugin {
GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin) GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);

View file

@ -78,7 +78,7 @@ public:
}; };
class EditorPropertyArray : public EditorProperty { class EditorPropertyArray : public EditorProperty {
GDCLASS(EditorPropertyArray, EditorProperty) GDCLASS(EditorPropertyArray, EditorProperty);
PopupMenu *change_type; PopupMenu *change_type;
bool updating; bool updating;
@ -117,7 +117,7 @@ public:
}; };
class EditorPropertyDictionary : public EditorProperty { class EditorPropertyDictionary : public EditorProperty {
GDCLASS(EditorPropertyDictionary, EditorProperty) GDCLASS(EditorPropertyDictionary, EditorProperty);
PopupMenu *change_type; PopupMenu *change_type;
bool updating; bool updating;

View file

@ -36,7 +36,7 @@
#include "scene/gui/texture_rect.h" #include "scene/gui/texture_rect.h"
class EditorSpinSlider : public Range { class EditorSpinSlider : public Range {
GDCLASS(EditorSpinSlider, Range) GDCLASS(EditorSpinSlider, Range);
String label; String label;
int updown_offset; int updown_offset;

View file

@ -41,7 +41,7 @@
class ExportTemplateVersion; class ExportTemplateVersion;
class ExportTemplateManager : public ConfirmationDialog { class ExportTemplateManager : public ConfirmationDialog {
GDCLASS(ExportTemplateManager, ConfirmationDialog) GDCLASS(ExportTemplateManager, ConfirmationDialog);
AcceptDialog *template_downloader; AcceptDialog *template_downloader;
VBoxContainer *template_list; VBoxContainer *template_list;

View file

@ -36,7 +36,8 @@
// Performs the actual search // Performs the actual search
class FindInFiles : public Node { class FindInFiles : public Node {
GDCLASS(FindInFiles, Node) GDCLASS(FindInFiles, Node);
public: public:
static const char *SIGNAL_RESULT_FOUND; static const char *SIGNAL_RESULT_FOUND;
static const char *SIGNAL_FINISHED; static const char *SIGNAL_FINISHED;
@ -93,7 +94,8 @@ class HBoxContainer;
// Prompts search parameters // Prompts search parameters
class FindInFilesDialog : public AcceptDialog { class FindInFilesDialog : public AcceptDialog {
GDCLASS(FindInFilesDialog, AcceptDialog) GDCLASS(FindInFilesDialog, AcceptDialog);
public: public:
static const char *SIGNAL_FIND_REQUESTED; static const char *SIGNAL_FIND_REQUESTED;
static const char *SIGNAL_REPLACE_REQUESTED; static const char *SIGNAL_REPLACE_REQUESTED;
@ -138,7 +140,8 @@ class ProgressBar;
// Display search results // Display search results
class FindInFilesPanel : public Control { class FindInFilesPanel : public Control {
GDCLASS(FindInFilesPanel, Control) GDCLASS(FindInFilesPanel, Control);
public: public:
static const char *SIGNAL_RESULT_SELECTED; static const char *SIGNAL_RESULT_SELECTED;
static const char *SIGNAL_FILES_MODIFIED; static const char *SIGNAL_FILES_MODIFIED;

View file

@ -34,7 +34,8 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class EditorImportPlugin : public ResourceImporter { class EditorImportPlugin : public ResourceImporter {
GDCLASS(EditorImportPlugin, Reference) GDCLASS(EditorImportPlugin, Reference);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -37,7 +37,7 @@
class StreamBitMap; class StreamBitMap;
class ResourceImporterBitMap : public ResourceImporter { class ResourceImporterBitMap : public ResourceImporter {
GDCLASS(ResourceImporterBitMap, ResourceImporter) GDCLASS(ResourceImporterBitMap, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;

View file

@ -34,7 +34,8 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class ResourceImporterCSVTranslation : public ResourceImporter { class ResourceImporterCSVTranslation : public ResourceImporter {
GDCLASS(ResourceImporterCSVTranslation, ResourceImporter) GDCLASS(ResourceImporterCSVTranslation, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;
virtual String get_visible_name() const; virtual String get_visible_name() const;

View file

@ -35,7 +35,8 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class ResourceImporterImage : public ResourceImporter { class ResourceImporterImage : public ResourceImporter {
GDCLASS(ResourceImporterImage, ResourceImporter) GDCLASS(ResourceImporterImage, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;
virtual String get_visible_name() const; virtual String get_visible_name() const;

View file

@ -37,7 +37,7 @@
class StreamTexture; class StreamTexture;
class ResourceImporterLayeredTexture : public ResourceImporter { class ResourceImporterLayeredTexture : public ResourceImporter {
GDCLASS(ResourceImporterLayeredTexture, ResourceImporter) GDCLASS(ResourceImporterLayeredTexture, ResourceImporter);
bool is_3d; bool is_3d;
static const char *compression_formats[]; static const char *compression_formats[];

View file

@ -47,7 +47,8 @@ public:
}; };
class ResourceImporterOBJ : public ResourceImporter { class ResourceImporterOBJ : public ResourceImporter {
GDCLASS(ResourceImporterOBJ, ResourceImporter) GDCLASS(ResourceImporterOBJ, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;
virtual String get_visible_name() const; virtual String get_visible_name() const;

View file

@ -90,7 +90,7 @@ public:
}; };
class ResourceImporterScene : public ResourceImporter { class ResourceImporterScene : public ResourceImporter {
GDCLASS(ResourceImporterScene, ResourceImporter) GDCLASS(ResourceImporterScene, ResourceImporter);
Set<Ref<EditorSceneImporter> > importers; Set<Ref<EditorSceneImporter> > importers;

View file

@ -37,7 +37,7 @@
class StreamTexture; class StreamTexture;
class ResourceImporterTexture : public ResourceImporter { class ResourceImporterTexture : public ResourceImporter {
GDCLASS(ResourceImporterTexture, ResourceImporter) GDCLASS(ResourceImporterTexture, ResourceImporter);
protected: protected:
enum { enum {

View file

@ -34,7 +34,7 @@
#include "core/image.h" #include "core/image.h"
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class ResourceImporterTextureAtlas : public ResourceImporter { class ResourceImporterTextureAtlas : public ResourceImporter {
GDCLASS(ResourceImporterTextureAtlas, ResourceImporter) GDCLASS(ResourceImporterTextureAtlas, ResourceImporter);
struct PackData { struct PackData {
Rect2 region; Rect2 region;

View file

@ -34,7 +34,8 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class ResourceImporterWAV : public ResourceImporter { class ResourceImporterWAV : public ResourceImporter {
GDCLASS(ResourceImporterWAV, ResourceImporter) GDCLASS(ResourceImporterWAV, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;
virtual String get_visible_name() const; virtual String get_visible_name() const;

View file

@ -32,7 +32,8 @@
#include "editor_node.h" #include "editor_node.h"
class ImportDockParameters : public Object { class ImportDockParameters : public Object {
GDCLASS(ImportDockParameters, Object) GDCLASS(ImportDockParameters, Object);
public: public:
Map<StringName, Variant> values; Map<StringName, Variant> values;
List<PropertyInfo> properties; List<PropertyInfo> properties;

View file

@ -43,7 +43,7 @@
class ImportDockParameters; class ImportDockParameters;
class ImportDock : public VBoxContainer { class ImportDock : public VBoxContainer {
GDCLASS(ImportDock, VBoxContainer) GDCLASS(ImportDock, VBoxContainer);
Label *imported; Label *imported;
OptionButton *import_as; OptionButton *import_as;

View file

@ -35,7 +35,7 @@
class PaneDrag : public Control { class PaneDrag : public Control {
GDCLASS(PaneDrag, Control) GDCLASS(PaneDrag, Control);
bool mouse_over; bool mouse_over;

View file

@ -43,7 +43,7 @@
class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin { class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin) GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin);
Ref<AnimationNodeBlendSpace1D> blend_space; Ref<AnimationNodeBlendSpace1D> blend_space;

View file

@ -41,7 +41,8 @@
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
class AnimationTreeNodeEditorPlugin : public VBoxContainer { class AnimationTreeNodeEditorPlugin : public VBoxContainer {
GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer) GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer);
public: public:
virtual bool can_edit(const Ref<AnimationNode> &p_node) = 0; virtual bool can_edit(const Ref<AnimationNode> &p_node) = 0;
virtual void edit(const Ref<AnimationNode> &p_node) = 0; virtual void edit(const Ref<AnimationNode> &p_node) = 0;

View file

@ -37,7 +37,8 @@
// Edits a y(x) curve // Edits a y(x) curve
class CurveEditor : public Control { class CurveEditor : public Control {
GDCLASS(CurveEditor, Control) GDCLASS(CurveEditor, Control);
public: public:
CurveEditor(); CurveEditor();
@ -120,14 +121,16 @@ private:
}; };
class EditorInspectorPluginCurve : public EditorInspectorPlugin { class EditorInspectorPluginCurve : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object); virtual void parse_begin(Object *p_object);
}; };
class CurveEditorPlugin : public EditorPlugin { class CurveEditorPlugin : public EditorPlugin {
GDCLASS(CurveEditorPlugin, EditorPlugin) GDCLASS(CurveEditorPlugin, EditorPlugin);
public: public:
CurveEditorPlugin(EditorNode *p_node); CurveEditorPlugin(EditorNode *p_node);
@ -135,7 +138,8 @@ public:
}; };
class CurvePreviewGenerator : public EditorResourcePreviewGenerator { class CurvePreviewGenerator : public EditorResourcePreviewGenerator {
GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator) GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator);
public: public:
virtual bool handles(const String &p_type) const; virtual bool handles(const String &p_type) const;
virtual Ref<Texture> generate(const Ref<Resource> &p_from, const Size2 p_size) const; virtual Ref<Texture> generate(const Ref<Resource> &p_from, const Size2 p_size) const;

View file

@ -36,7 +36,8 @@
void post_process_preview(Ref<Image> p_image); void post_process_preview(Ref<Image> p_image);
class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator { class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator);
public: public:
virtual bool handles(const String &p_type) const; virtual bool handles(const String &p_type) const;
virtual bool generate_small_preview_automatically() const; virtual bool generate_small_preview_automatically() const;
@ -46,7 +47,8 @@ public:
}; };
class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator { class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator);
public: public:
virtual bool handles(const String &p_type) const; virtual bool handles(const String &p_type) const;
virtual bool generate_small_preview_automatically() const; virtual bool generate_small_preview_automatically() const;
@ -56,7 +58,8 @@ public:
}; };
class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator { class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator);
public: public:
virtual bool handles(const String &p_type) const; virtual bool handles(const String &p_type) const;
virtual bool generate_small_preview_automatically() const; virtual bool generate_small_preview_automatically() const;
@ -77,7 +80,7 @@ public:
class EditorMaterialPreviewPlugin : public EditorResourcePreviewGenerator { class EditorMaterialPreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator);
RID scenario; RID scenario;
RID sphere; RID sphere;
@ -123,7 +126,7 @@ public:
class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator { class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator);
RID scenario; RID scenario;
RID mesh_instance; RID mesh_instance;
@ -151,7 +154,7 @@ public:
class EditorFontPreviewPlugin : public EditorResourcePreviewGenerator { class EditorFontPreviewPlugin : public EditorResourcePreviewGenerator {
GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator) GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator);
RID viewport; RID viewport;
RID viewport_texture; RID viewport_texture;

View file

@ -36,7 +36,7 @@
#include "scene/gui/gradient_edit.h" #include "scene/gui/gradient_edit.h"
class GradientEditor : public GradientEdit { class GradientEditor : public GradientEdit {
GDCLASS(GradientEditor, GradientEdit) GDCLASS(GradientEditor, GradientEdit);
bool editing; bool editing;
Ref<Gradient> gradient; Ref<Gradient> gradient;
@ -54,7 +54,8 @@ public:
}; };
class EditorInspectorPluginGradient : public EditorInspectorPlugin { class EditorInspectorPluginGradient : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object); virtual void parse_begin(Object *p_object);

View file

@ -78,7 +78,7 @@ public:
}; };
class EditorInspectorPluginMaterial : public EditorInspectorPlugin { class EditorInspectorPluginMaterial : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin);
Ref<Environment> env; Ref<Environment> env;
public: public:
@ -99,7 +99,8 @@ public:
}; };
class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin { class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin {
GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin) GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin);
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;
@ -107,7 +108,8 @@ public:
}; };
class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin { class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin) GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin);
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;
@ -115,7 +117,8 @@ public:
}; };
class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin { class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin) GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin);
public: public:
virtual String converts_to() const; virtual String converts_to() const;
virtual bool handles(const Ref<Resource> &p_resource) const; virtual bool handles(const Ref<Resource> &p_resource) const;

View file

@ -73,7 +73,8 @@ public:
}; };
class EditorInspectorPluginMesh : public EditorInspectorPlugin { class EditorInspectorPluginMesh : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object); virtual void parse_begin(Object *p_object);

View file

@ -42,7 +42,7 @@
class ParticlesEditorBase : public Control { class ParticlesEditorBase : public Control {
GDCLASS(ParticlesEditorBase, Control) GDCLASS(ParticlesEditorBase, Control);
protected: protected:
Spatial *base_node; Spatial *base_node;

View file

@ -37,7 +37,7 @@
#include "scene/animation/animation_tree.h" #include "scene/animation/animation_tree.h"
class EditorPropertyRootMotion : public EditorProperty { class EditorPropertyRootMotion : public EditorProperty {
GDCLASS(EditorPropertyRootMotion, EditorProperty) GDCLASS(EditorPropertyRootMotion, EditorProperty);
Button *assign; Button *assign;
Button *clear; Button *clear;
NodePath base_hint; NodePath base_hint;
@ -60,7 +60,7 @@ public:
}; };
class EditorInspectorRootMotionPlugin : public EditorInspectorPlugin { class EditorInspectorRootMotionPlugin : public EditorInspectorPlugin {
GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin) GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);

View file

@ -50,7 +50,7 @@
class ScriptEditorQuickOpen : public ConfirmationDialog { class ScriptEditorQuickOpen : public ConfirmationDialog {
GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog) GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog);
LineEdit *search_box; LineEdit *search_box;
Tree *search_options; Tree *search_options;
@ -77,7 +77,7 @@ class ScriptEditorDebugger;
class ScriptEditorBase : public VBoxContainer { class ScriptEditorBase : public VBoxContainer {
GDCLASS(ScriptEditorBase, VBoxContainer) GDCLASS(ScriptEditorBase, VBoxContainer);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -431,7 +431,8 @@ public:
class SpatialEditorViewportContainer : public Container { class SpatialEditorViewportContainer : public Container {
GDCLASS(SpatialEditorViewportContainer, Container) GDCLASS(SpatialEditorViewportContainer, Container);
public: public:
enum View { enum View {
VIEW_USE_1_VIEWPORT, VIEW_USE_1_VIEWPORT,

View file

@ -56,7 +56,8 @@ public:
}; };
class EditorInspectorPluginStyleBox : public EditorInspectorPlugin { class EditorInspectorPluginStyleBox : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object); virtual void parse_begin(Object *p_object);

View file

@ -35,7 +35,7 @@
class TextEditor : public ScriptEditorBase { class TextEditor : public ScriptEditorBase {
GDCLASS(TextEditor, ScriptEditorBase) GDCLASS(TextEditor, ScriptEditorBase);
private: private:
CodeTextEditor *code_editor; CodeTextEditor *code_editor;

View file

@ -54,7 +54,8 @@ public:
}; };
class EditorInspectorPluginTexture : public EditorInspectorPlugin { class EditorInspectorPluginTexture : public EditorInspectorPlugin {
GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin) GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
virtual void parse_begin(Object *p_object); virtual void parse_begin(Object *p_object);

View file

@ -46,7 +46,7 @@ class TileSetEditor : public HSplitContainer {
friend class TileSetEditorPlugin; friend class TileSetEditorPlugin;
friend class TilesetEditorContext; friend class TilesetEditorContext;
GDCLASS(TileSetEditor, HSplitContainer) GDCLASS(TileSetEditor, HSplitContainer);
enum TextureToolButtons { enum TextureToolButtons {
TOOL_TILESET_ADD_TEXTURE, TOOL_TILESET_ADD_TEXTURE,

View file

@ -2350,7 +2350,7 @@ VisualShaderEditorPlugin::~VisualShaderEditorPlugin() {
//////////////// ////////////////
class VisualShaderNodePluginInputEditor : public OptionButton { class VisualShaderNodePluginInputEditor : public OptionButton {
GDCLASS(VisualShaderNodePluginInputEditor, OptionButton) GDCLASS(VisualShaderNodePluginInputEditor, OptionButton);
Ref<VisualShaderNodeInput> input; Ref<VisualShaderNodeInput> input;
@ -2395,7 +2395,8 @@ public:
}; };
class VisualShaderNodePluginDefaultEditor : public VBoxContainer { class VisualShaderNodePluginDefaultEditor : public VBoxContainer {
GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer) GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer);
public: public:
void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) { void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) {

View file

@ -42,7 +42,8 @@
class VisualShaderNodePlugin : public Reference { class VisualShaderNodePlugin : public Reference {
GDCLASS(VisualShaderNodePlugin, Reference) GDCLASS(VisualShaderNodePlugin, Reference);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -245,14 +246,14 @@ public:
class VisualShaderNodePluginDefault : public VisualShaderNodePlugin { class VisualShaderNodePluginDefault : public VisualShaderNodePlugin {
GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin) GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin);
public: public:
virtual Control *create_editor(const Ref<VisualShaderNode> &p_node); virtual Control *create_editor(const Ref<VisualShaderNode> &p_node);
}; };
class EditorPropertyShaderMode : public EditorProperty { class EditorPropertyShaderMode : public EditorProperty {
GDCLASS(EditorPropertyShaderMode, EditorProperty) GDCLASS(EditorPropertyShaderMode, EditorProperty);
OptionButton *options; OptionButton *options;
void _option_selected(int p_which); void _option_selected(int p_which);
@ -268,7 +269,7 @@ public:
}; };
class EditorInspectorShaderModePlugin : public EditorInspectorPlugin { class EditorInspectorShaderModePlugin : public EditorInspectorPlugin {
GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin) GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin);
public: public:
virtual bool can_handle(Object *p_object); virtual bool can_handle(Object *p_object);
@ -278,7 +279,7 @@ public:
}; };
class VisualShaderNodePortPreview : public Control { class VisualShaderNodePortPreview : public Control {
GDCLASS(VisualShaderNodePortPreview, Control) GDCLASS(VisualShaderNodePortPreview, Control);
Ref<VisualShader> shader; Ref<VisualShader> shader;
VisualShader::Type type; VisualShader::Type type;
int node; int node;

View file

@ -56,7 +56,7 @@ class PropertySelector;
class EditorResourceConversionPlugin : public Reference { class EditorResourceConversionPlugin : public Reference {
GDCLASS(EditorResourceConversionPlugin, Reference) GDCLASS(EditorResourceConversionPlugin, Reference);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -36,7 +36,7 @@
#include "scene/gui/rich_text_label.h" #include "scene/gui/rich_text_label.h"
class PropertySelector : public ConfirmationDialog { class PropertySelector : public ConfirmationDialog {
GDCLASS(PropertySelector, ConfirmationDialog) GDCLASS(PropertySelector, ConfirmationDialog);
LineEdit *search_box; LineEdit *search_box;
Tree *search_options; Tree *search_options;

View file

@ -37,7 +37,7 @@
#include "scene/gui/tree.h" #include "scene/gui/tree.h"
class EditorQuickOpen : public ConfirmationDialog { class EditorQuickOpen : public ConfirmationDialog {
GDCLASS(EditorQuickOpen, ConfirmationDialog) GDCLASS(EditorQuickOpen, ConfirmationDialog);
LineEdit *search_box; LineEdit *search_box;
Tree *search_options; Tree *search_options;

View file

@ -45,7 +45,7 @@
*/ */
class BulletPhysicsServer : public PhysicsServer { class BulletPhysicsServer : public PhysicsServer {
GDCLASS(BulletPhysicsServer, PhysicsServer) GDCLASS(BulletPhysicsServer, PhysicsServer);
friend class BulletPhysicsDirectSpaceState; friend class BulletPhysicsDirectSpaceState;

View file

@ -54,7 +54,7 @@ class BulletPhysicsDirectBodyState;
/// created by BulletPhysicsServer and is held by the "singleton" variable of this class /// created by BulletPhysicsServer and is held by the "singleton" variable of this class
/// Each time something require it, the body must be set again. /// Each time something require it, the body must be set again.
class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState { class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState {
GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState) GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState);
static BulletPhysicsDirectBodyState *singleton; static BulletPhysicsDirectBodyState *singleton;

View file

@ -68,7 +68,8 @@ class btGjkEpaPenetrationDepthSolver;
extern ContactAddedCallback gContactAddedCallback; extern ContactAddedCallback gContactAddedCallback;
class BulletPhysicsDirectSpaceState : public PhysicsDirectSpaceState { class BulletPhysicsDirectSpaceState : public PhysicsDirectSpaceState {
GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState) GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState);
private: private:
SpaceBullet *space; SpaceBullet *space;

View file

@ -55,7 +55,8 @@ public:
}; };
class EditorPluginCSG : public EditorPlugin { class EditorPluginCSG : public EditorPlugin {
GDCLASS(EditorPluginCSG, EditorPlugin) GDCLASS(EditorPluginCSG, EditorPlugin);
public: public:
EditorPluginCSG(EditorNode *p_editor); EditorPluginCSG(EditorNode *p_editor);
}; };

View file

@ -156,7 +156,8 @@ public:
VARIANT_ENUM_CAST(CSGShape::Operation) VARIANT_ENUM_CAST(CSGShape::Operation)
class CSGCombiner : public CSGShape { class CSGCombiner : public CSGShape {
GDCLASS(CSGCombiner, CSGShape) GDCLASS(CSGCombiner, CSGShape);
private: private:
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
@ -165,7 +166,7 @@ public:
}; };
class CSGPrimitive : public CSGShape { class CSGPrimitive : public CSGShape {
GDCLASS(CSGPrimitive, CSGShape) GDCLASS(CSGPrimitive, CSGShape);
private: private:
bool invert_faces; bool invert_faces;
@ -182,7 +183,7 @@ public:
}; };
class CSGMesh : public CSGPrimitive { class CSGMesh : public CSGPrimitive {
GDCLASS(CSGMesh, CSGPrimitive) GDCLASS(CSGMesh, CSGPrimitive);
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
@ -204,7 +205,7 @@ public:
class CSGSphere : public CSGPrimitive { class CSGSphere : public CSGPrimitive {
GDCLASS(CSGSphere, CSGPrimitive) GDCLASS(CSGSphere, CSGPrimitive);
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
Ref<Material> material; Ref<Material> material;
@ -237,7 +238,7 @@ public:
class CSGBox : public CSGPrimitive { class CSGBox : public CSGPrimitive {
GDCLASS(CSGBox, CSGPrimitive) GDCLASS(CSGBox, CSGPrimitive);
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
Ref<Material> material; Ref<Material> material;
@ -266,7 +267,7 @@ public:
class CSGCylinder : public CSGPrimitive { class CSGCylinder : public CSGPrimitive {
GDCLASS(CSGCylinder, CSGPrimitive) GDCLASS(CSGCylinder, CSGPrimitive);
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
Ref<Material> material; Ref<Material> material;
@ -303,7 +304,7 @@ public:
class CSGTorus : public CSGPrimitive { class CSGTorus : public CSGPrimitive {
GDCLASS(CSGTorus, CSGPrimitive) GDCLASS(CSGTorus, CSGPrimitive);
virtual CSGBrush *_build_brush(); virtual CSGBrush *_build_brush();
Ref<Material> material; Ref<Material> material;
@ -340,7 +341,7 @@ public:
class CSGPolygon : public CSGPrimitive { class CSGPolygon : public CSGPrimitive {
GDCLASS(CSGPolygon, CSGPrimitive) GDCLASS(CSGPolygon, CSGPrimitive);
public: public:
enum Mode { enum Mode {

View file

@ -38,7 +38,8 @@
class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer { class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer {
GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer) GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer);
public: public:
enum CompressionMode { enum CompressionMode {
COMPRESS_NONE, COMPRESS_NONE,

View file

@ -41,7 +41,7 @@
*/ */
class ARVRInterfaceGDNative : public ARVRInterface { class ARVRInterfaceGDNative : public ARVRInterface {
GDCLASS(ARVRInterfaceGDNative, ARVRInterface) GDCLASS(ARVRInterfaceGDNative, ARVRInterface);
void cleanup(); void cleanup();

View file

@ -45,7 +45,7 @@ class GDNativeLibraryResourceLoader;
class GDNative; class GDNative;
class GDNativeLibrary : public Resource { class GDNativeLibrary : public Resource {
GDCLASS(GDNativeLibrary, Resource) GDCLASS(GDNativeLibrary, Resource);
static Map<String, Vector<Ref<GDNative> > > *loaded_libraries; static Map<String, Vector<Ref<GDNative> > > *loaded_libraries;
@ -137,7 +137,7 @@ struct GDNativeCallRegistry {
}; };
class GDNative : public Reference { class GDNative : public Reference {
GDCLASS(GDNative, Reference) GDCLASS(GDNative, Reference);
Ref<GDNativeLibrary> library; Ref<GDNativeLibrary> library;

View file

@ -99,7 +99,7 @@ struct NativeScriptDesc {
}; };
class NativeScript : public Script { class NativeScript : public Script {
GDCLASS(NativeScript, Script) GDCLASS(NativeScript, Script);
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
Set<PlaceHolderScriptInstance *> placeholders; Set<PlaceHolderScriptInstance *> placeholders;
@ -370,7 +370,7 @@ inline NativeScriptDesc *NativeScript::get_script_desc() const {
} }
class NativeReloadNode : public Node { class NativeReloadNode : public Node {
GDCLASS(NativeReloadNode, Node) GDCLASS(NativeReloadNode, Node);
bool unloaded; bool unloaded;
public: public:

View file

@ -36,7 +36,7 @@
#include "modules/gdnative/include/net/godot_net.h" #include "modules/gdnative/include/net/godot_net.h"
class MultiplayerPeerGDNative : public NetworkedMultiplayerPeer { class MultiplayerPeerGDNative : public NetworkedMultiplayerPeer {
GDCLASS(MultiplayerPeerGDNative, NetworkedMultiplayerPeer) GDCLASS(MultiplayerPeerGDNative, NetworkedMultiplayerPeer);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -36,7 +36,7 @@
#include "modules/gdnative/include/net/godot_net.h" #include "modules/gdnative/include/net/godot_net.h"
class PacketPeerGDNative : public PacketPeer { class PacketPeerGDNative : public PacketPeer {
GDCLASS(PacketPeerGDNative, PacketPeer) GDCLASS(PacketPeerGDNative, PacketPeer);
protected: protected:
static void _bind_methods(); static void _bind_methods();

View file

@ -63,7 +63,7 @@ TScriptInstance *cast_script_instance(ScriptInstance *p_inst) {
class CSharpScript : public Script { class CSharpScript : public Script {
GDCLASS(CSharpScript, Script) GDCLASS(CSharpScript, Script);
friend class CSharpInstance; friend class CSharpInstance;
friend class CSharpLanguage; friend class CSharpLanguage;

View file

@ -35,7 +35,7 @@
#include "monodevelop_instance.h" #include "monodevelop_instance.h"
class GodotSharpEditor : public Node { class GodotSharpEditor : public Node {
GDCLASS(GodotSharpEditor, Object) GDCLASS(GodotSharpEditor, Object);
EditorNode *editor; EditorNode *editor;
@ -109,7 +109,7 @@ public:
}; };
class MonoReloadNode : public Node { class MonoReloadNode : public Node {
GDCLASS(MonoReloadNode, Node) GDCLASS(MonoReloadNode, Node);
Timer *reload_timer; Timer *reload_timer;

View file

@ -40,7 +40,7 @@ class MonoBuildTab;
class MonoBottomPanel : public VBoxContainer { class MonoBottomPanel : public VBoxContainer {
GDCLASS(MonoBottomPanel, VBoxContainer) GDCLASS(MonoBottomPanel, VBoxContainer);
EditorNode *editor; EditorNode *editor;
@ -87,7 +87,7 @@ public:
class MonoBuildTab : public VBoxContainer { class MonoBuildTab : public VBoxContainer {
GDCLASS(MonoBuildTab, VBoxContainer) GDCLASS(MonoBuildTab, VBoxContainer);
public: public:
enum BuildResult { enum BuildResult {

View file

@ -37,7 +37,7 @@
class MonoGCHandle : public Reference { class MonoGCHandle : public Reference {
GDCLASS(MonoGCHandle, Reference) GDCLASS(MonoGCHandle, Reference);
bool released; bool released;
bool weak; bool weak;

View file

@ -267,7 +267,7 @@ public:
(void)__gdmono__scope__exit__domain__unload__; (void)__gdmono__scope__exit__domain__unload__;
class _GodotSharp : public Object { class _GodotSharp : public Object {
GDCLASS(_GodotSharp, Object) GDCLASS(_GodotSharp, Object);
friend class GDMono; friend class GDMono;

View file

@ -41,7 +41,7 @@ Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p
class SignalAwaiterHandle : public MonoGCHandle { class SignalAwaiterHandle : public MonoGCHandle {
GDCLASS(SignalAwaiterHandle, MonoGCHandle) GDCLASS(SignalAwaiterHandle, MonoGCHandle);
bool completed; bool completed;

View file

@ -40,7 +40,7 @@
#include "editor/property_editor.h" #include "editor/property_editor.h"
class NoiseTexture : public Texture { class NoiseTexture : public Texture {
GDCLASS(NoiseTexture, Texture) GDCLASS(NoiseTexture, Texture);
private: private:
Ref<Image> data; Ref<Image> data;

View file

@ -38,7 +38,7 @@
#include "thirdparty/misc/open-simplex-noise.h" #include "thirdparty/misc/open-simplex-noise.h"
class OpenSimplexNoise : public Resource { class OpenSimplexNoise : public Resource {
GDCLASS(OpenSimplexNoise, Resource) GDCLASS(OpenSimplexNoise, Resource);
OBJ_SAVE_TYPE(OpenSimplexNoise); OBJ_SAVE_TYPE(OpenSimplexNoise);
osn_context contexts[6]; osn_context contexts[6];

View file

@ -43,7 +43,7 @@
class AudioStreamPlaybackOpus : public AudioStreamPlayback { class AudioStreamPlaybackOpus : public AudioStreamPlayback {
GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback) GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback);
enum { enum {
MIN_MIX = 1024 MIN_MIX = 1024
@ -117,7 +117,7 @@ public:
class AudioStreamOpus : public AudioStream { class AudioStreamOpus : public AudioStream {
GDCLASS(AudioStreamOpus, AudioStream) GDCLASS(AudioStreamOpus, AudioStream);
String file; String file;

View file

@ -40,7 +40,7 @@ class AudioStreamOGGVorbis;
class AudioStreamPlaybackOGGVorbis : public AudioStreamPlaybackResampled { class AudioStreamPlaybackOGGVorbis : public AudioStreamPlaybackResampled {
GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlaybackResampled) GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlaybackResampled);
stb_vorbis *ogg_stream; stb_vorbis *ogg_stream;
stb_vorbis_alloc ogg_alloc; stb_vorbis_alloc ogg_alloc;
@ -72,7 +72,7 @@ public:
class AudioStreamOGGVorbis : public AudioStream { class AudioStreamOGGVorbis : public AudioStream {
GDCLASS(AudioStreamOGGVorbis, AudioStream) GDCLASS(AudioStreamOGGVorbis, AudioStream);
OBJ_SAVE_TYPE(AudioStream) //children are all saved as AudioStream, so they can be exchanged OBJ_SAVE_TYPE(AudioStream) //children are all saved as AudioStream, so they can be exchanged
RES_BASE_EXTENSION("oggstr"); RES_BASE_EXTENSION("oggstr");

View file

@ -35,7 +35,8 @@
#include "core/io/resource_importer.h" #include "core/io/resource_importer.h"
class ResourceImporterOGGVorbis : public ResourceImporter { class ResourceImporterOGGVorbis : public ResourceImporter {
GDCLASS(ResourceImporterOGGVorbis, ResourceImporter) GDCLASS(ResourceImporterOGGVorbis, ResourceImporter);
public: public:
virtual String get_importer_name() const; virtual String get_importer_name() const;
virtual String get_visible_name() const; virtual String get_visible_name() const;

View file

@ -39,7 +39,7 @@ class VisualScriptNodeInstance;
class VisualScript; class VisualScript;
class VisualScriptNode : public Resource { class VisualScriptNode : public Resource {
GDCLASS(VisualScriptNode, Resource) GDCLASS(VisualScriptNode, Resource);
friend class VisualScript; friend class VisualScript;
@ -165,7 +165,7 @@ public:
class VisualScript : public Script { class VisualScript : public Script {
GDCLASS(VisualScript, Script) GDCLASS(VisualScript, Script);
RES_BASE_EXTENSION("vs"); RES_BASE_EXTENSION("vs");

View file

@ -35,7 +35,8 @@
class VisualScriptBuiltinFunc : public VisualScriptNode { class VisualScriptBuiltinFunc : public VisualScriptNode {
GDCLASS(VisualScriptBuiltinFunc, VisualScriptNode) GDCLASS(VisualScriptBuiltinFunc, VisualScriptNode);
public: public:
enum BuiltinFunc { enum BuiltinFunc {
MATH_SIN, MATH_SIN,

View file

@ -46,7 +46,7 @@
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
class VisualScriptEditorSignalEdit : public Object { class VisualScriptEditorSignalEdit : public Object {
GDCLASS(VisualScriptEditorSignalEdit, Object) GDCLASS(VisualScriptEditorSignalEdit, Object);
StringName sig; StringName sig;
@ -186,7 +186,7 @@ public:
class VisualScriptEditorVariableEdit : public Object { class VisualScriptEditorVariableEdit : public Object {
GDCLASS(VisualScriptEditorVariableEdit, Object) GDCLASS(VisualScriptEditorVariableEdit, Object);
StringName var; StringName var;

View file

@ -44,7 +44,7 @@ class VisualScriptEditorVariableEdit;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
class VisualScriptEditor : public ScriptEditorBase { class VisualScriptEditor : public ScriptEditorBase {
GDCLASS(VisualScriptEditor, ScriptEditorBase) GDCLASS(VisualScriptEditor, ScriptEditorBase);
enum { enum {
TYPE_SEQUENCE = 1000, TYPE_SEQUENCE = 1000,

View file

@ -36,7 +36,7 @@
class VisualScriptExpression : public VisualScriptNode { class VisualScriptExpression : public VisualScriptNode {
GDCLASS(VisualScriptExpression, VisualScriptNode) GDCLASS(VisualScriptExpression, VisualScriptNode);
friend class VisualScriptNodeInstanceExpression; friend class VisualScriptNodeInstanceExpression;
struct Input { struct Input {

View file

@ -35,7 +35,7 @@
class VisualScriptReturn : public VisualScriptNode { class VisualScriptReturn : public VisualScriptNode {
GDCLASS(VisualScriptReturn, VisualScriptNode) GDCLASS(VisualScriptReturn, VisualScriptNode);
Variant::Type type; Variant::Type type;
bool with_value; bool with_value;
@ -72,7 +72,7 @@ public:
class VisualScriptCondition : public VisualScriptNode { class VisualScriptCondition : public VisualScriptNode {
GDCLASS(VisualScriptCondition, VisualScriptNode) GDCLASS(VisualScriptCondition, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -100,7 +100,7 @@ public:
class VisualScriptWhile : public VisualScriptNode { class VisualScriptWhile : public VisualScriptNode {
GDCLASS(VisualScriptWhile, VisualScriptNode) GDCLASS(VisualScriptWhile, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -128,7 +128,7 @@ public:
class VisualScriptIterator : public VisualScriptNode { class VisualScriptIterator : public VisualScriptNode {
GDCLASS(VisualScriptIterator, VisualScriptNode) GDCLASS(VisualScriptIterator, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -156,7 +156,7 @@ public:
class VisualScriptSequence : public VisualScriptNode { class VisualScriptSequence : public VisualScriptNode {
GDCLASS(VisualScriptSequence, VisualScriptNode) GDCLASS(VisualScriptSequence, VisualScriptNode);
int steps; int steps;
@ -189,7 +189,7 @@ public:
class VisualScriptSwitch : public VisualScriptNode { class VisualScriptSwitch : public VisualScriptNode {
GDCLASS(VisualScriptSwitch, VisualScriptNode) GDCLASS(VisualScriptSwitch, VisualScriptNode);
struct Case { struct Case {
Variant::Type type; Variant::Type type;
@ -231,7 +231,7 @@ public:
class VisualScriptTypeCast : public VisualScriptNode { class VisualScriptTypeCast : public VisualScriptNode {
GDCLASS(VisualScriptTypeCast, VisualScriptNode) GDCLASS(VisualScriptTypeCast, VisualScriptNode);
StringName base_type; StringName base_type;
String script; String script;

View file

@ -35,7 +35,8 @@
class VisualScriptFunctionCall : public VisualScriptNode { class VisualScriptFunctionCall : public VisualScriptNode {
GDCLASS(VisualScriptFunctionCall, VisualScriptNode) GDCLASS(VisualScriptFunctionCall, VisualScriptNode);
public: public:
enum CallMode { enum CallMode {
CALL_MODE_SELF, CALL_MODE_SELF,
@ -137,7 +138,8 @@ VARIANT_ENUM_CAST(VisualScriptFunctionCall::RPCCallMode);
class VisualScriptPropertySet : public VisualScriptNode { class VisualScriptPropertySet : public VisualScriptNode {
GDCLASS(VisualScriptPropertySet, VisualScriptNode) GDCLASS(VisualScriptPropertySet, VisualScriptNode);
public: public:
enum CallMode { enum CallMode {
CALL_MODE_SELF, CALL_MODE_SELF,
@ -242,7 +244,8 @@ VARIANT_ENUM_CAST(VisualScriptPropertySet::AssignOp);
class VisualScriptPropertyGet : public VisualScriptNode { class VisualScriptPropertyGet : public VisualScriptNode {
GDCLASS(VisualScriptPropertyGet, VisualScriptNode) GDCLASS(VisualScriptPropertyGet, VisualScriptNode);
public: public:
enum CallMode { enum CallMode {
CALL_MODE_SELF, CALL_MODE_SELF,
@ -323,7 +326,7 @@ VARIANT_ENUM_CAST(VisualScriptPropertyGet::CallMode);
class VisualScriptEmitSignal : public VisualScriptNode { class VisualScriptEmitSignal : public VisualScriptNode {
GDCLASS(VisualScriptEmitSignal, VisualScriptNode) GDCLASS(VisualScriptEmitSignal, VisualScriptNode);
private: private:
StringName name; StringName name;

View file

@ -35,7 +35,7 @@
class VisualScriptFunction : public VisualScriptNode { class VisualScriptFunction : public VisualScriptNode {
GDCLASS(VisualScriptFunction, VisualScriptNode) GDCLASS(VisualScriptFunction, VisualScriptNode);
struct Argument { struct Argument {
String name; String name;
@ -105,7 +105,7 @@ public:
class VisualScriptOperator : public VisualScriptNode { class VisualScriptOperator : public VisualScriptNode {
GDCLASS(VisualScriptOperator, VisualScriptNode) GDCLASS(VisualScriptOperator, VisualScriptNode);
Variant::Type typed; Variant::Type typed;
Variant::Operator op; Variant::Operator op;
@ -141,7 +141,7 @@ public:
class VisualScriptSelect : public VisualScriptNode { class VisualScriptSelect : public VisualScriptNode {
GDCLASS(VisualScriptSelect, VisualScriptNode) GDCLASS(VisualScriptSelect, VisualScriptNode);
Variant::Type typed; Variant::Type typed;
@ -174,7 +174,7 @@ public:
class VisualScriptVariableGet : public VisualScriptNode { class VisualScriptVariableGet : public VisualScriptNode {
GDCLASS(VisualScriptVariableGet, VisualScriptNode) GDCLASS(VisualScriptVariableGet, VisualScriptNode);
StringName variable; StringName variable;
@ -207,7 +207,7 @@ public:
class VisualScriptVariableSet : public VisualScriptNode { class VisualScriptVariableSet : public VisualScriptNode {
GDCLASS(VisualScriptVariableSet, VisualScriptNode) GDCLASS(VisualScriptVariableSet, VisualScriptNode);
StringName variable; StringName variable;
@ -240,7 +240,7 @@ public:
class VisualScriptConstant : public VisualScriptNode { class VisualScriptConstant : public VisualScriptNode {
GDCLASS(VisualScriptConstant, VisualScriptNode) GDCLASS(VisualScriptConstant, VisualScriptNode);
Variant::Type type; Variant::Type type;
Variant value; Variant value;
@ -277,7 +277,7 @@ public:
class VisualScriptPreload : public VisualScriptNode { class VisualScriptPreload : public VisualScriptNode {
GDCLASS(VisualScriptPreload, VisualScriptNode) GDCLASS(VisualScriptPreload, VisualScriptNode);
Ref<Resource> preload; Ref<Resource> preload;
@ -309,7 +309,7 @@ public:
class VisualScriptIndexGet : public VisualScriptNode { class VisualScriptIndexGet : public VisualScriptNode {
GDCLASS(VisualScriptIndexGet, VisualScriptNode) GDCLASS(VisualScriptIndexGet, VisualScriptNode);
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const;
@ -333,7 +333,7 @@ public:
class VisualScriptIndexSet : public VisualScriptNode { class VisualScriptIndexSet : public VisualScriptNode {
GDCLASS(VisualScriptIndexSet, VisualScriptNode) GDCLASS(VisualScriptIndexSet, VisualScriptNode);
public: public:
virtual int get_output_sequence_port_count() const; virtual int get_output_sequence_port_count() const;
@ -357,7 +357,7 @@ public:
class VisualScriptGlobalConstant : public VisualScriptNode { class VisualScriptGlobalConstant : public VisualScriptNode {
GDCLASS(VisualScriptGlobalConstant, VisualScriptNode) GDCLASS(VisualScriptGlobalConstant, VisualScriptNode);
int index; int index;
@ -388,7 +388,7 @@ public:
class VisualScriptClassConstant : public VisualScriptNode { class VisualScriptClassConstant : public VisualScriptNode {
GDCLASS(VisualScriptClassConstant, VisualScriptNode) GDCLASS(VisualScriptClassConstant, VisualScriptNode);
StringName base_type; StringName base_type;
StringName name; StringName name;
@ -425,7 +425,7 @@ public:
class VisualScriptBasicTypeConstant : public VisualScriptNode { class VisualScriptBasicTypeConstant : public VisualScriptNode {
GDCLASS(VisualScriptBasicTypeConstant, VisualScriptNode) GDCLASS(VisualScriptBasicTypeConstant, VisualScriptNode);
Variant::Type type; Variant::Type type;
StringName name; StringName name;
@ -463,7 +463,8 @@ public:
class VisualScriptMathConstant : public VisualScriptNode { class VisualScriptMathConstant : public VisualScriptNode {
GDCLASS(VisualScriptMathConstant, VisualScriptNode) GDCLASS(VisualScriptMathConstant, VisualScriptNode);
public: public:
enum MathConstant { enum MathConstant {
MATH_CONSTANT_ONE, MATH_CONSTANT_ONE,
@ -512,7 +513,7 @@ VARIANT_ENUM_CAST(VisualScriptMathConstant::MathConstant)
class VisualScriptEngineSingleton : public VisualScriptNode { class VisualScriptEngineSingleton : public VisualScriptNode {
GDCLASS(VisualScriptEngineSingleton, VisualScriptNode) GDCLASS(VisualScriptEngineSingleton, VisualScriptNode);
String singleton; String singleton;
@ -545,7 +546,7 @@ public:
class VisualScriptSceneNode : public VisualScriptNode { class VisualScriptSceneNode : public VisualScriptNode {
GDCLASS(VisualScriptSceneNode, VisualScriptNode) GDCLASS(VisualScriptSceneNode, VisualScriptNode);
NodePath path; NodePath path;
@ -580,7 +581,7 @@ public:
class VisualScriptSceneTree : public VisualScriptNode { class VisualScriptSceneTree : public VisualScriptNode {
GDCLASS(VisualScriptSceneTree, VisualScriptNode) GDCLASS(VisualScriptSceneTree, VisualScriptNode);
protected: protected:
virtual void _validate_property(PropertyInfo &property) const; virtual void _validate_property(PropertyInfo &property) const;
@ -610,7 +611,7 @@ public:
class VisualScriptResourcePath : public VisualScriptNode { class VisualScriptResourcePath : public VisualScriptNode {
GDCLASS(VisualScriptResourcePath, VisualScriptNode) GDCLASS(VisualScriptResourcePath, VisualScriptNode);
String path; String path;
@ -642,7 +643,7 @@ public:
class VisualScriptSelf : public VisualScriptNode { class VisualScriptSelf : public VisualScriptNode {
GDCLASS(VisualScriptSelf, VisualScriptNode) GDCLASS(VisualScriptSelf, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -671,7 +672,7 @@ public:
class VisualScriptCustomNode : public VisualScriptNode { class VisualScriptCustomNode : public VisualScriptNode {
GDCLASS(VisualScriptCustomNode, VisualScriptNode) GDCLASS(VisualScriptCustomNode, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -719,7 +720,7 @@ VARIANT_ENUM_CAST(VisualScriptCustomNode::StartMode);
class VisualScriptSubCall : public VisualScriptNode { class VisualScriptSubCall : public VisualScriptNode {
GDCLASS(VisualScriptSubCall, VisualScriptNode) GDCLASS(VisualScriptSubCall, VisualScriptNode);
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -747,7 +748,7 @@ public:
class VisualScriptComment : public VisualScriptNode { class VisualScriptComment : public VisualScriptNode {
GDCLASS(VisualScriptComment, VisualScriptNode) GDCLASS(VisualScriptComment, VisualScriptNode);
String title; String title;
String description; String description;
@ -788,7 +789,7 @@ public:
class VisualScriptConstructor : public VisualScriptNode { class VisualScriptConstructor : public VisualScriptNode {
GDCLASS(VisualScriptConstructor, VisualScriptNode) GDCLASS(VisualScriptConstructor, VisualScriptNode);
Variant::Type type; Variant::Type type;
MethodInfo constructor; MethodInfo constructor;
@ -824,7 +825,7 @@ public:
class VisualScriptLocalVar : public VisualScriptNode { class VisualScriptLocalVar : public VisualScriptNode {
GDCLASS(VisualScriptLocalVar, VisualScriptNode) GDCLASS(VisualScriptLocalVar, VisualScriptNode);
StringName name; StringName name;
Variant::Type type; Variant::Type type;
@ -860,7 +861,7 @@ public:
class VisualScriptLocalVarSet : public VisualScriptNode { class VisualScriptLocalVarSet : public VisualScriptNode {
GDCLASS(VisualScriptLocalVarSet, VisualScriptNode) GDCLASS(VisualScriptLocalVarSet, VisualScriptNode);
StringName name; StringName name;
Variant::Type type; Variant::Type type;
@ -897,7 +898,8 @@ public:
class VisualScriptInputAction : public VisualScriptNode { class VisualScriptInputAction : public VisualScriptNode {
GDCLASS(VisualScriptInputAction, VisualScriptNode) GDCLASS(VisualScriptInputAction, VisualScriptNode);
public: public:
enum Mode { enum Mode {
MODE_PRESSED, MODE_PRESSED,
@ -944,7 +946,7 @@ VARIANT_ENUM_CAST(VisualScriptInputAction::Mode)
class VisualScriptDeconstruct : public VisualScriptNode { class VisualScriptDeconstruct : public VisualScriptNode {
GDCLASS(VisualScriptDeconstruct, VisualScriptNode) GDCLASS(VisualScriptDeconstruct, VisualScriptNode);
struct Element { struct Element {
StringName name; StringName name;

View file

@ -36,7 +36,7 @@
#include "scene/gui/rich_text_label.h" #include "scene/gui/rich_text_label.h"
class VisualScriptPropertySelector : public ConfirmationDialog { class VisualScriptPropertySelector : public ConfirmationDialog {
GDCLASS(VisualScriptPropertySelector, ConfirmationDialog) GDCLASS(VisualScriptPropertySelector, ConfirmationDialog);
LineEdit *search_box; LineEdit *search_box;
Tree *search_options; Tree *search_options;

View file

@ -35,7 +35,8 @@
class VisualScriptYield : public VisualScriptNode { class VisualScriptYield : public VisualScriptNode {
GDCLASS(VisualScriptYield, VisualScriptNode) GDCLASS(VisualScriptYield, VisualScriptNode);
public: public:
enum YieldMode { enum YieldMode {
YIELD_RETURN, YIELD_RETURN,
@ -84,7 +85,8 @@ VARIANT_ENUM_CAST(VisualScriptYield::YieldMode)
class VisualScriptYieldSignal : public VisualScriptNode { class VisualScriptYieldSignal : public VisualScriptNode {
GDCLASS(VisualScriptYieldSignal, VisualScriptNode) GDCLASS(VisualScriptYieldSignal, VisualScriptNode);
public: public:
enum CallMode { enum CallMode {
CALL_MODE_SELF, CALL_MODE_SELF,

View file

@ -41,7 +41,7 @@ class OpusVorbisDecoder;
class VideoStreamPlaybackWebm : public VideoStreamPlayback { class VideoStreamPlaybackWebm : public VideoStreamPlayback {
GDCLASS(VideoStreamPlaybackWebm, VideoStreamPlayback) GDCLASS(VideoStreamPlaybackWebm, VideoStreamPlayback);
String file_name; String file_name;
int audio_track; int audio_track;

View file

@ -208,7 +208,7 @@ static const LauncherIcon launcher_icons[] = {
class EditorExportPlatformAndroid : public EditorExportPlatform { class EditorExportPlatformAndroid : public EditorExportPlatform {
GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform) GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform);
Ref<ImageTexture> logo; Ref<ImageTexture> logo;
Ref<ImageTexture> run_icon; Ref<ImageTexture> run_icon;

View file

@ -40,7 +40,7 @@
class EditorExportPlatformJavaScript : public EditorExportPlatform { class EditorExportPlatformJavaScript : public EditorExportPlatform {
GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform) GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform);
Ref<ImageTexture> logo; Ref<ImageTexture> logo;
Ref<ImageTexture> run_icon; Ref<ImageTexture> run_icon;

View file

@ -37,7 +37,7 @@
class AudioStreamPlayer2D : public Node2D { class AudioStreamPlayer2D : public Node2D {
GDCLASS(AudioStreamPlayer2D, Node2D) GDCLASS(AudioStreamPlayer2D, Node2D);
private: private:
enum { enum {

View file

@ -46,7 +46,7 @@ class StyleBox;
class CanvasItemMaterial : public Material { class CanvasItemMaterial : public Material {
GDCLASS(CanvasItemMaterial, Material) GDCLASS(CanvasItemMaterial, Material);
public: public:
enum BlendMode { enum BlendMode {

View file

@ -36,7 +36,7 @@
class CollisionObject2D : public Node2D { class CollisionObject2D : public Node2D {
GDCLASS(CollisionObject2D, Node2D) GDCLASS(CollisionObject2D, Node2D);
bool area; bool area;
RID rid; RID rid;

View file

@ -38,7 +38,7 @@ class CollisionObject2D;
class CollisionShape2D : public Node2D { class CollisionShape2D : public Node2D {
GDCLASS(CollisionShape2D, Node2D) GDCLASS(CollisionShape2D, Node2D);
Ref<Shape2D> shape; Ref<Shape2D> shape;
Rect2 rect; Rect2 rect;
uint32_t owner_id; uint32_t owner_id;

View file

@ -35,7 +35,7 @@
class Line2D : public Node2D { class Line2D : public Node2D {
GDCLASS(Line2D, Node2D) GDCLASS(Line2D, Node2D);
public: public:
enum LineJointMode { enum LineJointMode {

View file

@ -34,7 +34,7 @@
#include "scene/2d/node_2d.h" #include "scene/2d/node_2d.h"
class MeshInstance2D : public Node2D { class MeshInstance2D : public Node2D {
GDCLASS(MeshInstance2D, Node2D) GDCLASS(MeshInstance2D, Node2D);
Ref<Mesh> mesh; Ref<Mesh> mesh;

View file

@ -37,7 +37,7 @@
class Particles2D : public Node2D { class Particles2D : public Node2D {
private: private:
GDCLASS(Particles2D, Node2D) GDCLASS(Particles2D, Node2D);
public: public:
enum DrawOrder { enum DrawOrder {

View file

@ -35,7 +35,7 @@
class Position2D : public Node2D { class Position2D : public Node2D {
GDCLASS(Position2D, Node2D) GDCLASS(Position2D, Node2D);
void _draw_cross(); void _draw_cross();

View file

@ -36,7 +36,7 @@
class Skeleton2D; class Skeleton2D;
class Bone2D : public Node2D { class Bone2D : public Node2D {
GDCLASS(Bone2D, Node2D) GDCLASS(Bone2D, Node2D);
friend class Skeleton2D; friend class Skeleton2D;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

Some files were not shown because too many files have changed in this diff Show more