asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ClassDB: Provide the enum name of integer constants

Browse source
This commit is contained in:
Ignacio Etcheverry 2017-08-20 17:45:01 +02:00
parent f6c39830cb
commit 32dd9a9f66
107 changed files with 2059 additions and 1894 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
core/bind/core_bind.cpp
View file

@ -151,12 +151,12 @@ void _ResourceSaver::_bind_methods() {
ClassDB::bind_method(D_METHOD("save", "path", "resource", "flags"), &_ResourceSaver::save, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_recognized_extensions", "type"), &_ResourceSaver::get_recognized_extensions);
BIND_CONSTANT(FLAG_RELATIVE_PATHS);
BIND_CONSTANT(FLAG_BUNDLE_RESOURCES);
BIND_CONSTANT(FLAG_CHANGE_PATH);
BIND_CONSTANT(FLAG_OMIT_EDITOR_PROPERTIES);
BIND_CONSTANT(FLAG_SAVE_BIG_ENDIAN);
BIND_CONSTANT(FLAG_COMPRESS);
BIND_ENUM_CONSTANT(FLAG_RELATIVE_PATHS);
BIND_ENUM_CONSTANT(FLAG_BUNDLE_RESOURCES);
BIND_ENUM_CONSTANT(FLAG_CHANGE_PATH);
BIND_ENUM_CONSTANT(FLAG_OMIT_EDITOR_PROPERTIES);
BIND_ENUM_CONSTANT(FLAG_SAVE_BIG_ENDIAN);
BIND_ENUM_CONSTANT(FLAG_COMPRESS);
}
_ResourceSaver::_ResourceSaver() {
@ -1104,49 +1104,49 @@ void _OS::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_power_seconds_left"), &_OS::get_power_seconds_left);
ClassDB::bind_method(D_METHOD("get_power_percent_left"), &_OS::get_power_percent_left);
BIND_CONSTANT(DAY_SUNDAY);
BIND_CONSTANT(DAY_MONDAY);
BIND_CONSTANT(DAY_TUESDAY);
BIND_CONSTANT(DAY_WEDNESDAY);
BIND_CONSTANT(DAY_THURSDAY);
BIND_CONSTANT(DAY_FRIDAY);
BIND_CONSTANT(DAY_SATURDAY);
BIND_ENUM_CONSTANT(DAY_SUNDAY);
BIND_ENUM_CONSTANT(DAY_MONDAY);
BIND_ENUM_CONSTANT(DAY_TUESDAY);
BIND_ENUM_CONSTANT(DAY_WEDNESDAY);
BIND_ENUM_CONSTANT(DAY_THURSDAY);
BIND_ENUM_CONSTANT(DAY_FRIDAY);
BIND_ENUM_CONSTANT(DAY_SATURDAY);
BIND_CONSTANT(MONTH_JANUARY);
BIND_CONSTANT(MONTH_FEBRUARY);
BIND_CONSTANT(MONTH_MARCH);
BIND_CONSTANT(MONTH_APRIL);
BIND_CONSTANT(MONTH_MAY);
BIND_CONSTANT(MONTH_JUNE);
BIND_CONSTANT(MONTH_JULY);
BIND_CONSTANT(MONTH_AUGUST);
BIND_CONSTANT(MONTH_SEPTEMBER);
BIND_CONSTANT(MONTH_OCTOBER);
BIND_CONSTANT(MONTH_NOVEMBER);
BIND_CONSTANT(MONTH_DECEMBER);
BIND_ENUM_CONSTANT(MONTH_JANUARY);
BIND_ENUM_CONSTANT(MONTH_FEBRUARY);
BIND_ENUM_CONSTANT(MONTH_MARCH);
BIND_ENUM_CONSTANT(MONTH_APRIL);
BIND_ENUM_CONSTANT(MONTH_MAY);
BIND_ENUM_CONSTANT(MONTH_JUNE);
BIND_ENUM_CONSTANT(MONTH_JULY);
BIND_ENUM_CONSTANT(MONTH_AUGUST);
BIND_ENUM_CONSTANT(MONTH_SEPTEMBER);
BIND_ENUM_CONSTANT(MONTH_OCTOBER);
BIND_ENUM_CONSTANT(MONTH_NOVEMBER);
BIND_ENUM_CONSTANT(MONTH_DECEMBER);
BIND_CONSTANT(SCREEN_ORIENTATION_LANDSCAPE);
BIND_CONSTANT(SCREEN_ORIENTATION_PORTRAIT);
BIND_CONSTANT(SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
BIND_CONSTANT(SCREEN_ORIENTATION_REVERSE_PORTRAIT);
BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR_PORTRAIT);
BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_LANDSCAPE);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_PORTRAIT);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_REVERSE_PORTRAIT);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_SENSOR_PORTRAIT);
BIND_ENUM_CONSTANT(SCREEN_ORIENTATION_SENSOR);
BIND_CONSTANT(SYSTEM_DIR_DESKTOP);
BIND_CONSTANT(SYSTEM_DIR_DCIM);
BIND_CONSTANT(SYSTEM_DIR_DOCUMENTS);
BIND_CONSTANT(SYSTEM_DIR_DOWNLOADS);
BIND_CONSTANT(SYSTEM_DIR_MOVIES);
BIND_CONSTANT(SYSTEM_DIR_MUSIC);
BIND_CONSTANT(SYSTEM_DIR_PICTURES);
BIND_CONSTANT(SYSTEM_DIR_RINGTONES);
BIND_ENUM_CONSTANT(SYSTEM_DIR_DESKTOP);
BIND_ENUM_CONSTANT(SYSTEM_DIR_DCIM);
BIND_ENUM_CONSTANT(SYSTEM_DIR_DOCUMENTS);
BIND_ENUM_CONSTANT(SYSTEM_DIR_DOWNLOADS);
BIND_ENUM_CONSTANT(SYSTEM_DIR_MOVIES);
BIND_ENUM_CONSTANT(SYSTEM_DIR_MUSIC);
BIND_ENUM_CONSTANT(SYSTEM_DIR_PICTURES);
BIND_ENUM_CONSTANT(SYSTEM_DIR_RINGTONES);
BIND_CONSTANT(POWERSTATE_UNKNOWN);
BIND_CONSTANT(POWERSTATE_ON_BATTERY);
BIND_CONSTANT(POWERSTATE_NO_BATTERY);
BIND_CONSTANT(POWERSTATE_CHARGING);
BIND_CONSTANT(POWERSTATE_CHARGED);
BIND_ENUM_CONSTANT(POWERSTATE_UNKNOWN);
BIND_ENUM_CONSTANT(POWERSTATE_ON_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_NO_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGING);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGED);
}
_OS::_OS() {
@ -1772,15 +1772,15 @@ void _File::_bind_methods() {
ClassDB::bind_method(D_METHOD("file_exists", "path"), &_File::file_exists);
ClassDB::bind_method(D_METHOD("get_modified_time", "file"), &_File::get_modified_time);
BIND_CONSTANT(READ);
BIND_CONSTANT(WRITE);
BIND_CONSTANT(READ_WRITE);
BIND_CONSTANT(WRITE_READ);
BIND_ENUM_CONSTANT(READ);
BIND_ENUM_CONSTANT(WRITE);
BIND_ENUM_CONSTANT(READ_WRITE);
BIND_ENUM_CONSTANT(WRITE_READ);
BIND_CONSTANT(COMPRESSION_FASTLZ);
BIND_CONSTANT(COMPRESSION_DEFLATE);
BIND_CONSTANT(COMPRESSION_ZSTD);
BIND_CONSTANT(COMPRESSION_GZIP);
BIND_ENUM_CONSTANT(COMPRESSION_FASTLZ);
BIND_ENUM_CONSTANT(COMPRESSION_DEFLATE);
BIND_ENUM_CONSTANT(COMPRESSION_ZSTD);
BIND_ENUM_CONSTANT(COMPRESSION_GZIP);
}
_File::_File() {
@ -2285,9 +2285,9 @@ void _Thread::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_active"), &_Thread::is_active);
ClassDB::bind_method(D_METHOD("wait_to_finish"), &_Thread::wait_to_finish);
BIND_CONSTANT(PRIORITY_LOW);
BIND_CONSTANT(PRIORITY_NORMAL);
BIND_CONSTANT(PRIORITY_HIGH);
BIND_ENUM_CONSTANT(PRIORITY_LOW);
BIND_ENUM_CONSTANT(PRIORITY_NORMAL);
BIND_ENUM_CONSTANT(PRIORITY_HIGH);
}
_Thread::_Thread() {

9
core/bind/core_bind.h
View file

@ -85,6 +85,8 @@ public:
_ResourceSaver();
};
VARIANT_ENUM_CAST(_ResourceSaver::SaverFlags);
class MainLoop;
class _OS : public Object {
@ -310,6 +312,8 @@ public:
_OS();
};
VARIANT_ENUM_CAST(_OS::Weekday);
VARIANT_ENUM_CAST(_OS::Month);
VARIANT_ENUM_CAST(_OS::SystemDir);
VARIANT_ENUM_CAST(_OS::ScreenOrientation);
@ -447,6 +451,9 @@ public:
virtual ~_File();
};
VARIANT_ENUM_CAST(_File::ModeFlags);
VARIANT_ENUM_CAST(_File::CompressionMode);
class _Directory : public Reference {
GDCLASS(_Directory, Reference);
@ -578,6 +585,8 @@ public:
~_Thread();
};
VARIANT_ENUM_CAST(_Thread::Priority);
class _ClassDB : public Object {
GDCLASS(_ClassDB, Object)

83
core/class_db.cpp
View file

@ -583,7 +583,7 @@ MethodBind *ClassDB::get_method(StringName p_class, StringName p_name) {
return NULL;
}
void ClassDB::bind_integer_constant(const StringName &p_class, const StringName &p_name, int p_constant) {
void ClassDB::bind_integer_constant(const StringName &p_class, const StringName &p_enum, const StringName &p_name, int p_constant) {
OBJTYPE_WLOCK;
@ -600,6 +600,16 @@ void ClassDB::bind_integer_constant(const StringName &p_class, const StringName
type->constant_map[p_name] = p_constant;
#ifdef DEBUG_METHODS_ENABLED
List<StringName> *constants_list = type->enum_map.getptr(p_enum);
if (constants_list) {
constants_list->push_back(p_name);
} else {
List<StringName> new_list;
new_list.push_back(p_name);
type->enum_map[p_enum] = new_list;
}
type->constant_order.push_back(p_name);
#endif
}
@ -655,6 +665,77 @@ int ClassDB::get_integer_constant(const StringName &p_class, const StringName &p
return 0;
}
#ifdef DEBUG_METHODS_ENABLED
StringName ClassDB::get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance) {
OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class);
while (type) {
const StringName *k = NULL;
while ((k = type->enum_map.next(k))) {
List<StringName> &constants_list = type->enum_map.get(*k);
const List<StringName>::Element *found = constants_list.find(p_name);
if (found)
return found->get();
}
if (p_no_inheritance)
break;
type = type->inherits_ptr;
}
return StringName();
}
void ClassDB::get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance) {
OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class);
while (type) {
const StringName *k = NULL;
while ((k = type->enum_map.next(k))) {
p_enums->push_back(*k);
}
if (p_no_inheritance)
break;
type = type->inherits_ptr;
}
}
void ClassDB::get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance) {
OBJTYPE_RLOCK;
ClassInfo *type = classes.getptr(p_class);
while (type) {
const List<StringName> *constants = type->enum_map.getptr(p_enum);
if (constants) {
for (const List<StringName>::Element *E = constants->front(); E; E = E->next()) {
p_constants->push_back(E->get());
}
}
if (p_no_inheritance)
break;
type = type->inherits_ptr;
}
}
#endif
void ClassDB::add_signal(StringName p_class, const MethodInfo &p_signal) {
OBJTYPE_WLOCK;

27
core/class_db.h
View file

@ -138,6 +138,7 @@ public:
HashMap<StringName, MethodInfo, StringNameHasher> signal_map;
List<PropertyInfo> property_list;
#ifdef DEBUG_METHODS_ENABLED
HashMap<StringName, List<StringName> > enum_map;
List<StringName> constant_order;
List<StringName> method_order;
Set<StringName> methods_in_properties;
@ -488,9 +489,16 @@ public:
static void add_virtual_method(const StringName &p_class, const MethodInfo &p_method, bool p_virtual = true);
static void get_virtual_methods(const StringName &p_class, List<MethodInfo> *p_methods, bool p_no_inheritance = false);
static void bind_integer_constant(const StringName &p_class, const StringName &p_name, int p_constant);
static void bind_integer_constant(const StringName &p_class, const StringName &p_enum, const StringName &p_name, int p_constant);
static void get_integer_constant_list(const StringName &p_class, List<String> *p_constants, bool p_no_inheritance = false);
static int get_integer_constant(const StringName &p_class, const StringName &p_name, bool *p_success = NULL);
#ifdef DEBUG_METHODS_ENABLED
static StringName get_integer_constant_enum(const StringName &p_class, const StringName &p_name, bool p_no_inheritance = false);
static void get_enum_list(const StringName &p_class, List<StringName> *p_enums, bool p_no_inheritance = false);
static void get_enum_constants(const StringName &p_class, const StringName &p_enum, List<StringName> *p_constants, bool p_no_inheritance = false);
#endif
static StringName get_category(const StringName &p_node);
static bool get_setter_and_type_for_property(const StringName &p_class, const StringName &p_prop, StringName &r_class, StringName &r_setter);
@ -509,8 +517,23 @@ public:
static void cleanup();
};
#ifdef DEBUG_METHODS_ENABLED
#define BIND_CONSTANT(m_constant) \
ClassDB::bind_integer_constant(get_class_static(), #m_constant, m_constant);
ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
#define BIND_ENUM_CONSTANT(m_constant) \
ClassDB::bind_integer_constant(get_class_static(), __constant_get_enum_name(m_constant, #m_constant), #m_constant, m_constant);
#else
#define BIND_CONSTANT(m_constant) \
ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
#define BIND_ENUM_CONSTANT(m_constant) \
ClassDB::bind_integer_constant(get_class_static(), StringName(), #m_constant, m_constant);
#endif
#ifdef TOOLS_ENABLED

971
core/global_constants.cpp
View file

File diff suppressed because it is too large Load diff

3
core/global_constants.h
View file

@ -30,9 +30,12 @@
#ifndef GLOBAL_CONSTANTS_H
#define GLOBAL_CONSTANTS_H
#include "string_db.h"
class GlobalConstants {
public:
static int get_global_constant_count();
static StringName get_global_constant_enum(int p_idx);
static const char *get_global_constant_name(int p_idx);
static int get_global_constant_value(int p_idx);
};

104
core/image.cpp
View file

@ -2275,62 +2275,62 @@ void Image::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE), "_set_data", "_get_data");
BIND_CONSTANT(FORMAT_L8); //luminance
BIND_CONSTANT(FORMAT_LA8); //luminance-alpha
BIND_CONSTANT(FORMAT_R8);
BIND_CONSTANT(FORMAT_RG8);
BIND_CONSTANT(FORMAT_RGB8);
BIND_CONSTANT(FORMAT_RGBA8);
BIND_CONSTANT(FORMAT_RGBA4444);
BIND_CONSTANT(FORMAT_RGBA5551);
BIND_CONSTANT(FORMAT_RF); //float
BIND_CONSTANT(FORMAT_RGF);
BIND_CONSTANT(FORMAT_RGBF);
BIND_CONSTANT(FORMAT_RGBAF);
BIND_CONSTANT(FORMAT_RH); //half float
BIND_CONSTANT(FORMAT_RGH);
BIND_CONSTANT(FORMAT_RGBH);
BIND_CONSTANT(FORMAT_RGBAH);
BIND_CONSTANT(FORMAT_RGBE9995);
BIND_CONSTANT(FORMAT_DXT1); //s3tc bc1
BIND_CONSTANT(FORMAT_DXT3); //bc2
BIND_CONSTANT(FORMAT_DXT5); //bc3
BIND_CONSTANT(FORMAT_RGTC_R);
BIND_CONSTANT(FORMAT_RGTC_RG);
BIND_CONSTANT(FORMAT_BPTC_RGBA); //btpc bc6h
BIND_CONSTANT(FORMAT_BPTC_RGBF); //float /
BIND_CONSTANT(FORMAT_BPTC_RGBFU); //unsigned float
BIND_CONSTANT(FORMAT_PVRTC2); //pvrtc
BIND_CONSTANT(FORMAT_PVRTC2A);
BIND_CONSTANT(FORMAT_PVRTC4);
BIND_CONSTANT(FORMAT_PVRTC4A);
BIND_CONSTANT(FORMAT_ETC); //etc1
BIND_CONSTANT(FORMAT_ETC2_R11); //etc2
BIND_CONSTANT(FORMAT_ETC2_R11S); //signed ); NOT srgb.
BIND_CONSTANT(FORMAT_ETC2_RG11);
BIND_CONSTANT(FORMAT_ETC2_RG11S);
BIND_CONSTANT(FORMAT_ETC2_RGB8);
BIND_CONSTANT(FORMAT_ETC2_RGBA8);
BIND_CONSTANT(FORMAT_ETC2_RGB8A1);
BIND_CONSTANT(FORMAT_MAX);
BIND_ENUM_CONSTANT(FORMAT_L8); //luminance
BIND_ENUM_CONSTANT(FORMAT_LA8); //luminance-alpha
BIND_ENUM_CONSTANT(FORMAT_R8);
BIND_ENUM_CONSTANT(FORMAT_RG8);
BIND_ENUM_CONSTANT(FORMAT_RGB8);
BIND_ENUM_CONSTANT(FORMAT_RGBA8);
BIND_ENUM_CONSTANT(FORMAT_RGBA4444);
BIND_ENUM_CONSTANT(FORMAT_RGBA5551);
BIND_ENUM_CONSTANT(FORMAT_RF); //float
BIND_ENUM_CONSTANT(FORMAT_RGF);
BIND_ENUM_CONSTANT(FORMAT_RGBF);
BIND_ENUM_CONSTANT(FORMAT_RGBAF);
BIND_ENUM_CONSTANT(FORMAT_RH); //half float
BIND_ENUM_CONSTANT(FORMAT_RGH);
BIND_ENUM_CONSTANT(FORMAT_RGBH);
BIND_ENUM_CONSTANT(FORMAT_RGBAH);
BIND_ENUM_CONSTANT(FORMAT_RGBE9995);
BIND_ENUM_CONSTANT(FORMAT_DXT1); //s3tc bc1
BIND_ENUM_CONSTANT(FORMAT_DXT3); //bc2
BIND_ENUM_CONSTANT(FORMAT_DXT5); //bc3
BIND_ENUM_CONSTANT(FORMAT_RGTC_R);
BIND_ENUM_CONSTANT(FORMAT_RGTC_RG);
BIND_ENUM_CONSTANT(FORMAT_BPTC_RGBA); //btpc bc6h
BIND_ENUM_CONSTANT(FORMAT_BPTC_RGBF); //float /
BIND_ENUM_CONSTANT(FORMAT_BPTC_RGBFU); //unsigned float
BIND_ENUM_CONSTANT(FORMAT_PVRTC2); //pvrtc
BIND_ENUM_CONSTANT(FORMAT_PVRTC2A);
BIND_ENUM_CONSTANT(FORMAT_PVRTC4);
BIND_ENUM_CONSTANT(FORMAT_PVRTC4A);
BIND_ENUM_CONSTANT(FORMAT_ETC); //etc1
BIND_ENUM_CONSTANT(FORMAT_ETC2_R11); //etc2
BIND_ENUM_CONSTANT(FORMAT_ETC2_R11S); //signed ); NOT srgb.
BIND_ENUM_CONSTANT(FORMAT_ETC2_RG11);
BIND_ENUM_CONSTANT(FORMAT_ETC2_RG11S);
BIND_ENUM_CONSTANT(FORMAT_ETC2_RGB8);
BIND_ENUM_CONSTANT(FORMAT_ETC2_RGBA8);
BIND_ENUM_CONSTANT(FORMAT_ETC2_RGB8A1);
BIND_ENUM_CONSTANT(FORMAT_MAX);
BIND_CONSTANT(INTERPOLATE_NEAREST);
BIND_CONSTANT(INTERPOLATE_BILINEAR);
BIND_CONSTANT(INTERPOLATE_CUBIC);
BIND_ENUM_CONSTANT(INTERPOLATE_NEAREST);
BIND_ENUM_CONSTANT(INTERPOLATE_BILINEAR);
BIND_ENUM_CONSTANT(INTERPOLATE_CUBIC);
BIND_CONSTANT(ALPHA_NONE);
BIND_CONSTANT(ALPHA_BIT);
BIND_CONSTANT(ALPHA_BLEND);
BIND_ENUM_CONSTANT(ALPHA_NONE);
BIND_ENUM_CONSTANT(ALPHA_BIT);
BIND_ENUM_CONSTANT(ALPHA_BLEND);
BIND_CONSTANT(COMPRESS_S3TC);
BIND_CONSTANT(COMPRESS_PVRTC2);
BIND_CONSTANT(COMPRESS_PVRTC4);
BIND_CONSTANT(COMPRESS_ETC);
BIND_CONSTANT(COMPRESS_ETC2);
BIND_ENUM_CONSTANT(COMPRESS_S3TC);
BIND_ENUM_CONSTANT(COMPRESS_PVRTC2);
BIND_ENUM_CONSTANT(COMPRESS_PVRTC4);
BIND_ENUM_CONSTANT(COMPRESS_ETC);
BIND_ENUM_CONSTANT(COMPRESS_ETC2);
BIND_CONSTANT(COMPRESS_SOURCE_GENERIC);
BIND_CONSTANT(COMPRESS_SOURCE_SRGB);
BIND_CONSTANT(COMPRESS_SOURCE_NORMAL);
BIND_ENUM_CONSTANT(COMPRESS_SOURCE_GENERIC);
BIND_ENUM_CONSTANT(COMPRESS_SOURCE_SRGB);
BIND_ENUM_CONSTANT(COMPRESS_SOURCE_NORMAL);
}
void Image::set_compress_bc_func(void (*p_compress_func)(Image *, CompressSource)) {

136
core/io/http_client.cpp
View file

@ -650,84 +650,84 @@ void HTTPClient::_bind_methods() {
ClassDB::bind_method(D_METHOD("query_string_from_dict", "fields"), &HTTPClient::query_string_from_dict);
BIND_CONSTANT(METHOD_GET);
BIND_CONSTANT(METHOD_HEAD);
BIND_CONSTANT(METHOD_POST);
BIND_CONSTANT(METHOD_PUT);
BIND_CONSTANT(METHOD_DELETE);
BIND_CONSTANT(METHOD_OPTIONS);
BIND_CONSTANT(METHOD_TRACE);
BIND_CONSTANT(METHOD_CONNECT);
BIND_CONSTANT(METHOD_MAX);
BIND_ENUM_CONSTANT(METHOD_GET);
BIND_ENUM_CONSTANT(METHOD_HEAD);
BIND_ENUM_CONSTANT(METHOD_POST);
BIND_ENUM_CONSTANT(METHOD_PUT);
BIND_ENUM_CONSTANT(METHOD_DELETE);
BIND_ENUM_CONSTANT(METHOD_OPTIONS);
BIND_ENUM_CONSTANT(METHOD_TRACE);
BIND_ENUM_CONSTANT(METHOD_CONNECT);
BIND_ENUM_CONSTANT(METHOD_MAX);
BIND_CONSTANT(STATUS_DISCONNECTED);
BIND_CONSTANT(STATUS_RESOLVING); //resolving hostname (if passed a hostname)
BIND_CONSTANT(STATUS_CANT_RESOLVE);
BIND_CONSTANT(STATUS_CONNECTING); //connecting to ip
BIND_CONSTANT(STATUS_CANT_CONNECT);
BIND_CONSTANT(STATUS_CONNECTED); //connected ); requests only accepted here
BIND_CONSTANT(STATUS_REQUESTING); // request in progress
BIND_CONSTANT(STATUS_BODY); // request resulted in body ); which must be read
BIND_CONSTANT(STATUS_CONNECTION_ERROR);
BIND_CONSTANT(STATUS_SSL_HANDSHAKE_ERROR);
BIND_ENUM_CONSTANT(STATUS_DISCONNECTED);
BIND_ENUM_CONSTANT(STATUS_RESOLVING); //resolving hostname (if passed a hostname)
BIND_ENUM_CONSTANT(STATUS_CANT_RESOLVE);
BIND_ENUM_CONSTANT(STATUS_CONNECTING); //connecting to ip
BIND_ENUM_CONSTANT(STATUS_CANT_CONNECT);
BIND_ENUM_CONSTANT(STATUS_CONNECTED); //connected ); requests only accepted here
BIND_ENUM_CONSTANT(STATUS_REQUESTING); // request in progress
BIND_ENUM_CONSTANT(STATUS_BODY); // request resulted in body ); which must be read
BIND_ENUM_CONSTANT(STATUS_CONNECTION_ERROR);
BIND_ENUM_CONSTANT(STATUS_SSL_HANDSHAKE_ERROR);
BIND_CONSTANT(RESPONSE_CONTINUE);
BIND_CONSTANT(RESPONSE_SWITCHING_PROTOCOLS);
BIND_CONSTANT(RESPONSE_PROCESSING);
BIND_ENUM_CONSTANT(RESPONSE_CONTINUE);
BIND_ENUM_CONSTANT(RESPONSE_SWITCHING_PROTOCOLS);
BIND_ENUM_CONSTANT(RESPONSE_PROCESSING);
// 2xx successful
BIND_CONSTANT(RESPONSE_OK);
BIND_CONSTANT(RESPONSE_CREATED);
BIND_CONSTANT(RESPONSE_ACCEPTED);
BIND_CONSTANT(RESPONSE_NON_AUTHORITATIVE_INFORMATION);
BIND_CONSTANT(RESPONSE_NO_CONTENT);
BIND_CONSTANT(RESPONSE_RESET_CONTENT);
BIND_CONSTANT(RESPONSE_PARTIAL_CONTENT);
BIND_CONSTANT(RESPONSE_MULTI_STATUS);
BIND_CONSTANT(RESPONSE_IM_USED);
BIND_ENUM_CONSTANT(RESPONSE_OK);
BIND_ENUM_CONSTANT(RESPONSE_CREATED);
BIND_ENUM_CONSTANT(RESPONSE_ACCEPTED);
BIND_ENUM_CONSTANT(RESPONSE_NON_AUTHORITATIVE_INFORMATION);
BIND_ENUM_CONSTANT(RESPONSE_NO_CONTENT);
BIND_ENUM_CONSTANT(RESPONSE_RESET_CONTENT);
BIND_ENUM_CONSTANT(RESPONSE_PARTIAL_CONTENT);
BIND_ENUM_CONSTANT(RESPONSE_MULTI_STATUS);
BIND_ENUM_CONSTANT(RESPONSE_IM_USED);
// 3xx redirection
BIND_CONSTANT(RESPONSE_MULTIPLE_CHOICES);
BIND_CONSTANT(RESPONSE_MOVED_PERMANENTLY);
BIND_CONSTANT(RESPONSE_FOUND);
BIND_CONSTANT(RESPONSE_SEE_OTHER);
BIND_CONSTANT(RESPONSE_NOT_MODIFIED);
BIND_CONSTANT(RESPONSE_USE_PROXY);
BIND_CONSTANT(RESPONSE_TEMPORARY_REDIRECT);
BIND_ENUM_CONSTANT(RESPONSE_MULTIPLE_CHOICES);
BIND_ENUM_CONSTANT(RESPONSE_MOVED_PERMANENTLY);
BIND_ENUM_CONSTANT(RESPONSE_FOUND);
BIND_ENUM_CONSTANT(RESPONSE_SEE_OTHER);
BIND_ENUM_CONSTANT(RESPONSE_NOT_MODIFIED);
BIND_ENUM_CONSTANT(RESPONSE_USE_PROXY);
BIND_ENUM_CONSTANT(RESPONSE_TEMPORARY_REDIRECT);
// 4xx client error
BIND_CONSTANT(RESPONSE_BAD_REQUEST);
BIND_CONSTANT(RESPONSE_UNAUTHORIZED);
BIND_CONSTANT(RESPONSE_PAYMENT_REQUIRED);
BIND_CONSTANT(RESPONSE_FORBIDDEN);
BIND_CONSTANT(RESPONSE_NOT_FOUND);
BIND_CONSTANT(RESPONSE_METHOD_NOT_ALLOWED);
BIND_CONSTANT(RESPONSE_NOT_ACCEPTABLE);
BIND_CONSTANT(RESPONSE_PROXY_AUTHENTICATION_REQUIRED);
BIND_CONSTANT(RESPONSE_REQUEST_TIMEOUT);
BIND_CONSTANT(RESPONSE_CONFLICT);
BIND_CONSTANT(RESPONSE_GONE);
BIND_CONSTANT(RESPONSE_LENGTH_REQUIRED);
BIND_CONSTANT(RESPONSE_PRECONDITION_FAILED);
BIND_CONSTANT(RESPONSE_REQUEST_ENTITY_TOO_LARGE);
BIND_CONSTANT(RESPONSE_REQUEST_URI_TOO_LONG);
BIND_CONSTANT(RESPONSE_UNSUPPORTED_MEDIA_TYPE);
BIND_CONSTANT(RESPONSE_REQUESTED_RANGE_NOT_SATISFIABLE);
BIND_CONSTANT(RESPONSE_EXPECTATION_FAILED);
BIND_CONSTANT(RESPONSE_UNPROCESSABLE_ENTITY);
BIND_CONSTANT(RESPONSE_LOCKED);
BIND_CONSTANT(RESPONSE_FAILED_DEPENDENCY);
BIND_CONSTANT(RESPONSE_UPGRADE_REQUIRED);
BIND_ENUM_CONSTANT(RESPONSE_BAD_REQUEST);
BIND_ENUM_CONSTANT(RESPONSE_UNAUTHORIZED);
BIND_ENUM_CONSTANT(RESPONSE_PAYMENT_REQUIRED);
BIND_ENUM_CONSTANT(RESPONSE_FORBIDDEN);
BIND_ENUM_CONSTANT(RESPONSE_NOT_FOUND);
BIND_ENUM_CONSTANT(RESPONSE_METHOD_NOT_ALLOWED);
BIND_ENUM_CONSTANT(RESPONSE_NOT_ACCEPTABLE);
BIND_ENUM_CONSTANT(RESPONSE_PROXY_AUTHENTICATION_REQUIRED);
BIND_ENUM_CONSTANT(RESPONSE_REQUEST_TIMEOUT);
BIND_ENUM_CONSTANT(RESPONSE_CONFLICT);
BIND_ENUM_CONSTANT(RESPONSE_GONE);
BIND_ENUM_CONSTANT(RESPONSE_LENGTH_REQUIRED);
BIND_ENUM_CONSTANT(RESPONSE_PRECONDITION_FAILED);
BIND_ENUM_CONSTANT(RESPONSE_REQUEST_ENTITY_TOO_LARGE);
BIND_ENUM_CONSTANT(RESPONSE_REQUEST_URI_TOO_LONG);
BIND_ENUM_CONSTANT(RESPONSE_UNSUPPORTED_MEDIA_TYPE);
BIND_ENUM_CONSTANT(RESPONSE_REQUESTED_RANGE_NOT_SATISFIABLE);
BIND_ENUM_CONSTANT(RESPONSE_EXPECTATION_FAILED);
BIND_ENUM_CONSTANT(RESPONSE_UNPROCESSABLE_ENTITY);
BIND_ENUM_CONSTANT(RESPONSE_LOCKED);
BIND_ENUM_CONSTANT(RESPONSE_FAILED_DEPENDENCY);
BIND_ENUM_CONSTANT(RESPONSE_UPGRADE_REQUIRED);
// 5xx server error
BIND_CONSTANT(RESPONSE_INTERNAL_SERVER_ERROR);
BIND_CONSTANT(RESPONSE_NOT_IMPLEMENTED);
BIND_CONSTANT(RESPONSE_BAD_GATEWAY);
BIND_CONSTANT(RESPONSE_SERVICE_UNAVAILABLE);
BIND_CONSTANT(RESPONSE_GATEWAY_TIMEOUT);
BIND_CONSTANT(RESPONSE_HTTP_VERSION_NOT_SUPPORTED);
BIND_CONSTANT(RESPONSE_INSUFFICIENT_STORAGE);
BIND_CONSTANT(RESPONSE_NOT_EXTENDED);
BIND_ENUM_CONSTANT(RESPONSE_INTERNAL_SERVER_ERROR);
BIND_ENUM_CONSTANT(RESPONSE_NOT_IMPLEMENTED);
BIND_ENUM_CONSTANT(RESPONSE_BAD_GATEWAY);
BIND_ENUM_CONSTANT(RESPONSE_SERVICE_UNAVAILABLE);
BIND_ENUM_CONSTANT(RESPONSE_GATEWAY_TIMEOUT);
BIND_ENUM_CONSTANT(RESPONSE_HTTP_VERSION_NOT_SUPPORTED);
BIND_ENUM_CONSTANT(RESPONSE_INSUFFICIENT_STORAGE);
BIND_ENUM_CONSTANT(RESPONSE_NOT_EXTENDED);
}
void HTTPClient::set_read_chunk_size(int p_size) {

1
core/io/http_client.h
View file

@ -197,6 +197,7 @@ public:
~HTTPClient();
};
VARIANT_ENUM_CAST(HTTPClient::ResponseCode)
VARIANT_ENUM_CAST(HTTPClient::Method);
VARIANT_ENUM_CAST(HTTPClient::Status);

16
core/io/ip.cpp
View file

@ -242,18 +242,18 @@ void IP::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_local_addresses"), &IP::_get_local_addresses);
ClassDB::bind_method(D_METHOD("clear_cache", "hostname"), &IP::clear_cache, DEFVAL(""));
BIND_CONSTANT(RESOLVER_STATUS_NONE);
BIND_CONSTANT(RESOLVER_STATUS_WAITING);
BIND_CONSTANT(RESOLVER_STATUS_DONE);
BIND_CONSTANT(RESOLVER_STATUS_ERROR);
BIND_ENUM_CONSTANT(RESOLVER_STATUS_NONE);
BIND_ENUM_CONSTANT(RESOLVER_STATUS_WAITING);
BIND_ENUM_CONSTANT(RESOLVER_STATUS_DONE);
BIND_ENUM_CONSTANT(RESOLVER_STATUS_ERROR);
BIND_CONSTANT(RESOLVER_MAX_QUERIES);
BIND_CONSTANT(RESOLVER_INVALID_ID);
BIND_CONSTANT(TYPE_NONE);
BIND_CONSTANT(TYPE_IPV4);
BIND_CONSTANT(TYPE_IPV6);
BIND_CONSTANT(TYPE_ANY);
BIND_ENUM_CONSTANT(TYPE_NONE);
BIND_ENUM_CONSTANT(TYPE_IPV4);
BIND_ENUM_CONSTANT(TYPE_IPV6);
BIND_ENUM_CONSTANT(TYPE_ANY);
}
IP *IP::singleton = NULL;

12
core/io/networked_multiplayer_peer.cpp
View file

@ -44,13 +44,13 @@ void NetworkedMultiplayerPeer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_refuse_new_connections", "enable"), &NetworkedMultiplayerPeer::set_refuse_new_connections);
ClassDB::bind_method(D_METHOD("is_refusing_new_connections"), &NetworkedMultiplayerPeer::is_refusing_new_connections);
BIND_CONSTANT(TRANSFER_MODE_UNRELIABLE);
BIND_CONSTANT(TRANSFER_MODE_UNRELIABLE_ORDERED);
BIND_CONSTANT(TRANSFER_MODE_RELIABLE);
BIND_ENUM_CONSTANT(TRANSFER_MODE_UNRELIABLE);
BIND_ENUM_CONSTANT(TRANSFER_MODE_UNRELIABLE_ORDERED);
BIND_ENUM_CONSTANT(TRANSFER_MODE_RELIABLE);
BIND_CONSTANT(CONNECTION_DISCONNECTED);
BIND_CONSTANT(CONNECTION_CONNECTING);
BIND_CONSTANT(CONNECTION_CONNECTED);
BIND_ENUM_CONSTANT(CONNECTION_DISCONNECTED);
BIND_ENUM_CONSTANT(CONNECTION_CONNECTING);
BIND_ENUM_CONSTANT(CONNECTION_CONNECTED);
BIND_CONSTANT(TARGET_PEER_BROADCAST);
BIND_CONSTANT(TARGET_PEER_SERVER);

9
core/io/stream_peer_ssl.cpp
View file

@ -55,10 +55,11 @@ void StreamPeerSSL::_bind_methods() {
ClassDB::bind_method(D_METHOD("connect_to_stream", "stream", "validate_certs", "for_hostname"), &StreamPeerSSL::connect_to_stream, DEFVAL(false), DEFVAL(String()));
ClassDB::bind_method(D_METHOD("get_status"), &StreamPeerSSL::get_status);
ClassDB::bind_method(D_METHOD("disconnect_from_stream"), &StreamPeerSSL::disconnect_from_stream);
BIND_CONSTANT(STATUS_DISCONNECTED);
BIND_CONSTANT(STATUS_CONNECTED);
BIND_CONSTANT(STATUS_ERROR_NO_CERTIFICATE);
BIND_CONSTANT(STATUS_ERROR_HOSTNAME_MISMATCH);
BIND_ENUM_CONSTANT(STATUS_DISCONNECTED);
BIND_ENUM_CONSTANT(STATUS_CONNECTED);
BIND_ENUM_CONSTANT(STATUS_ERROR_NO_CERTIFICATE);
BIND_ENUM_CONSTANT(STATUS_ERROR_HOSTNAME_MISMATCH);
}
StreamPeerSSL::StreamPeerSSL() {

8
core/io/stream_peer_tcp.cpp
View file

@ -55,10 +55,10 @@ void StreamPeerTCP::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_connected_port"), &StreamPeerTCP::get_connected_port);
ClassDB::bind_method(D_METHOD("disconnect_from_host"), &StreamPeerTCP::disconnect_from_host);
BIND_CONSTANT(STATUS_NONE);
BIND_CONSTANT(STATUS_CONNECTING);
BIND_CONSTANT(STATUS_CONNECTED);
BIND_CONSTANT(STATUS_ERROR);
BIND_ENUM_CONSTANT(STATUS_NONE);
BIND_ENUM_CONSTANT(STATUS_CONNECTING);
BIND_ENUM_CONSTANT(STATUS_CONNECTED);
BIND_ENUM_CONSTANT(STATUS_ERROR);
}
Ref<StreamPeerTCP> StreamPeerTCP::create_ref() {

14
core/io/xml_parser.cpp
View file

@ -373,13 +373,13 @@ void XMLParser::_bind_methods() {
ClassDB::bind_method(D_METHOD("open", "file"), &XMLParser::open);
ClassDB::bind_method(D_METHOD("open_buffer", "buffer"), &XMLParser::open_buffer);
BIND_CONSTANT(NODE_NONE);
BIND_CONSTANT(NODE_ELEMENT);
BIND_CONSTANT(NODE_ELEMENT_END);
BIND_CONSTANT(NODE_TEXT);
BIND_CONSTANT(NODE_COMMENT);
BIND_CONSTANT(NODE_CDATA);
BIND_CONSTANT(NODE_UNKNOWN);
BIND_ENUM_CONSTANT(NODE_NONE);
BIND_ENUM_CONSTANT(NODE_ELEMENT);
BIND_ENUM_CONSTANT(NODE_ELEMENT_END);
BIND_ENUM_CONSTANT(NODE_TEXT);
BIND_ENUM_CONSTANT(NODE_COMMENT);
BIND_ENUM_CONSTANT(NODE_CDATA);
BIND_ENUM_CONSTANT(NODE_UNKNOWN);
};
Error XMLParser::read() {

26
core/method_bind.h
View file

@ -124,6 +124,9 @@ struct VariantCaster<const T &> {
#endif
// Object enum casts must go here
VARIANT_ENUM_CAST(Object::ConnectFlags);
#define CHECK_ARG(m_arg) \
if ((m_arg - 1) < p_arg_count) { \
Variant::Type argtype = get_argument_type(m_arg - 1); \
@ -148,14 +151,35 @@ struct VariantCaster<const T &> {
VARIANT_ENUM_CAST(Vector3::Axis);
VARIANT_ENUM_CAST(Error);
VARIANT_ENUM_CAST(wchar_t);
VARIANT_ENUM_CAST(Margin);
VARIANT_ENUM_CAST(Corner);
VARIANT_ENUM_CAST(Orientation);
VARIANT_ENUM_CAST(HAlign);
VARIANT_ENUM_CAST(VAlign);
VARIANT_ENUM_CAST(PropertyHint);
VARIANT_ENUM_CAST(PropertyUsageFlags);
VARIANT_ENUM_CAST(MethodFlags);
VARIANT_ENUM_CAST(Variant::Type);
VARIANT_ENUM_CAST(Variant::Operator);
template <>
struct VariantCaster<wchar_t> {
static _FORCE_INLINE_ wchar_t cast(const Variant &p_variant) {
return (wchar_t)p_variant.operator int();
}
};
#ifdef PTRCALL_ENABLED
template <>
struct PtrToArg<wchar_t> {
_FORCE_INLINE_ static wchar_t convert(const void *p_ptr) {
return wchar_t(*reinterpret_cast<const int *>(p_ptr));
}
_FORCE_INLINE_ static void encode(wchar_t p_val, const void *p_ptr) {
*(int *)p_ptr = p_val;
}
};
#endif
class MethodBind {
int method_id;

6
core/object.cpp
View file

@ -1737,9 +1737,9 @@ void Object::_bind_methods() {
BIND_CONSTANT(NOTIFICATION_POSTINITIALIZE);
BIND_CONSTANT(NOTIFICATION_PREDELETE);
BIND_CONSTANT(CONNECT_DEFERRED);
BIND_CONSTANT(CONNECT_PERSIST);
BIND_CONSTANT(CONNECT_ONESHOT);
BIND_ENUM_CONSTANT(CONNECT_DEFERRED);
BIND_ENUM_CONSTANT(CONNECT_PERSIST);
BIND_ENUM_CONSTANT(CONNECT_ONESHOT);
}
void Object::call_deferred(const StringName &p_method, VARIANT_ARG_DECLARE) {

8
core/os/input.cpp
View file

@ -86,10 +86,10 @@ void Input::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(Vector2()));
ClassDB::bind_method(D_METHOD("parse_input_event", "event"), &Input::parse_input_event);
BIND_CONSTANT(MOUSE_MODE_VISIBLE);
BIND_CONSTANT(MOUSE_MODE_HIDDEN);
BIND_CONSTANT(MOUSE_MODE_CAPTURED);
BIND_CONSTANT(MOUSE_MODE_CONFINED);
BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE);
BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN);
BIND_ENUM_CONSTANT(MOUSE_MODE_CAPTURED);
BIND_ENUM_CONSTANT(MOUSE_MODE_CONFINED);
ADD_SIGNAL(MethodInfo("joy_connection_changed", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::BOOL, "connected")));
}

4
core/register_core_types.cpp
View file

@ -75,6 +75,8 @@ static _Geometry *_geometry = NULL;
extern Mutex *_global_mutex;
extern void register_global_constants();
extern void unregister_global_constants();
extern void register_variant_methods();
extern void unregister_variant_methods();
@ -88,6 +90,7 @@ void register_core_types() {
StringName::setup();
register_global_constants();
register_variant_methods();
CoreStringNames::create();
@ -218,6 +221,7 @@ void unregister_core_types() {
ObjectDB::cleanup();
unregister_variant_methods();
unregister_global_constants();
ClassDB::cleanup();
ResourceCache::clear();

74
core/simple_type.h
View file

@ -32,96 +32,22 @@
/* Batch of specializations to obtain the actual simple type */
template <class T>
struct GetSimpleType {
T type;
};
template <class T>
struct GetSimpleTypeT {
typedef T type_t;
};
template <class T>
struct GetSimpleType<T &> {
T type;
};
template <class T>
struct GetSimpleTypeT<T &> {
typedef T type_t;
};
template <class T>
struct GetSimpleType<T const> {
T type;
_FORCE_INLINE_ GetSimpleType() {}
};
template <class T>
struct GetSimpleTypeT<T const> {
typedef T type_t;
};
template <class T>
struct GetSimpleType<const T &> {
T type;
_FORCE_INLINE_ GetSimpleType() {}
};
template <class T>
struct GetSimpleType<T *> {
T *type;
_FORCE_INLINE_ GetSimpleType() { type = NULL; }
};
template <class T>
struct GetSimpleType<const T *> {
T *type;
_FORCE_INLINE_ GetSimpleType() { type = NULL; }
};
#define SIMPLE_NUMERIC_TYPE(m_type) \
template <> \
struct GetSimpleType<m_type> { \
m_type type; \
_FORCE_INLINE_ GetSimpleType() { type = (m_type)0; } \
}; \
template <> \
struct GetSimpleType<m_type const> { \
m_type type; \
_FORCE_INLINE_ GetSimpleType() { type = (m_type)0; } \
}; \
template <> \
struct GetSimpleType<m_type &> { \
m_type type; \
_FORCE_INLINE_ GetSimpleType() { type = (m_type)0; } \
}; \
template <> \
struct GetSimpleType<const m_type &> { \
m_type type; \
_FORCE_INLINE_ GetSimpleType() { type = (m_type)0; } \
};
SIMPLE_NUMERIC_TYPE(bool);
SIMPLE_NUMERIC_TYPE(uint8_t);
SIMPLE_NUMERIC_TYPE(int8_t);
SIMPLE_NUMERIC_TYPE(uint16_t);
SIMPLE_NUMERIC_TYPE(int16_t);
SIMPLE_NUMERIC_TYPE(uint32_t);
SIMPLE_NUMERIC_TYPE(int32_t);
SIMPLE_NUMERIC_TYPE(int64_t);
SIMPLE_NUMERIC_TYPE(uint64_t);
SIMPLE_NUMERIC_TYPE(float);
SIMPLE_NUMERIC_TYPE(double);
#endif

63
core/type_info.h
View file

@ -1,6 +1,8 @@
#ifndef GET_TYPE_INFO_H
#define GET_TYPE_INFO_H
#ifdef DEBUG_METHODS_ENABLED
template <bool C, typename T = void>
struct EnableIf {
@ -40,8 +42,8 @@ struct GetTypeInfo {
enum { VARIANT_TYPE = Variant::NIL };
static inline StringName get_class_name() {
ERR_PRINT("Fallback type info. Bug!");
return ""; // Not "Nil", this is an error
ERR_PRINT("GetTypeInfo fallback. Bug!");
return StringName(); // Not "Nil", this is an error
}
};
@ -70,6 +72,7 @@ MAKE_TYPE_INFO(uint32_t, Variant::INT)
MAKE_TYPE_INFO(int32_t, Variant::INT)
MAKE_TYPE_INFO(int64_t, Variant::INT)
MAKE_TYPE_INFO(uint64_t, Variant::INT)
MAKE_TYPE_INFO(wchar_t, Variant::INT)
MAKE_TYPE_INFO(float, Variant::REAL)
MAKE_TYPE_INFO(double, Variant::REAL)
@ -152,36 +155,6 @@ MAKE_TEMPLATE_TYPE_INFO(Vector, Plane, Variant::ARRAY)
MAKE_TEMPLATE_TYPE_INFO(PoolVector, Plane, Variant::ARRAY)
MAKE_TEMPLATE_TYPE_INFO(PoolVector, Face3, Variant::POOL_VECTOR3_ARRAY)
#define MAKE_ENUM_TYPE_INFO(m_enum) \
template <> \
struct GetTypeInfo<m_enum> { \
enum { VARIANT_TYPE = Variant::INT }; \
static inline StringName get_class_name() { \
return Variant::get_type_name((Variant::Type)VARIANT_TYPE); \
} \
}; \
template <> \
struct GetTypeInfo<m_enum const> { \
enum { VARIANT_TYPE = Variant::INT }; \
static inline StringName get_class_name() { \
return Variant::get_type_name((Variant::Type)VARIANT_TYPE); \
} \
}; \
template <> \
struct GetTypeInfo<m_enum &> { \
enum { VARIANT_TYPE = Variant::INT }; \
static inline StringName get_class_name() { \
return Variant::get_type_name((Variant::Type)VARIANT_TYPE); \
} \
}; \
template <> \
struct GetTypeInfo<const m_enum &> { \
enum { VARIANT_TYPE = Variant::INT }; \
static inline StringName get_class_name() { \
return Variant::get_type_name((Variant::Type)VARIANT_TYPE); \
} \
};
template <typename T>
struct GetTypeInfo<T *, typename EnableIf<TypeInherits<Object, T>::value>::type> {
enum { VARIANT_TYPE = Variant::OBJECT };
@ -200,4 +173,30 @@ struct GetTypeInfo<const T *, typename EnableIf<TypeInherits<Object, T>::value>:
}
};
#define TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_impl) \
template <> \
struct GetTypeInfo<m_impl> { \
enum { VARIANT_TYPE = Variant::INT }; \
static inline StringName get_class_name() { return "enum." #m_enum; } \
};
#define MAKE_ENUM_TYPE_INFO(m_enum) \
TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum) \
TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum const) \
TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, m_enum &) \
TEMPL_MAKE_ENUM_TYPE_INFO(m_enum, const m_enum &)
template <typename T>
inline StringName __constant_get_enum_name(T param, const String &p_constant) {
if (GetTypeInfo<T>::VARIANT_TYPE == Variant::NIL)
ERR_PRINTS("Missing VARIANT_ENUM_CAST for constant's enum: " + p_constant);
return GetTypeInfo<T>::get_class_name();
}
#else
#define MAKE_ENUM_TYPE_INFO(m_enum)
#endif // DEBUG_METHODS_ENABLED
#endif // GET_TYPE_INFO_H

6
core/undo_redo.cpp
View file

@ -504,7 +504,7 @@ void UndoRedo::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_current_action_name"), &UndoRedo::get_current_action_name);
ClassDB::bind_method(D_METHOD("get_version"), &UndoRedo::get_version);
BIND_CONSTANT(MERGE_DISABLE);
BIND_CONSTANT(MERGE_ENDS);
BIND_CONSTANT(MERGE_ALL);
BIND_ENUM_CONSTANT(MERGE_DISABLE);
BIND_ENUM_CONSTANT(MERGE_ENDS);
BIND_ENUM_CONSTANT(MERGE_ALL);
}

26
editor/editor_export.cpp
View file

@ -3323,22 +3323,22 @@ void EditorImportExport::_bind_methods() {
BIND_CONSTANT( ACTION_NONE );
BIND_CONSTANT( ACTION_COPY );
BIND_CONSTANT( ACTION_BUNDLE );
BIND_ENUM_CONSTANT( ACTION_NONE );
BIND_ENUM_CONSTANT( ACTION_COPY );
BIND_ENUM_CONSTANT( ACTION_BUNDLE );
BIND_CONSTANT( EXPORT_SELECTED );
BIND_CONSTANT( EXPORT_RESOURCES );
BIND_CONSTANT( EXPORT_ALL );
BIND_ENUM_CONSTANT( EXPORT_SELECTED );
BIND_ENUM_CONSTANT( EXPORT_RESOURCES );
BIND_ENUM_CONSTANT( EXPORT_ALL );
BIND_CONSTANT( IMAGE_ACTION_NONE );
BIND_CONSTANT( IMAGE_ACTION_COMPRESS_DISK );
BIND_CONSTANT( IMAGE_ACTION_COMPRESS_RAM );
BIND_CONSTANT( IMAGE_ACTION_KEEP );
BIND_ENUM_CONSTANT( IMAGE_ACTION_NONE );
BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_DISK );
BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_RAM );
BIND_ENUM_CONSTANT( IMAGE_ACTION_KEEP );
BIND_CONSTANT( SCRIPT_ACTION_NONE );
BIND_CONSTANT( SCRIPT_ACTION_COMPILE );
BIND_CONSTANT( SCRIPT_ACTION_ENCRYPT );
BIND_ENUM_CONSTANT( SCRIPT_ACTION_NONE );
BIND_ENUM_CONSTANT( SCRIPT_ACTION_COMPILE );
BIND_ENUM_CONSTANT( SCRIPT_ACTION_ENCRYPT );
};

16
editor/editor_file_dialog.cpp
View file

@ -1187,15 +1187,15 @@ void EditorFileDialog::_bind_methods() {
ADD_SIGNAL(MethodInfo("files_selected", PropertyInfo(Variant::POOL_STRING_ARRAY, "paths")));
ADD_SIGNAL(MethodInfo("dir_selected", PropertyInfo(Variant::STRING, "dir")));
BIND_CONSTANT(MODE_OPEN_FILE);
BIND_CONSTANT(MODE_OPEN_FILES);
BIND_CONSTANT(MODE_OPEN_DIR);
BIND_CONSTANT(MODE_OPEN_ANY);
BIND_CONSTANT(MODE_SAVE_FILE);
BIND_ENUM_CONSTANT(MODE_OPEN_FILE);
BIND_ENUM_CONSTANT(MODE_OPEN_FILES);
BIND_ENUM_CONSTANT(MODE_OPEN_DIR);
BIND_ENUM_CONSTANT(MODE_OPEN_ANY);
BIND_ENUM_CONSTANT(MODE_SAVE_FILE);
BIND_CONSTANT(ACCESS_RESOURCES);
BIND_CONSTANT(ACCESS_USERDATA);
BIND_CONSTANT(ACCESS_FILESYSTEM);
BIND_ENUM_CONSTANT(ACCESS_RESOURCES);
BIND_ENUM_CONSTANT(ACCESS_USERDATA);
BIND_ENUM_CONSTANT(ACCESS_FILESYSTEM);
}
void EditorFileDialog::set_show_hidden_files(bool p_show) {

32
editor/editor_plugin.cpp
View file

@ -468,23 +468,23 @@ void EditorPlugin::_bind_methods() {
ADD_SIGNAL(MethodInfo("scene_closed", PropertyInfo(Variant::STRING, "filepath:String")));
ADD_SIGNAL(MethodInfo("main_screen_changed", PropertyInfo(Variant::STRING, "screen_name:String")));
BIND_CONSTANT(CONTAINER_TOOLBAR);
BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_MENU);
BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_SIDE);
BIND_CONSTANT(CONTAINER_SPATIAL_EDITOR_BOTTOM);
BIND_CONSTANT(CONTAINER_CANVAS_EDITOR_MENU);
BIND_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE);
BIND_CONSTANT(CONTAINER_PROPERTY_EDITOR_BOTTOM);
BIND_ENUM_CONSTANT(CONTAINER_TOOLBAR);
BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_MENU);
BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_SIDE);
BIND_ENUM_CONSTANT(CONTAINER_SPATIAL_EDITOR_BOTTOM);
BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_MENU);
BIND_ENUM_CONSTANT(CONTAINER_CANVAS_EDITOR_SIDE);
BIND_ENUM_CONSTANT(CONTAINER_PROPERTY_EDITOR_BOTTOM);
BIND_CONSTANT(DOCK_SLOT_LEFT_UL);
BIND_CONSTANT(DOCK_SLOT_LEFT_BL);
BIND_CONSTANT(DOCK_SLOT_LEFT_UR);
BIND_CONSTANT(DOCK_SLOT_LEFT_BR);
BIND_CONSTANT(DOCK_SLOT_RIGHT_UL);
BIND_CONSTANT(DOCK_SLOT_RIGHT_BL);
BIND_CONSTANT(DOCK_SLOT_RIGHT_UR);
BIND_CONSTANT(DOCK_SLOT_RIGHT_BR);
BIND_CONSTANT(DOCK_SLOT_MAX);
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UL);
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BL);
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_UR);
BIND_ENUM_CONSTANT(DOCK_SLOT_LEFT_BR);
BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_UL);
BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BL);
BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_UR);
BIND_ENUM_CONSTANT(DOCK_SLOT_RIGHT_BR);
BIND_ENUM_CONSTANT(DOCK_SLOT_MAX);
}
EditorPlugin::EditorPlugin() {

56
main/performance.cpp
View file

@ -40,35 +40,35 @@ void Performance::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_monitor", "monitor"), &Performance::get_monitor);
BIND_CONSTANT(TIME_FPS);
BIND_CONSTANT(TIME_PROCESS);
BIND_CONSTANT(TIME_FIXED_PROCESS);
BIND_CONSTANT(MEMORY_STATIC);
BIND_CONSTANT(MEMORY_DYNAMIC);
BIND_CONSTANT(MEMORY_STATIC_MAX);
BIND_CONSTANT(MEMORY_DYNAMIC_MAX);
BIND_CONSTANT(MEMORY_MESSAGE_BUFFER_MAX);
BIND_CONSTANT(OBJECT_COUNT);
BIND_CONSTANT(OBJECT_RESOURCE_COUNT);
BIND_CONSTANT(OBJECT_NODE_COUNT);
BIND_CONSTANT(RENDER_OBJECTS_IN_FRAME);
BIND_CONSTANT(RENDER_VERTICES_IN_FRAME);
BIND_CONSTANT(RENDER_MATERIAL_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_SHADER_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_SURFACE_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_DRAW_CALLS_IN_FRAME);
BIND_CONSTANT(RENDER_USAGE_VIDEO_MEM_TOTAL);
BIND_CONSTANT(RENDER_VIDEO_MEM_USED);
BIND_CONSTANT(RENDER_TEXTURE_MEM_USED);
BIND_CONSTANT(RENDER_VERTEX_MEM_USED);
BIND_CONSTANT(PHYSICS_2D_ACTIVE_OBJECTS);
BIND_CONSTANT(PHYSICS_2D_COLLISION_PAIRS);
BIND_CONSTANT(PHYSICS_2D_ISLAND_COUNT);
BIND_CONSTANT(PHYSICS_3D_ACTIVE_OBJECTS);
BIND_CONSTANT(PHYSICS_3D_COLLISION_PAIRS);
BIND_CONSTANT(PHYSICS_3D_ISLAND_COUNT);
BIND_ENUM_CONSTANT(TIME_FPS);
BIND_ENUM_CONSTANT(TIME_PROCESS);
BIND_ENUM_CONSTANT(TIME_FIXED_PROCESS);
BIND_ENUM_CONSTANT(MEMORY_STATIC);
BIND_ENUM_CONSTANT(MEMORY_DYNAMIC);
BIND_ENUM_CONSTANT(MEMORY_STATIC_MAX);
BIND_ENUM_CONSTANT(MEMORY_DYNAMIC_MAX);
BIND_ENUM_CONSTANT(MEMORY_MESSAGE_BUFFER_MAX);
BIND_ENUM_CONSTANT(OBJECT_COUNT);
BIND_ENUM_CONSTANT(OBJECT_RESOURCE_COUNT);
BIND_ENUM_CONSTANT(OBJECT_NODE_COUNT);
BIND_ENUM_CONSTANT(RENDER_OBJECTS_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_VERTICES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_MATERIAL_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_SHADER_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_SURFACE_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_DRAW_CALLS_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_USAGE_VIDEO_MEM_TOTAL);
BIND_ENUM_CONSTANT(RENDER_VIDEO_MEM_USED);
BIND_ENUM_CONSTANT(RENDER_TEXTURE_MEM_USED);
BIND_ENUM_CONSTANT(RENDER_VERTEX_MEM_USED);
BIND_ENUM_CONSTANT(PHYSICS_2D_ACTIVE_OBJECTS);
BIND_ENUM_CONSTANT(PHYSICS_2D_COLLISION_PAIRS);
BIND_ENUM_CONSTANT(PHYSICS_2D_ISLAND_COUNT);
BIND_ENUM_CONSTANT(PHYSICS_3D_ACTIVE_OBJECTS);
BIND_ENUM_CONSTANT(PHYSICS_3D_COLLISION_PAIRS);
BIND_ENUM_CONSTANT(PHYSICS_3D_ISLAND_COUNT);
BIND_CONSTANT(MONITOR_MAX);
BIND_ENUM_CONSTANT(MONITOR_MAX);
}
String Performance::get_monitor_name(Monitor p_monitor) const {

10
modules/enet/networked_multiplayer_enet.cpp
View file

@ -658,11 +658,11 @@ void NetworkedMultiplayerENet::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_compression_mode"), &NetworkedMultiplayerENet::get_compression_mode);
ClassDB::bind_method(D_METHOD("set_bind_ip", "ip"), &NetworkedMultiplayerENet::set_bind_ip);
BIND_CONSTANT(COMPRESS_NONE);
BIND_CONSTANT(COMPRESS_RANGE_CODER);
BIND_CONSTANT(COMPRESS_FASTLZ);
BIND_CONSTANT(COMPRESS_ZLIB);
BIND_CONSTANT(COMPRESS_ZSTD);
BIND_ENUM_CONSTANT(COMPRESS_NONE);
BIND_ENUM_CONSTANT(COMPRESS_RANGE_CODER);
BIND_ENUM_CONSTANT(COMPRESS_FASTLZ);
BIND_ENUM_CONSTANT(COMPRESS_ZLIB);
BIND_ENUM_CONSTANT(COMPRESS_ZSTD);
}
NetworkedMultiplayerENet::NetworkedMultiplayerENet() {

21
modules/visual_script/visual_script_func_nodes.cpp
View file

@ -747,10 +747,10 @@ void VisualScriptFunctionCall::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "validate"), "set_validate", "get_validate");
ADD_PROPERTY(PropertyInfo(Variant::INT, "rpc_call_mode", PROPERTY_HINT_ENUM, "Disabled,Reliable,Unreliable,ReliableToID,UnreliableToID"), "set_rpc_call_mode", "get_rpc_call_mode"); //when set, if loaded properly, will override argument count.
BIND_CONSTANT(CALL_MODE_SELF);
BIND_CONSTANT(CALL_MODE_NODE_PATH);
BIND_CONSTANT(CALL_MODE_INSTANCE);
BIND_CONSTANT(CALL_MODE_BASIC_TYPE);
BIND_ENUM_CONSTANT(CALL_MODE_SELF);
BIND_ENUM_CONSTANT(CALL_MODE_NODE_PATH);
BIND_ENUM_CONSTANT(CALL_MODE_INSTANCE);
BIND_ENUM_CONSTANT(CALL_MODE_BASIC_TYPE);
}
class VisualScriptNodeInstanceFunctionCall : public VisualScriptNodeInstance {
@ -1490,9 +1490,10 @@ void VisualScriptPropertySet::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "property"), "set_property", "get_property");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "index"), "set_index", "get_index");
ADD_PROPERTY(PropertyInfo(Variant::INT, "assign_op", PROPERTY_HINT_ENUM, "Assign,Add,Sub,Mul,Div,Mod,ShiftLeft,ShiftRight,BitAnd,BitOr,Bitxor"), "set_assign_op", "get_assign_op");
BIND_CONSTANT(CALL_MODE_SELF);
BIND_CONSTANT(CALL_MODE_NODE_PATH);
BIND_CONSTANT(CALL_MODE_INSTANCE);
BIND_ENUM_CONSTANT(CALL_MODE_SELF);
BIND_ENUM_CONSTANT(CALL_MODE_NODE_PATH);
BIND_ENUM_CONSTANT(CALL_MODE_INSTANCE);
}
class VisualScriptNodeInstancePropertySet : public VisualScriptNodeInstance {
@ -2202,9 +2203,9 @@ void VisualScriptPropertyGet::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "property"), "set_property", "get_property");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "index", PROPERTY_HINT_ENUM), "set_index", "get_index");
BIND_CONSTANT(CALL_MODE_SELF);
BIND_CONSTANT(CALL_MODE_NODE_PATH);
BIND_CONSTANT(CALL_MODE_INSTANCE);
BIND_ENUM_CONSTANT(CALL_MODE_SELF);
BIND_ENUM_CONSTANT(CALL_MODE_NODE_PATH);
BIND_ENUM_CONSTANT(CALL_MODE_INSTANCE);
}
class VisualScriptNodeInstancePropertyGet : public VisualScriptNodeInstance {

6
modules/visual_script/visual_script_nodes.cpp
View file

@ -2712,9 +2712,9 @@ void VisualScriptCustomNode::_bind_methods() {
ClassDB::bind_method(D_METHOD("_script_changed"), &VisualScriptCustomNode::_script_changed);
BIND_CONSTANT(START_MODE_BEGIN_SEQUENCE);
BIND_CONSTANT(START_MODE_CONTINUE_SEQUENCE);
BIND_CONSTANT(START_MODE_RESUME_YIELD);
BIND_ENUM_CONSTANT(START_MODE_BEGIN_SEQUENCE);
BIND_ENUM_CONSTANT(START_MODE_CONTINUE_SEQUENCE);
BIND_ENUM_CONSTANT(START_MODE_RESUME_YIELD);
BIND_CONSTANT(STEP_PUSH_STACK_BIT);
BIND_CONSTANT(STEP_GO_BACK_BIT);

2
modules/visual_script/visual_script_nodes.h
View file

@ -727,6 +727,8 @@ public:
VisualScriptCustomNode();
};
VARIANT_ENUM_CAST(VisualScriptCustomNode::StartMode);
class VisualScriptSubCall : public VisualScriptNode {
GDCLASS(VisualScriptSubCall, VisualScriptNode)

12
modules/visual_script/visual_script_yield_nodes.cpp
View file

@ -189,9 +189,9 @@ void VisualScriptYield::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Frame,FixedFrame,Time", PROPERTY_USAGE_NOEDITOR), "set_yield_mode", "get_yield_mode");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "wait_time"), "set_wait_time", "get_wait_time");
BIND_CONSTANT(YIELD_FRAME);
BIND_CONSTANT(YIELD_FIXED_FRAME);
BIND_CONSTANT(YIELD_WAIT);
BIND_ENUM_CONSTANT(YIELD_FRAME);
BIND_ENUM_CONSTANT(YIELD_FIXED_FRAME);
BIND_ENUM_CONSTANT(YIELD_WAIT);
}
VisualScriptYield::VisualScriptYield() {
@ -493,9 +493,9 @@ void VisualScriptYieldSignal::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "node_path", PROPERTY_HINT_NODE_PATH_TO_EDITED_NODE), "set_base_path", "get_base_path");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "signal"), "set_signal", "get_signal");
BIND_CONSTANT(CALL_MODE_SELF);
BIND_CONSTANT(CALL_MODE_NODE_PATH);
BIND_CONSTANT(CALL_MODE_INSTANCE);
BIND_ENUM_CONSTANT(CALL_MODE_SELF);
BIND_ENUM_CONSTANT(CALL_MODE_NODE_PATH);
BIND_ENUM_CONSTANT(CALL_MODE_INSTANCE);
}
class VisualScriptNodeInstanceYieldSignal : public VisualScriptNodeInstance {

6
scene/2d/back_buffer_copy.cpp
View file

@ -85,9 +85,9 @@ void BackBufferCopy::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "copy_mode", PROPERTY_HINT_ENUM, "Disabled,Rect,Viewport"), "set_copy_mode", "get_copy_mode");
ADD_PROPERTY(PropertyInfo(Variant::RECT2, "rect"), "set_rect", "get_rect");
BIND_CONSTANT(COPY_MODE_DISABLED);
BIND_CONSTANT(COPY_MODE_RECT);
BIND_CONSTANT(COPY_MODE_VIEWPORT);
BIND_ENUM_CONSTANT(COPY_MODE_DISABLED);
BIND_ENUM_CONSTANT(COPY_MODE_RECT);
BIND_ENUM_CONSTANT(COPY_MODE_VIEWPORT);
}
BackBufferCopy::BackBufferCopy() {

4
scene/2d/camera_2d.cpp
View file

@ -735,8 +735,8 @@ void Camera2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editor_draw_limits"), "set_limit_drawing_enabled", "is_limit_drawing_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editor_draw_drag_margin"), "set_margin_drawing_enabled", "is_margin_drawing_enabled");
BIND_CONSTANT(ANCHOR_MODE_DRAG_CENTER);
BIND_CONSTANT(ANCHOR_MODE_FIXED_TOP_LEFT);
BIND_ENUM_CONSTANT(ANCHOR_MODE_DRAG_CENTER);
BIND_ENUM_CONSTANT(ANCHOR_MODE_FIXED_TOP_LEFT);
}
Camera2D::Camera2D() {

27
scene/2d/canvas_item.cpp
View file

@ -188,14 +188,15 @@ void CanvasItemMaterial::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "blend_mode", PROPERTY_HINT_ENUM, "Mix,Add,Sub,Mul,Premult Alpha"), "set_blend_mode", "get_blend_mode");
ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mode", PROPERTY_HINT_ENUM, "Normal,Unshaded,Light Only"), "set_light_mode", "get_light_mode");
BIND_CONSTANT(BLEND_MODE_MIX);
BIND_CONSTANT(BLEND_MODE_ADD);
BIND_CONSTANT(BLEND_MODE_SUB);
BIND_CONSTANT(BLEND_MODE_MUL);
BIND_CONSTANT(BLEND_MODE_PREMULT_ALPHA);
BIND_CONSTANT(LIGHT_MODE_NORMAL);
BIND_CONSTANT(LIGHT_MODE_UNSHADED);
BIND_CONSTANT(LIGHT_MODE_LIGHT_ONLY);
BIND_ENUM_CONSTANT(BLEND_MODE_MIX);
BIND_ENUM_CONSTANT(BLEND_MODE_ADD);
BIND_ENUM_CONSTANT(BLEND_MODE_SUB);
BIND_ENUM_CONSTANT(BLEND_MODE_MUL);
BIND_ENUM_CONSTANT(BLEND_MODE_PREMULT_ALPHA);
BIND_ENUM_CONSTANT(LIGHT_MODE_NORMAL);
BIND_ENUM_CONSTANT(LIGHT_MODE_UNSHADED);
BIND_ENUM_CONSTANT(LIGHT_MODE_LIGHT_ONLY);
}
CanvasItemMaterial::CanvasItemMaterial()
@ -1042,11 +1043,11 @@ void CanvasItem::_bind_methods() {
ADD_SIGNAL(MethodInfo("hide"));
ADD_SIGNAL(MethodInfo("item_rect_changed"));
BIND_CONSTANT(BLEND_MODE_MIX);
BIND_CONSTANT(BLEND_MODE_ADD);
BIND_CONSTANT(BLEND_MODE_SUB);
BIND_CONSTANT(BLEND_MODE_MUL);
BIND_CONSTANT(BLEND_MODE_PREMULT_ALPHA);
BIND_ENUM_CONSTANT(BLEND_MODE_MIX);
BIND_ENUM_CONSTANT(BLEND_MODE_ADD);
BIND_ENUM_CONSTANT(BLEND_MODE_SUB);
BIND_ENUM_CONSTANT(BLEND_MODE_MUL);
BIND_ENUM_CONSTANT(BLEND_MODE_PREMULT_ALPHA);
BIND_CONSTANT(NOTIFICATION_DRAW);
BIND_CONSTANT(NOTIFICATION_VISIBILITY_CHANGED);

8
scene/2d/light_2d.cpp
View file

@ -437,10 +437,10 @@ void Light2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "shadow_filter_smooth", PROPERTY_HINT_RANGE, "0,64,0.1"), "set_shadow_smooth", "get_shadow_smooth");
ADD_PROPERTY(PropertyInfo(Variant::INT, "shadow_item_cull_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_item_shadow_cull_mask", "get_item_shadow_cull_mask");
BIND_CONSTANT(MODE_ADD);
BIND_CONSTANT(MODE_SUB);
BIND_CONSTANT(MODE_MIX);
BIND_CONSTANT(MODE_MASK);
BIND_ENUM_CONSTANT(MODE_ADD);
BIND_ENUM_CONSTANT(MODE_SUB);
BIND_ENUM_CONSTANT(MODE_MIX);
BIND_ENUM_CONSTANT(MODE_MASK);
}
Light2D::Light2D() {

6
scene/2d/light_occluder_2d.cpp
View file

@ -87,9 +87,9 @@ void OccluderPolygon2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "cull_mode", PROPERTY_HINT_ENUM, "Disabled,ClockWise,CounterClockWise"), "set_cull_mode", "get_cull_mode");
ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "polygon"), "set_polygon", "get_polygon");
BIND_CONSTANT(CULL_DISABLED);
BIND_CONSTANT(CULL_CLOCKWISE);
BIND_CONSTANT(CULL_COUNTER_CLOCKWISE);
BIND_ENUM_CONSTANT(CULL_DISABLED);
BIND_ENUM_CONSTANT(CULL_CLOCKWISE);
BIND_ENUM_CONSTANT(CULL_COUNTER_CLOCKWISE);
}
OccluderPolygon2D::OccluderPolygon2D() {

16
scene/2d/line_2d.cpp
View file

@ -322,16 +322,16 @@ void Line2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "sharp_limit"), "set_sharp_limit", "get_sharp_limit");
ADD_PROPERTY(PropertyInfo(Variant::INT, "round_precision"), "set_round_precision", "get_round_precision");
BIND_CONSTANT(LINE_JOINT_SHARP);
BIND_CONSTANT(LINE_JOINT_BEVEL);
BIND_CONSTANT(LINE_JOINT_ROUND);
BIND_ENUM_CONSTANT(LINE_JOINT_SHARP);
BIND_ENUM_CONSTANT(LINE_JOINT_BEVEL);
BIND_ENUM_CONSTANT(LINE_JOINT_ROUND);
BIND_CONSTANT(LINE_CAP_NONE);
BIND_CONSTANT(LINE_CAP_BOX);
BIND_CONSTANT(LINE_CAP_ROUND);
BIND_ENUM_CONSTANT(LINE_CAP_NONE);
BIND_ENUM_CONSTANT(LINE_CAP_BOX);
BIND_ENUM_CONSTANT(LINE_CAP_ROUND);
BIND_CONSTANT(LINE_TEXTURE_NONE);
BIND_CONSTANT(LINE_TEXTURE_TILE);
BIND_ENUM_CONSTANT(LINE_TEXTURE_NONE);
BIND_ENUM_CONSTANT(LINE_TEXTURE_TILE);
ClassDB::bind_method(D_METHOD("_gradient_changed"), &Line2D::_gradient_changed);
}

4
scene/2d/particles_2d.cpp
View file

@ -388,8 +388,8 @@ void Particles2D::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "h_frames", PROPERTY_HINT_RANGE, "1,1024,1"), "set_h_frames", "get_h_frames");
ADD_PROPERTY(PropertyInfo(Variant::INT, "v_frames", PROPERTY_HINT_RANGE, "1,1024,1"), "set_v_frames", "get_v_frames");
BIND_CONSTANT(DRAW_ORDER_INDEX);
BIND_CONSTANT(DRAW_ORDER_LIFETIME);
BIND_ENUM_CONSTANT(DRAW_ORDER_INDEX);
BIND_ENUM_CONSTANT(DRAW_ORDER_LIFETIME);
}
Particles2D::Particles2D() {

14
scene/2d/physics_body_2d.cpp
View file

@ -931,14 +931,14 @@ void RigidBody2D::_bind_methods() {
ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body")));
ADD_SIGNAL(MethodInfo("sleeping_state_changed"));
BIND_CONSTANT(MODE_STATIC);
BIND_CONSTANT(MODE_KINEMATIC);
BIND_CONSTANT(MODE_RIGID);
BIND_CONSTANT(MODE_CHARACTER);
BIND_ENUM_CONSTANT(MODE_STATIC);
BIND_ENUM_CONSTANT(MODE_KINEMATIC);
BIND_ENUM_CONSTANT(MODE_RIGID);
BIND_ENUM_CONSTANT(MODE_CHARACTER);
BIND_CONSTANT(CCD_MODE_DISABLED);
BIND_CONSTANT(CCD_MODE_CAST_RAY);
BIND_CONSTANT(CCD_MODE_CAST_SHAPE);
BIND_ENUM_CONSTANT(CCD_MODE_DISABLED);
BIND_ENUM_CONSTANT(CCD_MODE_CAST_RAY);
BIND_ENUM_CONSTANT(CCD_MODE_CAST_SHAPE);
}
RigidBody2D::RigidBody2D()

21
scene/2d/tile_map.cpp
View file

@ -1315,15 +1315,18 @@ void TileMap::_bind_methods() {
ADD_SIGNAL(MethodInfo("settings_changed"));
BIND_CONSTANT(INVALID_CELL);
BIND_CONSTANT(MODE_SQUARE);
BIND_CONSTANT(MODE_ISOMETRIC);
BIND_CONSTANT(MODE_CUSTOM);
BIND_CONSTANT(HALF_OFFSET_X);
BIND_CONSTANT(HALF_OFFSET_Y);
BIND_CONSTANT(HALF_OFFSET_DISABLED);
BIND_CONSTANT(TILE_ORIGIN_TOP_LEFT);
BIND_CONSTANT(TILE_ORIGIN_CENTER);
BIND_CONSTANT(TILE_ORIGIN_BOTTOM_LEFT);
BIND_ENUM_CONSTANT(MODE_SQUARE);
BIND_ENUM_CONSTANT(MODE_ISOMETRIC);
BIND_ENUM_CONSTANT(MODE_CUSTOM);
BIND_ENUM_CONSTANT(HALF_OFFSET_X);
BIND_ENUM_CONSTANT(HALF_OFFSET_Y);
BIND_ENUM_CONSTANT(HALF_OFFSET_DISABLED);
BIND_ENUM_CONSTANT(TILE_ORIGIN_TOP_LEFT);
BIND_ENUM_CONSTANT(TILE_ORIGIN_CENTER);
BIND_ENUM_CONSTANT(TILE_ORIGIN_BOTTOM_LEFT);
}
TileMap::TileMap() {

15
scene/2d/visibility_notifier_2d.cpp
View file

@ -35,7 +35,6 @@
#include "scene/animation/animation_player.h"
#include "scene/main/viewport.h"
#include "scene/scene_string_names.h"
#include "scene/scene_string_names.h"
void VisibilityNotifier2D::_enter_viewport(Viewport *p_viewport) {
@ -341,13 +340,13 @@ void VisibilityEnabler2D::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "process_parent"), "set_enabler", "is_enabler_enabled", ENABLER_PARENT_PROCESS);
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "fixed_process_parent"), "set_enabler", "is_enabler_enabled", ENABLER_PARENT_FIXED_PROCESS);
BIND_CONSTANT(ENABLER_FREEZE_BODIES);
BIND_CONSTANT(ENABLER_PAUSE_ANIMATIONS);
BIND_CONSTANT(ENABLER_PAUSE_PARTICLES);
BIND_CONSTANT(ENABLER_PAUSE_ANIMATED_SPRITES);
BIND_CONSTANT(ENABLER_PARENT_PROCESS);
BIND_CONSTANT(ENABLER_PARENT_FIXED_PROCESS);
BIND_CONSTANT(ENABLER_MAX);
BIND_ENUM_CONSTANT(ENABLER_FREEZE_BODIES);
BIND_ENUM_CONSTANT(ENABLER_PAUSE_ANIMATIONS);
BIND_ENUM_CONSTANT(ENABLER_PAUSE_PARTICLES);
BIND_ENUM_CONSTANT(ENABLER_PAUSE_ANIMATED_SPRITES);
BIND_ENUM_CONSTANT(ENABLER_PARENT_PROCESS);
BIND_ENUM_CONSTANT(ENABLER_PARENT_FIXED_PROCESS);
BIND_ENUM_CONSTANT(ENABLER_MAX);
}
void VisibilityEnabler2D::set_enabler(Enabler p_enabler, bool p_enable) {

16
scene/3d/audio_stream_player_3d.cpp
View file

@ -888,16 +888,16 @@ void AudioStreamPlayer3D::_bind_methods() {
ADD_GROUP("Doppler", "doppler_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "doppler_tracking", PROPERTY_HINT_ENUM, "Disabled,Idle,Fixed"), "set_doppler_tracking", "get_doppler_tracking");
BIND_CONSTANT(ATTENUATION_INVERSE_DISTANCE);
BIND_CONSTANT(ATTENUATION_INVERSE_SQUARE_DISTANCE);
BIND_CONSTANT(ATTENUATION_LOGARITHMIC);
BIND_ENUM_CONSTANT(ATTENUATION_INVERSE_DISTANCE);
BIND_ENUM_CONSTANT(ATTENUATION_INVERSE_SQUARE_DISTANCE);
BIND_ENUM_CONSTANT(ATTENUATION_LOGARITHMIC);
BIND_CONSTANT(OUT_OF_RANGE_MIX);
BIND_CONSTANT(OUT_OF_RANGE_PAUSE);
BIND_ENUM_CONSTANT(OUT_OF_RANGE_MIX);
BIND_ENUM_CONSTANT(OUT_OF_RANGE_PAUSE);
BIND_CONSTANT(DOPPLER_TRACKING_DISABLED);
BIND_CONSTANT(DOPPLER_TRACKING_IDLE_STEP);
BIND_CONSTANT(DOPPLER_TRACKING_FIXED_STEP);
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_DISABLED);
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_IDLE_STEP);
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_FIXED_STEP);
}
AudioStreamPlayer3D::AudioStreamPlayer3D() {

14
scene/3d/camera.cpp
View file

@ -564,15 +564,15 @@ void Camera::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_doppler_tracking"), &Camera::get_doppler_tracking);
//ClassDB::bind_method(D_METHOD("_camera_make_current"),&Camera::_camera_make_current );
BIND_CONSTANT(PROJECTION_PERSPECTIVE);
BIND_CONSTANT(PROJECTION_ORTHOGONAL);
BIND_ENUM_CONSTANT(PROJECTION_PERSPECTIVE);
BIND_ENUM_CONSTANT(PROJECTION_ORTHOGONAL);
BIND_CONSTANT(KEEP_WIDTH);
BIND_CONSTANT(KEEP_HEIGHT);
BIND_ENUM_CONSTANT(KEEP_WIDTH);
BIND_ENUM_CONSTANT(KEEP_HEIGHT);
BIND_CONSTANT(DOPPLER_TRACKING_DISABLED)
BIND_CONSTANT(DOPPLER_TRACKING_IDLE_STEP)
BIND_CONSTANT(DOPPLER_TRACKING_FIXED_STEP)
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_DISABLED)
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_IDLE_STEP)
BIND_ENUM_CONSTANT(DOPPLER_TRACKING_FIXED_STEP)
}
float Camera::get_fov() const {

4
scene/3d/character_camera.cpp
View file

@ -659,8 +659,8 @@ void CharacterCamera::_bind_methods() {
ClassDB::bind_method(D_METHOD("_ray_collision"),&CharacterCamera::_ray_collision);
BIND_CONSTANT( CAMERA_FIXED );
BIND_CONSTANT( CAMERA_FOLLOW );
BIND_ENUM_CONSTANT( CAMERA_FIXED );
BIND_ENUM_CONSTANT( CAMERA_FOLLOW );
}
void CharacterCamera::_ray_collision(Vector3 p_point, Vector3 p_normal, int p_subindex, ObjectID p_against,int p_idx) {

8
scene/3d/gi_probe.cpp
View file

@ -1488,10 +1488,10 @@ void GIProbe::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "compress"), "set_compress", "is_compressed");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "GIProbeData"), "set_probe_data", "get_probe_data");
BIND_CONSTANT(SUBDIV_64);
BIND_CONSTANT(SUBDIV_128);
BIND_CONSTANT(SUBDIV_256);
BIND_CONSTANT(SUBDIV_MAX);
BIND_ENUM_CONSTANT(SUBDIV_64);
BIND_ENUM_CONSTANT(SUBDIV_128);
BIND_ENUM_CONSTANT(SUBDIV_256);
BIND_ENUM_CONSTANT(SUBDIV_MAX);
}
GIProbe::GIProbe() {

34
scene/3d/light.cpp
View file

@ -235,21 +235,21 @@ void Light::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editor_only"), "set_editor_only", "is_editor_only");
ADD_GROUP("", "");
BIND_CONSTANT(PARAM_ENERGY);
BIND_CONSTANT(PARAM_SPECULAR);
BIND_CONSTANT(PARAM_RANGE);
BIND_CONSTANT(PARAM_ATTENUATION);
BIND_CONSTANT(PARAM_SPOT_ANGLE);
BIND_CONSTANT(PARAM_SPOT_ATTENUATION);
BIND_CONSTANT(PARAM_CONTACT_SHADOW_SIZE);
BIND_CONSTANT(PARAM_SHADOW_MAX_DISTANCE);
BIND_CONSTANT(PARAM_SHADOW_SPLIT_1_OFFSET);
BIND_CONSTANT(PARAM_SHADOW_SPLIT_2_OFFSET);
BIND_CONSTANT(PARAM_SHADOW_SPLIT_3_OFFSET);
BIND_CONSTANT(PARAM_SHADOW_NORMAL_BIAS);
BIND_CONSTANT(PARAM_SHADOW_BIAS);
BIND_ENUM_CONSTANT(PARAM_ENERGY);
BIND_ENUM_CONSTANT(PARAM_SPECULAR);
BIND_ENUM_CONSTANT(PARAM_RANGE);
BIND_ENUM_CONSTANT(PARAM_ATTENUATION);
BIND_ENUM_CONSTANT(PARAM_SPOT_ANGLE);
BIND_ENUM_CONSTANT(PARAM_SPOT_ATTENUATION);
BIND_ENUM_CONSTANT(PARAM_CONTACT_SHADOW_SIZE);
BIND_ENUM_CONSTANT(PARAM_SHADOW_MAX_DISTANCE);
BIND_ENUM_CONSTANT(PARAM_SHADOW_SPLIT_1_OFFSET);
BIND_ENUM_CONSTANT(PARAM_SHADOW_SPLIT_2_OFFSET);
BIND_ENUM_CONSTANT(PARAM_SHADOW_SPLIT_3_OFFSET);
BIND_ENUM_CONSTANT(PARAM_SHADOW_NORMAL_BIAS);
BIND_ENUM_CONSTANT(PARAM_SHADOW_BIAS);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_MAX);
}
Light::Light(VisualServer::LightType p_type) {
@ -334,9 +334,9 @@ void DirectionalLight::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "directional_shadow_blend_splits"), "set_blend_splits", "is_blend_splits_enabled");
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "directional_shadow_normal_bias", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_param", "get_param", PARAM_SHADOW_NORMAL_BIAS);
BIND_CONSTANT(SHADOW_ORTHOGONAL);
BIND_CONSTANT(SHADOW_PARALLEL_2_SPLITS);
BIND_CONSTANT(SHADOW_PARALLEL_4_SPLITS);
BIND_ENUM_CONSTANT(SHADOW_ORTHOGONAL);
BIND_ENUM_CONSTANT(SHADOW_PARALLEL_2_SPLITS);
BIND_ENUM_CONSTANT(SHADOW_PARALLEL_4_SPLITS);
}
DirectionalLight::DirectionalLight()

49
scene/3d/particles.cpp
View file

@ -347,9 +347,10 @@ void Particles::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "draw_pass_" + itos(i + 1), PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_draw_pass_mesh", "get_draw_pass_mesh", i);
}
BIND_CONSTANT(DRAW_ORDER_INDEX);
BIND_CONSTANT(DRAW_ORDER_LIFETIME);
BIND_CONSTANT(DRAW_ORDER_VIEW_DEPTH);
BIND_ENUM_CONSTANT(DRAW_ORDER_INDEX);
BIND_ENUM_CONSTANT(DRAW_ORDER_LIFETIME);
BIND_ENUM_CONSTANT(DRAW_ORDER_VIEW_DEPTH);
BIND_CONSTANT(MAX_DRAW_PASSES);
}
@ -1487,29 +1488,29 @@ void ParticlesMaterial::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "anim_offset_curve", PROPERTY_HINT_RESOURCE_TYPE, "CurveTexture"), "set_param_texture", "get_param_texture", PARAM_ANIM_OFFSET);
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "anim_loop"), "set_flag", "get_flag", FLAG_ANIM_LOOP);
BIND_CONSTANT(PARAM_INITIAL_LINEAR_VELOCITY);
BIND_CONSTANT(PARAM_ANGULAR_VELOCITY);
BIND_CONSTANT(PARAM_ORBIT_VELOCITY);
BIND_CONSTANT(PARAM_LINEAR_ACCEL);
BIND_CONSTANT(PARAM_RADIAL_ACCEL);
BIND_CONSTANT(PARAM_TANGENTIAL_ACCEL);
BIND_CONSTANT(PARAM_DAMPING);
BIND_CONSTANT(PARAM_ANGLE);
BIND_CONSTANT(PARAM_SCALE);
BIND_CONSTANT(PARAM_HUE_VARIATION);
BIND_CONSTANT(PARAM_ANIM_SPEED);
BIND_CONSTANT(PARAM_ANIM_OFFSET);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_INITIAL_LINEAR_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_ORBIT_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_LINEAR_ACCEL);
BIND_ENUM_CONSTANT(PARAM_RADIAL_ACCEL);
BIND_ENUM_CONSTANT(PARAM_TANGENTIAL_ACCEL);
BIND_ENUM_CONSTANT(PARAM_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGLE);
BIND_ENUM_CONSTANT(PARAM_SCALE);
BIND_ENUM_CONSTANT(PARAM_HUE_VARIATION);
BIND_ENUM_CONSTANT(PARAM_ANIM_SPEED);
BIND_ENUM_CONSTANT(PARAM_ANIM_OFFSET);
BIND_ENUM_CONSTANT(PARAM_MAX);
BIND_CONSTANT(FLAG_ALIGN_Y_TO_VELOCITY);
BIND_CONSTANT(FLAG_ROTATE_Y);
BIND_CONSTANT(FLAG_MAX);
BIND_ENUM_CONSTANT(FLAG_ALIGN_Y_TO_VELOCITY);
BIND_ENUM_CONSTANT(FLAG_ROTATE_Y);
BIND_ENUM_CONSTANT(FLAG_MAX);
BIND_CONSTANT(EMISSION_SHAPE_POINT);
BIND_CONSTANT(EMISSION_SHAPE_SPHERE);
BIND_CONSTANT(EMISSION_SHAPE_BOX);
BIND_CONSTANT(EMISSION_SHAPE_POINTS);
BIND_CONSTANT(EMISSION_SHAPE_DIRECTED_POINTS);
BIND_ENUM_CONSTANT(EMISSION_SHAPE_POINT);
BIND_ENUM_CONSTANT(EMISSION_SHAPE_SPHERE);
BIND_ENUM_CONSTANT(EMISSION_SHAPE_BOX);
BIND_ENUM_CONSTANT(EMISSION_SHAPE_POINTS);
BIND_ENUM_CONSTANT(EMISSION_SHAPE_DIRECTED_POINTS);
}
ParticlesMaterial::ParticlesMaterial()

8
scene/3d/path.cpp
View file

@ -281,10 +281,10 @@ void PathFollow::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_loop", "loop"), &PathFollow::set_loop);
ClassDB::bind_method(D_METHOD("has_loop"), &PathFollow::has_loop);
BIND_CONSTANT(ROTATION_NONE);
BIND_CONSTANT(ROTATION_Y);
BIND_CONSTANT(ROTATION_XY);
BIND_CONSTANT(ROTATION_XYZ);
BIND_ENUM_CONSTANT(ROTATION_NONE);
BIND_ENUM_CONSTANT(ROTATION_Y);
BIND_ENUM_CONSTANT(ROTATION_XY);
BIND_ENUM_CONSTANT(ROTATION_XYZ);
}
void PathFollow::set_offset(float p_offset) {

8
scene/3d/physics_body.cpp
View file

@ -868,10 +868,10 @@ void RigidBody::_bind_methods() {
ADD_SIGNAL(MethodInfo("body_exited", PropertyInfo(Variant::OBJECT, "body")));
ADD_SIGNAL(MethodInfo("sleeping_state_changed"));
BIND_CONSTANT(MODE_STATIC);
BIND_CONSTANT(MODE_KINEMATIC);
BIND_CONSTANT(MODE_RIGID);
BIND_CONSTANT(MODE_CHARACTER);
BIND_ENUM_CONSTANT(MODE_STATIC);
BIND_ENUM_CONSTANT(MODE_KINEMATIC);
BIND_ENUM_CONSTANT(MODE_RIGID);
BIND_ENUM_CONSTANT(MODE_CHARACTER);
}
RigidBody::RigidBody()

126
scene/3d/physics_joint.cpp
View file

@ -188,9 +188,9 @@ void PinJoint::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/damping", PROPERTY_HINT_RANGE, "0.01,8.0,0.01"), "set_param", "get_param", PARAM_DAMPING);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "params/impulse_clamp", PROPERTY_HINT_RANGE, "0.0,64.0,0.01"), "set_param", "get_param", PARAM_IMPULSE_CLAMP);
BIND_CONSTANT(PARAM_BIAS);
BIND_CONSTANT(PARAM_DAMPING);
BIND_CONSTANT(PARAM_IMPULSE_CLAMP);
BIND_ENUM_CONSTANT(PARAM_BIAS);
BIND_ENUM_CONSTANT(PARAM_DAMPING);
BIND_ENUM_CONSTANT(PARAM_IMPULSE_CLAMP);
}
void PinJoint::set_param(Param p_param, float p_value) {
@ -282,19 +282,19 @@ void HingeJoint::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "motor/target_velocity", PROPERTY_HINT_RANGE, "0.01,4096,0.01"), "set_param", "get_param", PARAM_MOTOR_TARGET_VELOCITY);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "motor/max_impulse", PROPERTY_HINT_RANGE, "0.01,1024,0.01"), "set_param", "get_param", PARAM_MOTOR_MAX_IMPULSE);
BIND_CONSTANT(PARAM_BIAS);
BIND_CONSTANT(PARAM_LIMIT_UPPER);
BIND_CONSTANT(PARAM_LIMIT_LOWER);
BIND_CONSTANT(PARAM_LIMIT_BIAS);
BIND_CONSTANT(PARAM_LIMIT_SOFTNESS);
BIND_CONSTANT(PARAM_LIMIT_RELAXATION);
BIND_CONSTANT(PARAM_MOTOR_TARGET_VELOCITY);
BIND_CONSTANT(PARAM_MOTOR_MAX_IMPULSE);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_BIAS);
BIND_ENUM_CONSTANT(PARAM_LIMIT_UPPER);
BIND_ENUM_CONSTANT(PARAM_LIMIT_LOWER);
BIND_ENUM_CONSTANT(PARAM_LIMIT_BIAS);
BIND_ENUM_CONSTANT(PARAM_LIMIT_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_LIMIT_RELAXATION);
BIND_ENUM_CONSTANT(PARAM_MOTOR_TARGET_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_MOTOR_MAX_IMPULSE);
BIND_ENUM_CONSTANT(PARAM_MAX);
BIND_CONSTANT(FLAG_USE_LIMIT);
BIND_CONSTANT(FLAG_ENABLE_MOTOR);
BIND_CONSTANT(FLAG_MAX);
BIND_ENUM_CONSTANT(FLAG_USE_LIMIT);
BIND_ENUM_CONSTANT(FLAG_ENABLE_MOTOR);
BIND_ENUM_CONSTANT(FLAG_MAX);
}
void HingeJoint::set_param(Param p_param, float p_value) {
@ -428,31 +428,31 @@ void SliderJoint::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "angular_ortho/restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_ANGULAR_ORTHOGONAL_RESTITUTION);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "angular_ortho/damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"), "set_param", "get_param", PARAM_ANGULAR_ORTHOGONAL_DAMPING);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_UPPER);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_LOWER);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_SOFTNESS);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_RESTITUTION);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_DAMPING);
BIND_CONSTANT(PARAM_LINEAR_MOTION_SOFTNESS);
BIND_CONSTANT(PARAM_LINEAR_MOTION_RESTITUTION);
BIND_CONSTANT(PARAM_LINEAR_MOTION_DAMPING);
BIND_CONSTANT(PARAM_LINEAR_ORTHOGONAL_SOFTNESS);
BIND_CONSTANT(PARAM_LINEAR_ORTHOGONAL_RESTITUTION);
BIND_CONSTANT(PARAM_LINEAR_ORTHOGONAL_DAMPING);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_UPPER);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_LOWER);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_DAMPING);
BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTION_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTION_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_LINEAR_MOTION_DAMPING);
BIND_ENUM_CONSTANT(PARAM_LINEAR_ORTHOGONAL_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_LINEAR_ORTHOGONAL_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_LINEAR_ORTHOGONAL_DAMPING);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_UPPER);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_LOWER);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_RESTITUTION);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_DAMPING);
BIND_CONSTANT(PARAM_ANGULAR_MOTION_SOFTNESS);
BIND_CONSTANT(PARAM_ANGULAR_MOTION_RESTITUTION);
BIND_CONSTANT(PARAM_ANGULAR_MOTION_DAMPING);
BIND_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_SOFTNESS);
BIND_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_RESTITUTION);
BIND_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_UPPER);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_LOWER);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTION_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTION_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTION_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_ORTHOGONAL_DAMPING);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_MAX);
}
void SliderJoint::set_param(Param p_param, float p_value) {
@ -560,12 +560,12 @@ void ConeTwistJoint::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_SOFTNESS);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "relaxation", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"), "set_param", "get_param", PARAM_RELAXATION);
BIND_CONSTANT(PARAM_SWING_SPAN);
BIND_CONSTANT(PARAM_TWIST_SPAN);
BIND_CONSTANT(PARAM_BIAS);
BIND_CONSTANT(PARAM_SOFTNESS);
BIND_CONSTANT(PARAM_RELAXATION);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_SWING_SPAN);
BIND_ENUM_CONSTANT(PARAM_TWIST_SPAN);
BIND_ENUM_CONSTANT(PARAM_BIAS);
BIND_ENUM_CONSTANT(PARAM_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_RELAXATION);
BIND_ENUM_CONSTANT(PARAM_MAX);
}
void ConeTwistJoint::set_param(Param p_param, float p_value) {
@ -773,26 +773,26 @@ void Generic6DOFJoint::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "angular_motor_z/target_velocity"), "set_param_z", "get_param_z", PARAM_ANGULAR_MOTOR_TARGET_VELOCITY);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "angular_motor_z/force_limit"), "set_param_z", "get_param_z", PARAM_ANGULAR_MOTOR_FORCE_LIMIT);
BIND_CONSTANT(PARAM_LINEAR_LOWER_LIMIT);
BIND_CONSTANT(PARAM_LINEAR_UPPER_LIMIT);
BIND_CONSTANT(PARAM_LINEAR_LIMIT_SOFTNESS);
BIND_CONSTANT(PARAM_LINEAR_RESTITUTION);
BIND_CONSTANT(PARAM_LINEAR_DAMPING);
BIND_CONSTANT(PARAM_ANGULAR_LOWER_LIMIT);
BIND_CONSTANT(PARAM_ANGULAR_UPPER_LIMIT);
BIND_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
BIND_CONSTANT(PARAM_ANGULAR_DAMPING);
BIND_CONSTANT(PARAM_ANGULAR_RESTITUTION);
BIND_CONSTANT(PARAM_ANGULAR_FORCE_LIMIT);
BIND_CONSTANT(PARAM_ANGULAR_ERP);
BIND_CONSTANT(PARAM_ANGULAR_MOTOR_TARGET_VELOCITY);
BIND_CONSTANT(PARAM_ANGULAR_MOTOR_FORCE_LIMIT);
BIND_CONSTANT(PARAM_MAX);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LOWER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_LINEAR_UPPER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_LINEAR_LIMIT_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_LINEAR_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_LINEAR_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LOWER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_UPPER_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_LIMIT_SOFTNESS);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_DAMPING);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_RESTITUTION);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_FORCE_LIMIT);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_ERP);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_TARGET_VELOCITY);
BIND_ENUM_CONSTANT(PARAM_ANGULAR_MOTOR_FORCE_LIMIT);
BIND_ENUM_CONSTANT(PARAM_MAX);
BIND_CONSTANT(FLAG_ENABLE_LINEAR_LIMIT);
BIND_CONSTANT(FLAG_ENABLE_ANGULAR_LIMIT);
BIND_CONSTANT(FLAG_ENABLE_MOTOR);
BIND_CONSTANT(FLAG_MAX);
BIND_ENUM_CONSTANT(FLAG_ENABLE_LINEAR_LIMIT);
BIND_ENUM_CONSTANT(FLAG_ENABLE_ANGULAR_LIMIT);
BIND_ENUM_CONSTANT(FLAG_ENABLE_MOTOR);
BIND_ENUM_CONSTANT(FLAG_MAX);
}
void Generic6DOFJoint::set_param_x(Param p_param, float p_value) {

4
scene/3d/reflection_probe.cpp
View file

@ -252,8 +252,8 @@ void ReflectionProbe::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "interior_ambient_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_interior_ambient_energy", "get_interior_ambient_energy");
ADD_PROPERTY(PropertyInfo(Variant::REAL, "interior_ambient_contrib", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_interior_ambient_probe_contribution", "get_interior_ambient_probe_contribution");
BIND_CONSTANT(UPDATE_ONCE);
BIND_CONSTANT(UPDATE_ALWAYS);
BIND_ENUM_CONSTANT(UPDATE_ONCE);
BIND_ENUM_CONSTANT(UPDATE_ALWAYS);
}
ReflectionProbe::ReflectionProbe() {

14
scene/3d/sprite_3d.cpp
View file

@ -276,14 +276,14 @@ void SpriteBase3D::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "double_sided"), "set_draw_flag", "get_draw_flag", FLAG_DOUBLE_SIDED);
ADD_PROPERTY(PropertyInfo(Variant::INT, "alpha_cut", PROPERTY_HINT_ENUM, "Disabled,Discard,Opaque Pre-Pass"), "set_alpha_cut_mode", "get_alpha_cut_mode");
BIND_CONSTANT(FLAG_TRANSPARENT);
BIND_CONSTANT(FLAG_SHADED);
BIND_CONSTANT(FLAG_DOUBLE_SIDED);
BIND_CONSTANT(FLAG_MAX);
BIND_ENUM_CONSTANT(FLAG_TRANSPARENT);
BIND_ENUM_CONSTANT(FLAG_SHADED);
BIND_ENUM_CONSTANT(FLAG_DOUBLE_SIDED);
BIND_ENUM_CONSTANT(FLAG_MAX);
BIND_CONSTANT(ALPHA_CUT_DISABLED);
BIND_CONSTANT(ALPHA_CUT_DISCARD);
BIND_CONSTANT(ALPHA_CUT_OPAQUE_PREPASS);
BIND_ENUM_CONSTANT(ALPHA_CUT_DISABLED);
BIND_ENUM_CONSTANT(ALPHA_CUT_DISCARD);
BIND_ENUM_CONSTANT(ALPHA_CUT_OPAQUE_PREPASS);
}
SpriteBase3D::SpriteBase3D() {

7
scene/3d/visibility_notifier.cpp
View file

@ -33,7 +33,6 @@
#include "scene/3d/physics_body.h"
#include "scene/animation/animation_player.h"
#include "scene/scene_string_names.h"
#include "scene/scene_string_names.h"
void VisibilityNotifier::_enter_camera(Camera *p_camera) {
@ -252,9 +251,9 @@ void VisibilityEnabler::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "pause_animations"), "set_enabler", "is_enabler_enabled", ENABLER_PAUSE_ANIMATIONS);
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "freeze_bodies"), "set_enabler", "is_enabler_enabled", ENABLER_FREEZE_BODIES);
BIND_CONSTANT(ENABLER_FREEZE_BODIES);
BIND_CONSTANT(ENABLER_PAUSE_ANIMATIONS);
BIND_CONSTANT(ENABLER_MAX);
BIND_ENUM_CONSTANT(ENABLER_FREEZE_BODIES);
BIND_ENUM_CONSTANT(ENABLER_PAUSE_ANIMATIONS);
BIND_ENUM_CONSTANT(ENABLER_MAX);
}
void VisibilityEnabler::set_enabler(Enabler p_enabler, bool p_enable) {

4
scene/animation/animation_player.cpp
View file

@ -1277,8 +1277,8 @@ void AnimationPlayer::_bind_methods() {
ADD_SIGNAL(MethodInfo("animation_changed", PropertyInfo(Variant::STRING, "old_name"), PropertyInfo(Variant::STRING, "new_name")));
ADD_SIGNAL(MethodInfo("animation_started", PropertyInfo(Variant::STRING, "name")));
BIND_CONSTANT(ANIMATION_PROCESS_FIXED);
BIND_CONSTANT(ANIMATION_PROCESS_IDLE);
BIND_ENUM_CONSTANT(ANIMATION_PROCESS_FIXED);
BIND_ENUM_CONSTANT(ANIMATION_PROCESS_IDLE);
}
AnimationPlayer::AnimationPlayer() {

20
scene/animation/animation_tree_player.cpp
View file

@ -1797,16 +1797,16 @@ void AnimationTreePlayer::_bind_methods() {
ADD_GROUP("Playback", "playback_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "playback_process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_animation_process_mode", "get_animation_process_mode");
BIND_CONSTANT(NODE_OUTPUT);
BIND_CONSTANT(NODE_ANIMATION);
BIND_CONSTANT(NODE_ONESHOT);
BIND_CONSTANT(NODE_MIX);
BIND_CONSTANT(NODE_BLEND2);
BIND_CONSTANT(NODE_BLEND3);
BIND_CONSTANT(NODE_BLEND4);
BIND_CONSTANT(NODE_TIMESCALE);
BIND_CONSTANT(NODE_TIMESEEK);
BIND_CONSTANT(NODE_TRANSITION);
BIND_ENUM_CONSTANT(NODE_OUTPUT);
BIND_ENUM_CONSTANT(NODE_ANIMATION);
BIND_ENUM_CONSTANT(NODE_ONESHOT);
BIND_ENUM_CONSTANT(NODE_MIX);
BIND_ENUM_CONSTANT(NODE_BLEND2);
BIND_ENUM_CONSTANT(NODE_BLEND3);
BIND_ENUM_CONSTANT(NODE_BLEND4);
BIND_ENUM_CONSTANT(NODE_TIMESCALE);
BIND_ENUM_CONSTANT(NODE_TIMESEEK);
BIND_ENUM_CONSTANT(NODE_TRANSITION);
}
AnimationTreePlayer::AnimationTreePlayer() {

34
scene/animation/tween.cpp
View file

@ -224,25 +224,25 @@ void Tween::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "playback_process_mode", PROPERTY_HINT_ENUM, "Fixed,Idle"), "set_tween_process_mode", "get_tween_process_mode");
BIND_CONSTANT(TWEEN_PROCESS_FIXED);
BIND_CONSTANT(TWEEN_PROCESS_IDLE);
BIND_ENUM_CONSTANT(TWEEN_PROCESS_FIXED);
BIND_ENUM_CONSTANT(TWEEN_PROCESS_IDLE);
BIND_CONSTANT(TRANS_LINEAR);
BIND_CONSTANT(TRANS_SINE);
BIND_CONSTANT(TRANS_QUINT);
BIND_CONSTANT(TRANS_QUART);
BIND_CONSTANT(TRANS_QUAD);
BIND_CONSTANT(TRANS_EXPO);
BIND_CONSTANT(TRANS_ELASTIC);
BIND_CONSTANT(TRANS_CUBIC);
BIND_CONSTANT(TRANS_CIRC);
BIND_CONSTANT(TRANS_BOUNCE);
BIND_CONSTANT(TRANS_BACK);
BIND_ENUM_CONSTANT(TRANS_LINEAR);
BIND_ENUM_CONSTANT(TRANS_SINE);
BIND_ENUM_CONSTANT(TRANS_QUINT);
BIND_ENUM_CONSTANT(TRANS_QUART);
BIND_ENUM_CONSTANT(TRANS_QUAD);
BIND_ENUM_CONSTANT(TRANS_EXPO);
BIND_ENUM_CONSTANT(TRANS_ELASTIC);
BIND_ENUM_CONSTANT(TRANS_CUBIC);
BIND_ENUM_CONSTANT(TRANS_CIRC);
BIND_ENUM_CONSTANT(TRANS_BOUNCE);
BIND_ENUM_CONSTANT(TRANS_BACK);
BIND_CONSTANT(EASE_IN);
BIND_CONSTANT(EASE_OUT);
BIND_CONSTANT(EASE_IN_OUT);
BIND_CONSTANT(EASE_OUT_IN);
BIND_ENUM_CONSTANT(EASE_IN);
BIND_ENUM_CONSTANT(EASE_OUT);
BIND_ENUM_CONSTANT(EASE_IN_OUT);
BIND_ENUM_CONSTANT(EASE_OUT_IN);
}
Variant &Tween::_get_initial_val(InterpolateData &p_data) {

12
scene/gui/base_button.cpp
View file

@ -514,13 +514,13 @@ void BaseButton::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "shortcut", PROPERTY_HINT_RESOURCE_TYPE, "ShortCut"), "set_shortcut", "get_shortcut");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "group", PROPERTY_HINT_RESOURCE_TYPE, "ButtonGroup"), "set_button_group", "get_button_group");
BIND_CONSTANT(DRAW_NORMAL);
BIND_CONSTANT(DRAW_PRESSED);
BIND_CONSTANT(DRAW_HOVER);
BIND_CONSTANT(DRAW_DISABLED);
BIND_ENUM_CONSTANT(DRAW_NORMAL);
BIND_ENUM_CONSTANT(DRAW_PRESSED);
BIND_ENUM_CONSTANT(DRAW_HOVER);
BIND_ENUM_CONSTANT(DRAW_DISABLED);
BIND_CONSTANT(ACTION_MODE_BUTTON_PRESS);
BIND_CONSTANT(ACTION_MODE_BUTTON_RELEASE);
BIND_ENUM_CONSTANT(ACTION_MODE_BUTTON_PRESS);
BIND_ENUM_CONSTANT(ACTION_MODE_BUTTON_RELEASE);
}
BaseButton::BaseButton() {

6
scene/gui/box_container.cpp
View file

@ -295,9 +295,9 @@ void BoxContainer::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_alignment"), &BoxContainer::get_alignment);
ClassDB::bind_method(D_METHOD("set_alignment", "alignment"), &BoxContainer::set_alignment);
BIND_CONSTANT(ALIGN_BEGIN);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_END);
BIND_ENUM_CONSTANT(ALIGN_BEGIN);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_END);
ADD_PROPERTY(PropertyInfo(Variant::INT, "alignment", PROPERTY_HINT_ENUM, "Begin,Center,End"), "set_alignment", "get_alignment");
}

6
scene/gui/button.cpp
View file

@ -245,9 +245,9 @@ void Button::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_text_align"), &Button::get_text_align);
ClassDB::bind_method(D_METHOD("is_flat"), &Button::is_flat);
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_RIGHT);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT_INTL), "set_text", "get_text");
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "icon", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_button_icon", "get_button_icon");

96
scene/gui/control.cpp
View file

@ -2634,9 +2634,9 @@ void Control::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), "set_theme", "get_theme");
ADD_GROUP("", "");
BIND_CONSTANT(FOCUS_NONE);
BIND_CONSTANT(FOCUS_CLICK);
BIND_CONSTANT(FOCUS_ALL);
BIND_ENUM_CONSTANT(FOCUS_NONE);
BIND_ENUM_CONSTANT(FOCUS_CLICK);
BIND_ENUM_CONSTANT(FOCUS_ALL);
BIND_CONSTANT(NOTIFICATION_RESIZED);
BIND_CONSTANT(NOTIFICATION_MOUSE_ENTER);
@ -2646,56 +2646,56 @@ void Control::_bind_methods() {
BIND_CONSTANT(NOTIFICATION_THEME_CHANGED);
BIND_CONSTANT(NOTIFICATION_MODAL_CLOSE);
BIND_CONSTANT(CURSOR_ARROW);
BIND_CONSTANT(CURSOR_IBEAM);
BIND_CONSTANT(CURSOR_POINTING_HAND);
BIND_CONSTANT(CURSOR_CROSS);
BIND_CONSTANT(CURSOR_WAIT);
BIND_CONSTANT(CURSOR_BUSY);
BIND_CONSTANT(CURSOR_DRAG);
BIND_CONSTANT(CURSOR_CAN_DROP);
BIND_CONSTANT(CURSOR_FORBIDDEN);
BIND_CONSTANT(CURSOR_VSIZE);
BIND_CONSTANT(CURSOR_HSIZE);
BIND_CONSTANT(CURSOR_BDIAGSIZE);
BIND_CONSTANT(CURSOR_FDIAGSIZE);
BIND_CONSTANT(CURSOR_MOVE);
BIND_CONSTANT(CURSOR_VSPLIT);
BIND_CONSTANT(CURSOR_HSPLIT);
BIND_CONSTANT(CURSOR_HELP);
BIND_ENUM_CONSTANT(CURSOR_ARROW);
BIND_ENUM_CONSTANT(CURSOR_IBEAM);
BIND_ENUM_CONSTANT(CURSOR_POINTING_HAND);
BIND_ENUM_CONSTANT(CURSOR_CROSS);
BIND_ENUM_CONSTANT(CURSOR_WAIT);
BIND_ENUM_CONSTANT(CURSOR_BUSY);
BIND_ENUM_CONSTANT(CURSOR_DRAG);
BIND_ENUM_CONSTANT(CURSOR_CAN_DROP);
BIND_ENUM_CONSTANT(CURSOR_FORBIDDEN);
BIND_ENUM_CONSTANT(CURSOR_VSIZE);
BIND_ENUM_CONSTANT(CURSOR_HSIZE);
BIND_ENUM_CONSTANT(CURSOR_BDIAGSIZE);
BIND_ENUM_CONSTANT(CURSOR_FDIAGSIZE);
BIND_ENUM_CONSTANT(CURSOR_MOVE);
BIND_ENUM_CONSTANT(CURSOR_VSPLIT);
BIND_ENUM_CONSTANT(CURSOR_HSPLIT);
BIND_ENUM_CONSTANT(CURSOR_HELP);
BIND_CONSTANT(PRESET_TOP_LEFT);
BIND_CONSTANT(PRESET_TOP_RIGHT);
BIND_CONSTANT(PRESET_BOTTOM_LEFT);
BIND_CONSTANT(PRESET_BOTTOM_RIGHT);
BIND_CONSTANT(PRESET_CENTER_LEFT);
BIND_CONSTANT(PRESET_CENTER_TOP);
BIND_CONSTANT(PRESET_CENTER_RIGHT);
BIND_CONSTANT(PRESET_CENTER_BOTTOM);
BIND_CONSTANT(PRESET_CENTER);
BIND_CONSTANT(PRESET_LEFT_WIDE);
BIND_CONSTANT(PRESET_TOP_WIDE);
BIND_CONSTANT(PRESET_RIGHT_WIDE);
BIND_CONSTANT(PRESET_BOTTOM_WIDE);
BIND_CONSTANT(PRESET_VCENTER_WIDE);
BIND_CONSTANT(PRESET_HCENTER_WIDE);
BIND_CONSTANT(PRESET_WIDE);
BIND_ENUM_CONSTANT(PRESET_TOP_LEFT);
BIND_ENUM_CONSTANT(PRESET_TOP_RIGHT);
BIND_ENUM_CONSTANT(PRESET_BOTTOM_LEFT);
BIND_ENUM_CONSTANT(PRESET_BOTTOM_RIGHT);
BIND_ENUM_CONSTANT(PRESET_CENTER_LEFT);
BIND_ENUM_CONSTANT(PRESET_CENTER_TOP);
BIND_ENUM_CONSTANT(PRESET_CENTER_RIGHT);
BIND_ENUM_CONSTANT(PRESET_CENTER_BOTTOM);
BIND_ENUM_CONSTANT(PRESET_CENTER);
BIND_ENUM_CONSTANT(PRESET_LEFT_WIDE);
BIND_ENUM_CONSTANT(PRESET_TOP_WIDE);
BIND_ENUM_CONSTANT(PRESET_RIGHT_WIDE);
BIND_ENUM_CONSTANT(PRESET_BOTTOM_WIDE);
BIND_ENUM_CONSTANT(PRESET_VCENTER_WIDE);
BIND_ENUM_CONSTANT(PRESET_HCENTER_WIDE);
BIND_ENUM_CONSTANT(PRESET_WIDE);
BIND_CONSTANT(SIZE_EXPAND);
BIND_CONSTANT(SIZE_FILL);
BIND_CONSTANT(SIZE_EXPAND_FILL);
BIND_CONSTANT(SIZE_SHRINK_CENTER);
BIND_CONSTANT(SIZE_SHRINK_END);
BIND_ENUM_CONSTANT(SIZE_EXPAND);
BIND_ENUM_CONSTANT(SIZE_FILL);
BIND_ENUM_CONSTANT(SIZE_EXPAND_FILL);
BIND_ENUM_CONSTANT(SIZE_SHRINK_CENTER);
BIND_ENUM_CONSTANT(SIZE_SHRINK_END);
BIND_CONSTANT(MOUSE_FILTER_STOP);
BIND_CONSTANT(MOUSE_FILTER_PASS);
BIND_CONSTANT(MOUSE_FILTER_IGNORE);
BIND_ENUM_CONSTANT(MOUSE_FILTER_STOP);
BIND_ENUM_CONSTANT(MOUSE_FILTER_PASS);
BIND_ENUM_CONSTANT(MOUSE_FILTER_IGNORE);
BIND_CONSTANT(GROW_DIRECTION_BEGIN);
BIND_CONSTANT(GROW_DIRECTION_END);
BIND_ENUM_CONSTANT(GROW_DIRECTION_BEGIN);
BIND_ENUM_CONSTANT(GROW_DIRECTION_END);
BIND_CONSTANT(ANCHOR_BEGIN);
BIND_CONSTANT(ANCHOR_END);
BIND_ENUM_CONSTANT(ANCHOR_BEGIN);
BIND_ENUM_CONSTANT(ANCHOR_END);
ADD_SIGNAL(MethodInfo("resized"));
ADD_SIGNAL(MethodInfo("gui_input", PropertyInfo(Variant::OBJECT, "ev", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent")));

17
scene/gui/file_dialog.cpp
View file

@ -718,16 +718,15 @@ void FileDialog::_bind_methods() {
ADD_SIGNAL(MethodInfo("files_selected", PropertyInfo(Variant::POOL_STRING_ARRAY, "paths")));
ADD_SIGNAL(MethodInfo("dir_selected", PropertyInfo(Variant::STRING, "dir")));
BIND_CONSTANT(MODE_OPEN_FILE);
BIND_CONSTANT(MODE_OPEN_FILES);
BIND_CONSTANT(MODE_OPEN_DIR);
BIND_CONSTANT(MODE_OPEN_ANY);
BIND_ENUM_CONSTANT(MODE_OPEN_FILE);
BIND_ENUM_CONSTANT(MODE_OPEN_FILES);
BIND_ENUM_CONSTANT(MODE_OPEN_DIR);
BIND_ENUM_CONSTANT(MODE_OPEN_ANY);
BIND_ENUM_CONSTANT(MODE_SAVE_FILE);
BIND_CONSTANT(MODE_SAVE_FILE);
BIND_CONSTANT(ACCESS_RESOURCES);
BIND_CONSTANT(ACCESS_USERDATA);
BIND_CONSTANT(ACCESS_FILESYSTEM);
BIND_ENUM_CONSTANT(ACCESS_RESOURCES);
BIND_ENUM_CONSTANT(ACCESS_USERDATA);
BIND_ENUM_CONSTANT(ACCESS_FILESYSTEM);
ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Open one,Open many,Open folder,Open any,Save"), "set_mode", "get_mode");
ADD_PROPERTY(PropertyInfo(Variant::INT, "access", PROPERTY_HINT_ENUM, "Resources,User data,File system"), "set_access", "get_access");

6
scene/gui/graph_node.cpp
View file

@ -710,9 +710,9 @@ void GraphNode::_bind_methods() {
ADD_SIGNAL(MethodInfo("close_request"));
ADD_SIGNAL(MethodInfo("resize_request", PropertyInfo(Variant::VECTOR2, "new_minsize")));
BIND_CONSTANT(OVERLAY_DISABLED);
BIND_CONSTANT(OVERLAY_BREAKPOINT);
BIND_CONSTANT(OVERLAY_POSITION);
BIND_ENUM_CONSTANT(OVERLAY_DISABLED);
BIND_ENUM_CONSTANT(OVERLAY_BREAKPOINT);
BIND_ENUM_CONSTANT(OVERLAY_POSITION);
}
GraphNode::GraphNode() {

9
scene/gui/item_list.cpp
View file

@ -1374,10 +1374,11 @@ void ItemList::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "icon_mode", PROPERTY_HINT_ENUM, "Top,Left"), "set_icon_mode", "get_icon_mode");
ADD_PROPERTYNO(PropertyInfo(Variant::REAL, "icon_scale"), "set_icon_scale", "get_icon_scale");
BIND_CONSTANT(ICON_MODE_TOP);
BIND_CONSTANT(ICON_MODE_LEFT);
BIND_CONSTANT(SELECT_SINGLE);
BIND_CONSTANT(SELECT_MULTI);
BIND_ENUM_CONSTANT(ICON_MODE_TOP);
BIND_ENUM_CONSTANT(ICON_MODE_LEFT);
BIND_ENUM_CONSTANT(SELECT_SINGLE);
BIND_ENUM_CONSTANT(SELECT_MULTI);
ADD_SIGNAL(MethodInfo("item_selected", PropertyInfo(Variant::INT, "index")));
ADD_SIGNAL(MethodInfo("item_rmb_selected", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::VECTOR2, "atpos")));

16
scene/gui/label.cpp
View file

@ -644,15 +644,15 @@ void Label::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_max_lines_visible", "lines_visible"), &Label::set_max_lines_visible);
ClassDB::bind_method(D_METHOD("get_max_lines_visible"), &Label::get_max_lines_visible);
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
BIND_CONSTANT(ALIGN_FILL);
BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_RIGHT);
BIND_ENUM_CONSTANT(ALIGN_FILL);
BIND_CONSTANT(VALIGN_TOP);
BIND_CONSTANT(VALIGN_CENTER);
BIND_CONSTANT(VALIGN_BOTTOM);
BIND_CONSTANT(VALIGN_FILL);
BIND_ENUM_CONSTANT(VALIGN_TOP);
BIND_ENUM_CONSTANT(VALIGN_CENTER);
BIND_ENUM_CONSTANT(VALIGN_BOTTOM);
BIND_ENUM_CONSTANT(VALIGN_FILL);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text", PROPERTY_HINT_MULTILINE_TEXT, "", PROPERTY_USAGE_DEFAULT_INTL), "set_text", "get_text");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_align", "get_align");

22
scene/gui/line_edit.cpp
View file

@ -1352,18 +1352,18 @@ void LineEdit::_bind_methods() {
ADD_SIGNAL(MethodInfo("text_changed", PropertyInfo(Variant::STRING, "text")));
ADD_SIGNAL(MethodInfo("text_entered", PropertyInfo(Variant::STRING, "text")));
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
BIND_CONSTANT(ALIGN_FILL);
BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_RIGHT);
BIND_ENUM_CONSTANT(ALIGN_FILL);
BIND_CONSTANT(MENU_CUT);
BIND_CONSTANT(MENU_COPY);
BIND_CONSTANT(MENU_PASTE);
BIND_CONSTANT(MENU_CLEAR);
BIND_CONSTANT(MENU_SELECT_ALL);
BIND_CONSTANT(MENU_UNDO);
BIND_CONSTANT(MENU_MAX);
BIND_ENUM_CONSTANT(MENU_CUT);
BIND_ENUM_CONSTANT(MENU_COPY);
BIND_ENUM_CONSTANT(MENU_PASTE);
BIND_ENUM_CONSTANT(MENU_CLEAR);
BIND_ENUM_CONSTANT(MENU_SELECT_ALL);
BIND_ENUM_CONSTANT(MENU_UNDO);
BIND_ENUM_CONSTANT(MENU_MAX);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text"), "set_text", "get_text");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "align", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_align", "get_align");

1
scene/gui/line_edit.h
View file

@ -186,5 +186,6 @@ public:
};
VARIANT_ENUM_CAST(LineEdit::Align);
VARIANT_ENUM_CAST(LineEdit::MenuItems);
#endif

6
scene/gui/link_button.cpp
View file

@ -130,9 +130,9 @@ void LinkButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_underline_mode", "underline_mode"), &LinkButton::set_underline_mode);
ClassDB::bind_method(D_METHOD("get_underline_mode"), &LinkButton::get_underline_mode);
BIND_CONSTANT(UNDERLINE_MODE_ALWAYS);
BIND_CONSTANT(UNDERLINE_MODE_ON_HOVER);
BIND_CONSTANT(UNDERLINE_MODE_NEVER);
BIND_ENUM_CONSTANT(UNDERLINE_MODE_ALWAYS);
BIND_ENUM_CONSTANT(UNDERLINE_MODE_ON_HOVER);
BIND_ENUM_CONSTANT(UNDERLINE_MODE_NEVER);
ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "text"), "set_text", "get_text");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "underline", PROPERTY_HINT_ENUM, "Always,On Hover,Never"), "set_underline_mode", "get_underline_mode");

6
scene/gui/patch_9_rect.cpp
View file

@ -82,9 +82,9 @@ void NinePatchRect::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "axis_stretch_horizontal", PROPERTY_HINT_ENUM, "Stretch,Tile,Tile Fit"), "set_h_axis_stretch_mode", "get_h_axis_stretch_mode");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "axis_stretch_vertical", PROPERTY_HINT_ENUM, "Stretch,Tile,Tile Fit"), "set_v_axis_stretch_mode", "get_v_axis_stretch_mode");
BIND_CONSTANT(AXIS_STRETCH_MODE_STRETCH);
BIND_CONSTANT(AXIS_STRETCH_MODE_TILE);
BIND_CONSTANT(AXIS_STRETCH_MODE_TILE_FIT);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_STRETCH);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_TILE);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_TILE_FIT);
}
void NinePatchRect::set_texture(const Ref<Texture> &p_tex) {

1
scene/gui/popup.cpp
View file

@ -247,6 +247,7 @@ void Popup::_bind_methods() {
ADD_SIGNAL(MethodInfo("popup_hide"));
ADD_GROUP("Popup", "popup_");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "popup_exclusive"), "set_exclusive", "is_exclusive");
BIND_CONSTANT(NOTIFICATION_POST_POPUP);
BIND_CONSTANT(NOTIFICATION_POPUP_HIDE);
}

36
scene/gui/rich_text_label.cpp
View file

@ -1915,26 +1915,26 @@ void RichTextLabel::_bind_methods() {
ADD_SIGNAL(MethodInfo("meta_clicked", PropertyInfo(Variant::NIL, "meta")));
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
BIND_CONSTANT(ALIGN_FILL);
BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_RIGHT);
BIND_ENUM_CONSTANT(ALIGN_FILL);
BIND_CONSTANT(LIST_NUMBERS);
BIND_CONSTANT(LIST_LETTERS);
BIND_CONSTANT(LIST_DOTS);
BIND_ENUM_CONSTANT(LIST_NUMBERS);
BIND_ENUM_CONSTANT(LIST_LETTERS);
BIND_ENUM_CONSTANT(LIST_DOTS);
BIND_CONSTANT(ITEM_FRAME);
BIND_CONSTANT(ITEM_TEXT);
BIND_CONSTANT(ITEM_IMAGE);
BIND_CONSTANT(ITEM_NEWLINE);
BIND_CONSTANT(ITEM_FONT);
BIND_CONSTANT(ITEM_COLOR);
BIND_CONSTANT(ITEM_UNDERLINE);
BIND_CONSTANT(ITEM_ALIGN);
BIND_CONSTANT(ITEM_INDENT);
BIND_CONSTANT(ITEM_LIST);
BIND_CONSTANT(ITEM_META);
BIND_ENUM_CONSTANT(ITEM_FRAME);
BIND_ENUM_CONSTANT(ITEM_TEXT);
BIND_ENUM_CONSTANT(ITEM_IMAGE);
BIND_ENUM_CONSTANT(ITEM_NEWLINE);
BIND_ENUM_CONSTANT(ITEM_FONT);
BIND_ENUM_CONSTANT(ITEM_COLOR);
BIND_ENUM_CONSTANT(ITEM_UNDERLINE);
BIND_ENUM_CONSTANT(ITEM_ALIGN);
BIND_ENUM_CONSTANT(ITEM_INDENT);
BIND_ENUM_CONSTANT(ITEM_LIST);
BIND_ENUM_CONSTANT(ITEM_META);
}
void RichTextLabel::set_visible_characters(int p_visible) {

6
scene/gui/split_container.cpp
View file

@ -410,9 +410,9 @@ void SplitContainer::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collapsed"), "set_collapsed", "is_collapsed");
ADD_PROPERTY(PropertyInfo(Variant::INT, "dragger_visibility", PROPERTY_HINT_ENUM, "Visible,Hidden,Hidden & Collapsed"), "set_dragger_visibility", "get_dragger_visibility");
BIND_CONSTANT(DRAGGER_VISIBLE);
BIND_CONSTANT(DRAGGER_HIDDEN);
BIND_CONSTANT(DRAGGER_HIDDEN_COLLAPSED);
BIND_ENUM_CONSTANT(DRAGGER_VISIBLE);
BIND_ENUM_CONSTANT(DRAGGER_HIDDEN);
BIND_ENUM_CONSTANT(DRAGGER_HIDDEN_COLLAPSED);
}
SplitContainer::SplitContainer(bool p_vertical) {

16
scene/gui/tabs.cpp
View file

@ -815,15 +815,15 @@ void Tabs::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE, "-1,4096,1", PROPERTY_USAGE_EDITOR), "set_current_tab", "get_current_tab");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "tab_close_display_policy", PROPERTY_HINT_ENUM, "Show Never,Show Active Only,Show Always"), "set_tab_close_display_policy", "get_tab_close_display_policy");
BIND_CONSTANT(ALIGN_LEFT);
BIND_CONSTANT(ALIGN_CENTER);
BIND_CONSTANT(ALIGN_RIGHT);
BIND_CONSTANT(ALIGN_MAX);
BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER);
BIND_ENUM_CONSTANT(ALIGN_RIGHT);
BIND_ENUM_CONSTANT(ALIGN_MAX);
BIND_CONSTANT(CLOSE_BUTTON_SHOW_ACTIVE_ONLY);
BIND_CONSTANT(CLOSE_BUTTON_SHOW_ALWAYS);
BIND_CONSTANT(CLOSE_BUTTON_SHOW_NEVER);
BIND_CONSTANT(CLOSE_BUTTON_MAX);
BIND_ENUM_CONSTANT(CLOSE_BUTTON_SHOW_ACTIVE_ONLY);
BIND_ENUM_CONSTANT(CLOSE_BUTTON_SHOW_ALWAYS);
BIND_ENUM_CONSTANT(CLOSE_BUTTON_SHOW_NEVER);
BIND_ENUM_CONSTANT(CLOSE_BUTTON_MAX);
}
Tabs::Tabs() {

20
scene/gui/text_edit.cpp
View file

@ -4704,9 +4704,9 @@ void TextEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("_click_selection_held"), &TextEdit::_click_selection_held);
ClassDB::bind_method(D_METHOD("_toggle_draw_caret"), &TextEdit::_toggle_draw_caret);
BIND_CONSTANT(SEARCH_MATCH_CASE);
BIND_CONSTANT(SEARCH_WHOLE_WORDS);
BIND_CONSTANT(SEARCH_BACKWARDS);
BIND_ENUM_CONSTANT(SEARCH_MATCH_CASE);
BIND_ENUM_CONSTANT(SEARCH_WHOLE_WORDS);
BIND_ENUM_CONSTANT(SEARCH_BACKWARDS);
/*
ClassDB::bind_method(D_METHOD("delete_char"),&TextEdit::delete_char);
@ -4789,13 +4789,13 @@ void TextEdit::_bind_methods() {
ADD_SIGNAL(MethodInfo("breakpoint_toggled", PropertyInfo(Variant::INT, "row")));
ADD_SIGNAL(MethodInfo("symbol_lookup", PropertyInfo(Variant::STRING, "symbol"), PropertyInfo(Variant::INT, "row"), PropertyInfo(Variant::INT, "column")));
BIND_CONSTANT(MENU_CUT);
BIND_CONSTANT(MENU_COPY);
BIND_CONSTANT(MENU_PASTE);
BIND_CONSTANT(MENU_CLEAR);
BIND_CONSTANT(MENU_SELECT_ALL);
BIND_CONSTANT(MENU_UNDO);
BIND_CONSTANT(MENU_MAX);
BIND_ENUM_CONSTANT(MENU_CUT);
BIND_ENUM_CONSTANT(MENU_COPY);
BIND_ENUM_CONSTANT(MENU_PASTE);
BIND_ENUM_CONSTANT(MENU_CLEAR);
BIND_ENUM_CONSTANT(MENU_SELECT_ALL);
BIND_ENUM_CONSTANT(MENU_UNDO);
BIND_ENUM_CONSTANT(MENU_MAX);
GLOBAL_DEF("gui/timers/text_edit_idle_detect_sec", 3);
}

3
scene/gui/text_edit.h
View file

@ -535,4 +535,7 @@ public:
~TextEdit();
};
VARIANT_ENUM_CAST(TextEdit::MenuItems);
VARIANT_ENUM_CAST(TextEdit::SearchFlags);
#endif // TEXT_EDIT_H

14
scene/gui/texture_button.cpp
View file

@ -208,13 +208,13 @@ void TextureButton::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "expand", PROPERTY_HINT_RESOURCE_TYPE, "bool"), "set_expand", "get_expand");
ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "stretch_mode", PROPERTY_HINT_ENUM, "Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), "set_stretch_mode", "get_stretch_mode");
BIND_CONSTANT(STRETCH_SCALE);
BIND_CONSTANT(STRETCH_TILE);
BIND_CONSTANT(STRETCH_KEEP);
BIND_CONSTANT(STRETCH_KEEP_CENTERED);
BIND_CONSTANT(STRETCH_KEEP_ASPECT);
BIND_CONSTANT(STRETCH_KEEP_ASPECT_CENTERED);
BIND_CONSTANT(STRETCH_KEEP_ASPECT_COVERED);
BIND_ENUM_CONSTANT(STRETCH_SCALE);
BIND_ENUM_CONSTANT(STRETCH_TILE);
BIND_ENUM_CONSTANT(STRETCH_KEEP);
BIND_ENUM_CONSTANT(STRETCH_KEEP_CENTERED);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT_CENTERED);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT_COVERED);
}
void TextureButton::set_normal_texture(const Ref<Texture> &p_normal) {

12
scene/gui/texture_progress.cpp
View file

@ -273,12 +273,12 @@ void TextureProgress::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "radial_fill_degrees", PROPERTY_HINT_RANGE, "0.0,360.0,0.1,slider"), "set_fill_degrees", "get_fill_degrees");
ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "radial_center_offset"), "set_radial_center_offset", "get_radial_center_offset");
BIND_CONSTANT(FILL_LEFT_TO_RIGHT);
BIND_CONSTANT(FILL_RIGHT_TO_LEFT);
BIND_CONSTANT(FILL_TOP_TO_BOTTOM);
BIND_CONSTANT(FILL_BOTTOM_TO_TOP);
BIND_CONSTANT(FILL_CLOCKWISE);
BIND_CONSTANT(FILL_COUNTER_CLOCKWISE);
BIND_ENUM_CONSTANT(FILL_LEFT_TO_RIGHT);
BIND_ENUM_CONSTANT(FILL_RIGHT_TO_LEFT);
BIND_ENUM_CONSTANT(FILL_TOP_TO_BOTTOM);
BIND_ENUM_CONSTANT(FILL_BOTTOM_TO_TOP);
BIND_ENUM_CONSTANT(FILL_CLOCKWISE);
BIND_ENUM_CONSTANT(FILL_COUNTER_CLOCKWISE);
}
TextureProgress::TextureProgress() {

2
scene/gui/texture_progress.h
View file

@ -89,4 +89,6 @@ private:
Point2 get_relative_center();
};
VARIANT_ENUM_CAST(TextureProgress::FillMode);
#endif // TEXTURE_PROGRESS_H

16
scene/gui/texture_rect.cpp
View file

@ -112,14 +112,14 @@ void TextureRect::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "expand"), "set_expand", "has_expand");
ADD_PROPERTYNO(PropertyInfo(Variant::INT, "stretch_mode", PROPERTY_HINT_ENUM, "Scale On Expand (Compat),Scale,Tile,Keep,Keep Centered,Keep Aspect,Keep Aspect Centered,Keep Aspect Covered"), "set_stretch_mode", "get_stretch_mode");
BIND_CONSTANT(STRETCH_SCALE_ON_EXPAND);
BIND_CONSTANT(STRETCH_SCALE);
BIND_CONSTANT(STRETCH_TILE);
BIND_CONSTANT(STRETCH_KEEP);
BIND_CONSTANT(STRETCH_KEEP_CENTERED);
BIND_CONSTANT(STRETCH_KEEP_ASPECT);
BIND_CONSTANT(STRETCH_KEEP_ASPECT_CENTERED);
BIND_CONSTANT(STRETCH_KEEP_ASPECT_COVERED);
BIND_ENUM_CONSTANT(STRETCH_SCALE_ON_EXPAND);
BIND_ENUM_CONSTANT(STRETCH_SCALE);
BIND_ENUM_CONSTANT(STRETCH_TILE);
BIND_ENUM_CONSTANT(STRETCH_KEEP);
BIND_ENUM_CONSTANT(STRETCH_KEEP_CENTERED);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT_CENTERED);
BIND_ENUM_CONSTANT(STRETCH_KEEP_ASPECT_COVERED);
}
void TextureRect::set_texture(const Ref<Texture> &p_tex) {

24
scene/gui/tree.cpp
View file

@ -752,12 +752,12 @@ void TreeItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_disable_folding", "disable"), &TreeItem::set_disable_folding);
ClassDB::bind_method(D_METHOD("is_folding_disabled"), &TreeItem::is_folding_disabled);
BIND_CONSTANT(CELL_MODE_STRING);
BIND_CONSTANT(CELL_MODE_CHECK);
BIND_CONSTANT(CELL_MODE_RANGE);
BIND_CONSTANT(CELL_MODE_RANGE_EXPRESSION);
BIND_CONSTANT(CELL_MODE_ICON);
BIND_CONSTANT(CELL_MODE_CUSTOM);
BIND_ENUM_CONSTANT(CELL_MODE_STRING);
BIND_ENUM_CONSTANT(CELL_MODE_CHECK);
BIND_ENUM_CONSTANT(CELL_MODE_RANGE);
BIND_ENUM_CONSTANT(CELL_MODE_RANGE_EXPRESSION);
BIND_ENUM_CONSTANT(CELL_MODE_ICON);
BIND_ENUM_CONSTANT(CELL_MODE_CUSTOM);
}
void TreeItem::clear_children() {
@ -3658,13 +3658,13 @@ void Tree::_bind_methods() {
ADD_SIGNAL(MethodInfo("item_activated"));
ADD_SIGNAL(MethodInfo("column_title_pressed", PropertyInfo(Variant::INT, "column")));
BIND_CONSTANT(SELECT_SINGLE);
BIND_CONSTANT(SELECT_ROW);
BIND_CONSTANT(SELECT_MULTI);
BIND_ENUM_CONSTANT(SELECT_SINGLE);
BIND_ENUM_CONSTANT(SELECT_ROW);
BIND_ENUM_CONSTANT(SELECT_MULTI);
BIND_CONSTANT(DROP_MODE_DISABLED);
BIND_CONSTANT(DROP_MODE_ON_ITEM);
BIND_CONSTANT(DROP_MODE_INBETWEEN);
BIND_ENUM_CONSTANT(DROP_MODE_DISABLED);
BIND_ENUM_CONSTANT(DROP_MODE_ON_ITEM);
BIND_ENUM_CONSTANT(DROP_MODE_INBETWEEN);
}
Tree::Tree() {

1
scene/gui/tree.h
View file

@ -583,4 +583,5 @@ public:
};
VARIANT_ENUM_CAST(Tree::SelectMode);
VARIANT_ENUM_CAST(Tree::DropModeFlags);
#endif

26
scene/main/http_request.cpp
View file

@ -547,19 +547,19 @@ void HTTPRequest::_bind_methods() {
ADD_SIGNAL(MethodInfo("request_completed", PropertyInfo(Variant::INT, "result"), PropertyInfo(Variant::INT, "response_code"), PropertyInfo(Variant::POOL_STRING_ARRAY, "headers"), PropertyInfo(Variant::POOL_BYTE_ARRAY, "body")));
BIND_CONSTANT(RESULT_SUCCESS);
//BIND_CONSTANT( RESULT_NO_BODY );
BIND_CONSTANT(RESULT_CHUNKED_BODY_SIZE_MISMATCH);
BIND_CONSTANT(RESULT_CANT_CONNECT);
BIND_CONSTANT(RESULT_CANT_RESOLVE);
BIND_CONSTANT(RESULT_CONNECTION_ERROR);
BIND_CONSTANT(RESULT_SSL_HANDSHAKE_ERROR);
BIND_CONSTANT(RESULT_NO_RESPONSE);
BIND_CONSTANT(RESULT_BODY_SIZE_LIMIT_EXCEEDED);
BIND_CONSTANT(RESULT_REQUEST_FAILED);
BIND_CONSTANT(RESULT_DOWNLOAD_FILE_CANT_OPEN);
BIND_CONSTANT(RESULT_DOWNLOAD_FILE_WRITE_ERROR);
BIND_CONSTANT(RESULT_REDIRECT_LIMIT_REACHED);
BIND_ENUM_CONSTANT(RESULT_SUCCESS);
//BIND_ENUM_CONSTANT( RESULT_NO_BODY );
BIND_ENUM_CONSTANT(RESULT_CHUNKED_BODY_SIZE_MISMATCH);
BIND_ENUM_CONSTANT(RESULT_CANT_CONNECT);
BIND_ENUM_CONSTANT(RESULT_CANT_RESOLVE);
BIND_ENUM_CONSTANT(RESULT_CONNECTION_ERROR);
BIND_ENUM_CONSTANT(RESULT_SSL_HANDSHAKE_ERROR);
BIND_ENUM_CONSTANT(RESULT_NO_RESPONSE);
BIND_ENUM_CONSTANT(RESULT_BODY_SIZE_LIMIT_EXCEEDED);
BIND_ENUM_CONSTANT(RESULT_REQUEST_FAILED);
BIND_ENUM_CONSTANT(RESULT_DOWNLOAD_FILE_CANT_OPEN);
BIND_ENUM_CONSTANT(RESULT_DOWNLOAD_FILE_WRITE_ERROR);
BIND_ENUM_CONSTANT(RESULT_REDIRECT_LIMIT_REACHED);
}
HTTPRequest::HTTPRequest() {

2
scene/main/http_request.h
View file

@ -137,4 +137,6 @@ public:
~HTTPRequest();
};
VARIANT_ENUM_CAST(HTTPRequest::Result);
#endif // HTTPREQUEST_H

24
scene/main/node.cpp
View file

@ -2858,20 +2858,20 @@ void Node::_bind_methods() {
BIND_CONSTANT(NOTIFICATION_INTERNAL_PROCESS);
BIND_CONSTANT(NOTIFICATION_INTERNAL_FIXED_PROCESS);
BIND_CONSTANT(RPC_MODE_DISABLED);
BIND_CONSTANT(RPC_MODE_REMOTE);
BIND_CONSTANT(RPC_MODE_SYNC);
BIND_CONSTANT(RPC_MODE_MASTER);
BIND_CONSTANT(RPC_MODE_SLAVE);
BIND_ENUM_CONSTANT(RPC_MODE_DISABLED);
BIND_ENUM_CONSTANT(RPC_MODE_REMOTE);
BIND_ENUM_CONSTANT(RPC_MODE_SYNC);
BIND_ENUM_CONSTANT(RPC_MODE_MASTER);
BIND_ENUM_CONSTANT(RPC_MODE_SLAVE);
BIND_CONSTANT(PAUSE_MODE_INHERIT);
BIND_CONSTANT(PAUSE_MODE_STOP);
BIND_CONSTANT(PAUSE_MODE_PROCESS);
BIND_ENUM_CONSTANT(PAUSE_MODE_INHERIT);
BIND_ENUM_CONSTANT(PAUSE_MODE_STOP);
BIND_ENUM_CONSTANT(PAUSE_MODE_PROCESS);
BIND_CONSTANT(DUPLICATE_SIGNALS);
BIND_CONSTANT(DUPLICATE_GROUPS);
BIND_CONSTANT(DUPLICATE_SCRIPTS);
BIND_CONSTANT(DUPLICATE_USE_INSTANCING);
BIND_ENUM_CONSTANT(DUPLICATE_SIGNALS);
BIND_ENUM_CONSTANT(DUPLICATE_GROUPS);
BIND_ENUM_CONSTANT(DUPLICATE_SCRIPTS);
BIND_ENUM_CONSTANT(DUPLICATE_USE_INSTANCING);
ADD_SIGNAL(MethodInfo("renamed"));
ADD_SIGNAL(MethodInfo("tree_entered"));

2
scene/main/node.h
View file

@ -412,6 +412,8 @@ public:
~Node();
};
VARIANT_ENUM_CAST(Node::DuplicateFlags);
typedef Set<Node *, Node::Comparator> NodeSet;
#endif

23
scene/main/scene_tree.cpp
View file

@ -2202,18 +2202,19 @@ void SceneTree::_bind_methods() {
ADD_SIGNAL(MethodInfo("connection_failed"));
ADD_SIGNAL(MethodInfo("server_disconnected"));
BIND_CONSTANT(GROUP_CALL_DEFAULT);
BIND_CONSTANT(GROUP_CALL_REVERSE);
BIND_CONSTANT(GROUP_CALL_REALTIME);
BIND_CONSTANT(GROUP_CALL_UNIQUE);
BIND_ENUM_CONSTANT(GROUP_CALL_DEFAULT);
BIND_ENUM_CONSTANT(GROUP_CALL_REVERSE);
BIND_ENUM_CONSTANT(GROUP_CALL_REALTIME);
BIND_ENUM_CONSTANT(GROUP_CALL_UNIQUE);
BIND_CONSTANT(STRETCH_MODE_DISABLED);
BIND_CONSTANT(STRETCH_MODE_2D);
BIND_CONSTANT(STRETCH_MODE_VIEWPORT);
BIND_CONSTANT(STRETCH_ASPECT_IGNORE);
BIND_CONSTANT(STRETCH_ASPECT_KEEP);
BIND_CONSTANT(STRETCH_ASPECT_KEEP_WIDTH);
BIND_CONSTANT(STRETCH_ASPECT_KEEP_HEIGHT);
BIND_ENUM_CONSTANT(STRETCH_MODE_DISABLED);
BIND_ENUM_CONSTANT(STRETCH_MODE_2D);
BIND_ENUM_CONSTANT(STRETCH_MODE_VIEWPORT);
BIND_ENUM_CONSTANT(STRETCH_ASPECT_IGNORE);
BIND_ENUM_CONSTANT(STRETCH_ASPECT_KEEP);
BIND_ENUM_CONSTANT(STRETCH_ASPECT_KEEP_WIDTH);
BIND_ENUM_CONSTANT(STRETCH_ASPECT_KEEP_HEIGHT);
}
SceneTree *SceneTree::singleton = NULL;

1
scene/main/scene_tree.h
View file

@ -465,5 +465,6 @@ public:
VARIANT_ENUM_CAST(SceneTree::StretchMode);
VARIANT_ENUM_CAST(SceneTree::StretchAspect);
VARIANT_ENUM_CAST(SceneTree::CallGroupFlags);
#endif

4
scene/main/timer.cpp
View file

@ -202,8 +202,8 @@ void Timer::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "one_shot"), "set_one_shot", "is_one_shot");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autostart"), "set_autostart", "has_autostart");
BIND_CONSTANT(TIMER_PROCESS_FIXED);
BIND_CONSTANT(TIMER_PROCESS_IDLE);
BIND_ENUM_CONSTANT(TIMER_PROCESS_FIXED);
BIND_ENUM_CONSTANT(TIMER_PROCESS_IDLE);
}
Timer::Timer() {

56
scene/main/viewport.cpp
View file

@ -2772,38 +2772,38 @@ void Viewport::_bind_methods() {
ADD_SIGNAL(MethodInfo("size_changed"));
BIND_CONSTANT(UPDATE_DISABLED);
BIND_CONSTANT(UPDATE_ONCE);
BIND_CONSTANT(UPDATE_WHEN_VISIBLE);
BIND_CONSTANT(UPDATE_ALWAYS);
BIND_ENUM_CONSTANT(UPDATE_DISABLED);
BIND_ENUM_CONSTANT(UPDATE_ONCE);
BIND_ENUM_CONSTANT(UPDATE_WHEN_VISIBLE);
BIND_ENUM_CONSTANT(UPDATE_ALWAYS);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_DISABLED);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_1);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_4);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_16);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_64);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_256);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_1024);
BIND_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_MAX);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_DISABLED);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_1);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_4);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_16);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_64);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_256);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_1024);
BIND_ENUM_CONSTANT(SHADOW_ATLAS_QUADRANT_SUBDIV_MAX);
BIND_CONSTANT(RENDER_INFO_OBJECTS_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_VERTICES_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_MATERIAL_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_SHADER_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_SURFACE_CHANGES_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_DRAW_CALLS_IN_FRAME);
BIND_CONSTANT(RENDER_INFO_MAX);
BIND_ENUM_CONSTANT(RENDER_INFO_OBJECTS_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_VERTICES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_MATERIAL_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_SHADER_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_SURFACE_CHANGES_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_DRAW_CALLS_IN_FRAME);
BIND_ENUM_CONSTANT(RENDER_INFO_MAX);
BIND_CONSTANT(DEBUG_DRAW_DISABLED);
BIND_CONSTANT(DEBUG_DRAW_UNSHADED);
BIND_CONSTANT(DEBUG_DRAW_OVERDRAW);
BIND_CONSTANT(DEBUG_DRAW_WIREFRAME);
BIND_ENUM_CONSTANT(DEBUG_DRAW_DISABLED);
BIND_ENUM_CONSTANT(DEBUG_DRAW_UNSHADED);
BIND_ENUM_CONSTANT(DEBUG_DRAW_OVERDRAW);
BIND_ENUM_CONSTANT(DEBUG_DRAW_WIREFRAME);
BIND_CONSTANT(MSAA_DISABLED);
BIND_CONSTANT(MSAA_2X);
BIND_CONSTANT(MSAA_4X);
BIND_CONSTANT(MSAA_8X);
BIND_CONSTANT(MSAA_16X);
BIND_ENUM_CONSTANT(MSAA_DISABLED);
BIND_ENUM_CONSTANT(MSAA_2X);
BIND_ENUM_CONSTANT(MSAA_4X);
BIND_ENUM_CONSTANT(MSAA_8X);
BIND_ENUM_CONSTANT(MSAA_16X);
}
Viewport::Viewport() {

18
scene/resources/animation.cpp
View file

@ -1676,17 +1676,17 @@ void Animation::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear"), &Animation::clear);
BIND_CONSTANT(TYPE_VALUE);
BIND_CONSTANT(TYPE_TRANSFORM);
BIND_CONSTANT(TYPE_METHOD);
BIND_ENUM_CONSTANT(TYPE_VALUE);
BIND_ENUM_CONSTANT(TYPE_TRANSFORM);
BIND_ENUM_CONSTANT(TYPE_METHOD);
BIND_CONSTANT(INTERPOLATION_NEAREST);
BIND_CONSTANT(INTERPOLATION_LINEAR);
BIND_CONSTANT(INTERPOLATION_CUBIC);
BIND_ENUM_CONSTANT(INTERPOLATION_NEAREST);
BIND_ENUM_CONSTANT(INTERPOLATION_LINEAR);
BIND_ENUM_CONSTANT(INTERPOLATION_CUBIC);
BIND_CONSTANT(UPDATE_CONTINUOUS);
BIND_CONSTANT(UPDATE_DISCRETE);
BIND_CONSTANT(UPDATE_TRIGGER);
BIND_ENUM_CONSTANT(UPDATE_CONTINUOUS);
BIND_ENUM_CONSTANT(UPDATE_DISCRETE);
BIND_ENUM_CONSTANT(UPDATE_TRIGGER);
}
void Animation::clear() {

8
scene/resources/dynamic_font.cpp
View file

@ -892,10 +892,10 @@ void DynamicFont::_bind_methods() {
ADD_GROUP("Font", "");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "font_data", PROPERTY_HINT_RESOURCE_TYPE, "DynamicFontData"), "set_font_data", "get_font_data");
BIND_CONSTANT(SPACING_TOP);
BIND_CONSTANT(SPACING_BOTTOM);
BIND_CONSTANT(SPACING_CHAR);
BIND_CONSTANT(SPACING_SPACE);
BIND_ENUM_CONSTANT(SPACING_TOP);
BIND_ENUM_CONSTANT(SPACING_BOTTOM);
BIND_ENUM_CONSTANT(SPACING_CHAR);
BIND_ENUM_CONSTANT(SPACING_SPACE);
}
DynamicFont::DynamicFont() {

2
scene/resources/dynamic_font.h
View file

@ -236,6 +236,8 @@ public:
~DynamicFont();
};
VARIANT_ENUM_CAST(DynamicFont::SpacingType);
/////////////
class ResourceFormatLoaderDynamicFont : public ResourceFormatLoader {

37
scene/resources/environment.cpp
View file

@ -1114,23 +1114,26 @@ void Environment::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "adjustment_saturation", PROPERTY_HINT_RANGE, "0.01,8,0.01"), "set_adjustment_saturation", "get_adjustment_saturation");
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "adjustment_color_correction", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_adjustment_color_correction", "get_adjustment_color_correction");
BIND_CONSTANT(BG_KEEP);
BIND_CONSTANT(BG_CLEAR_COLOR);
BIND_CONSTANT(BG_COLOR);
BIND_CONSTANT(BG_SKY);
BIND_CONSTANT(BG_CANVAS);
BIND_CONSTANT(BG_MAX);
BIND_CONSTANT(GLOW_BLEND_MODE_ADDITIVE);
BIND_CONSTANT(GLOW_BLEND_MODE_SCREEN);
BIND_CONSTANT(GLOW_BLEND_MODE_SOFTLIGHT);
BIND_CONSTANT(GLOW_BLEND_MODE_REPLACE);
BIND_CONSTANT(TONE_MAPPER_LINEAR);
BIND_CONSTANT(TONE_MAPPER_REINHARDT);
BIND_CONSTANT(TONE_MAPPER_FILMIC);
BIND_CONSTANT(TONE_MAPPER_ACES);
BIND_CONSTANT(DOF_BLUR_QUALITY_LOW);
BIND_CONSTANT(DOF_BLUR_QUALITY_MEDIUM);
BIND_CONSTANT(DOF_BLUR_QUALITY_HIGH);
BIND_ENUM_CONSTANT(BG_KEEP);
BIND_ENUM_CONSTANT(BG_CLEAR_COLOR);
BIND_ENUM_CONSTANT(BG_COLOR);
BIND_ENUM_CONSTANT(BG_SKY);
BIND_ENUM_CONSTANT(BG_CANVAS);
BIND_ENUM_CONSTANT(BG_MAX);
BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_ADDITIVE);
BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_SCREEN);
BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_SOFTLIGHT);
BIND_ENUM_CONSTANT(GLOW_BLEND_MODE_REPLACE);
BIND_ENUM_CONSTANT(TONE_MAPPER_LINEAR);
BIND_ENUM_CONSTANT(TONE_MAPPER_REINHARDT);
BIND_ENUM_CONSTANT(TONE_MAPPER_FILMIC);
BIND_ENUM_CONSTANT(TONE_MAPPER_ACES);
BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_LOW);
BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_MEDIUM);
BIND_ENUM_CONSTANT(DOF_BLUR_QUALITY_HIGH);
}
Environment::Environment() {

144
scene/resources/material.cpp
View file

@ -1718,88 +1718,88 @@ void SpatialMaterial::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "uv2_triplanar"), "set_flag", "get_flag", FLAG_UV2_USE_TRIPLANAR);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "uv2_triplanar_sharpness", PROPERTY_HINT_EXP_EASING), "set_uv2_triplanar_blend_sharpness", "get_uv2_triplanar_blend_sharpness");
BIND_CONSTANT(TEXTURE_ALBEDO);
BIND_CONSTANT(TEXTURE_METALLIC);
BIND_CONSTANT(TEXTURE_ROUGHNESS);
BIND_CONSTANT(TEXTURE_EMISSION);
BIND_CONSTANT(TEXTURE_NORMAL);
BIND_CONSTANT(TEXTURE_RIM);
BIND_CONSTANT(TEXTURE_CLEARCOAT);
BIND_CONSTANT(TEXTURE_FLOWMAP);
BIND_CONSTANT(TEXTURE_AMBIENT_OCCLUSION);
BIND_CONSTANT(TEXTURE_DEPTH);
BIND_CONSTANT(TEXTURE_SUBSURFACE_SCATTERING);
BIND_CONSTANT(TEXTURE_REFRACTION);
BIND_CONSTANT(TEXTURE_DETAIL_MASK);
BIND_CONSTANT(TEXTURE_DETAIL_ALBEDO);
BIND_CONSTANT(TEXTURE_DETAIL_NORMAL);
BIND_CONSTANT(TEXTURE_MAX);
BIND_ENUM_CONSTANT(TEXTURE_ALBEDO);
BIND_ENUM_CONSTANT(TEXTURE_METALLIC);
BIND_ENUM_CONSTANT(TEXTURE_ROUGHNESS);
BIND_ENUM_CONSTANT(TEXTURE_EMISSION);
BIND_ENUM_CONSTANT(TEXTURE_NORMAL);
BIND_ENUM_CONSTANT(TEXTURE_RIM);
BIND_ENUM_CONSTANT(TEXTURE_CLEARCOAT);
BIND_ENUM_CONSTANT(TEXTURE_FLOWMAP);
BIND_ENUM_CONSTANT(TEXTURE_AMBIENT_OCCLUSION);
BIND_ENUM_CONSTANT(TEXTURE_DEPTH);
BIND_ENUM_CONSTANT(TEXTURE_SUBSURFACE_SCATTERING);
BIND_ENUM_CONSTANT(TEXTURE_REFRACTION);
BIND_ENUM_CONSTANT(TEXTURE_DETAIL_MASK);
BIND_ENUM_CONSTANT(TEXTURE_DETAIL_ALBEDO);
BIND_ENUM_CONSTANT(TEXTURE_DETAIL_NORMAL);
BIND_ENUM_CONSTANT(TEXTURE_MAX);
BIND_CONSTANT(DETAIL_UV_1);
BIND_CONSTANT(DETAIL_UV_2);
BIND_ENUM_CONSTANT(DETAIL_UV_1);
BIND_ENUM_CONSTANT(DETAIL_UV_2);
BIND_CONSTANT(FEATURE_TRANSPARENT);
BIND_CONSTANT(FEATURE_EMISSION);
BIND_CONSTANT(FEATURE_NORMAL_MAPPING);
BIND_CONSTANT(FEATURE_RIM);
BIND_CONSTANT(FEATURE_CLEARCOAT);
BIND_CONSTANT(FEATURE_ANISOTROPY);
BIND_CONSTANT(FEATURE_AMBIENT_OCCLUSION);
BIND_CONSTANT(FEATURE_DEPTH_MAPPING);
BIND_CONSTANT(FEATURE_SUBSURACE_SCATTERING);
BIND_CONSTANT(FEATURE_REFRACTION);
BIND_CONSTANT(FEATURE_DETAIL);
BIND_CONSTANT(FEATURE_MAX);
BIND_ENUM_CONSTANT(FEATURE_TRANSPARENT);
BIND_ENUM_CONSTANT(FEATURE_EMISSION);
BIND_ENUM_CONSTANT(FEATURE_NORMAL_MAPPING);
BIND_ENUM_CONSTANT(FEATURE_RIM);
BIND_ENUM_CONSTANT(FEATURE_CLEARCOAT);
BIND_ENUM_CONSTANT(FEATURE_ANISOTROPY);
BIND_ENUM_CONSTANT(FEATURE_AMBIENT_OCCLUSION);
BIND_ENUM_CONSTANT(FEATURE_DEPTH_MAPPING);
BIND_ENUM_CONSTANT(FEATURE_SUBSURACE_SCATTERING);
BIND_ENUM_CONSTANT(FEATURE_REFRACTION);
BIND_ENUM_CONSTANT(FEATURE_DETAIL);
BIND_ENUM_CONSTANT(FEATURE_MAX);
BIND_CONSTANT(BLEND_MODE_MIX);
BIND_CONSTANT(BLEND_MODE_ADD);
BIND_CONSTANT(BLEND_MODE_SUB);
BIND_CONSTANT(BLEND_MODE_MUL);
BIND_ENUM_CONSTANT(BLEND_MODE_MIX);
BIND_ENUM_CONSTANT(BLEND_MODE_ADD);
BIND_ENUM_CONSTANT(BLEND_MODE_SUB);
BIND_ENUM_CONSTANT(BLEND_MODE_MUL);
BIND_CONSTANT(DEPTH_DRAW_OPAQUE_ONLY);
BIND_CONSTANT(DEPTH_DRAW_ALWAYS);
BIND_CONSTANT(DEPTH_DRAW_DISABLED);
BIND_CONSTANT(DEPTH_DRAW_ALPHA_OPAQUE_PREPASS);
BIND_ENUM_CONSTANT(DEPTH_DRAW_OPAQUE_ONLY);
BIND_ENUM_CONSTANT(DEPTH_DRAW_ALWAYS);
BIND_ENUM_CONSTANT(DEPTH_DRAW_DISABLED);
BIND_ENUM_CONSTANT(DEPTH_DRAW_ALPHA_OPAQUE_PREPASS);
BIND_CONSTANT(CULL_BACK);
BIND_CONSTANT(CULL_FRONT);
BIND_CONSTANT(CULL_DISABLED);
BIND_ENUM_CONSTANT(CULL_BACK);
BIND_ENUM_CONSTANT(CULL_FRONT);
BIND_ENUM_CONSTANT(CULL_DISABLED);
BIND_CONSTANT(FLAG_UNSHADED);
BIND_CONSTANT(FLAG_USE_VERTEX_LIGHTING);
BIND_CONSTANT(FLAG_ONTOP);
BIND_CONSTANT(FLAG_ALBEDO_FROM_VERTEX_COLOR);
BIND_CONSTANT(FLAG_SRGB_VERTEX_COLOR);
BIND_CONSTANT(FLAG_USE_POINT_SIZE);
BIND_CONSTANT(FLAG_FIXED_SIZE);
BIND_CONSTANT(FLAG_UV1_USE_TRIPLANAR);
BIND_CONSTANT(FLAG_UV2_USE_TRIPLANAR);
BIND_CONSTANT(FLAG_AO_ON_UV2);
BIND_CONSTANT(FLAG_USE_ALPHA_SCISSOR);
BIND_CONSTANT(FLAG_MAX);
BIND_ENUM_CONSTANT(FLAG_UNSHADED);
BIND_ENUM_CONSTANT(FLAG_USE_VERTEX_LIGHTING);
BIND_ENUM_CONSTANT(FLAG_ONTOP);
BIND_ENUM_CONSTANT(FLAG_ALBEDO_FROM_VERTEX_COLOR);
BIND_ENUM_CONSTANT(FLAG_SRGB_VERTEX_COLOR);
BIND_ENUM_CONSTANT(FLAG_USE_POINT_SIZE);
BIND_ENUM_CONSTANT(FLAG_FIXED_SIZE);
BIND_ENUM_CONSTANT(FLAG_UV1_USE_TRIPLANAR);
BIND_ENUM_CONSTANT(FLAG_UV2_USE_TRIPLANAR);
BIND_ENUM_CONSTANT(FLAG_AO_ON_UV2);
BIND_ENUM_CONSTANT(FLAG_USE_ALPHA_SCISSOR);
BIND_ENUM_CONSTANT(FLAG_MAX);
BIND_CONSTANT(DIFFUSE_LAMBERT);
BIND_CONSTANT(DIFFUSE_HALF_LAMBERT);
BIND_CONSTANT(DIFFUSE_OREN_NAYAR);
BIND_CONSTANT(DIFFUSE_BURLEY);
BIND_CONSTANT(DIFFUSE_TOON);
BIND_ENUM_CONSTANT(DIFFUSE_LAMBERT);
BIND_ENUM_CONSTANT(DIFFUSE_HALF_LAMBERT);
BIND_ENUM_CONSTANT(DIFFUSE_OREN_NAYAR);
BIND_ENUM_CONSTANT(DIFFUSE_BURLEY);
BIND_ENUM_CONSTANT(DIFFUSE_TOON);
BIND_CONSTANT(SPECULAR_SCHLICK_GGX);
BIND_CONSTANT(SPECULAR_BLINN);
BIND_CONSTANT(SPECULAR_PHONG);
BIND_CONSTANT(SPECULAR_TOON);
BIND_CONSTANT(SPECULAR_DISABLED);
BIND_ENUM_CONSTANT(SPECULAR_SCHLICK_GGX);
BIND_ENUM_CONSTANT(SPECULAR_BLINN);
BIND_ENUM_CONSTANT(SPECULAR_PHONG);
BIND_ENUM_CONSTANT(SPECULAR_TOON);
BIND_ENUM_CONSTANT(SPECULAR_DISABLED);
BIND_CONSTANT(BILLBOARD_DISABLED);
BIND_CONSTANT(BILLBOARD_ENABLED);
BIND_CONSTANT(BILLBOARD_FIXED_Y);
BIND_CONSTANT(BILLBOARD_PARTICLES);
BIND_ENUM_CONSTANT(BILLBOARD_DISABLED);
BIND_ENUM_CONSTANT(BILLBOARD_ENABLED);
BIND_ENUM_CONSTANT(BILLBOARD_FIXED_Y);
BIND_ENUM_CONSTANT(BILLBOARD_PARTICLES);
BIND_CONSTANT(TEXTURE_CHANNEL_RED);
BIND_CONSTANT(TEXTURE_CHANNEL_GREEN);
BIND_CONSTANT(TEXTURE_CHANNEL_BLUE);
BIND_CONSTANT(TEXTURE_CHANNEL_ALPHA);
BIND_CONSTANT(TEXTURE_CHANNEL_GRAYSCALE);
BIND_ENUM_CONSTANT(TEXTURE_CHANNEL_RED);
BIND_ENUM_CONSTANT(TEXTURE_CHANNEL_GREEN);
BIND_ENUM_CONSTANT(TEXTURE_CHANNEL_BLUE);
BIND_ENUM_CONSTANT(TEXTURE_CHANNEL_ALPHA);
BIND_ENUM_CONSTANT(TEXTURE_CHANNEL_GRAYSCALE);
}
SpatialMaterial::SpatialMaterial()

50
scene/resources/mesh.cpp
View file

@ -415,13 +415,13 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
void Mesh::_bind_methods() {
BIND_CONSTANT(PRIMITIVE_POINTS);
BIND_CONSTANT(PRIMITIVE_LINES);
BIND_CONSTANT(PRIMITIVE_LINE_STRIP);
BIND_CONSTANT(PRIMITIVE_LINE_LOOP);
BIND_CONSTANT(PRIMITIVE_TRIANGLES);
BIND_CONSTANT(PRIMITIVE_TRIANGLE_STRIP);
BIND_CONSTANT(PRIMITIVE_TRIANGLE_FAN);
BIND_ENUM_CONSTANT(PRIMITIVE_POINTS);
BIND_ENUM_CONSTANT(PRIMITIVE_LINES);
BIND_ENUM_CONSTANT(PRIMITIVE_LINE_STRIP);
BIND_ENUM_CONSTANT(PRIMITIVE_LINE_LOOP);
BIND_ENUM_CONSTANT(PRIMITIVE_TRIANGLES);
BIND_ENUM_CONSTANT(PRIMITIVE_TRIANGLE_STRIP);
BIND_ENUM_CONSTANT(PRIMITIVE_TRIANGLE_FAN);
}
Mesh::Mesh() {
@ -1026,25 +1026,25 @@ void ArrayMesh::_bind_methods() {
BIND_CONSTANT(NO_INDEX_ARRAY);
BIND_CONSTANT(ARRAY_WEIGHTS_SIZE);
BIND_CONSTANT(ARRAY_VERTEX);
BIND_CONSTANT(ARRAY_NORMAL);
BIND_CONSTANT(ARRAY_TANGENT);
BIND_CONSTANT(ARRAY_COLOR);
BIND_CONSTANT(ARRAY_TEX_UV);
BIND_CONSTANT(ARRAY_TEX_UV2);
BIND_CONSTANT(ARRAY_BONES);
BIND_CONSTANT(ARRAY_WEIGHTS);
BIND_CONSTANT(ARRAY_INDEX);
BIND_ENUM_CONSTANT(ARRAY_VERTEX);
BIND_ENUM_CONSTANT(ARRAY_NORMAL);
BIND_ENUM_CONSTANT(ARRAY_TANGENT);
BIND_ENUM_CONSTANT(ARRAY_COLOR);
BIND_ENUM_CONSTANT(ARRAY_TEX_UV);
BIND_ENUM_CONSTANT(ARRAY_TEX_UV2);
BIND_ENUM_CONSTANT(ARRAY_BONES);
BIND_ENUM_CONSTANT(ARRAY_WEIGHTS);
BIND_ENUM_CONSTANT(ARRAY_INDEX);
BIND_CONSTANT(ARRAY_FORMAT_VERTEX);
BIND_CONSTANT(ARRAY_FORMAT_NORMAL);
BIND_CONSTANT(ARRAY_FORMAT_TANGENT);
BIND_CONSTANT(ARRAY_FORMAT_COLOR);
BIND_CONSTANT(ARRAY_FORMAT_TEX_UV);
BIND_CONSTANT(ARRAY_FORMAT_TEX_UV2);
BIND_CONSTANT(ARRAY_FORMAT_BONES);
BIND_CONSTANT(ARRAY_FORMAT_WEIGHTS);
BIND_CONSTANT(ARRAY_FORMAT_INDEX);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_VERTEX);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_NORMAL);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_TANGENT);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_COLOR);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_TEX_UV);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_TEX_UV2);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_BONES);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_WEIGHTS);
BIND_ENUM_CONSTANT(ARRAY_FORMAT_INDEX);
}
ArrayMesh::ArrayMesh() {

1
scene/resources/mesh.h
View file

@ -218,6 +218,7 @@ public:
};
VARIANT_ENUM_CAST(Mesh::ArrayType);
VARIANT_ENUM_CAST(Mesh::ArrayFormat);
VARIANT_ENUM_CAST(Mesh::PrimitiveType);
VARIANT_ENUM_CAST(Mesh::BlendShapeMode);

11
scene/resources/multimesh.cpp
View file

@ -213,11 +213,12 @@ void MultiMesh::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR3_ARRAY, "transform_array", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_transform_array", "_get_transform_array");
ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "color_array", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_color_array", "_get_color_array");
BIND_CONSTANT(TRANSFORM_2D);
BIND_CONSTANT(TRANSFORM_3D);
BIND_CONSTANT(COLOR_NONE);
BIND_CONSTANT(COLOR_8BIT);
BIND_CONSTANT(COLOR_FLOAT);
BIND_ENUM_CONSTANT(TRANSFORM_2D);
BIND_ENUM_CONSTANT(TRANSFORM_3D);
BIND_ENUM_CONSTANT(COLOR_NONE);
BIND_ENUM_CONSTANT(COLOR_8BIT);
BIND_ENUM_CONSTANT(COLOR_FLOAT);
}
MultiMesh::MultiMesh() {

12
scene/resources/packed_scene.cpp
View file

@ -1689,9 +1689,9 @@ void SceneState::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_connection_flags", "idx"), &SceneState::get_connection_flags);
ClassDB::bind_method(D_METHOD("get_connection_binds", "idx"), &SceneState::get_connection_binds);
BIND_CONSTANT(GEN_EDIT_STATE_DISABLED);
BIND_CONSTANT(GEN_EDIT_STATE_INSTANCE);
BIND_CONSTANT(GEN_EDIT_STATE_MAIN);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_DISABLED);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_INSTANCE);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_MAIN);
}
SceneState::SceneState() {
@ -1792,9 +1792,9 @@ void PackedScene::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "_bundled"), "_set_bundled_scene", "_get_bundled_scene");
BIND_CONSTANT(GEN_EDIT_STATE_DISABLED);
BIND_CONSTANT(GEN_EDIT_STATE_INSTANCE);
BIND_CONSTANT(GEN_EDIT_STATE_MAIN);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_DISABLED);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_INSTANCE);
BIND_ENUM_CONSTANT(GEN_EDIT_STATE_MAIN);
}
PackedScene::PackedScene() {

6
scene/resources/shader.cpp
View file

@ -137,9 +137,9 @@ void Shader::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::STRING, "code", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_code", "get_code");
BIND_CONSTANT(MODE_SPATIAL);
BIND_CONSTANT(MODE_CANVAS_ITEM);
BIND_CONSTANT(MODE_PARTICLES);
BIND_ENUM_CONSTANT(MODE_SPATIAL);
BIND_ENUM_CONSTANT(MODE_CANVAS_ITEM);
BIND_ENUM_CONSTANT(MODE_PARTICLES);
}
Shader::Shader() {

332
scene/resources/shader_graph.cpp
View file

@ -272,129 +272,129 @@ void ShaderGraph::_bind_methods() {
//void get_connections(ShaderType p_which,List<Connection> *p_connections) const;
BIND_CONSTANT( NODE_INPUT ); // all inputs (shader type dependent)
BIND_CONSTANT( NODE_SCALAR_CONST ); //scalar constant
BIND_CONSTANT( NODE_VEC_CONST ); //vec3 constant
BIND_CONSTANT( NODE_RGB_CONST ); //rgb constant (shows a color picker instead)
BIND_CONSTANT( NODE_XFORM_CONST ); // 4x4 matrix constant
BIND_CONSTANT( NODE_TIME ); // time in seconds
BIND_CONSTANT( NODE_SCREEN_TEX ); // screen texture sampler (takes UV) (only usable in fragment shader)
BIND_CONSTANT( NODE_SCALAR_OP ); // scalar vs scalar op (mul ); add ); div ); etc)
BIND_CONSTANT( NODE_VEC_OP ); // vec3 vs vec3 op (mul );ad );div );crossprod );etc)
BIND_CONSTANT( NODE_VEC_SCALAR_OP ); // vec3 vs scalar op (mul ); add ); div ); etc)
BIND_CONSTANT( NODE_RGB_OP ); // vec3 vs vec3 rgb op (with scalar amount) ); like brighten ); darken ); burn ); dodge ); multiply ); etc.
BIND_CONSTANT( NODE_XFORM_MULT ); // mat4 x mat4
BIND_CONSTANT( NODE_XFORM_VEC_MULT ); // mat4 x vec3 mult (with no-translation option)
BIND_CONSTANT( NODE_XFORM_VEC_INV_MULT ); // mat4 x vec3 inverse mult (with no-translation option)
BIND_CONSTANT( NODE_SCALAR_FUNC ); // scalar function (sin ); cos ); etc)
BIND_CONSTANT( NODE_VEC_FUNC ); // vector function (normalize ); negate ); reciprocal ); rgb2hsv ); hsv2rgb ); etc ); etc)
BIND_CONSTANT( NODE_VEC_LEN ); // vec3 length
BIND_CONSTANT( NODE_DOT_PROD ); // vec3 . vec3 (dot product -> scalar output)
BIND_CONSTANT( NODE_VEC_TO_SCALAR ); // 1 vec3 input ); 3 scalar outputs
BIND_CONSTANT( NODE_SCALAR_TO_VEC ); // 3 scalar input ); 1 vec3 output
BIND_CONSTANT( NODE_VEC_TO_XFORM ); // 3 vec input ); 1 xform output
BIND_CONSTANT( NODE_XFORM_TO_VEC ); // 3 vec input ); 1 xform output
BIND_CONSTANT( NODE_SCALAR_INTERP ); // scalar interpolation (with optional curve)
BIND_CONSTANT( NODE_VEC_INTERP ); // vec3 interpolation (with optional curve)
BIND_CONSTANT( NODE_COLOR_RAMP );
BIND_CONSTANT( NODE_CURVE_MAP );
BIND_CONSTANT( NODE_SCALAR_INPUT ); // scalar uniform (assignable in material)
BIND_CONSTANT( NODE_VEC_INPUT ); // vec3 uniform (assignable in material)
BIND_CONSTANT( NODE_RGB_INPUT ); // color uniform (assignable in material)
BIND_CONSTANT( NODE_XFORM_INPUT ); // mat4 uniform (assignable in material)
BIND_CONSTANT( NODE_TEXTURE_INPUT ); // texture input (assignable in material)
BIND_CONSTANT( NODE_CUBEMAP_INPUT ); // cubemap input (assignable in material)
BIND_CONSTANT( NODE_DEFAULT_TEXTURE );
BIND_CONSTANT( NODE_OUTPUT ); // output (shader type dependent)
BIND_CONSTANT( NODE_COMMENT ); // comment
BIND_CONSTANT( NODE_TYPE_MAX );
BIND_ENUM_CONSTANT( NODE_INPUT ); // all inputs (shader type dependent)
BIND_ENUM_CONSTANT( NODE_SCALAR_CONST ); //scalar constant
BIND_ENUM_CONSTANT( NODE_VEC_CONST ); //vec3 constant
BIND_ENUM_CONSTANT( NODE_RGB_CONST ); //rgb constant (shows a color picker instead)
BIND_ENUM_CONSTANT( NODE_XFORM_CONST ); // 4x4 matrix constant
BIND_ENUM_CONSTANT( NODE_TIME ); // time in seconds
BIND_ENUM_CONSTANT( NODE_SCREEN_TEX ); // screen texture sampler (takes UV) (only usable in fragment shader)
BIND_ENUM_CONSTANT( NODE_SCALAR_OP ); // scalar vs scalar op (mul ); add ); div ); etc)
BIND_ENUM_CONSTANT( NODE_VEC_OP ); // vec3 vs vec3 op (mul );ad );div );crossprod );etc)
BIND_ENUM_CONSTANT( NODE_VEC_SCALAR_OP ); // vec3 vs scalar op (mul ); add ); div ); etc)
BIND_ENUM_CONSTANT( NODE_RGB_OP ); // vec3 vs vec3 rgb op (with scalar amount) ); like brighten ); darken ); burn ); dodge ); multiply ); etc.
BIND_ENUM_CONSTANT( NODE_XFORM_MULT ); // mat4 x mat4
BIND_ENUM_CONSTANT( NODE_XFORM_VEC_MULT ); // mat4 x vec3 mult (with no-translation option)
BIND_ENUM_CONSTANT( NODE_XFORM_VEC_INV_MULT ); // mat4 x vec3 inverse mult (with no-translation option)
BIND_ENUM_CONSTANT( NODE_SCALAR_FUNC ); // scalar function (sin ); cos ); etc)
BIND_ENUM_CONSTANT( NODE_VEC_FUNC ); // vector function (normalize ); negate ); reciprocal ); rgb2hsv ); hsv2rgb ); etc ); etc)
BIND_ENUM_CONSTANT( NODE_VEC_LEN ); // vec3 length
BIND_ENUM_CONSTANT( NODE_DOT_PROD ); // vec3 . vec3 (dot product -> scalar output)
BIND_ENUM_CONSTANT( NODE_VEC_TO_SCALAR ); // 1 vec3 input ); 3 scalar outputs
BIND_ENUM_CONSTANT( NODE_SCALAR_TO_VEC ); // 3 scalar input ); 1 vec3 output
BIND_ENUM_CONSTANT( NODE_VEC_TO_XFORM ); // 3 vec input ); 1 xform output
BIND_ENUM_CONSTANT( NODE_XFORM_TO_VEC ); // 3 vec input ); 1 xform output
BIND_ENUM_CONSTANT( NODE_SCALAR_INTERP ); // scalar interpolation (with optional curve)
BIND_ENUM_CONSTANT( NODE_VEC_INTERP ); // vec3 interpolation (with optional curve)
BIND_ENUM_CONSTANT( NODE_COLOR_RAMP );
BIND_ENUM_CONSTANT( NODE_CURVE_MAP );
BIND_ENUM_CONSTANT( NODE_SCALAR_INPUT ); // scalar uniform (assignable in material)
BIND_ENUM_CONSTANT( NODE_VEC_INPUT ); // vec3 uniform (assignable in material)
BIND_ENUM_CONSTANT( NODE_RGB_INPUT ); // color uniform (assignable in material)
BIND_ENUM_CONSTANT( NODE_XFORM_INPUT ); // mat4 uniform (assignable in material)
BIND_ENUM_CONSTANT( NODE_TEXTURE_INPUT ); // texture input (assignable in material)
BIND_ENUM_CONSTANT( NODE_CUBEMAP_INPUT ); // cubemap input (assignable in material)
BIND_ENUM_CONSTANT( NODE_DEFAULT_TEXTURE );
BIND_ENUM_CONSTANT( NODE_OUTPUT ); // output (shader type dependent)
BIND_ENUM_CONSTANT( NODE_COMMENT ); // comment
BIND_ENUM_CONSTANT( NODE_TYPE_MAX );
BIND_CONSTANT( SLOT_TYPE_SCALAR );
BIND_CONSTANT( SLOT_TYPE_VEC );
BIND_CONSTANT( SLOT_TYPE_XFORM );
BIND_CONSTANT( SLOT_TYPE_TEXTURE );
BIND_CONSTANT( SLOT_MAX );
BIND_ENUM_CONSTANT( SLOT_TYPE_SCALAR );
BIND_ENUM_CONSTANT( SLOT_TYPE_VEC );
BIND_ENUM_CONSTANT( SLOT_TYPE_XFORM );
BIND_ENUM_CONSTANT( SLOT_TYPE_TEXTURE );
BIND_ENUM_CONSTANT( SLOT_MAX );
BIND_CONSTANT( SHADER_TYPE_VERTEX );
BIND_CONSTANT( SHADER_TYPE_FRAGMENT );
BIND_CONSTANT( SHADER_TYPE_LIGHT );
BIND_CONSTANT( SHADER_TYPE_MAX );
BIND_ENUM_CONSTANT( SHADER_TYPE_VERTEX );
BIND_ENUM_CONSTANT( SHADER_TYPE_FRAGMENT );
BIND_ENUM_CONSTANT( SHADER_TYPE_LIGHT );
BIND_ENUM_CONSTANT( SHADER_TYPE_MAX );
BIND_CONSTANT( SLOT_IN );
BIND_CONSTANT( SLOT_OUT );
BIND_ENUM_CONSTANT( SLOT_IN );
BIND_ENUM_CONSTANT( SLOT_OUT );
BIND_CONSTANT( GRAPH_OK );
BIND_CONSTANT( GRAPH_ERROR_CYCLIC );
BIND_CONSTANT( GRAPH_ERROR_MISSING_CONNECTIONS );
BIND_ENUM_CONSTANT( GRAPH_OK );
BIND_ENUM_CONSTANT( GRAPH_ERROR_CYCLIC );
BIND_ENUM_CONSTANT( GRAPH_ERROR_MISSING_CONNECTIONS );
BIND_CONSTANT( SCALAR_OP_ADD );
BIND_CONSTANT( SCALAR_OP_SUB );
BIND_CONSTANT( SCALAR_OP_MUL );
BIND_CONSTANT( SCALAR_OP_DIV );
BIND_CONSTANT( SCALAR_OP_MOD );
BIND_CONSTANT( SCALAR_OP_POW );
BIND_CONSTANT( SCALAR_OP_MAX );
BIND_CONSTANT( SCALAR_OP_MIN );
BIND_CONSTANT( SCALAR_OP_ATAN2 );
BIND_CONSTANT( SCALAR_MAX_OP );
BIND_ENUM_CONSTANT( SCALAR_OP_ADD );
BIND_ENUM_CONSTANT( SCALAR_OP_SUB );
BIND_ENUM_CONSTANT( SCALAR_OP_MUL );
BIND_ENUM_CONSTANT( SCALAR_OP_DIV );
BIND_ENUM_CONSTANT( SCALAR_OP_MOD );
BIND_ENUM_CONSTANT( SCALAR_OP_POW );
BIND_ENUM_CONSTANT( SCALAR_OP_MAX );
BIND_ENUM_CONSTANT( SCALAR_OP_MIN );
BIND_ENUM_CONSTANT( SCALAR_OP_ATAN2 );
BIND_ENUM_CONSTANT( SCALAR_MAX_OP );
BIND_CONSTANT( VEC_OP_ADD );
BIND_CONSTANT( VEC_OP_SUB );
BIND_CONSTANT( VEC_OP_MUL );
BIND_CONSTANT( VEC_OP_DIV );
BIND_CONSTANT( VEC_OP_MOD );
BIND_CONSTANT( VEC_OP_POW );
BIND_CONSTANT( VEC_OP_MAX );
BIND_CONSTANT( VEC_OP_MIN );
BIND_CONSTANT( VEC_OP_CROSS );
BIND_CONSTANT( VEC_MAX_OP );
BIND_ENUM_CONSTANT( VEC_OP_ADD );
BIND_ENUM_CONSTANT( VEC_OP_SUB );
BIND_ENUM_CONSTANT( VEC_OP_MUL );
BIND_ENUM_CONSTANT( VEC_OP_DIV );
BIND_ENUM_CONSTANT( VEC_OP_MOD );
BIND_ENUM_CONSTANT( VEC_OP_POW );
BIND_ENUM_CONSTANT( VEC_OP_MAX );
BIND_ENUM_CONSTANT( VEC_OP_MIN );
BIND_ENUM_CONSTANT( VEC_OP_CROSS );
BIND_ENUM_CONSTANT( VEC_MAX_OP );
BIND_CONSTANT( VEC_SCALAR_OP_MUL );
BIND_CONSTANT( VEC_SCALAR_OP_DIV );
BIND_CONSTANT( VEC_SCALAR_OP_POW );
BIND_CONSTANT( VEC_SCALAR_MAX_OP );
BIND_ENUM_CONSTANT( VEC_SCALAR_OP_MUL );
BIND_ENUM_CONSTANT( VEC_SCALAR_OP_DIV );
BIND_ENUM_CONSTANT( VEC_SCALAR_OP_POW );
BIND_ENUM_CONSTANT( VEC_SCALAR_MAX_OP );
BIND_CONSTANT( RGB_OP_SCREEN );
BIND_CONSTANT( RGB_OP_DIFFERENCE );
BIND_CONSTANT( RGB_OP_DARKEN );
BIND_CONSTANT( RGB_OP_LIGHTEN );
BIND_CONSTANT( RGB_OP_OVERLAY );
BIND_CONSTANT( RGB_OP_DODGE );
BIND_CONSTANT( RGB_OP_BURN );
BIND_CONSTANT( RGB_OP_SOFT_LIGHT );
BIND_CONSTANT( RGB_OP_HARD_LIGHT );
BIND_CONSTANT( RGB_MAX_OP );
BIND_ENUM_CONSTANT( RGB_OP_SCREEN );
BIND_ENUM_CONSTANT( RGB_OP_DIFFERENCE );
BIND_ENUM_CONSTANT( RGB_OP_DARKEN );
BIND_ENUM_CONSTANT( RGB_OP_LIGHTEN );
BIND_ENUM_CONSTANT( RGB_OP_OVERLAY );
BIND_ENUM_CONSTANT( RGB_OP_DODGE );
BIND_ENUM_CONSTANT( RGB_OP_BURN );
BIND_ENUM_CONSTANT( RGB_OP_SOFT_LIGHT );
BIND_ENUM_CONSTANT( RGB_OP_HARD_LIGHT );
BIND_ENUM_CONSTANT( RGB_MAX_OP );
BIND_CONSTANT( SCALAR_FUNC_SIN );
BIND_CONSTANT( SCALAR_FUNC_COS );
BIND_CONSTANT( SCALAR_FUNC_TAN );
BIND_CONSTANT( SCALAR_FUNC_ASIN );
BIND_CONSTANT( SCALAR_FUNC_ACOS );
BIND_CONSTANT( SCALAR_FUNC_ATAN );
BIND_CONSTANT( SCALAR_FUNC_SINH );
BIND_CONSTANT( SCALAR_FUNC_COSH );
BIND_CONSTANT( SCALAR_FUNC_TANH );
BIND_CONSTANT( SCALAR_FUNC_LOG );
BIND_CONSTANT( SCALAR_FUNC_EXP );
BIND_CONSTANT( SCALAR_FUNC_SQRT );
BIND_CONSTANT( SCALAR_FUNC_ABS );
BIND_CONSTANT( SCALAR_FUNC_SIGN );
BIND_CONSTANT( SCALAR_FUNC_FLOOR );
BIND_CONSTANT( SCALAR_FUNC_ROUND );
BIND_CONSTANT( SCALAR_FUNC_CEIL );
BIND_CONSTANT( SCALAR_FUNC_FRAC );
BIND_CONSTANT( SCALAR_FUNC_SATURATE );
BIND_CONSTANT( SCALAR_FUNC_NEGATE );
BIND_CONSTANT( SCALAR_MAX_FUNC );
BIND_ENUM_CONSTANT( SCALAR_FUNC_SIN );
BIND_ENUM_CONSTANT( SCALAR_FUNC_COS );
BIND_ENUM_CONSTANT( SCALAR_FUNC_TAN );
BIND_ENUM_CONSTANT( SCALAR_FUNC_ASIN );
BIND_ENUM_CONSTANT( SCALAR_FUNC_ACOS );
BIND_ENUM_CONSTANT( SCALAR_FUNC_ATAN );
BIND_ENUM_CONSTANT( SCALAR_FUNC_SINH );
BIND_ENUM_CONSTANT( SCALAR_FUNC_COSH );
BIND_ENUM_CONSTANT( SCALAR_FUNC_TANH );
BIND_ENUM_CONSTANT( SCALAR_FUNC_LOG );
BIND_ENUM_CONSTANT( SCALAR_FUNC_EXP );
BIND_ENUM_CONSTANT( SCALAR_FUNC_SQRT );
BIND_ENUM_CONSTANT( SCALAR_FUNC_ABS );
BIND_ENUM_CONSTANT( SCALAR_FUNC_SIGN );
BIND_ENUM_CONSTANT( SCALAR_FUNC_FLOOR );
BIND_ENUM_CONSTANT( SCALAR_FUNC_ROUND );
BIND_ENUM_CONSTANT( SCALAR_FUNC_CEIL );
BIND_ENUM_CONSTANT( SCALAR_FUNC_FRAC );
BIND_ENUM_CONSTANT( SCALAR_FUNC_SATURATE );
BIND_ENUM_CONSTANT( SCALAR_FUNC_NEGATE );
BIND_ENUM_CONSTANT( SCALAR_MAX_FUNC );
BIND_CONSTANT( VEC_FUNC_NORMALIZE );
BIND_CONSTANT( VEC_FUNC_SATURATE );
BIND_CONSTANT( VEC_FUNC_NEGATE );
BIND_CONSTANT( VEC_FUNC_RECIPROCAL );
BIND_CONSTANT( VEC_FUNC_RGB2HSV );
BIND_CONSTANT( VEC_FUNC_HSV2RGB );
BIND_CONSTANT( VEC_MAX_FUNC );
BIND_ENUM_CONSTANT( VEC_FUNC_NORMALIZE );
BIND_ENUM_CONSTANT( VEC_FUNC_SATURATE );
BIND_ENUM_CONSTANT( VEC_FUNC_NEGATE );
BIND_ENUM_CONSTANT( VEC_FUNC_RECIPROCAL );
BIND_ENUM_CONSTANT( VEC_FUNC_RGB2HSV );
BIND_ENUM_CONSTANT( VEC_FUNC_HSV2RGB );
BIND_ENUM_CONSTANT( VEC_MAX_FUNC );
ADD_SIGNAL(MethodInfo("updated"));
@ -415,60 +415,60 @@ void ShaderGraph::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear"),&ShaderGraph::clear );
BIND_CONSTANT( NODE_IN ); ///< param 0: name
BIND_CONSTANT( NODE_OUT ); ///< param 0: name
BIND_CONSTANT( NODE_CONSTANT ); ///< param 0: value
BIND_CONSTANT( NODE_PARAMETER ); ///< param 0: name
BIND_CONSTANT( NODE_ADD );
BIND_CONSTANT( NODE_SUB );
BIND_CONSTANT( NODE_MUL );
BIND_CONSTANT( NODE_DIV );
BIND_CONSTANT( NODE_MOD );
BIND_CONSTANT( NODE_SIN );
BIND_CONSTANT( NODE_COS );
BIND_CONSTANT( NODE_TAN );
BIND_CONSTANT( NODE_ARCSIN );
BIND_CONSTANT( NODE_ARCCOS );
BIND_CONSTANT( NODE_ARCTAN );
BIND_CONSTANT( NODE_POW );
BIND_CONSTANT( NODE_LOG );
BIND_CONSTANT( NODE_MAX );
BIND_CONSTANT( NODE_MIN );
BIND_CONSTANT( NODE_COMPARE );
BIND_CONSTANT( NODE_TEXTURE ); ///< param 0: texture
BIND_CONSTANT( NODE_TIME ); ///< param 0: interval length
BIND_CONSTANT( NODE_NOISE );
BIND_CONSTANT( NODE_PASS );
BIND_CONSTANT( NODE_VEC_IN ); ///< param 0: name
BIND_CONSTANT( NODE_VEC_OUT ); ///< param 0: name
BIND_CONSTANT( NODE_VEC_CONSTANT ); ///< param 0: value
BIND_CONSTANT( NODE_VEC_PARAMETER ); ///< param 0: name
BIND_CONSTANT( NODE_VEC_ADD );
BIND_CONSTANT( NODE_VEC_SUB );
BIND_CONSTANT( NODE_VEC_MUL );
BIND_CONSTANT( NODE_VEC_DIV );
BIND_CONSTANT( NODE_VEC_MOD );
BIND_CONSTANT( NODE_VEC_CROSS );
BIND_CONSTANT( NODE_VEC_DOT );
BIND_CONSTANT( NODE_VEC_POW );
BIND_CONSTANT( NODE_VEC_NORMALIZE );
BIND_CONSTANT( NODE_VEC_TRANSFORM3 );
BIND_CONSTANT( NODE_VEC_TRANSFORM4 );
BIND_CONSTANT( NODE_VEC_COMPARE );
BIND_CONSTANT( NODE_VEC_TEXTURE_2D );
BIND_CONSTANT( NODE_VEC_TEXTURE_CUBE );
BIND_CONSTANT( NODE_VEC_NOISE );
BIND_CONSTANT( NODE_VEC_0 );
BIND_CONSTANT( NODE_VEC_1 );
BIND_CONSTANT( NODE_VEC_2 );
BIND_CONSTANT( NODE_VEC_BUILD );
BIND_CONSTANT( NODE_VEC_PASS );
BIND_CONSTANT( NODE_COLOR_CONSTANT );
BIND_CONSTANT( NODE_COLOR_PARAMETER );
BIND_CONSTANT( NODE_TEXTURE_PARAMETER );
BIND_CONSTANT( NODE_TEXTURE_2D_PARAMETER );
BIND_CONSTANT( NODE_TEXTURE_CUBE_PARAMETER );
BIND_CONSTANT( NODE_TYPE_MAX );
BIND_ENUM_CONSTANT( NODE_IN ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_OUT ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_CONSTANT ); ///< param 0: value
BIND_ENUM_CONSTANT( NODE_PARAMETER ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_ADD );
BIND_ENUM_CONSTANT( NODE_SUB );
BIND_ENUM_CONSTANT( NODE_MUL );
BIND_ENUM_CONSTANT( NODE_DIV );
BIND_ENUM_CONSTANT( NODE_MOD );
BIND_ENUM_CONSTANT( NODE_SIN );
BIND_ENUM_CONSTANT( NODE_COS );
BIND_ENUM_CONSTANT( NODE_TAN );
BIND_ENUM_CONSTANT( NODE_ARCSIN );
BIND_ENUM_CONSTANT( NODE_ARCCOS );
BIND_ENUM_CONSTANT( NODE_ARCTAN );
BIND_ENUM_CONSTANT( NODE_POW );
BIND_ENUM_CONSTANT( NODE_LOG );
BIND_ENUM_CONSTANT( NODE_MAX );
BIND_ENUM_CONSTANT( NODE_MIN );
BIND_ENUM_CONSTANT( NODE_COMPARE );
BIND_ENUM_CONSTANT( NODE_TEXTURE ); ///< param 0: texture
BIND_ENUM_CONSTANT( NODE_TIME ); ///< param 0: interval length
BIND_ENUM_CONSTANT( NODE_NOISE );
BIND_ENUM_CONSTANT( NODE_PASS );
BIND_ENUM_CONSTANT( NODE_VEC_IN ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_VEC_OUT ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_VEC_CONSTANT ); ///< param 0: value
BIND_ENUM_CONSTANT( NODE_VEC_PARAMETER ); ///< param 0: name
BIND_ENUM_CONSTANT( NODE_VEC_ADD );
BIND_ENUM_CONSTANT( NODE_VEC_SUB );
BIND_ENUM_CONSTANT( NODE_VEC_MUL );
BIND_ENUM_CONSTANT( NODE_VEC_DIV );
BIND_ENUM_CONSTANT( NODE_VEC_MOD );
BIND_ENUM_CONSTANT( NODE_VEC_CROSS );
BIND_ENUM_CONSTANT( NODE_VEC_DOT );
BIND_ENUM_CONSTANT( NODE_VEC_POW );
BIND_ENUM_CONSTANT( NODE_VEC_NORMALIZE );
BIND_ENUM_CONSTANT( NODE_VEC_TRANSFORM3 );
BIND_ENUM_CONSTANT( NODE_VEC_TRANSFORM4 );
BIND_ENUM_CONSTANT( NODE_VEC_COMPARE );
BIND_ENUM_CONSTANT( NODE_VEC_TEXTURE_2D );
BIND_ENUM_CONSTANT( NODE_VEC_TEXTURE_CUBE );
BIND_ENUM_CONSTANT( NODE_VEC_NOISE );
BIND_ENUM_CONSTANT( NODE_VEC_0 );
BIND_ENUM_CONSTANT( NODE_VEC_1 );
BIND_ENUM_CONSTANT( NODE_VEC_2 );
BIND_ENUM_CONSTANT( NODE_VEC_BUILD );
BIND_ENUM_CONSTANT( NODE_VEC_PASS );
BIND_ENUM_CONSTANT( NODE_COLOR_CONSTANT );
BIND_ENUM_CONSTANT( NODE_COLOR_PARAMETER );
BIND_ENUM_CONSTANT( NODE_TEXTURE_PARAMETER );
BIND_ENUM_CONSTANT( NODE_TEXTURE_2D_PARAMETER );
BIND_ENUM_CONSTANT( NODE_TEXTURE_CUBE_PARAMETER );
BIND_ENUM_CONSTANT( NODE_TYPE_MAX );
#endif
}

28
scene/resources/sky_box.cpp
View file

@ -49,14 +49,14 @@ void Sky::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "radiance_size", PROPERTY_HINT_ENUM, "32,64,128,256,512,1024,2048"), "set_radiance_size", "get_radiance_size");
BIND_CONSTANT(RADIANCE_SIZE_32);
BIND_CONSTANT(RADIANCE_SIZE_64);
BIND_CONSTANT(RADIANCE_SIZE_128);
BIND_CONSTANT(RADIANCE_SIZE_256);
BIND_CONSTANT(RADIANCE_SIZE_512);
BIND_CONSTANT(RADIANCE_SIZE_1024);
BIND_CONSTANT(RADIANCE_SIZE_2048);
BIND_CONSTANT(RADIANCE_SIZE_MAX);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_32);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_64);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_128);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_256);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_512);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_1024);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_2048);
BIND_ENUM_CONSTANT(RADIANCE_SIZE_MAX);
}
Sky::Sky() {
@ -517,12 +517,12 @@ void ProceduralSky::_bind_methods() {
ADD_GROUP("Texture", "texture_");
ADD_PROPERTY(PropertyInfo(Variant::INT, "texture_size", PROPERTY_HINT_ENUM, "256,512,1024,2048,4096"), "set_texture_size", "get_texture_size");
BIND_CONSTANT(TEXTURE_SIZE_256);
BIND_CONSTANT(TEXTURE_SIZE_512);
BIND_CONSTANT(TEXTURE_SIZE_1024);
BIND_CONSTANT(TEXTURE_SIZE_2048);
BIND_CONSTANT(TEXTURE_SIZE_4096);
BIND_CONSTANT(TEXTURE_SIZE_MAX);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_256);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_512);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_1024);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_2048);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_4096);
BIND_ENUM_CONSTANT(TEXTURE_SIZE_MAX);
}
ProceduralSky::ProceduralSky() {

6
scene/resources/style_box.cpp
View file

@ -296,9 +296,9 @@ void StyleBoxTexture::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate_color"), "set_modulate", "get_modulate");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "draw_center"), "set_draw_center", "get_draw_center");
BIND_CONSTANT(AXIS_STRETCH_MODE_STRETCH);
BIND_CONSTANT(AXIS_STRETCH_MODE_TILE);
BIND_CONSTANT(AXIS_STRETCH_MODE_TILE_FIT);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_STRETCH);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_TILE);
BIND_ENUM_CONSTANT(AXIS_STRETCH_MODE_TILE_FIT);
}
StyleBoxTexture::StyleBoxTexture() {

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