diff options
250 files changed, 10315 insertions, 3081 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index 84b0754929..bf833d1435 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -47,11 +47,13 @@ name is available. Geequlim Gen (dbsGen) George Marques (vnen) + Gilles Roudiere (groud) Guilherme Felipe (guilhermefelipecgs) Hein-Pieter van Braam (hpvb) Hubert Jarosz (Marqin) Hugo Locurcio (Calinou) Ignacio Etcheverry (neikeq) + Indah Sylvia (ISylvox) J08nY Jakub Grzesik (kubecz3k) Johan Manuel (29jm) @@ -77,18 +79,21 @@ name is available. Ramesh Ravone (RameshRavone) Ray Koopa (RayKoopa) Rémi Verschelde (akien-mga) + Ruslan Mustakov (endragor) + Saniko (sanikoyes) SaracenOne Theo Hallenius (TheoXD) Thomas Herzog (karroffel) Timo (toger5) V. Vamsi Krishna (vkbsb) Vinzenz Feenstra (vinzenz) + Wilson E. Alvarez (Rubonnek) Zher Huei Lee (leezh) ZuBsPaCe 박한얼 (volzhs) + bruvzg est31 marynate mrezai romulox-x - sanikoyes yg2f (SuperUserNameMan) diff --git a/DONORS.md b/DONORS.md new file mode 100644 index 0000000000..09049ede48 --- /dev/null +++ b/DONORS.md @@ -0,0 +1,141 @@ +# Donors to the Godot Engine project + +Godot Engine is a non-profit project developed by a community of voluntary +contributors, as well as occasional paid contributors thanks to the financial +support of generous donors. + +The ways to donate to the project, as well as details on how the funds are +used, are described on [Godot's website](https://godotengine.org/donate). + +The following is a list of the current monthly donors, to be have their +generous deed immortalized in the next stable release of Godot Engine. + +## Platinum sponsors + +None so far, but your company could be the first! :) + +## Gold sponsors + + Gamblify <https://www.gamblify.com> + +## Mini sponsors + + Arron Washington + Chrisartguy + Christian Uldall Pedersen + Hein-Pieter van Braam + Matthieu Huvé + Neal Gompa (Conan Kudo) + Olimpiu Metiu + Ruslan Mustakov + +## Gold donors + + Alexander Otto + Jake Bo + Javier + Nathan Warden + Ranoller + Rémi Verschelde + Stephan Lanfermann + + Andreas Schüle + Bernhard Liebl + Jordan M Lucas + + BanjoNode2D + Chris Serino + Conrad Curry + Craig Smith + David Churchill + Dean Harmon + Guilherme Felipe de C. G. da Silva + Henrique Alves + Laurence Bannister + Leo + PrzemysÅ‚aw GoÅ‚Ä…b (n-pigeon) + Robert Willes + Robin Arys + summerblind + Testus Maximus + Thomas Bjarnelöf + + Amanda Haldy + Andreas Haas + Bryanna M + Cody Parker + D + Ezra Theunissen + flesk + François Cantin + Hendrik Mans + Jeppe Zapp + Johannes Wuensch + Justin Arnold + Justo Delgado Baudà + Leandro Voltolino + Myles + Robert Podgorski + Scott Beacon + x1212 + +## Silver donors + + Alex Barsukov + Avencherus + Bastian Böhm + Ben Vercammen + Bryan Stevenson + Collin Shooltz + Fabian Becker + fengjiongmax + Geequlim + Gerrit Großkopf + Guldoman + hatniX + HeartBeast + Heribert Hirth + Hunter Jones + imekon + Jacob McKenney + Jonathon + Josh 'Cheeseness' Bush + Julian Murgia + Juraj Móza + Kevin Boyer + Klavdij Voncina + Lisandro Lorea + magodev + Martin Novák + Matthew Fitzpatrick + Matthew Valancy + Matthias Hölzl + Max R.R. Collada + Michael Gringauz + Mikael Olsson + Moritz Laass + nee + nvgrod + Pablo Seibelt + Pan Ip + Paul Mason + PaweÅ‚ Kowal + Pietro Vertechi + rayos + Richman Stewart + Roger Smith + Sam Van Campenhout + Sam Vila + Sasori Olkof + Sootstone + Tavo Tell + Tom Larrow + Trent McPheron + Troy Bonneau + UltyX + Xananax & karroffel + +## Bronze donors + +There are even more donors that support the project with a small monthly donation. +Every bit counts and we thank every one of them for their amazing support! diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index abe8b9b715..0f217c8235 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -568,7 +568,7 @@ Dictionary _OS::get_time(bool utc) const { } /** - * Get a epoch time value from a dictionary of time values + * Get an epoch time value from a dictionary of time values * @p datetime must be populated with the following keys: * day, hour, minute, month, second, year. (dst is ignored). * @@ -1705,7 +1705,7 @@ Variant _File::get_var() const { ERR_FAIL_COND_V(!f, Variant()); uint32_t len = get_32(); PoolVector<uint8_t> buff = get_buffer(len); - ERR_FAIL_COND_V(buff.size() != len, Variant()); + ERR_FAIL_COND_V((uint32_t)buff.size() != len, Variant()); PoolVector<uint8_t>::Read r = buff.read(); diff --git a/core/class_db.cpp b/core/class_db.cpp index 1cb287a143..f5ddd9c761 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -535,7 +535,11 @@ void ClassDB::get_method_list(StringName p_class, List<MethodInfo> *p_methods, b minfo.return_val = method->get_return_info(); minfo.flags = method->get_hint_flags(); - minfo.default_arguments = method->get_default_arguments(); + + for (int i = 0; i < method->get_argument_count(); i++) { + if (method->has_default_argument(i)) + minfo.default_arguments.push_back(method->get_default_argument(i)); + } p_methods->push_back(minfo); } diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 2ce2a70866..228611f8b3 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* fieldwise.cpp */ +/* math_fieldwise.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/helper/math_fieldwise.h b/core/helper/math_fieldwise.h index 4671703f41..400df040a4 100644 --- a/core/helper/math_fieldwise.h +++ b/core/helper/math_fieldwise.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* fieldwise.h */ +/* math_fieldwise.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/image.cpp b/core/image.cpp index bb1ce2cee3..4d1f32c360 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -1256,9 +1256,9 @@ void Image::create(const char **p_xpm) { if (*line_ptr == '#') { line_ptr++; - uint8_t col_r; - uint8_t col_g; - uint8_t col_b; + uint8_t col_r = 0; + uint8_t col_g = 0; + uint8_t col_b = 0; //uint8_t col_a=255; for (int i = 0; i < 6; i++) { diff --git a/core/io/file_access_compressed.h b/core/io/file_access_compressed.h index 2fe1428752..ba84c9767c 100644 --- a/core/io/file_access_compressed.h +++ b/core/io/file_access_compressed.h @@ -37,11 +37,11 @@ class FileAccessCompressed : public FileAccess { Compression::Mode cmode; bool writing; - int write_pos; + uint32_t write_pos; uint8_t *write_ptr; - int write_buffer_size; - int write_max; - int block_size; + uint32_t write_buffer_size; + uint32_t write_max; + uint32_t block_size; mutable bool read_eof; mutable bool at_end; @@ -57,7 +57,7 @@ class FileAccessCompressed : public FileAccess { mutable int read_block_size; mutable int read_pos; Vector<ReadBlock> read_blocks; - int read_total; + uint32_t read_total; String magic; mutable Vector<uint8_t> buffer; diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index cf82d04ac5..12503f3be4 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -73,14 +73,14 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8 length = p_base->get_64(); base = p_base->get_pos(); ERR_FAIL_COND_V(p_base->get_len() < base + length, ERR_FILE_CORRUPT); - int ds = length; + uint32_t ds = length; if (ds % 16) { ds += 16 - (ds % 16); } data.resize(ds); - int blen = p_base->get_buffer(data.ptr(), ds); + uint32_t blen = p_base->get_buffer(data.ptr(), ds); ERR_FAIL_COND_V(blen != ds, ERR_FILE_CORRUPT); aes256_context ctx; diff --git a/core/io/file_access_encrypted.h b/core/io/file_access_encrypted.h index 3df2806a7a..74d00a5a8f 100644 --- a/core/io/file_access_encrypted.h +++ b/core/io/file_access_encrypted.h @@ -48,7 +48,7 @@ private: size_t base; size_t length; Vector<uint8_t> data; - mutable size_t pos; + mutable int pos; mutable bool eofed; public: diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp index be31076557..d8b8c8c200 100644 --- a/core/io/file_access_network.cpp +++ b/core/io/file_access_network.cpp @@ -244,14 +244,14 @@ FileAccessNetworkClient::~FileAccessNetworkClient() { memdelete(sem); } -void FileAccessNetwork::_set_block(size_t p_offset, const Vector<uint8_t> &p_block) { +void FileAccessNetwork::_set_block(int p_offset, const Vector<uint8_t> &p_block) { int page = p_offset / page_size; ERR_FAIL_INDEX(page, pages.size()); if (page < pages.size() - 1) { ERR_FAIL_COND(p_block.size() != page_size); } else { - ERR_FAIL_COND((p_block.size() != (total_size % page_size))); + ERR_FAIL_COND((p_block.size() != (int)(total_size % page_size))); } buffer_mutex->lock(); diff --git a/core/io/file_access_network.h b/core/io/file_access_network.h index d6010cdbac..cd5046f007 100644 --- a/core/io/file_access_network.h +++ b/core/io/file_access_network.h @@ -97,7 +97,7 @@ class FileAccessNetwork : public FileAccess { mutable int last_page; mutable uint8_t *last_page_buff; - uint32_t page_size; + int page_size; int read_ahead; int max_pages; @@ -121,7 +121,7 @@ class FileAccessNetwork : public FileAccess { friend class FileAccessNetworkClient; void _queue_page(int p_page) const; void _respond(size_t p_len, Error p_status); - void _set_block(size_t p_offset, const Vector<uint8_t> &p_block); + void _set_block(int p_offset, const Vector<uint8_t> &p_block); public: enum Command { diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index af7db904e9..0834d6c321 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -333,14 +333,14 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int len -= 12; buf += 12; - int total = namecount + subnamecount; + uint32_t total = namecount + subnamecount; if (flags & 2) total++; if (r_len) (*r_len) += 12; - for (int i = 0; i < total; i++) { + for (uint32_t i = 0; i < total; i++) { ERR_FAIL_COND_V((int)len < 4, ERR_INVALID_DATA); strlen = decode_uint32(buf); @@ -566,7 +566,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int if (count) { data.resize(count); PoolVector<uint8_t>::Write w = data.write(); - for (int i = 0; i < count; i++) { + for (uint32_t i = 0; i < count; i++) { w[i] = buf[i]; } @@ -597,7 +597,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int //const int*rbuf=(const int*)buf; data.resize(count); PoolVector<int>::Write w = data.write(); - for (int i = 0; i < count; i++) { + for (uint32_t i = 0; i < count; i++) { w[i] = decode_uint32(&buf[i * 4]); } @@ -624,7 +624,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int //const float*rbuf=(const float*)buf; data.resize(count); PoolVector<float>::Write w = data.write(); - for (int i = 0; i < count; i++) { + for (uint32_t i = 0; i < count; i++) { w[i] = decode_float(&buf[i * 4]); } diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index f44492248e..084d8ffcab 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -102,7 +102,7 @@ StringName ResourceInteractiveLoaderBinary::_get_string() { uint32_t id = f->get_32(); if (id & 0x80000000) { - uint32_t len = id & 0x7FFFFFFF; + int len = id & 0x7FFFFFFF; if (len > str_buf.size()) { str_buf.resize(len); } @@ -336,9 +336,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) { } break; case OBJECT_EXTERNAL_RESOURCE_INDEX: { //new file format, just refers to an index in the external list - uint32_t erindex = f->get_32(); + int erindex = f->get_32(); - if (erindex >= external_resources.size()) { + if (erindex < 0 || erindex >= external_resources.size()) { WARN_PRINT("Broken external resource! (index out of size"); r_v = Variant(); } else { @@ -878,7 +878,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) { if (ver_format > FORMAT_VERSION || ver_major > VERSION_MAJOR) { f->close(); - ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a a new engine version: " + local_path); + ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path); ERR_FAIL(); } @@ -1117,6 +1117,9 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons memdelete(f); } ERR_FAIL_COND_V(!fw, ERR_CANT_CREATE); + + uint8_t magic[4] = { 'R', 'S', 'R', 'C' }; + fw->store_buffer(magic, 4); } bool big_endian = f->get_32(); @@ -1178,7 +1181,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons memdelete(f); memdelete(fw); - ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a a new engine version: " + local_path); + ERR_EXPLAIN("File Format '" + itos(FORMAT_VERSION) + "." + itos(ver_major) + "." + itos(ver_minor) + "' is too new! Please upgrade to a new engine version: " + local_path); ERR_FAIL_V(ERR_FILE_UNRECOGNIZED); } diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp index 353eabea45..92af247823 100644 --- a/core/io/translation_loader_po.cpp +++ b/core/io/translation_loader_po.cpp @@ -51,8 +51,8 @@ RES TranslationLoaderPO::load_translation(FileAccess *f, Error *r_error, const S Ref<Translation> translation = Ref<Translation>(memnew(Translation)); int line = 1; - bool skip_this; - bool skip_next; + bool skip_this = false; + bool skip_next = false; while (true) { diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index 62110bfe24..3a4be7cd13 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -385,7 +385,7 @@ void XMLParser::_bind_methods() { Error XMLParser::read() { // if not end reached, parse the node - if (P && (P - data) < length - 1 && *P != 0) { + if (P && (P - data) < (int64_t)length - 1 && *P != 0) { _parse_current_node(); return OK; } diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index 28c57b567f..26616ed94a 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -67,7 +67,7 @@ public: private: char *data; char *P; - int length; + uint64_t length; void unescape(String &p_str); Vector<String> special_characters; String node_name; diff --git a/core/list.h b/core/list.h index 0cad6038ff..a67287a9ab 100644 --- a/core/list.h +++ b/core/list.h @@ -180,7 +180,7 @@ private: public: /** - * return an const iterator to the beginning of the list. + * return a const iterator to the beginning of the list. */ _FORCE_INLINE_ const Element *front() const { @@ -195,7 +195,7 @@ public: }; /** - * return an const iterator to the last member of the list. + * return a const iterator to the last member of the list. */ _FORCE_INLINE_ const Element *back() const { diff --git a/core/math/a_star.h b/core/math/a_star.h index d2d2166719..75b860d0a4 100644 --- a/core/math/a_star.h +++ b/core/math/a_star.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* a_star.h */ +/* a_star.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/math/face3.cpp b/core/math/face3.cpp index 748faad28f..e1b172e491 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -296,7 +296,7 @@ void Face3::get_support(const Vector3 &p_normal, const Transform &p_transform, V /** FIND SUPPORT VERTEX **/ int vert_support_idx = -1; - real_t support_max; + real_t support_max = 0; for (int i = 0; i < 3; i++) { diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index 9732a1ff37..4051de7afb 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -234,7 +234,22 @@ Basis Basis::scaled(const Vector3 &p_scale) const { return m; } +void Basis::set_scale(const Vector3 &p_scale) { + + set_axis(0, get_axis(0).normalized() * p_scale.x); + set_axis(1, get_axis(1).normalized() * p_scale.y); + set_axis(2, get_axis(2).normalized() * p_scale.z); +} + Vector3 Basis::get_scale() const { + + return Vector3( + Vector3(elements[0][0], elements[1][0], elements[2][0]).length(), + Vector3(elements[0][1], elements[1][1], elements[2][1]).length(), + Vector3(elements[0][2], elements[1][2], elements[2][2]).length()); +} + +Vector3 Basis::get_signed_scale() const { // FIXME: We are assuming M = R.S (R is rotation and S is scaling), and use polar decomposition to extract R and S. // A polar decomposition is M = O.P, where O is an orthogonal matrix (meaning rotation and reflection) and // P is a positive semi-definite matrix (meaning it contains absolute values of scaling along its diagonal). diff --git a/core/math/matrix3.h b/core/math/matrix3.h index 9c9080ac46..23429888e0 100644 --- a/core/math/matrix3.h +++ b/core/math/matrix3.h @@ -97,7 +97,9 @@ public: void scale(const Vector3 &p_scale); Basis scaled(const Vector3 &p_scale) const; + void set_scale(const Vector3 &p_scale); Vector3 get_scale() const; + Vector3 get_signed_scale() const; // transposed dot products _FORCE_INLINE_ real_t tdotx(const Vector3 &v) const { diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp index e9a383df40..e0137b6921 100644 --- a/core/math/quick_hull.cpp +++ b/core/math/quick_hull.cpp @@ -76,7 +76,7 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me int simplex[4]; { - real_t max, min; + real_t max = 0, min = 0; for (int i = 0; i < p_points.size(); i++) { @@ -99,7 +99,7 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me //third vertex is one most further away from the line { - real_t maxd; + real_t maxd = 0; Vector3 rel12 = p_points[simplex[0]] - p_points[simplex[1]]; for (int i = 0; i < p_points.size(); i++) { @@ -121,7 +121,7 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me //fourth vertex is the one most further away from the plane { - real_t maxd; + real_t maxd = 0; Plane p(p_points[simplex[0]], p_points[simplex[1]], p_points[simplex[2]]); for (int i = 0; i < p_points.size(); i++) { @@ -389,8 +389,8 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me for (int i = 0; i < f.indices.size(); i++) { - uint32_t a = E->get().indices[i]; - uint32_t b = E->get().indices[(i + 1) % f.indices.size()]; + int a = E->get().indices[i]; + int b = E->get().indices[(i + 1) % f.indices.size()]; Edge e(a, b); Map<Edge, RetFaceConnect>::Element *F = ret_edges.find(e); diff --git a/core/math/transform.cpp b/core/math/transform.cpp index 60df69a509..638a39ab73 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -118,17 +118,17 @@ Transform Transform::interpolate_with(const Transform &p_transform, real_t p_c) /* not sure if very "efficient" but good enough? */ - Vector3 src_scale = basis.get_scale(); - Quat src_rot = basis; + Vector3 src_scale = basis.get_signed_scale(); + Quat src_rot = basis.orthonormalized(); Vector3 src_loc = origin; - Vector3 dst_scale = p_transform.basis.get_scale(); + Vector3 dst_scale = p_transform.basis.get_signed_scale(); Quat dst_rot = p_transform.basis; Vector3 dst_loc = p_transform.origin; - Transform dst; - dst.basis = src_rot.slerp(dst_rot, p_c); - dst.basis.scale(src_scale.linear_interpolate(dst_scale, p_c)); + Transform dst; //this could be made faster by using a single function in Basis.. + dst.basis = src_rot.slerp(dst_rot, p_c).normalized(); + dst.basis.set_scale(src_scale.linear_interpolate(dst_scale, p_c)); dst.origin = src_loc.linear_interpolate(dst_loc, p_c); return dst; diff --git a/core/method_bind.h b/core/method_bind.h index 75f09b2cd9..3c43f86b54 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -369,7 +369,7 @@ MethodBind *create_vararg_method_bind(Variant (T::*p_method)(const Variant **, i // tale of an amazing hack.. // -// if you declare an nonexistent class.. +// if you declare a nonexistent class.. class __UnexistingClass; #include "method_bind.gen.inc" diff --git a/core/os/os.cpp b/core/os/os.cpp index 1292b7eeed..764f7fe6e6 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -64,12 +64,13 @@ void OS::debug_break(){ void OS::print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type) { - const char *err_type; + const char *err_type = "**ERROR**"; switch (p_type) { case ERR_ERROR: err_type = "**ERROR**"; break; case ERR_WARNING: err_type = "**WARNING**"; break; case ERR_SCRIPT: err_type = "**SCRIPT ERROR**"; break; case ERR_SHADER: err_type = "**SHADER ERROR**"; break; + default: ERR_PRINT("Unknown error type"); break; } if (p_rationale && *p_rationale) diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 4040680c6d..ad8438e416 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -61,7 +61,7 @@ Variant PackedDataContainer::_iter_init_ofs(const Array &p_iter, uint32_t p_offs Variant PackedDataContainer::_iter_next_ofs(const Array &p_iter, uint32_t p_offset) { Array ref = p_iter; - uint32_t size = _size(p_offset); + int size = _size(p_offset); if (ref.size() != 1) return false; int pos = ref[0]; @@ -74,7 +74,7 @@ Variant PackedDataContainer::_iter_next_ofs(const Array &p_iter, uint32_t p_offs Variant PackedDataContainer::_iter_get_ofs(const Variant &p_iter, uint32_t p_offset) { - uint32_t size = _size(p_offset); + int size = _size(p_offset); int pos = p_iter; if (pos < 0 || pos >= size) return Variant(); @@ -164,7 +164,7 @@ Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs, const Variant &p_key, b if (p_key.is_num()) { int idx = p_key; - uint32_t len = decode_uint32(r + 4); + int len = decode_uint32(r + 4); if (idx < 0 || idx >= len) { err = true; return Variant(); @@ -183,7 +183,7 @@ Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs, const Variant &p_key, b uint32_t len = decode_uint32(r + 4); bool found = false; - for (int i = 0; i < len; i++) { + for (uint32_t i = 0; i < len; i++) { uint32_t khash = decode_uint32(r + 8 + i * 12 + 0); if (khash == hash) { Variant key = _get_at_ofs(decode_uint32(r + 8 + i * 12 + 4), rd.ptr(), err); diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index c122d21545..c5f6d0dde0 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -339,9 +339,9 @@ Error PoolAllocator::resize(ID p_mem, int p_new_size) { ERR_FAIL_COND_V(e->lock, ERR_ALREADY_IN_USE); } - int alloc_size = aligned(p_new_size); + uint32_t alloc_size = aligned(p_new_size); - if (aligned(e->len) == alloc_size) { + if ((uint32_t)aligned(e->len) == alloc_size) { e->len = p_new_size; mt_unlock(); @@ -374,7 +374,7 @@ Error PoolAllocator::resize(ID p_mem, int p_new_size) { } //no need to move stuff around, it fits before the next block - int next_pos; + uint32_t next_pos; if (entry_indices_pos + 1 == entry_count) { next_pos = pool_size; // - static_area_size; } else { diff --git a/core/project_settings.cpp b/core/project_settings.cpp index ce1d7918db..a74917162b 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* globals.cpp */ +/* project_settings.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/project_settings.h b/core/project_settings.h index 5c8907c74e..718ab2a011 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* globals.h */ +/* project_settings.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/core/reference.h b/core/reference.h index 5fe8296314..ca3ae60418 100644 --- a/core/reference.h +++ b/core/reference.h @@ -62,7 +62,7 @@ public: template <class T> class Ref { - T *reference; + T *reference = NULL; void ref(const Ref &p_from) { diff --git a/core/script_language.h b/core/script_language.h index 342d8c8072..2261737f9a 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -206,6 +206,7 @@ public: virtual int find_function(const String &p_function, const String &p_code) const = 0; virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const = 0; virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return ERR_UNAVAILABLE; } + virtual bool overrides_external_editor() { return false; } virtual Error complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, bool &r_force, String &r_call_hint) { return ERR_UNAVAILABLE; } diff --git a/core/ustring.cpp b/core/ustring.cpp index ee07c7b11b..8273ed144b 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -588,7 +588,7 @@ String String::camelcase_to_underscore(bool lowercase) const { const char a = 'a', z = 'z'; int start_index = 0; - for (size_t i = 1; i < this->size(); i++) { + for (int i = 1; i < this->size(); i++) { bool is_upper = cstr[i] >= A && cstr[i] <= Z; bool is_number = cstr[i] >= '0' && cstr[i] <= '9'; bool are_next_2_lower = false; @@ -3655,12 +3655,12 @@ String String::sprintf(const Array &values, bool *error) const { CharType *self = (CharType *)c_str(); bool in_format = false; int value_index = 0; - int min_chars; - int min_decimals; - bool in_decimals; - bool pad_with_zeroes; - bool left_justified; - bool show_sign; + int min_chars = 0; + int min_decimals = 0; + bool in_decimals = false; + bool pad_with_zeroes = false; + bool left_justified = false; + bool show_sign = false; *error = true; @@ -3687,12 +3687,12 @@ String String::sprintf(const Array &values, bool *error) const { } int64_t value = values[value_index]; - int base; + int base = 16; bool capitalize = false; switch (c) { case 'd': base = 10; break; case 'o': base = 8; break; - case 'x': base = 16; break; + case 'x': break; case 'X': base = 16; capitalize = true; @@ -3842,7 +3842,7 @@ String String::sprintf(const Array &values, bool *error) const { } break; } - case '.': { // Float separtor. + case '.': { // Float separator. if (in_decimals) { return "too many decimal points in format"; } @@ -3851,7 +3851,7 @@ String String::sprintf(const Array &values, bool *error) const { break; } - case '*': { // Dyanmic width, based on value. + case '*': { // Dynamic width, based on value. if (value_index >= values.size()) { return "not enough arguments for format string"; } diff --git a/core/vmap.h b/core/vmap.h index f0977341ec..8165a919b6 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -60,9 +60,13 @@ class VMap { int low = 0; int high = _data.size() - 1; - int middle; const _Pair *a = &_data[0]; + int middle = 0; +#if DEBUG_ENABLED + if (low > high) + ERR_PRINT("low > high, this may be a bug"); +#endif while (low <= high) { middle = (low + high) / 2; diff --git a/core/vset.h b/core/vset.h index 7b12ae0b25..67af6c1a4c 100644 --- a/core/vset.h +++ b/core/vset.h @@ -46,8 +46,13 @@ class VSet { int low = 0; int high = _data.size() - 1; - int middle; const T *a = &_data[0]; + int middle = 0; + +#if DEBUG_ENABLED + if (low > high) + ERR_PRINT("low > high, this may be a bug"); +#endif while (low <= high) { middle = (low + high) / 2; diff --git a/doc/base/classes.xml b/doc/base/classes.xml index e0b1ea3870..ad597c8fdc 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -61,7 +61,7 @@ </description> </method> <method name="assert"> - <return type="Nil"> + <return type="void"> </return> <argument index="0" name="condition" type="bool"> </argument> @@ -262,7 +262,7 @@ </description> </method> <method name="funcref"> - <return type="FuncRef"> + <return type="Object"> </return> <argument index="0" name="instance" type="Object"> </argument> @@ -275,7 +275,7 @@ <method name="hash"> <return type="int"> </return> - <argument index="0" name="var:Variant" type="Variant"> + <argument index="0" name="var" type="Variant"> </argument> <description> Hash the variable passed and return an integer. @@ -299,6 +299,18 @@ Get an object by its ID. </description> </method> + <method name="inverse_lerp"> + <return type="float"> + </return> + <argument index="0" name="from" type="float"> + </argument> + <argument index="1" name="to" type="float"> + </argument> + <argument index="2" name="value" type="float"> + </argument> + <description> + </description> + </method> <method name="is_inf"> <return type="float"> </return> @@ -317,6 +329,14 @@ Returns whether s is a NaN (Not-A-Number) value. </description> </method> + <method name="len"> + <return type="int"> + </return> + <argument index="0" name="var" type="Variant"> + </argument> + <description> + </description> + </method> <method name="lerp"> <return type="float"> </return> @@ -340,7 +360,7 @@ </description> </method> <method name="load"> - <return type="Resource"> + <return type="Object"> </return> <argument index="0" name="path" type="String"> </argument> @@ -418,64 +438,44 @@ Preload a resource from the filesystem. The resource is loaded during script parsing. </description> </method> - <method name="print"> - <return type="Nil"> + <method name="print" qualifiers="vararg"> + <return type="void"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Print one or more arguments to strings in the best way possible to a console line. </description> </method> <method name="print_stack"> - <return type="Nil"> + <return type="void"> </return> <description> Print a stack track at code location, only works when running with debugger turned on. </description> </method> - <method name="printerr"> - <return type="Nil"> + <method name="printerr" qualifiers="vararg"> + <return type="void"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Print one or more arguments to strings in the best way possible to standard error line. </description> </method> - <method name="printraw"> - <return type="Nil"> + <method name="printraw" qualifiers="vararg"> + <return type="void"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Print one or more arguments to strings in the best way possible to console. No newline is added at the end. </description> </method> - <method name="prints"> - <return type="Nil"> + <method name="prints" qualifiers="vararg"> + <return type="void"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Print one or more arguments to the console with a space between each argument. </description> </method> - <method name="printt"> - <return type="Nil"> + <method name="printt" qualifiers="vararg"> + <return type="void"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Print one or more arguments to the console with a tab between each argument. </description> @@ -524,21 +524,35 @@ </description> </method> <method name="randomize"> - <return type="Nil"> + <return type="void"> </return> <description> Randomize the seed (or the internal state) of the random number generator. Current implementation reseeds using a number based on time. </description> </method> - <method name="range"> + <method name="range" qualifiers="vararg"> <return type="Array"> </return> - <argument index="0" name="..." type="Variant"> - </argument> <description> Return an array with the given range. Range can be 1 argument N (0 to N-1), two arguments (initial, final-1) or three arguments (initial, final-1, increment). </description> </method> + <method name="range_lerp"> + <return type="float"> + </return> + <argument index="0" name="value" type="float"> + </argument> + <argument index="1" name="istart" type="float"> + </argument> + <argument index="2" name="istop" type="float"> + </argument> + <argument index="3" name="ostart" type="float"> + </argument> + <argument index="4" name="ostop" type="float"> + </argument> + <description> + </description> + </method> <method name="round"> <return type="float"> </return> @@ -549,7 +563,7 @@ </description> </method> <method name="seed"> - <return type="Nil"> + <return type="void"> </return> <argument index="0" name="seed" type="int"> </argument> @@ -604,13 +618,9 @@ Snap float value to a given step. </description> </method> - <method name="str"> + <method name="str" qualifiers="vararg"> <return type="String"> </return> - <argument index="0" name="what" type="Variant"> - </argument> - <argument index="1" name="..." type="Variant"> - </argument> <description> Convert one or more arguments to string in the best way possible. </description> @@ -645,7 +655,7 @@ <method name="to_json"> <return type="String"> </return> - <argument index="0" name="var:Variant" type="Variant"> + <argument index="0" name="var" type="Variant"> </argument> <description> Convert a Variant to json text. @@ -669,7 +679,7 @@ </description> </method> <method name="validate_json"> - <return type="Variant"> + <return type="String"> </return> <argument index="0" name="json" type="String"> </argument> @@ -696,7 +706,7 @@ </description> </method> <method name="weakref"> - <return type="WeakRef"> + <return type="Object"> </return> <argument index="0" name="obj" type="Object"> </argument> @@ -719,13 +729,13 @@ </method> </methods> <constants> - <constant name="PI" value="3.141593"> + <constant name="PI" value="3.141593" enum=""> Constant that represents how many times the diameter of a circumference fits around its perimeter. </constant> - <constant name="INF" value="inf"> + <constant name="INF" value="inf" enum=""> A positive infinity. (For negative infinity, use -INF). </constant> - <constant name="NAN" value="nan"> + <constant name="NAN" value="nan" enum=""> Macro constant that expands to an expression of type float that represents a NaN. The NaN values are used to identify undefined or non-representable values for floating-point elements, such as the square root of negative numbers or the result of 0/0. </constant> @@ -742,6 +752,8 @@ <methods> </methods> <members> + <member name="ARVRServer" type="ARVRServer" setter="" getter="" brief=""> + </member> <member name="AudioServer" type="AudioServer" setter="" getter="" brief=""> [AudioServer] singleton </member> @@ -754,9 +766,6 @@ <member name="Geometry" type="Geometry" setter="" getter="" brief=""> [Geometry] singleton </member> - <member name="ProjectSettings" type="ProjectSettings" setter="" getter="" brief=""> - [ProjectSettings] singleton - </member> <member name="IP" type="IP" setter="" getter="" brief=""> [IP] singleton </member> @@ -781,6 +790,9 @@ <member name="PhysicsServer" type="PhysicsServer" setter="" getter="" brief=""> [PhysicsServer] singleton </member> + <member name="ProjectSettings" type="ProjectSettings" setter="" getter="" brief=""> + [ProjectSettings] singleton + </member> <member name="ResourceLoader" type="ResourceLoader" setter="" getter="" brief=""> [ResourceLoader] singleton </member> @@ -831,7 +843,7 @@ <constant name="VALIGN_BOTTOM" value="2"> Vertical bottom alignment, usually for text-derived classes. </constant> - <constant name="SPKEY" value="16777216"> + <constant name="SPKEY" value="16777216" enum=""> Scancodes with this bit applied are non printable. </constant> <constant name="KEY_ESCAPE" value="16777217"> @@ -1496,191 +1508,191 @@ </constant> <constant name="KEY_MASK_GROUP_SWITCH" value="1073741824"> </constant> - <constant name="BUTTON_LEFT" value="1"> + <constant name="BUTTON_LEFT" value="1" enum=""> Left Mouse Button </constant> - <constant name="BUTTON_RIGHT" value="2"> + <constant name="BUTTON_RIGHT" value="2" enum=""> Right Mouse Button </constant> - <constant name="BUTTON_MIDDLE" value="3"> + <constant name="BUTTON_MIDDLE" value="3" enum=""> Middle Mouse Button </constant> - <constant name="BUTTON_WHEEL_UP" value="4"> + <constant name="BUTTON_WHEEL_UP" value="4" enum=""> Mouse wheel up </constant> - <constant name="BUTTON_WHEEL_DOWN" value="5"> + <constant name="BUTTON_WHEEL_DOWN" value="5" enum=""> Mouse wheel down </constant> - <constant name="BUTTON_WHEEL_LEFT" value="6"> + <constant name="BUTTON_WHEEL_LEFT" value="6" enum=""> Mouse wheel left button </constant> - <constant name="BUTTON_WHEEL_RIGHT" value="7"> + <constant name="BUTTON_WHEEL_RIGHT" value="7" enum=""> Mouse wheel right button </constant> - <constant name="BUTTON_MASK_LEFT" value="1"> + <constant name="BUTTON_MASK_LEFT" value="1" enum=""> </constant> - <constant name="BUTTON_MASK_RIGHT" value="2"> + <constant name="BUTTON_MASK_RIGHT" value="2" enum=""> </constant> - <constant name="BUTTON_MASK_MIDDLE" value="4"> + <constant name="BUTTON_MASK_MIDDLE" value="4" enum=""> </constant> - <constant name="JOY_BUTTON_0" value="0"> + <constant name="JOY_BUTTON_0" value="0" enum=""> Joypad Button 0 </constant> - <constant name="JOY_BUTTON_1" value="1"> + <constant name="JOY_BUTTON_1" value="1" enum=""> Joypad Button 1 </constant> - <constant name="JOY_BUTTON_2" value="2"> + <constant name="JOY_BUTTON_2" value="2" enum=""> Joypad Button 2 </constant> - <constant name="JOY_BUTTON_3" value="3"> + <constant name="JOY_BUTTON_3" value="3" enum=""> Joypad Button 3 </constant> - <constant name="JOY_BUTTON_4" value="4"> + <constant name="JOY_BUTTON_4" value="4" enum=""> Joypad Button 4 </constant> - <constant name="JOY_BUTTON_5" value="5"> + <constant name="JOY_BUTTON_5" value="5" enum=""> Joypad Button 5 </constant> - <constant name="JOY_BUTTON_6" value="6"> + <constant name="JOY_BUTTON_6" value="6" enum=""> Joypad Button 6 </constant> - <constant name="JOY_BUTTON_7" value="7"> + <constant name="JOY_BUTTON_7" value="7" enum=""> Joypad Button 7 </constant> - <constant name="JOY_BUTTON_8" value="8"> + <constant name="JOY_BUTTON_8" value="8" enum=""> Joypad Button 8 </constant> - <constant name="JOY_BUTTON_9" value="9"> + <constant name="JOY_BUTTON_9" value="9" enum=""> Joypad Button 9 </constant> - <constant name="JOY_BUTTON_10" value="10"> + <constant name="JOY_BUTTON_10" value="10" enum=""> Joypad Button 10 </constant> - <constant name="JOY_BUTTON_11" value="11"> + <constant name="JOY_BUTTON_11" value="11" enum=""> Joypad Button 11 </constant> - <constant name="JOY_BUTTON_12" value="12"> + <constant name="JOY_BUTTON_12" value="12" enum=""> Joypad Button 12 </constant> - <constant name="JOY_BUTTON_13" value="13"> + <constant name="JOY_BUTTON_13" value="13" enum=""> Joypad Button 13 </constant> - <constant name="JOY_BUTTON_14" value="14"> + <constant name="JOY_BUTTON_14" value="14" enum=""> Joypad Button 14 </constant> - <constant name="JOY_BUTTON_15" value="15"> + <constant name="JOY_BUTTON_15" value="15" enum=""> Joypad Button 15 </constant> - <constant name="JOY_BUTTON_MAX" value="16"> + <constant name="JOY_BUTTON_MAX" value="16" enum=""> Joypad Button 16 </constant> - <constant name="JOY_SONY_CIRCLE" value="1"> + <constant name="JOY_SONY_CIRCLE" value="1" enum=""> DUALSHOCK circle button </constant> - <constant name="JOY_SONY_X" value="0"> + <constant name="JOY_SONY_X" value="0" enum=""> DUALSHOCK X button </constant> - <constant name="JOY_SONY_SQUARE" value="2"> + <constant name="JOY_SONY_SQUARE" value="2" enum=""> DUALSHOCK square button </constant> - <constant name="JOY_SONY_TRIANGLE" value="3"> + <constant name="JOY_SONY_TRIANGLE" value="3" enum=""> DUALSHOCK triangle button </constant> - <constant name="JOY_XBOX_B" value="1"> + <constant name="JOY_XBOX_B" value="1" enum=""> XBOX controller B button </constant> - <constant name="JOY_XBOX_A" value="0"> + <constant name="JOY_XBOX_A" value="0" enum=""> XBOX controller A button </constant> - <constant name="JOY_XBOX_X" value="2"> + <constant name="JOY_XBOX_X" value="2" enum=""> XBOX controller X button </constant> - <constant name="JOY_XBOX_Y" value="3"> + <constant name="JOY_XBOX_Y" value="3" enum=""> XBOX controller Y button </constant> - <constant name="JOY_DS_A" value="1"> + <constant name="JOY_DS_A" value="1" enum=""> </constant> - <constant name="JOY_DS_B" value="0"> + <constant name="JOY_DS_B" value="0" enum=""> </constant> - <constant name="JOY_DS_X" value="3"> + <constant name="JOY_DS_X" value="3" enum=""> </constant> - <constant name="JOY_DS_Y" value="2"> + <constant name="JOY_DS_Y" value="2" enum=""> </constant> - <constant name="JOY_SELECT" value="10"> + <constant name="JOY_SELECT" value="10" enum=""> Joypad Button Select </constant> - <constant name="JOY_START" value="11"> + <constant name="JOY_START" value="11" enum=""> Joypad Button Start </constant> - <constant name="JOY_DPAD_UP" value="12"> + <constant name="JOY_DPAD_UP" value="12" enum=""> Joypad DPad Up </constant> - <constant name="JOY_DPAD_DOWN" value="13"> + <constant name="JOY_DPAD_DOWN" value="13" enum=""> Joypad DPad Down </constant> - <constant name="JOY_DPAD_LEFT" value="14"> + <constant name="JOY_DPAD_LEFT" value="14" enum=""> Joypad DPad Left </constant> - <constant name="JOY_DPAD_RIGHT" value="15"> + <constant name="JOY_DPAD_RIGHT" value="15" enum=""> Joypad DPad Right </constant> - <constant name="JOY_L" value="4"> + <constant name="JOY_L" value="4" enum=""> Joypad Left Shoulder Button </constant> - <constant name="JOY_L2" value="6"> + <constant name="JOY_L2" value="6" enum=""> Joypad Left Trigger </constant> - <constant name="JOY_L3" value="8"> + <constant name="JOY_L3" value="8" enum=""> Joypad Left Stick Click </constant> - <constant name="JOY_R" value="5"> + <constant name="JOY_R" value="5" enum=""> Joypad Right Shoulder Button </constant> - <constant name="JOY_R2" value="7"> + <constant name="JOY_R2" value="7" enum=""> Joypad Right Trigger </constant> - <constant name="JOY_R3" value="9"> + <constant name="JOY_R3" value="9" enum=""> Joypad Right Stick Click </constant> - <constant name="JOY_AXIS_0" value="0"> + <constant name="JOY_AXIS_0" value="0" enum=""> Joypad Left Stick Horizontal Axis </constant> - <constant name="JOY_AXIS_1" value="1"> + <constant name="JOY_AXIS_1" value="1" enum=""> Joypad Left Stick Vertical Axis </constant> - <constant name="JOY_AXIS_2" value="2"> + <constant name="JOY_AXIS_2" value="2" enum=""> Joypad Right Stick Horizontal Axis </constant> - <constant name="JOY_AXIS_3" value="3"> + <constant name="JOY_AXIS_3" value="3" enum=""> Joypad Right Stick Vertical Axis </constant> - <constant name="JOY_AXIS_4" value="4"> + <constant name="JOY_AXIS_4" value="4" enum=""> </constant> - <constant name="JOY_AXIS_5" value="5"> + <constant name="JOY_AXIS_5" value="5" enum=""> </constant> - <constant name="JOY_AXIS_6" value="6"> + <constant name="JOY_AXIS_6" value="6" enum=""> Joypad Left Trigger Analog Axis </constant> - <constant name="JOY_AXIS_7" value="7"> + <constant name="JOY_AXIS_7" value="7" enum=""> Joypad Right Trigger Analog Axis </constant> - <constant name="JOY_AXIS_MAX" value="8"> + <constant name="JOY_AXIS_MAX" value="8" enum=""> </constant> - <constant name="JOY_ANALOG_LX" value="0"> + <constant name="JOY_ANALOG_LX" value="0" enum=""> Joypad Left Stick Horizontal Axis </constant> - <constant name="JOY_ANALOG_LY" value="1"> + <constant name="JOY_ANALOG_LY" value="1" enum=""> Joypad Left Stick Vertical Axis </constant> - <constant name="JOY_ANALOG_RX" value="2"> + <constant name="JOY_ANALOG_RX" value="2" enum=""> Joypad Right Stick Horizontal Axis </constant> - <constant name="JOY_ANALOG_RY" value="3"> + <constant name="JOY_ANALOG_RY" value="3" enum=""> Joypad Right Stick Vertical Axis </constant> - <constant name="JOY_ANALOG_L2" value="6"> + <constant name="JOY_ANALOG_L2" value="6" enum=""> </constant> - <constant name="JOY_ANALOG_R2" value="7"> + <constant name="JOY_ANALOG_R2" value="7" enum=""> </constant> <constant name="OK" value="0"> Functions that return Error return OK when everything went ok. Most functions don't return error anyway and/or just print errors to stdout. @@ -1949,7 +1961,7 @@ </constant> </constants> </class> -<class name="@Native" category="Core"> +<class name="@NativeScript" category="Core"> <brief_description> </brief_description> <description> @@ -1969,6 +1981,542 @@ <constants> </constants> </class> +<class name="ARVRAnchor" inherits="Spatial" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_anchor_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_anchor_name" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> + <method name="get_is_active" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="get_size" qualifiers="const"> + <return type="Vector3"> + </return> + <description> + </description> + </method> + <method name="set_anchor_id"> + <return type="void"> + </return> + <argument index="0" name="anchor_id" type="int"> + </argument> + <description> + </description> + </method> + </methods> + <members> + <member name="anchor_id" type="int" setter="set_anchor_id" getter="get_anchor_id" brief=""> + </member> + </members> + <constants> + </constants> +</class> +<class name="ARVRCamera" inherits="Camera" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + </methods> + <constants> + </constants> +</class> +<class name="ARVRController" inherits="Spatial" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_controller_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_controller_name" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> + <method name="get_is_active" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="get_joystick_axis" qualifiers="const"> + <return type="float"> + </return> + <argument index="0" name="axis" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_joystick_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="is_button_pressed" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="button" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_controller_id"> + <return type="void"> + </return> + <argument index="0" name="controller_id" type="int"> + </argument> + <description> + </description> + </method> + </methods> + <members> + <member name="controller_id" type="int" setter="set_controller_id" getter="get_controller_id" brief=""> + </member> + </members> + <signals> + <signal name="button_pressed"> + <argument index="0" name="button" type="int"> + </argument> + <description> + </description> + </signal> + <signal name="button_release"> + <argument index="0" name="button" type="int"> + </argument> + <description> + </description> + </signal> + </signals> + <constants> + </constants> +</class> +<class name="ARVRInterface" inherits="Reference" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_name" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> + <method name="get_recommended_render_targetsize"> + <return type="Vector2"> + </return> + <description> + </description> + </method> + <method name="hmd_is_present"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="initialize"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_initialized"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_installed"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_primary"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="set_is_primary"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="supports_hmd"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="uninitialize"> + <return type="void"> + </return> + <description> + </description> + </method> + </methods> + <members> + <member name="primary" type="bool" setter="set_is_primary" getter="is_primary" brief=""> + </member> + </members> + <constants> + <constant name="EYE_MONO" value="0"> + </constant> + <constant name="EYE_LEFT" value="1"> + </constant> + <constant name="EYE_RIGHT" value="2"> + </constant> + </constants> +</class> +<class name="ARVROrigin" inherits="Spatial" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_world_scale" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> + <method name="set_world_scale"> + <return type="void"> + </return> + <argument index="0" name="world_scale" type="float"> + </argument> + <description> + </description> + </method> + </methods> + <members> + <member name="world_scale" type="float" setter="set_world_scale" getter="get_world_scale" brief=""> + </member> + </members> + <constants> + </constants> +</class> +<class name="ARVRPositionalTracker" inherits="Object" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_joy_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_name" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> + <method name="get_orientation" qualifiers="const"> + <return type="Basis"> + </return> + <description> + </description> + </method> + <method name="get_position" qualifiers="const"> + <return type="Vector3"> + </return> + <description> + </description> + </method> + <method name="get_tracks_orientation" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="get_tracks_position" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="get_transform" qualifiers="const"> + <return type="Transform"> + </return> + <argument index="0" name="adjust_by_reference_frame" type="bool"> + </argument> + <description> + </description> + </method> + <method name="get_type" qualifiers="const"> + <return type="int" enum="ARVRServer.TrackerType"> + </return> + <description> + </description> + </method> + </methods> + <constants> + </constants> +</class> +<class name="ARVRScriptInterface" inherits="ARVRInterface" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="_get_projection_for_eye" qualifiers="virtual"> + <return type="void"> + </return> + <description> + </description> + </method> + <method name="commit_for_eye" qualifiers="virtual"> + <return type="void"> + </return> + <argument index="0" name="eye" type="int"> + </argument> + <argument index="1" name="render_target" type="RID"> + </argument> + <description> + </description> + </method> + <method name="get_recommended_render_targetsize" qualifiers="virtual"> + <return type="Vector2"> + </return> + <description> + </description> + </method> + <method name="get_transform_for_eye" qualifiers="virtual"> + <return type="Transform"> + </return> + <argument index="0" name="eye" type="int"> + </argument> + <argument index="1" name="cam_transform" type="Transform"> + </argument> + <description> + </description> + </method> + <method name="hmd_is_present" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="initialize" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_initialized" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_installed" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_stereo" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="process" qualifiers="virtual"> + <return type="void"> + </return> + <description> + </description> + </method> + <method name="supports_hmd" qualifiers="virtual"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="uninitialize" qualifiers="virtual"> + <return type="void"> + </return> + <description> + </description> + </method> + </methods> + <constants> + </constants> +</class> +<class name="ARVRServer" inherits="Object" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="add_interface"> + <return type="void"> + </return> + <argument index="0" name="arg0" type="ARVRInterface"> + </argument> + <description> + </description> + </method> + <method name="find_interface" qualifiers="const"> + <return type="ARVRInterface"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </method> + <method name="get_interface" qualifiers="const"> + <return type="ARVRInterface"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_interface_count" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_reference_frame" qualifiers="const"> + <return type="Transform"> + </return> + <description> + </description> + </method> + <method name="get_tracker" qualifiers="const"> + <return type="ARVRPositionalTracker"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_tracker_count" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_world_scale" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> + <method name="remove_interface"> + <return type="void"> + </return> + <argument index="0" name="arg0" type="ARVRInterface"> + </argument> + <description> + </description> + </method> + <method name="request_reference_frame"> + <return type="void"> + </return> + <argument index="0" name="ignore_tilt" type="bool"> + </argument> + <argument index="1" name="keep_height" type="bool"> + </argument> + <description> + </description> + </method> + <method name="set_primary_interface"> + <return type="void"> + </return> + <argument index="0" name="arg0" type="ARVRInterface"> + </argument> + <description> + </description> + </method> + <method name="set_world_scale"> + <return type="void"> + </return> + <argument index="0" name="arg0" type="float"> + </argument> + <description> + </description> + </method> + </methods> + <members> + <member name="world_scale" type="float" setter="set_world_scale" getter="get_world_scale" brief=""> + </member> + </members> + <signals> + <signal name="interface_added"> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </signal> + <signal name="interface_removed"> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </signal> + <signal name="tracker_added"> + <argument index="0" name="name" type="String"> + </argument> + <argument index="1" name="type" type="int"> + </argument> + <description> + </description> + </signal> + <signal name="tracker_removed"> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </signal> + </signals> + <constants> + <constant name="TRACKER_CONTROLLER" value="1"> + </constant> + <constant name="TRACKER_BASESTATION" value="2"> + </constant> + <constant name="TRACKER_ANCHOR" value="4"> + </constant> + <constant name="TRACKER_UNKNOWN" value="128"> + </constant> + <constant name="TRACKER_ANY_KNOWN" value="127"> + </constant> + <constant name="TRACKER_ANY" value="255"> + </constant> + </constants> +</class> <class name="AStar" inherits="Reference" category="Core"> <brief_description> AStar class representation that uses vectors as edges. @@ -1979,6 +2527,8 @@ </description> <methods> <method name="_compute_cost" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="from_id" type="int"> </argument> <argument index="1" name="to_id" type="int"> @@ -1987,6 +2537,8 @@ </description> </method> <method name="_estimate_cost" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="from_id" type="int"> </argument> <argument index="1" name="to_id" type="int"> @@ -1995,11 +2547,13 @@ </description> </method> <method name="add_point"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="pos" type="Vector3"> </argument> - <argument index="2" name="weight_scale" type="float" default="1"> + <argument index="2" name="weight_scale" type="float" default="1.0"> </argument> <description> Add a new point at the given position [code]pos[/code] with the given identifier [code]id[/code]. The [code]weight_scale[/code] has to be 1 or larger. @@ -2017,11 +2571,15 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear all the points and segments from AStar instance. </description> </method> <method name="connect_points"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="to_id" type="int"> @@ -2033,6 +2591,8 @@ </description> </method> <method name="disconnect_points"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="to_id" type="int"> @@ -2115,6 +2675,8 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -2164,14 +2726,14 @@ </description> </method> <method name="get_label"> - <return type="Object"> + <return type="Label"> </return> <description> Return the label used for built-in text. </description> </method> <method name="get_ok"> - <return type="Object"> + <return type="Button"> </return> <description> Return the OK Button. @@ -2185,15 +2747,17 @@ </description> </method> <method name="register_text_enter"> - <return type="LineEdit"> + <return type="void"> </return> - <argument index="0" name="line_edit" type="Object"> + <argument index="0" name="line_edit" type="Node"> </argument> <description> Register a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted. </description> </method> <method name="set_hide_on_ok"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -2201,6 +2765,8 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -2296,6 +2862,8 @@ </description> </method> <method name="play"> + <return type="void"> + </return> <argument index="0" name="anim" type="String" default=""""> </argument> <description> @@ -2303,6 +2871,8 @@ </description> </method> <method name="set_animation"> + <return type="void"> + </return> <argument index="0" name="animation" type="String"> </argument> <description> @@ -2310,6 +2880,8 @@ </description> </method> <method name="set_centered"> + <return type="void"> + </return> <argument index="0" name="centered" type="bool"> </argument> <description> @@ -2317,6 +2889,8 @@ </description> </method> <method name="set_flip_h"> + <return type="void"> + </return> <argument index="0" name="flip_h" type="bool"> </argument> <description> @@ -2324,6 +2898,8 @@ </description> </method> <method name="set_flip_v"> + <return type="void"> + </return> <argument index="0" name="flip_v" type="bool"> </argument> <description> @@ -2331,6 +2907,8 @@ </description> </method> <method name="set_frame"> + <return type="void"> + </return> <argument index="0" name="frame" type="int"> </argument> <description> @@ -2338,6 +2916,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -2345,6 +2925,8 @@ </description> </method> <method name="set_sprite_frames"> + <return type="void"> + </return> <argument index="0" name="sprite_frames" type="SpriteFrames"> </argument> <description> @@ -2352,6 +2934,8 @@ </description> </method> <method name="stop"> + <return type="void"> + </return> <description> Stop the current animation (does not reset the frame counter). </description> @@ -2425,6 +3009,8 @@ </description> </method> <method name="play"> + <return type="void"> + </return> <argument index="0" name="anim" type="String" default=""""> </argument> <description> @@ -2432,6 +3018,8 @@ </description> </method> <method name="set_animation"> + <return type="void"> + </return> <argument index="0" name="animation" type="String"> </argument> <description> @@ -2439,6 +3027,8 @@ </description> </method> <method name="set_frame"> + <return type="void"> + </return> <argument index="0" name="frame" type="int"> </argument> <description> @@ -2446,6 +3036,8 @@ </description> </method> <method name="set_sprite_frames"> + <return type="void"> + </return> <argument index="0" name="sprite_frames" type="SpriteFrames"> </argument> <description> @@ -2453,6 +3045,8 @@ </description> </method> <method name="stop"> + <return type="void"> + </return> <description> Stop the current animation (does not reset the frame counter). </description> @@ -2490,7 +3084,7 @@ <method name="add_track"> <return type="int"> </return> - <argument index="0" name="type" type="int"> + <argument index="0" name="type" type="int" enum="Animation.TrackType"> </argument> <argument index="1" name="at_pos" type="int" default="-1"> </argument> @@ -2499,6 +3093,8 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear the animation (clear all tracks and reset all). </description> @@ -2576,6 +3172,8 @@ </description> </method> <method name="remove_track"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -2583,6 +3181,8 @@ </description> </method> <method name="set_length"> + <return type="void"> + </return> <argument index="0" name="time_sec" type="float"> </argument> <description> @@ -2590,6 +3190,8 @@ </description> </method> <method name="set_loop"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -2597,6 +3199,8 @@ </description> </method> <method name="set_step"> + <return type="void"> + </return> <argument index="0" name="size_sec" type="float"> </argument> <description> @@ -2625,7 +3229,7 @@ </description> </method> <method name="track_get_interpolation_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Animation.InterpolationType"> </return> <argument index="0" name="idx" type="int"> </argument> @@ -2665,6 +3269,8 @@ </description> </method> <method name="track_get_key_value" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="key_idx" type="int"> @@ -2683,7 +3289,7 @@ </description> </method> <method name="track_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Animation.TrackType"> </return> <argument index="0" name="idx" type="int"> </argument> @@ -2692,6 +3298,8 @@ </description> </method> <method name="track_insert_key"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="time" type="float"> @@ -2714,6 +3322,8 @@ </description> </method> <method name="track_move_down"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -2721,6 +3331,8 @@ </description> </method> <method name="track_move_up"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -2728,6 +3340,8 @@ </description> </method> <method name="track_remove_key"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="key_idx" type="int"> @@ -2737,6 +3351,8 @@ </description> </method> <method name="track_remove_key_at_pos"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="float"> @@ -2746,6 +3362,8 @@ </description> </method> <method name="track_set_imported"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="imported" type="bool"> @@ -2755,6 +3373,8 @@ </description> </method> <method name="track_set_interpolation_loop_wrap"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="interpolation" type="bool"> @@ -2763,15 +3383,19 @@ </description> </method> <method name="track_set_interpolation_type"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="interpolation" type="int"> + <argument index="1" name="interpolation" type="int" enum="Animation.InterpolationType"> </argument> <description> Set the interpolation type of a given track, from the INTERPOLATION_* enum. </description> </method> <method name="track_set_key_transition"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="key_idx" type="int"> @@ -2783,6 +3407,8 @@ </description> </method> <method name="track_set_key_value"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="key" type="int"> @@ -2794,6 +3420,8 @@ </description> </method> <method name="track_set_path"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="path" type="NodePath"> @@ -2844,7 +3472,7 @@ </description> </method> <method name="value_track_get_update_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Animation.UpdateMode"> </return> <argument index="0" name="idx" type="int"> </argument> @@ -2852,9 +3480,11 @@ </description> </method> <method name="value_track_set_update_mode"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Animation.UpdateMode"> </argument> <description> </description> @@ -2896,7 +3526,7 @@ </description> <methods> <method name="add_animation"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="name" type="String"> </argument> @@ -2907,6 +3537,8 @@ </description> </method> <method name="advance"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> @@ -2922,6 +3554,8 @@ </description> </method> <method name="animation_set_next"> + <return type="void"> + </return> <argument index="0" name="anim_from" type="String"> </argument> <argument index="1" name="anim_to" type="String"> @@ -2930,11 +3564,15 @@ </description> </method> <method name="clear_caches"> + <return type="void"> + </return> <description> The animation player creates caches for faster access to the nodes it will animate. However, if a specific node is removed, it may not notice it, so clear_caches will force the player to search for the nodes again. </description> </method> <method name="clear_queue"> + <return type="void"> + </return> <description> If animations are queued to play, clear them. </description> @@ -2965,7 +3603,7 @@ </description> </method> <method name="get_animation_process_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AnimationPlayer.AnimationProcessMode"> </return> <description> Return the mode in which the animation player processes. See [method set_animation_process_mode]. @@ -3062,11 +3700,13 @@ </description> </method> <method name="play"> + <return type="void"> + </return> <argument index="0" name="name" type="String" default=""""> </argument> <argument index="1" name="custom_blend" type="float" default="-1"> </argument> - <argument index="2" name="custom_speed" type="float" default="1"> + <argument index="2" name="custom_speed" type="float" default="1.0"> </argument> <argument index="3" name="from_end" type="bool" default="false"> </argument> @@ -3075,6 +3715,8 @@ </description> </method> <method name="play_backwards"> + <return type="void"> + </return> <argument index="0" name="name" type="String" default=""""> </argument> <argument index="1" name="custom_blend" type="float" default="-1"> @@ -3084,6 +3726,8 @@ </description> </method> <method name="queue"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -3091,6 +3735,8 @@ </description> </method> <method name="remove_animation"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -3098,6 +3744,8 @@ </description> </method> <method name="rename_animation"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="newname" type="String"> @@ -3107,6 +3755,8 @@ </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="pos_sec" type="float"> </argument> <argument index="1" name="update" type="bool" default="false"> @@ -3116,6 +3766,8 @@ </description> </method> <method name="set_active"> + <return type="void"> + </return> <argument index="0" name="active" type="bool"> </argument> <description> @@ -3123,13 +3775,17 @@ </description> </method> <method name="set_animation_process_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="AnimationPlayer.AnimationProcessMode"> </argument> <description> Set the mode in which the animation player processes. By default, it processes on idle time (framerate dependent), but using fixed time works well for animating static collision bodies in 2D and 3D. See enum ANIMATION_PROCESS_*. </description> </method> <method name="set_autoplay"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -3137,6 +3793,8 @@ </description> </method> <method name="set_blend_time"> + <return type="void"> + </return> <argument index="0" name="anim_from" type="String"> </argument> <argument index="1" name="anim_to" type="String"> @@ -3148,6 +3806,8 @@ </description> </method> <method name="set_current_animation"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <description> @@ -3155,6 +3815,8 @@ </description> </method> <method name="set_default_blend_time"> + <return type="void"> + </return> <argument index="0" name="sec" type="float"> </argument> <description> @@ -3162,6 +3824,8 @@ </description> </method> <method name="set_root"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> @@ -3169,6 +3833,8 @@ </description> </method> <method name="set_speed_scale"> + <return type="void"> + </return> <argument index="0" name="speed" type="float"> </argument> <description> @@ -3176,6 +3842,8 @@ </description> </method> <method name="stop"> + <return type="void"> + </return> <argument index="0" name="reset" type="bool" default="true"> </argument> <description> @@ -3183,6 +3851,8 @@ </description> </method> <method name="stop_all"> + <return type="void"> + </return> <description> Stop playback of animations (deprecated). </description> @@ -3191,7 +3861,7 @@ <members> <member name="playback_default_blend_time" type="float" setter="set_default_blend_time" getter="get_default_blend_time" brief=""> </member> - <member name="playback_process_mode" type="int" setter="set_animation_process_mode" getter="get_animation_process_mode" brief=""> + <member name="playback_process_mode" type="int" setter="set_animation_process_mode" getter="get_animation_process_mode" brief="" enum="AnimationPlayer.AnimationProcessMode"> </member> <member name="root_node" type="NodePath" setter="set_root" getter="get_root" brief=""> </member> @@ -3239,7 +3909,9 @@ </description> <methods> <method name="add_node"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="AnimationTreePlayer.NodeType"> </argument> <argument index="1" name="id" type="String"> </argument> @@ -3248,6 +3920,8 @@ </description> </method> <method name="advance"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> @@ -3270,6 +3944,8 @@ </description> </method> <method name="animation_node_set_animation"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="animation" type="Animation"> @@ -3279,6 +3955,8 @@ </description> </method> <method name="animation_node_set_filter_path"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="path" type="NodePath"> @@ -3289,6 +3967,8 @@ </description> </method> <method name="animation_node_set_master_animation"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="source" type="String"> @@ -3317,6 +3997,8 @@ </description> </method> <method name="blend2_node_set_amount"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="blend" type="float"> @@ -3325,6 +4007,8 @@ </description> </method> <method name="blend2_node_set_filter_path"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="path" type="NodePath"> @@ -3343,6 +4027,8 @@ </description> </method> <method name="blend3_node_set_amount"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="blend" type="float"> @@ -3359,6 +4045,8 @@ </description> </method> <method name="blend4_node_set_amount"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="blend" type="Vector2"> @@ -3367,7 +4055,7 @@ </description> </method> <method name="connect_nodes"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="id" type="String"> </argument> @@ -3379,6 +4067,8 @@ </description> </method> <method name="disconnect_nodes"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="dst_input_idx" type="int"> @@ -3387,7 +4077,7 @@ </description> </method> <method name="get_animation_process_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AnimationTreePlayer.AnimationProcessMode"> </return> <description> </description> @@ -3425,6 +4115,8 @@ </description> </method> <method name="mix_node_set_amount"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="ratio" type="float"> @@ -3470,7 +4162,7 @@ </description> </method> <method name="node_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="AnimationTreePlayer.NodeType"> </return> <argument index="0" name="id" type="String"> </argument> @@ -3479,7 +4171,7 @@ </description> </method> <method name="node_rename"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="node" type="String"> </argument> @@ -3490,6 +4182,8 @@ </description> </method> <method name="node_set_pos"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="screen_pos" type="Vector2"> @@ -3546,6 +4240,8 @@ </description> </method> <method name="oneshot_node_set_autorestart"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="enable" type="bool"> @@ -3554,6 +4250,8 @@ </description> </method> <method name="oneshot_node_set_autorestart_delay"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="delay_sec" type="float"> @@ -3562,6 +4260,8 @@ </description> </method> <method name="oneshot_node_set_autorestart_random_delay"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="rand_sec" type="float"> @@ -3570,6 +4270,8 @@ </description> </method> <method name="oneshot_node_set_fadein_time"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="time_sec" type="float"> @@ -3578,6 +4280,8 @@ </description> </method> <method name="oneshot_node_set_fadeout_time"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="time_sec" type="float"> @@ -3586,6 +4290,8 @@ </description> </method> <method name="oneshot_node_set_filter_path"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="path" type="NodePath"> @@ -3596,50 +4302,68 @@ </description> </method> <method name="oneshot_node_start"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <description> </description> </method> <method name="oneshot_node_stop"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <description> </description> </method> <method name="recompute_caches"> + <return type="void"> + </return> <description> </description> </method> <method name="remove_node"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <description> </description> </method> <method name="reset"> + <return type="void"> + </return> <description> </description> </method> <method name="set_active"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_animation_process_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="AnimationTreePlayer.AnimationProcessMode"> </argument> <description> </description> </method> <method name="set_base_path"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> </description> </method> <method name="set_master_player"> + <return type="void"> + </return> <argument index="0" name="nodepath" type="NodePath"> </argument> <description> @@ -3654,6 +4378,8 @@ </description> </method> <method name="timescale_node_set_scale"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="scale" type="float"> @@ -3662,6 +4388,8 @@ </description> </method> <method name="timeseek_node_seek"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="pos_sec" type="float"> @@ -3670,6 +4398,8 @@ </description> </method> <method name="transition_node_delete_input"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="input_idx" type="int"> @@ -3712,6 +4442,8 @@ </description> </method> <method name="transition_node_set_current"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="input_idx" type="int"> @@ -3720,6 +4452,8 @@ </description> </method> <method name="transition_node_set_input_auto_advance"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="input_idx" type="int"> @@ -3730,6 +4464,8 @@ </description> </method> <method name="transition_node_set_input_count"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="count" type="int"> @@ -3738,6 +4474,8 @@ </description> </method> <method name="transition_node_set_xfade_time"> + <return type="void"> + </return> <argument index="0" name="id" type="String"> </argument> <argument index="1" name="time_sec" type="float"> @@ -3747,7 +4485,7 @@ </method> </methods> <members> - <member name="playback_process_mode" type="int" setter="set_animation_process_mode" getter="get_animation_process_mode" brief=""> + <member name="playback_process_mode" type="int" setter="set_animation_process_mode" getter="get_animation_process_mode" brief="" enum="AnimationTreePlayer.AnimationProcessMode"> </member> </members> <constants> @@ -3894,7 +4632,7 @@ </description> </method> <method name="get_space_override_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Area.SpaceOverride"> </return> <description> Return the space override mode. @@ -3936,7 +4674,7 @@ <method name="overlaps_area" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="area" type="Object"> + <argument index="0" name="area" type="Node"> </argument> <description> Return whether the area passed is totally or partially inside this area. @@ -3945,13 +4683,15 @@ <method name="overlaps_body" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="body" type="Object"> + <argument index="0" name="body" type="Node"> </argument> <description> Return whether the body passed is totally or partially inside this area. </description> </method> <method name="set_angular_damp"> + <return type="void"> + </return> <argument index="0" name="angular_damp" type="float"> </argument> <description> @@ -3960,18 +4700,24 @@ </description> </method> <method name="set_audio_bus"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_audio_bus_override"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="collision_layer" type="int"> </argument> <description> @@ -3981,6 +4727,8 @@ </description> </method> <method name="set_collision_layer_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -3990,6 +4738,8 @@ </description> </method> <method name="set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="collision_mask" type="int"> </argument> <description> @@ -3997,6 +4747,8 @@ </description> </method> <method name="set_collision_mask_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -4006,6 +4758,8 @@ </description> </method> <method name="set_gravity"> + <return type="void"> + </return> <argument index="0" name="gravity" type="float"> </argument> <description> @@ -4014,6 +4768,8 @@ </description> </method> <method name="set_gravity_distance_scale"> + <return type="void"> + </return> <argument index="0" name="distance_scale" type="float"> </argument> <description> @@ -4021,6 +4777,8 @@ </description> </method> <method name="set_gravity_is_point"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4028,6 +4786,8 @@ </description> </method> <method name="set_gravity_vector"> + <return type="void"> + </return> <argument index="0" name="vector" type="Vector3"> </argument> <description> @@ -4036,6 +4796,8 @@ </description> </method> <method name="set_linear_damp"> + <return type="void"> + </return> <argument index="0" name="linear_damp" type="float"> </argument> <description> @@ -4044,6 +4806,8 @@ </description> </method> <method name="set_monitorable"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4051,6 +4815,8 @@ </description> </method> <method name="set_monitoring"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4058,33 +4824,43 @@ </description> </method> <method name="set_priority"> + <return type="void"> + </return> <argument index="0" name="priority" type="float"> </argument> <description> - Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. + Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have a space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important. </description> </method> <method name="set_reverb_amount"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_reverb_bus"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_reverb_uniformity"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_space_override_mode"> - <argument index="0" name="enable" type="int"> + <return type="void"> + </return> + <argument index="0" name="enable" type="int" enum="Area.SpaceOverride"> </argument> <description> Set the space override mode. This mode controls how an area affects gravity and damp. @@ -4096,6 +4872,8 @@ </description> </method> <method name="set_use_reverb_bus"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4127,7 +4905,7 @@ </member> <member name="monitoring" type="bool" setter="set_monitoring" getter="is_monitoring" brief=""> </member> - <member name="priority" type="int" setter="set_priority" getter="get_priority" brief=""> + <member name="priority" type="float" setter="set_priority" getter="get_priority" brief=""> </member> <member name="reverb_bus_amount" type="float" setter="set_reverb_amount" getter="get_reverb_amount" brief=""> </member> @@ -4137,7 +4915,7 @@ </member> <member name="reverb_bus_uniformity" type="float" setter="set_reverb_uniformity" getter="get_reverb_uniformity" brief=""> </member> - <member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" brief=""> + <member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" brief="" enum="Area.SpaceOverride"> </member> </members> <signals> @@ -4328,7 +5106,7 @@ </description> </method> <method name="get_space_override_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Area2D.SpaceOverride"> </return> <description> Return the space override mode. @@ -4364,7 +5142,7 @@ <method name="overlaps_area" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="area" type="Object"> + <argument index="0" name="area" type="Node"> </argument> <description> Return whether the area passed is totally or partially inside this area. @@ -4373,13 +5151,15 @@ <method name="overlaps_body" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="body" type="Object"> + <argument index="0" name="body" type="Node"> </argument> <description> Return whether the body passed is totally or partially inside this area. </description> </method> <method name="set_angular_damp"> + <return type="void"> + </return> <argument index="0" name="angular_damp" type="float"> </argument> <description> @@ -4388,18 +5168,24 @@ </description> </method> <method name="set_audio_bus"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_audio_bus_override"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="collision_layer" type="int"> </argument> <description> @@ -4409,6 +5195,8 @@ </description> </method> <method name="set_collision_layer_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -4418,6 +5206,8 @@ </description> </method> <method name="set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="collision_mask" type="int"> </argument> <description> @@ -4425,6 +5215,8 @@ </description> </method> <method name="set_collision_mask_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -4434,6 +5226,8 @@ </description> </method> <method name="set_gravity"> + <return type="void"> + </return> <argument index="0" name="gravity" type="float"> </argument> <description> @@ -4442,6 +5236,8 @@ </description> </method> <method name="set_gravity_distance_scale"> + <return type="void"> + </return> <argument index="0" name="distance_scale" type="float"> </argument> <description> @@ -4449,6 +5245,8 @@ </description> </method> <method name="set_gravity_is_point"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4456,6 +5254,8 @@ </description> </method> <method name="set_gravity_vector"> + <return type="void"> + </return> <argument index="0" name="vector" type="Vector2"> </argument> <description> @@ -4464,6 +5264,8 @@ </description> </method> <method name="set_linear_damp"> + <return type="void"> + </return> <argument index="0" name="linear_damp" type="float"> </argument> <description> @@ -4472,6 +5274,8 @@ </description> </method> <method name="set_monitorable"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4479,6 +5283,8 @@ </description> </method> <method name="set_monitoring"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -4486,15 +5292,19 @@ </description> </method> <method name="set_priority"> + <return type="void"> + </return> <argument index="0" name="priority" type="float"> </argument> <description> - Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have an space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. + Set the order in which the area is processed. Greater values mean the area gets processed first. This is useful for areas which have a space override different from AREA_SPACE_OVERRIDE_DISABLED or AREA_SPACE_OVERRIDE_COMBINE, as they replace values, and are thus order-dependent. Areas with the same priority value get evaluated in an unpredictable order, and should be differentiated if evaluation order is to be important. </description> </method> <method name="set_space_override_mode"> - <argument index="0" name="enable" type="int"> + <return type="void"> + </return> + <argument index="0" name="enable" type="int" enum="Area2D.SpaceOverride"> </argument> <description> Set the space override mode. This mode controls how an area affects gravity and damp. @@ -4531,9 +5341,9 @@ </member> <member name="monitoring" type="bool" setter="set_monitoring" getter="is_monitoring" brief=""> </member> - <member name="priority" type="int" setter="set_priority" getter="get_priority" brief=""> + <member name="priority" type="float" setter="set_priority" getter="get_priority" brief=""> </member> - <member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" brief=""> + <member name="space_override" type="int" setter="set_space_override_mode" getter="get_space_override_mode" brief="" enum="Area2D.SpaceOverride"> </member> </members> <signals> @@ -4860,7 +5670,7 @@ <argument index="1" name="func" type="String"> </argument> <description> - Sort the array using a custom method. The arguments are an object that holds the method and the name of such method. The custom method receives two arguments (a pair of elements from the array) and must return true if the first argument is less than the second, and return false otherwise. + Sort the array using a custom method. The arguments are an object that holds the method and the name of such method. The custom method receives two arguments (a pair of elements from the array) and must return true if the first argument is less than the second, and return false otherwise. Note: you cannot randomize the return value as the heapsort algorithm expects a deterministic result. Doing so will result in unexpected behavior. </description> </method> </methods> @@ -4874,17 +5684,21 @@ </description> <methods> <method name="add_blend_shape"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="add_surface_from_arrays"> - <argument index="0" name="primitive" type="int"> + <return type="void"> + </return> + <argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType"> </argument> <argument index="1" name="arrays" type="Array"> </argument> - <argument index="2" name="blend_shapes" type="Array" default="[]"> + <argument index="2" name="blend_shapes" type="Array" default="[ ]"> </argument> <argument index="3" name="compress_flags" type="int" default="97792"> </argument> @@ -4894,10 +5708,14 @@ </description> </method> <method name="center_geometry"> + <return type="void"> + </return> <description> </description> </method> <method name="clear_blend_shapes"> + <return type="void"> + </return> <description> </description> </method> @@ -4908,7 +5726,7 @@ </description> </method> <method name="get_blend_shape_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Mesh.BlendShapeMode"> </return> <description> </description> @@ -4935,16 +5753,22 @@ </description> </method> <method name="regen_normalmaps"> + <return type="void"> + </return> <description> </description> </method> <method name="set_blend_shape_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Mesh.BlendShapeMode"> </argument> <description> </description> </method> <method name="set_custom_aabb"> + <return type="void"> + </return> <argument index="0" name="aabb" type="Rect3"> </argument> <description> @@ -4995,7 +5819,7 @@ </description> </method> <method name="surface_get_primitive_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Mesh.PrimitiveType"> </return> <argument index="0" name="surf_idx" type="int"> </argument> @@ -5004,6 +5828,8 @@ </description> </method> <method name="surface_remove"> + <return type="void"> + </return> <argument index="0" name="surf_idx" type="int"> </argument> <description> @@ -5011,6 +5837,8 @@ </description> </method> <method name="surface_set_material"> + <return type="void"> + </return> <argument index="0" name="surf_idx" type="int"> </argument> <argument index="1" name="material" type="Material"> @@ -5019,6 +5847,8 @@ </description> </method> <method name="surface_set_name"> + <return type="void"> + </return> <argument index="0" name="surf_idx" type="int"> </argument> <argument index="1" name="name" type="String"> @@ -5029,10 +5859,10 @@ </method> </methods> <constants> - <constant name="NO_INDEX_ARRAY" value="-1"> + <constant name="NO_INDEX_ARRAY" value="-1" enum=""> Default value used for index_array_len when no indices are present. </constant> - <constant name="ARRAY_WEIGHTS_SIZE" value="4"> + <constant name="ARRAY_WEIGHTS_SIZE" value="4" enum=""> Amount of weights/bone indices per vertex (always 4). </constant> <constant name="ARRAY_VERTEX" value="0"> @@ -5062,6 +5892,8 @@ <constant name="ARRAY_INDEX" value="8"> Array of integers, used as indices referencing vertices. No index can be beyond the vertex array size. </constant> + <constant name="ARRAY_MAX" value="9"> + </constant> <constant name="ARRAY_FORMAT_VERTEX" value="1"> Array format will include vertices (mandatory). </constant> @@ -5116,18 +5948,24 @@ </description> </method> <method name="set_atlas"> + <return type="void"> + </return> <argument index="0" name="atlas" type="Texture"> </argument> <description> </description> </method> <method name="set_margin"> + <return type="void"> + </return> <argument index="0" name="margin" type="Rect2"> </argument> <description> </description> </method> <method name="set_region"> + <return type="void"> + </return> <argument index="0" name="region" type="Rect2"> </argument> <description> @@ -5142,12 +5980,6 @@ <member name="region" type="Rect2" setter="set_region" getter="get_region" brief=""> </member> </members> - <signals> - <signal name="atlas_changed"> - <description> - </description> - </signal> - </signals> <constants> </constants> </class> @@ -5184,6 +6016,8 @@ </description> </method> <method name="set_volume_db"> + <return type="void"> + </return> <argument index="0" name="volume" type="float"> </argument> <description> @@ -5290,18 +6124,24 @@ </description> </method> <method name="set_dry"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_voice_count"> + <return type="void"> + </return> <argument index="0" name="voices" type="int"> </argument> <description> </description> </method> <method name="set_voice_cutoff_hz"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="cutoff_hz" type="float"> @@ -5310,6 +6150,8 @@ </description> </method> <method name="set_voice_delay_ms"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="delay_ms" type="float"> @@ -5318,6 +6160,8 @@ </description> </method> <method name="set_voice_depth_ms"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="depth_ms" type="float"> @@ -5326,6 +6170,8 @@ </description> </method> <method name="set_voice_level_db"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="level_db" type="float"> @@ -5334,6 +6180,8 @@ </description> </method> <method name="set_voice_pan"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="pan" type="float"> @@ -5342,6 +6190,8 @@ </description> </method> <method name="set_voice_rate_hz"> + <return type="void"> + </return> <argument index="0" name="voice_idx" type="int"> </argument> <argument index="1" name="rate_hz" type="float"> @@ -5350,6 +6200,8 @@ </description> </method> <method name="set_wet"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> @@ -5464,42 +6316,56 @@ </description> </method> <method name="set_attack_us"> + <return type="void"> + </return> <argument index="0" name="attack_us" type="float"> </argument> <description> </description> </method> <method name="set_gain"> + <return type="void"> + </return> <argument index="0" name="gain" type="float"> </argument> <description> </description> </method> <method name="set_mix"> + <return type="void"> + </return> <argument index="0" name="mix" type="float"> </argument> <description> </description> </method> <method name="set_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> </description> </method> <method name="set_release_ms"> + <return type="void"> + </return> <argument index="0" name="release_ms" type="float"> </argument> <description> </description> </method> <method name="set_sidechain"> + <return type="void"> + </return> <argument index="0" name="sidechain" type="String"> </argument> <description> </description> </method> <method name="set_threshold"> + <return type="void"> + </return> <argument index="0" name="threshold" type="float"> </argument> <description> @@ -5517,7 +6383,7 @@ </member> <member name="release_ms" type="float" setter="set_release_ms" getter="get_release_ms" brief=""> </member> - <member name="sidechain" type="float" setter="set_sidechain" getter="get_sidechain" brief=""> + <member name="sidechain" type="String" setter="set_sidechain" getter="get_sidechain" brief=""> </member> <member name="threshold" type="float" setter="set_threshold" getter="get_threshold" brief=""> </member> @@ -5610,78 +6476,104 @@ </description> </method> <method name="set_dry"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_feedback_active"> + <return type="void"> + </return> <argument index="0" name="amount" type="bool"> </argument> <description> </description> </method> <method name="set_feedback_delay_ms"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_feedback_level_db"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_feedback_lowpass"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap1_active"> + <return type="void"> + </return> <argument index="0" name="amount" type="bool"> </argument> <description> </description> </method> <method name="set_tap1_delay_ms"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap1_level_db"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap1_pan"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap2_active"> + <return type="void"> + </return> <argument index="0" name="amount" type="bool"> </argument> <description> </description> </method> <method name="set_tap2_delay_ms"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap2_level_db"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_tap2_pan"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> @@ -5738,7 +6630,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioEffectDistortion.Mode"> </return> <description> </description> @@ -5756,30 +6648,40 @@ </description> </method> <method name="set_drive"> + <return type="void"> + </return> <argument index="0" name="drive" type="float"> </argument> <description> </description> </method> <method name="set_keep_hf_hz"> + <return type="void"> + </return> <argument index="0" name="keep_hf_hz" type="float"> </argument> <description> </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="AudioEffectDistortion.Mode"> </argument> <description> </description> </method> <method name="set_post_gain"> + <return type="void"> + </return> <argument index="0" name="post_gain" type="float"> </argument> <description> </description> </method> <method name="set_pre_gain"> + <return type="void"> + </return> <argument index="0" name="pre_gain" type="float"> </argument> <description> @@ -5791,7 +6693,7 @@ </member> <member name="keep_hf_hz" type="float" setter="set_keep_hf_hz" getter="get_keep_hf_hz" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="AudioEffectDistortion.Mode"> </member> <member name="post_gain" type="float" setter="set_post_gain" getter="get_post_gain" brief=""> </member> @@ -5822,6 +6724,8 @@ </description> </method> <method name="set_band_gain_db"> + <return type="void"> + </return> <argument index="0" name="band_idx" type="int"> </argument> <argument index="1" name="volume_db" type="float"> @@ -5876,7 +6780,7 @@ </description> </method> <method name="get_db" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioEffectFilter.FilterDB"> </return> <description> </description> @@ -5894,24 +6798,32 @@ </description> </method> <method name="set_cutoff"> + <return type="void"> + </return> <argument index="0" name="freq" type="float"> </argument> <description> </description> </method> <method name="set_db"> - <argument index="0" name="amount" type="int"> + <return type="void"> + </return> + <argument index="0" name="amount" type="int" enum="AudioEffectFilter.FilterDB"> </argument> <description> </description> </method> <method name="set_gain"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_resonance"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> @@ -5921,7 +6833,7 @@ <members> <member name="cutoff_hz" type="float" setter="set_cutoff" getter="get_cutoff" brief=""> </member> - <member name="dB" type="int" setter="set_db" getter="get_db" brief=""> + <member name="dB" type="int" setter="set_db" getter="get_db" brief="" enum="AudioEffectFilter.FilterDB"> </member> <member name="gain" type="float" setter="set_gain" getter="get_gain" brief=""> </member> @@ -5982,24 +6894,32 @@ </description> </method> <method name="set_ceiling_db"> + <return type="void"> + </return> <argument index="0" name="ceiling" type="float"> </argument> <description> </description> </method> <method name="set_soft_clip_db"> + <return type="void"> + </return> <argument index="0" name="soft_clip" type="float"> </argument> <description> </description> </method> <method name="set_soft_clip_ratio"> + <return type="void"> + </return> <argument index="0" name="soft_clip" type="float"> </argument> <description> </description> </method> <method name="set_threshold_db"> + <return type="void"> + </return> <argument index="0" name="threshold" type="float"> </argument> <description> @@ -6062,6 +6982,8 @@ </description> </method> <method name="set_pan"> + <return type="void"> + </return> <argument index="0" name="cpanume" type="float"> </argument> <description> @@ -6112,30 +7034,40 @@ </description> </method> <method name="set_depth"> + <return type="void"> + </return> <argument index="0" name="depth" type="float"> </argument> <description> </description> </method> <method name="set_feedback"> + <return type="void"> + </return> <argument index="0" name="fbk" type="float"> </argument> <description> </description> </method> <method name="set_range_max_hz"> + <return type="void"> + </return> <argument index="0" name="hz" type="float"> </argument> <description> </description> </method> <method name="set_range_min_hz"> + <return type="void"> + </return> <argument index="0" name="hz" type="float"> </argument> <description> </description> </method> <method name="set_rate_hz"> + <return type="void"> + </return> <argument index="0" name="hz" type="float"> </argument> <description> @@ -6170,6 +7102,8 @@ </description> </method> <method name="set_pitch_scale"> + <return type="void"> + </return> <argument index="0" name="rate" type="float"> </argument> <description> @@ -6238,48 +7172,64 @@ </description> </method> <method name="set_damping"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_dry"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_hpf"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_predelay_feedback"> + <return type="void"> + </return> <argument index="0" name="feedback" type="float"> </argument> <description> </description> </method> <method name="set_predelay_msec"> + <return type="void"> + </return> <argument index="0" name="msec" type="float"> </argument> <description> </description> </method> <method name="set_room_size"> + <return type="void"> + </return> <argument index="0" name="size" type="float"> </argument> <description> </description> </method> <method name="set_spread"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_wet"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> @@ -6332,18 +7282,24 @@ </description> </method> <method name="set_pan_pullout"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_surround"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_time_pullout"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> @@ -6370,17 +7326,21 @@ </description> <methods> <method name="add_bus"> + <return type="void"> + </return> <argument index="0" name="at_pos" type="int" default="-1"> </argument> <description> </description> </method> <method name="add_bus_effect"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="effect" type="AudioEffect"> </argument> - <argument index="2" name="arg2" type="int" default="-1"> + <argument index="2" name="at_pos" type="int" default="-1"> </argument> <description> </description> @@ -6408,12 +7368,10 @@ </description> </method> <method name="get_bus_effect_count"> + <return type="int"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> - <argument index="1" name="arg1" type="Object"> - </argument> - <argument index="2" name="arg2" type="int"> - </argument> <description> </description> </method> @@ -6476,7 +7434,7 @@ </description> </method> <method name="get_speaker_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioServer.SpeakerMode"> </return> <description> </description> @@ -6516,10 +7474,14 @@ </description> </method> <method name="lock"> + <return type="void"> + </return> <description> </description> </method> <method name="move_bus"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="to_index" type="int"> @@ -6528,12 +7490,16 @@ </description> </method> <method name="remove_bus"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> </description> </method> <method name="remove_bus_effect"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="effect_idx" type="int"> @@ -6542,6 +7508,8 @@ </description> </method> <method name="set_bus_bypass_effects"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -6550,12 +7518,16 @@ </description> </method> <method name="set_bus_count"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> </description> </method> <method name="set_bus_effect_enabled"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="effect_idx" type="int"> @@ -6566,12 +7538,16 @@ </description> </method> <method name="set_bus_layout"> + <return type="void"> + </return> <argument index="0" name="bus_layout" type="AudioBusLayout"> </argument> <description> </description> </method> <method name="set_bus_mute"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -6580,6 +7556,8 @@ </description> </method> <method name="set_bus_name"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="name" type="String"> @@ -6588,6 +7566,8 @@ </description> </method> <method name="set_bus_send"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="send" type="String"> @@ -6596,6 +7576,8 @@ </description> </method> <method name="set_bus_solo"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -6604,6 +7586,8 @@ </description> </method> <method name="set_bus_volume_db"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="volume_db" type="float"> @@ -6612,6 +7596,8 @@ </description> </method> <method name="swap_bus_effects"> + <return type="void"> + </return> <argument index="0" name="bus_idx" type="int"> </argument> <argument index="1" name="effect_idx" type="int"> @@ -6622,6 +7608,8 @@ </description> </method> <method name="unlock"> + <return type="void"> + </return> <description> </description> </method> @@ -6661,6 +7649,12 @@ <description> </description> </method> + <method name="get_loop_offset" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> <method name="has_loop" qualifiers="const"> <return type="bool"> </return> @@ -6668,23 +7662,37 @@ </description> </method> <method name="set_data"> + <return type="void"> + </return> <argument index="0" name="data" type="PoolByteArray"> </argument> <description> </description> </method> <method name="set_loop"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> + <method name="set_loop_offset"> + <return type="void"> + </return> + <argument index="0" name="seconds" type="float"> + </argument> + <description> + </description> + </method> </methods> <members> <member name="data" type="PoolByteArray" setter="set_data" getter="get_data" brief=""> </member> <member name="loop" type="bool" setter="set_loop" getter="has_loop" brief=""> </member> + <member name="loop_offset" type="float" setter="set_loop_offset" getter="get_loop_offset" brief=""> + </member> </members> <constants> </constants> @@ -6712,7 +7720,7 @@ </description> </method> <method name="get_mix_target" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamPlayer.MixTarget"> </return> <description> </description> @@ -6724,7 +7732,7 @@ </description> </method> <method name="get_stream" qualifiers="const"> - <return type="Object"> + <return type="AudioStream"> </return> <description> </description> @@ -6748,48 +7756,64 @@ </description> </method> <method name="play"> - <argument index="0" name="from_pos" type="float" default="0"> + <return type="void"> + </return> + <argument index="0" name="from_pos" type="float" default="0.0"> </argument> <description> </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="to_pos" type="float"> </argument> <description> </description> </method> <method name="set_autoplay"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_bus"> + <return type="void"> + </return> <argument index="0" name="bus" type="String"> </argument> <description> </description> </method> <method name="set_mix_target"> - <argument index="0" name="mix_target" type="int"> + <return type="void"> + </return> + <argument index="0" name="mix_target" type="int" enum="AudioStreamPlayer.MixTarget"> </argument> <description> </description> </method> <method name="set_stream"> + <return type="void"> + </return> <argument index="0" name="stream" type="AudioStream"> </argument> <description> </description> </method> <method name="set_volume_db"> + <return type="void"> + </return> <argument index="0" name="volume_db" type="float"> </argument> <description> </description> </method> <method name="stop"> + <return type="void"> + </return> <description> </description> </method> @@ -6799,7 +7823,7 @@ </member> <member name="bus" type="String" setter="set_bus" getter="get_bus" brief=""> </member> - <member name="mix_target" type="int" setter="set_mix_target" getter="get_mix_target" brief=""> + <member name="mix_target" type="int" setter="set_mix_target" getter="get_mix_target" brief="" enum="AudioStreamPlayer.MixTarget"> </member> <member name="playing" type="bool" setter="_set_playing" getter="_is_active" brief=""> </member> @@ -6808,6 +7832,12 @@ <member name="volume_db" type="float" setter="set_volume_db" getter="get_volume_db" brief=""> </member> </members> + <signals> + <signal name="finished"> + <description> + </description> + </signal> + </signals> <constants> </constants> </class> @@ -6848,7 +7878,7 @@ </description> </method> <method name="get_stream" qualifiers="const"> - <return type="Object"> + <return type="AudioStream"> </return> <description> </description> @@ -6872,60 +7902,80 @@ </description> </method> <method name="play"> - <argument index="0" name="from_pos" type="float" default="0"> + <return type="void"> + </return> + <argument index="0" name="from_pos" type="float" default="0.0"> </argument> <description> </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="to_pos" type="float"> </argument> <description> </description> </method> <method name="set_area_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> </description> </method> <method name="set_attenuation"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_autoplay"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_bus"> + <return type="void"> + </return> <argument index="0" name="bus" type="String"> </argument> <description> </description> </method> <method name="set_max_distance"> + <return type="void"> + </return> <argument index="0" name="pixels" type="float"> </argument> <description> </description> </method> <method name="set_stream"> + <return type="void"> + </return> <argument index="0" name="stream" type="AudioStream"> </argument> <description> </description> </method> <method name="set_volume_db"> + <return type="void"> + </return> <argument index="0" name="volume_db" type="float"> </argument> <description> </description> </method> <method name="stop"> + <return type="void"> + </return> <description> </description> </method> @@ -6948,6 +7998,12 @@ <member name="volume_db" type="float" setter="set_volume_db" getter="get_volume_db" brief=""> </member> </members> + <signals> + <signal name="finished"> + <description> + </description> + </signal> + </signals> <constants> </constants> </class> @@ -6976,7 +8032,7 @@ </description> </method> <method name="get_attenuation_model" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamPlayer3D.AttenuationModel"> </return> <description> </description> @@ -6988,7 +8044,7 @@ </description> </method> <method name="get_doppler_tracking" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamPlayer3D.DopplerTracking"> </return> <description> </description> @@ -7018,7 +8074,7 @@ </description> </method> <method name="get_out_of_range_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamPlayer3D.OutOfRangeMode"> </return> <description> </description> @@ -7030,7 +8086,7 @@ </description> </method> <method name="get_stream" qualifiers="const"> - <return type="Object"> + <return type="AudioStream"> </return> <description> </description> @@ -7066,114 +8122,152 @@ </description> </method> <method name="play"> - <argument index="0" name="from_pos" type="float" default="0"> + <return type="void"> + </return> + <argument index="0" name="from_pos" type="float" default="0.0"> </argument> <description> </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="to_pos" type="float"> </argument> <description> </description> </method> <method name="set_area_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> </description> </method> <method name="set_attenuation_filter_cutoff_hz"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_attenuation_filter_db"> + <return type="void"> + </return> <argument index="0" name="db" type="float"> </argument> <description> </description> </method> <method name="set_attenuation_model"> - <argument index="0" name="model" type="int"> + <return type="void"> + </return> + <argument index="0" name="model" type="int" enum="AudioStreamPlayer3D.AttenuationModel"> </argument> <description> </description> </method> <method name="set_autoplay"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_bus"> + <return type="void"> + </return> <argument index="0" name="bus" type="String"> </argument> <description> </description> </method> <method name="set_doppler_tracking"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="AudioStreamPlayer3D.DopplerTracking"> </argument> <description> </description> </method> <method name="set_emission_angle"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_emission_angle_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_emission_angle_filter_attenuation_db"> + <return type="void"> + </return> <argument index="0" name="db" type="float"> </argument> <description> </description> </method> <method name="set_max_db"> + <return type="void"> + </return> <argument index="0" name="max_db" type="float"> </argument> <description> </description> </method> <method name="set_max_distance"> + <return type="void"> + </return> <argument index="0" name="metres" type="float"> </argument> <description> </description> </method> <method name="set_out_of_range_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="AudioStreamPlayer3D.OutOfRangeMode"> </argument> <description> </description> </method> <method name="set_stream"> + <return type="void"> + </return> <argument index="0" name="stream" type="AudioStream"> </argument> <description> </description> </method> <method name="set_unit_db"> + <return type="void"> + </return> <argument index="0" name="unit_db" type="float"> </argument> <description> </description> </method> <method name="set_unit_size"> + <return type="void"> + </return> <argument index="0" name="unit_size" type="float"> </argument> <description> </description> </method> <method name="stop"> + <return type="void"> + </return> <description> </description> </method> @@ -7185,13 +8279,13 @@ </member> <member name="attenuation_filter_db" type="float" setter="set_attenuation_filter_db" getter="get_attenuation_filter_db" brief=""> </member> - <member name="attenuation_model" type="int" setter="set_attenuation_model" getter="get_attenuation_model" brief=""> + <member name="attenuation_model" type="int" setter="set_attenuation_model" getter="get_attenuation_model" brief="" enum="AudioStreamPlayer3D.AttenuationModel"> </member> <member name="autoplay" type="bool" setter="set_autoplay" getter="is_autoplay_enabled" brief=""> </member> <member name="bus" type="String" setter="set_bus" getter="get_bus" brief=""> </member> - <member name="doppler_tracking" type="int" setter="set_doppler_tracking" getter="get_doppler_tracking" brief=""> + <member name="doppler_tracking" type="int" setter="set_doppler_tracking" getter="get_doppler_tracking" brief="" enum="AudioStreamPlayer3D.DopplerTracking"> </member> <member name="emission_angle_degrees" type="float" setter="set_emission_angle" getter="get_emission_angle" brief=""> </member> @@ -7203,7 +8297,7 @@ </member> <member name="max_distance" type="float" setter="set_max_distance" getter="get_max_distance" brief=""> </member> - <member name="out_of_range_mode" type="int" setter="set_out_of_range_mode" getter="get_out_of_range_mode" brief=""> + <member name="out_of_range_mode" type="int" setter="set_out_of_range_mode" getter="get_out_of_range_mode" brief="" enum="AudioStreamPlayer3D.OutOfRangeMode"> </member> <member name="playing" type="bool" setter="_set_playing" getter="_is_active" brief=""> </member> @@ -7214,6 +8308,12 @@ <member name="unit_size" type="float" setter="set_unit_size" getter="get_unit_size" brief=""> </member> </members> + <signals> + <signal name="finished"> + <description> + </description> + </signal> + </signals> <constants> <constant name="ATTENUATION_INVERSE_DISTANCE" value="0"> </constant> @@ -7240,7 +8340,7 @@ </description> <methods> <method name="get_audio_stream" qualifiers="const"> - <return type="Object"> + <return type="AudioStream"> </return> <description> </description> @@ -7252,12 +8352,16 @@ </description> </method> <method name="set_audio_stream"> - <argument index="0" name="stream" type="Object"> + <return type="void"> + </return> + <argument index="0" name="stream" type="AudioStream"> </argument> <description> </description> </method> <method name="set_random_pitch"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> @@ -7286,7 +8390,7 @@ </description> </method> <method name="get_format" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamSample.Format"> </return> <description> </description> @@ -7304,7 +8408,7 @@ </description> </method> <method name="get_loop_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="AudioStreamSample.LoopMode"> </return> <description> </description> @@ -7322,42 +8426,56 @@ </description> </method> <method name="set_data"> + <return type="void"> + </return> <argument index="0" name="data" type="PoolByteArray"> </argument> <description> </description> </method> <method name="set_format"> - <argument index="0" name="format" type="int"> + <return type="void"> + </return> + <argument index="0" name="format" type="int" enum="AudioStreamSample.Format"> </argument> <description> </description> </method> <method name="set_loop_begin"> + <return type="void"> + </return> <argument index="0" name="loop_begin" type="int"> </argument> <description> </description> </method> <method name="set_loop_end"> + <return type="void"> + </return> <argument index="0" name="loop_end" type="int"> </argument> <description> </description> </method> <method name="set_loop_mode"> - <argument index="0" name="loop_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="loop_mode" type="int" enum="AudioStreamSample.LoopMode"> </argument> <description> </description> </method> <method name="set_mix_rate"> + <return type="void"> + </return> <argument index="0" name="mix_rate" type="int"> </argument> <description> </description> </method> <method name="set_stereo"> + <return type="void"> + </return> <argument index="0" name="stereo" type="bool"> </argument> <description> @@ -7367,13 +8485,13 @@ <members> <member name="data" type="PoolByteArray" setter="set_data" getter="get_data" brief=""> </member> - <member name="format" type="int" setter="set_format" getter="get_format" brief=""> + <member name="format" type="int" setter="set_format" getter="get_format" brief="" enum="AudioStreamSample.Format"> </member> <member name="loop_begin" type="int" setter="set_loop_begin" getter="get_loop_begin" brief=""> </member> <member name="loop_end" type="int" setter="set_loop_end" getter="get_loop_end" brief=""> </member> - <member name="loop_mode" type="int" setter="set_loop_mode" getter="get_loop_mode" brief=""> + <member name="loop_mode" type="int" setter="set_loop_mode" getter="get_loop_mode" brief="" enum="AudioStreamSample.LoopMode"> </member> <member name="mix_rate" type="int" setter="set_mix_rate" getter="get_mix_rate" brief=""> </member> @@ -7392,7 +8510,7 @@ </description> <methods> <method name="get_copy_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="BackBufferCopy.CopyMode"> </return> <description> Return the copy mode currently applied to the BackBufferCopy (refer to constants section). @@ -7406,13 +8524,17 @@ </description> </method> <method name="set_copy_mode"> - <argument index="0" name="copy_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="copy_mode" type="int" enum="BackBufferCopy.CopyMode"> </argument> <description> Set the copy mode of the BackBufferCopy (refer to constants section). </description> </method> <method name="set_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> @@ -7421,7 +8543,7 @@ </method> </methods> <members> - <member name="copy_mode" type="int" setter="set_copy_mode" getter="get_copy_mode" brief=""> + <member name="copy_mode" type="int" setter="set_copy_mode" getter="get_copy_mode" brief="" enum="BackBufferCopy.CopyMode"> </member> <member name="rect" type="Rect2" setter="set_rect" getter="get_rect" brief=""> </member> @@ -7447,11 +8569,15 @@ </description> <methods> <method name="_pressed" qualifiers="virtual"> + <return type="void"> + </return> <description> Called when button is pressed. </description> </method> <method name="_toggled" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> @@ -7459,34 +8585,34 @@ </description> </method> <method name="get_action_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="BaseButton.ActionMode"> </return> <description> Return the current mode of action (see [method set_action_mode]) (one of the ACTION_MODE_* constants). </description> </method> <method name="get_button_group" qualifiers="const"> - <return type="Object"> + <return type="ButtonGroup"> </return> <description> </description> </method> <method name="get_draw_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="BaseButton.DrawMode"> </return> <description> Return the visual state used to draw the button. This is useful mainly when implementing your own draw code by either overriding _draw() or connecting to "draw" signal. The visual state of the button is defined by the DRAW_* enum. </description> </method> <method name="get_enabled_focus_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.FocusMode"> </return> <description> Returns focus access mode used when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]). </description> </method> <method name="get_shortcut" qualifiers="const"> - <return type="Object"> + <return type="ShortCut"> </return> <description> </description> @@ -7520,19 +8646,25 @@ </description> </method> <method name="set_action_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="BaseButton.ActionMode"> </argument> <description> Set the current mode of action, determining when the button is considered clicked (see the ACTION_MODE_* constants). </description> </method> <method name="set_button_group"> - <argument index="0" name="button_group" type="Object"> + <return type="void"> + </return> + <argument index="0" name="button_group" type="ButtonGroup"> </argument> <description> </description> </method> <method name="set_disabled"> + <return type="void"> + </return> <argument index="0" name="disabled" type="bool"> </argument> <description> @@ -7540,13 +8672,17 @@ </description> </method> <method name="set_enabled_focus_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Control.FocusMode"> </argument> <description> Sets the focus access mode to use when switching between enabled/disabled (see [method Control.set_focus_mode] and [method set_disabled]). </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> @@ -7554,12 +8690,16 @@ </description> </method> <method name="set_shortcut"> - <argument index="0" name="shortcut" type="Object"> + <return type="void"> + </return> + <argument index="0" name="shortcut" type="ShortCut"> </argument> <description> </description> </method> <method name="set_toggle_mode"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -7568,15 +8708,15 @@ </method> </methods> <members> - <member name="action_mode" type="int" setter="set_action_mode" getter="get_action_mode" brief=""> + <member name="action_mode" type="int" setter="set_action_mode" getter="get_action_mode" brief="" enum="BaseButton.ActionMode"> </member> <member name="disabled" type="bool" setter="set_disabled" getter="is_disabled" brief=""> </member> - <member name="enabled_focus_mode" type="int" setter="set_enabled_focus_mode" getter="get_enabled_focus_mode" brief=""> + <member name="enabled_focus_mode" type="int" setter="set_enabled_focus_mode" getter="get_enabled_focus_mode" brief="" enum="Control.FocusMode"> </member> <member name="group" type="ButtonGroup" setter="set_button_group" getter="get_button_group" brief=""> </member> - <member name="is_pressed" type="bool" setter="set_pressed" getter="is_pressed" brief=""> + <member name="pressed" type="bool" setter="set_pressed" getter="is_pressed" brief=""> </member> <member name="shortcut" type="ShortCut" setter="set_shortcut" getter="get_shortcut" brief=""> </member> @@ -7812,13 +8952,17 @@ </description> <methods> <method name="create"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="create_from_image_alpha"> - <argument index="0" name="image" type="Object"> + <return type="void"> + </return> + <argument index="0" name="image" type="Image"> </argument> <description> </description> @@ -7844,6 +8988,8 @@ </description> </method> <method name="set_bit"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <argument index="1" name="bit" type="bool"> @@ -7852,6 +8998,8 @@ </description> </method> <method name="set_bit_rect"> + <return type="void"> + </return> <argument index="0" name="p_rect" type="Rect2"> </argument> <argument index="1" name="bit" type="bool"> @@ -7874,13 +9022,15 @@ </description> <methods> <method name="add_char"> + <return type="void"> + </return> <argument index="0" name="character" type="int"> </argument> <argument index="1" name="texture" type="int"> </argument> <argument index="2" name="rect" type="Rect2"> </argument> - <argument index="3" name="align" type="Vector2" default="Vector2(0, 0)"> + <argument index="3" name="align" type="Vector2" default="Vector2( 0, 0 )"> </argument> <argument index="4" name="advance" type="float" default="-1"> </argument> @@ -7889,6 +9039,8 @@ </description> </method> <method name="add_kerning_pair"> + <return type="void"> + </return> <argument index="0" name="char_a" type="int"> </argument> <argument index="1" name="char_b" type="int"> @@ -7900,6 +9052,8 @@ </description> </method> <method name="add_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> @@ -7907,12 +9061,14 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear all the font data. </description> </method> <method name="create_from_fnt"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -7931,7 +9087,7 @@ </description> </method> <method name="get_fallback" qualifiers="const"> - <return type="Object"> + <return type="BitmapFont"> </return> <description> </description> @@ -7962,6 +9118,8 @@ </description> </method> <method name="set_ascent"> + <return type="void"> + </return> <argument index="0" name="px" type="float"> </argument> <description> @@ -7969,18 +9127,24 @@ </description> </method> <method name="set_distance_field_hint"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_fallback"> - <argument index="0" name="fallback" type="Object"> + <return type="void"> + </return> + <argument index="0" name="fallback" type="BitmapFont"> </argument> <description> </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="px" type="float"> </argument> <description> @@ -8022,6 +9186,8 @@ </description> </method> <method name="set_bone_name"> + <return type="void"> + </return> <argument index="0" name="bone_name" type="String"> </argument> <description> @@ -8040,6 +9206,8 @@ </description> <methods> <method name="add_spacer"> + <return type="void"> + </return> <argument index="0" name="begin" type="bool"> </argument> <description> @@ -8048,14 +9216,16 @@ </description> </method> <method name="get_alignment" qualifiers="const"> - <return type="int"> + <return type="int" enum="BoxContainer.AlignMode"> </return> <description> Return the alignment of children in the container. </description> </method> <method name="set_alignment"> - <argument index="0" name="alignment" type="int"> + <return type="void"> + </return> + <argument index="0" name="alignment" type="int" enum="BoxContainer.AlignMode"> </argument> <description> Set the alignment of children in the container(Must be one of ALIGN_BEGIN, ALIGN_CENTER or ALIGN_END). @@ -8063,7 +9233,7 @@ </method> </methods> <members> - <member name="alignment" type="int" setter="set_alignment" getter="get_alignment" brief=""> + <member name="alignment" type="int" setter="set_alignment" getter="get_alignment" brief="" enum="BoxContainer.AlignMode"> </member> </members> <constants> @@ -8094,6 +9264,8 @@ </description> </method> <method name="set_extents"> + <return type="void"> + </return> <argument index="0" name="extents" type="Vector3"> </argument> <description> @@ -8138,7 +9310,7 @@ </description> </method> <method name="get_text_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="Button.TextAlign"> </return> <description> Return the text alignment policy. @@ -8152,6 +9324,8 @@ </description> </method> <method name="set_button_icon"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> @@ -8159,6 +9333,8 @@ </description> </method> <method name="set_clip_text"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -8166,6 +9342,8 @@ </description> </method> <method name="set_flat"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -8173,6 +9351,8 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -8180,7 +9360,9 @@ </description> </method> <method name="set_text_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="Button.TextAlign"> </argument> <description> Set the text alignment policy, using one of the ALIGN_* constants. @@ -8188,7 +9370,7 @@ </method> </methods> <members> - <member name="align" type="int" setter="set_text_align" getter="get_text_align" brief=""> + <member name="align" type="int" setter="set_text_align" getter="get_text_align" brief="" enum="Button.TextAlign"> </member> <member name="clip_text" type="bool" setter="set_clip_text" getter="get_clip_text" brief=""> </member> @@ -8267,6 +9449,8 @@ </description> <methods> <method name="clear_current"> + <return type="void"> + </return> <description> </description> </method> @@ -8284,7 +9468,7 @@ </description> </method> <method name="get_doppler_tracking" qualifiers="const"> - <return type="int"> + <return type="int" enum="Camera.DopplerTracking"> </return> <description> </description> @@ -8308,13 +9492,13 @@ </description> </method> <method name="get_keep_aspect_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Camera.KeepAspect"> </return> <description> </description> </method> <method name="get_projection" qualifiers="const"> - <return type="int"> + <return type="int" enum="Camera.Projection"> </return> <description> </description> @@ -8359,6 +9543,8 @@ </description> </method> <method name="make_current"> + <return type="void"> + </return> <description> Make this camera the current Camera for the [Viewport] (see class description). If the Camera Node is outside the scene tree, it will attempt to become current once it's added. </description> @@ -8398,36 +9584,48 @@ </description> </method> <method name="set_cull_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> </description> </method> <method name="set_doppler_tracking"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Camera.DopplerTracking"> </argument> <description> </description> </method> <method name="set_environment"> + <return type="void"> + </return> <argument index="0" name="env" type="Environment"> </argument> <description> </description> </method> <method name="set_h_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="float"> </argument> <description> </description> </method> <method name="set_keep_aspect_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Camera.KeepAspect"> </argument> <description> </description> </method> <method name="set_orthogonal"> + <return type="void"> + </return> <argument index="0" name="size" type="float"> </argument> <argument index="1" name="z_near" type="float"> @@ -8439,6 +9637,8 @@ </description> </method> <method name="set_perspective"> + <return type="void"> + </return> <argument index="0" name="fov" type="float"> </argument> <argument index="1" name="z_near" type="float"> @@ -8450,6 +9650,8 @@ </description> </method> <method name="set_v_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="float"> </argument> <description> @@ -8494,21 +9696,27 @@ </description> <methods> <method name="align"> + <return type="void"> + </return> <description> Align the camera to the tracked node </description> </method> <method name="clear_current"> + <return type="void"> + </return> <description> </description> </method> <method name="force_update_scroll"> + <return type="void"> + </return> <description> Force the camera to update scroll immediately. </description> </method> <method name="get_anchor_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Camera2D.AnchorMode"> </return> <description> </description> @@ -8527,7 +9735,7 @@ </description> </method> <method name="get_custom_viewport" qualifiers="const"> - <return type="Viewport"> + <return type="Node"> </return> <description> </description> @@ -8535,7 +9743,7 @@ <method name="get_drag_margin" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the margins needed to drag the camera (see [method set_drag_margin]). @@ -8556,7 +9764,7 @@ <method name="get_limit" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the scrolling limit in pixels. @@ -8637,30 +9845,40 @@ </description> </method> <method name="make_current"> + <return type="void"> + </return> <description> Make this the current 2D camera for the scene (viewport and layer), in case there's many cameras in the scene. </description> </method> <method name="reset_smoothing"> + <return type="void"> + </return> <description> Set the camera's position immediately to its current smoothing destination. This has no effect if smoothing is disabled. </description> </method> <method name="set_anchor_mode"> - <argument index="0" name="anchor_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="anchor_mode" type="int" enum="Camera2D.AnchorMode"> </argument> <description> </description> </method> <method name="set_custom_viewport"> - <argument index="0" name="viewport" type="Viewport"> + <return type="void"> + </return> + <argument index="0" name="viewport" type="Node"> </argument> <description> </description> </method> <method name="set_drag_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="drag_margin" type="float"> </argument> @@ -8669,31 +9887,41 @@ </description> </method> <method name="set_enable_follow_smoothing"> + <return type="void"> + </return> <argument index="0" name="follow_smoothing" type="bool"> </argument> <description> </description> </method> <method name="set_follow_smoothing"> + <return type="void"> + </return> <argument index="0" name="follow_smoothing" type="float"> </argument> <description> </description> </method> <method name="set_h_drag_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_h_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="float"> </argument> <description> </description> </method> <method name="set_limit"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="limit" type="int"> </argument> @@ -8702,12 +9930,16 @@ </description> </method> <method name="set_limit_drawing_enabled"> + <return type="void"> + </return> <argument index="0" name="limit_drawing_enabled" type="bool"> </argument> <description> </description> </method> <method name="set_limit_smoothing_enabled"> + <return type="void"> + </return> <argument index="0" name="limit_smoothing_enabled" type="bool"> </argument> <description> @@ -8716,12 +9948,16 @@ </description> </method> <method name="set_margin_drawing_enabled"> + <return type="void"> + </return> <argument index="0" name="margin_drawing_enabled" type="bool"> </argument> <description> </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -8729,30 +9965,40 @@ </description> </method> <method name="set_rotating"> + <return type="void"> + </return> <argument index="0" name="rotating" type="bool"> </argument> <description> </description> </method> <method name="set_screen_drawing_enabled"> + <return type="void"> + </return> <argument index="0" name="screen_drawing_enabled" type="bool"> </argument> <description> </description> </method> <method name="set_v_drag_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_v_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="float"> </argument> <description> </description> </method> <method name="set_zoom"> + <return type="void"> + </return> <argument index="0" name="zoom" type="Vector2"> </argument> <description> @@ -8760,7 +10006,7 @@ </method> </methods> <members> - <member name="anchor_mode" type="int" setter="set_anchor_mode" getter="get_anchor_mode" brief=""> + <member name="anchor_mode" type="int" setter="set_anchor_mode" getter="get_anchor_mode" brief="" enum="Camera2D.AnchorMode"> </member> <member name="current" type="bool" setter="_set_current" getter="is_current" brief=""> </member> @@ -8823,6 +10069,8 @@ </description> <methods> <method name="_draw" qualifiers="virtual"> + <return type="void"> + </return> <description> Called (if exists) to draw the canvas item. </description> @@ -8838,13 +10086,15 @@ </argument> <argument index="3" name="next" type="String"> </argument> - <argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="4" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <description> Draw a string character using a custom font. Returns the advance, depending on the char width and kerning with an optional next char. </description> </method> <method name="draw_circle"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <argument index="1" name="radius" type="float"> @@ -8856,28 +10106,34 @@ </description> </method> <method name="draw_colored_polygon"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="color" type="Color"> </argument> - <argument index="2" name="uvs" type="PoolVector2Array" default="PoolVector2Array([])"> + <argument index="2" name="uvs" type="PoolVector2Array" default="PoolVector2Array( )"> + </argument> + <argument index="3" name="texture" type="Texture" default="null"> </argument> - <argument index="3" name="texture" type="Texture" default="NULL"> + <argument index="4" name="normal_map" type="Texture" default="null"> </argument> - <argument index="4" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="antialiased" type="bool" default="false"> </argument> <description> Draw a colored polygon of any amount of points, convex or concave. </description> </method> <method name="draw_line"> + <return type="void"> + </return> <argument index="0" name="from" type="Vector2"> </argument> <argument index="1" name="to" type="Vector2"> </argument> <argument index="2" name="color" type="Color"> </argument> - <argument index="3" name="width" type="float" default="1"> + <argument index="3" name="width" type="float" default="1.0"> </argument> <argument index="4" name="antialiased" type="bool" default="false"> </argument> @@ -8886,26 +10142,32 @@ </description> </method> <method name="draw_polygon"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="colors" type="PoolColorArray"> </argument> - <argument index="2" name="uvs" type="PoolVector2Array" default="PoolVector2Array([])"> + <argument index="2" name="uvs" type="PoolVector2Array" default="PoolVector2Array( )"> + </argument> + <argument index="3" name="texture" type="Texture" default="null"> </argument> - <argument index="3" name="texture" type="Texture" default="NULL"> + <argument index="4" name="normal_map" type="Texture" default="null"> </argument> - <argument index="4" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="antialiased" type="bool" default="false"> </argument> <description> Draw a polygon of any amount of points, convex or concave. </description> </method> <method name="draw_polyline"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="color" type="Color"> </argument> - <argument index="2" name="width" type="float" default="1"> + <argument index="2" name="width" type="float" default="1.0"> </argument> <argument index="3" name="antialiased" type="bool" default="false"> </argument> @@ -8913,11 +10175,13 @@ </description> </method> <method name="draw_polyline_colors"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="colors" type="PoolColorArray"> </argument> - <argument index="2" name="width" type="float" default="1"> + <argument index="2" name="width" type="float" default="1.0"> </argument> <argument index="3" name="antialiased" type="bool" default="false"> </argument> @@ -8925,23 +10189,27 @@ </description> </method> <method name="draw_primitive"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="colors" type="PoolColorArray"> </argument> <argument index="2" name="uvs" type="PoolVector2Array"> </argument> - <argument index="3" name="texture" type="Texture" default="NULL"> + <argument index="3" name="texture" type="Texture" default="null"> </argument> - <argument index="4" name="width" type="float" default="1"> + <argument index="4" name="width" type="float" default="1.0"> </argument> - <argument index="5" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="normal_map" type="Texture" default="null"> </argument> <description> Draw a custom primitive, 1 point for a point, 2 points for a line, 3 points for a triangle and 4 points for a quad. </description> </method> <method name="draw_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <argument index="1" name="color" type="Color"> @@ -8953,6 +10221,8 @@ </description> </method> <method name="draw_set_transform"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <argument index="1" name="rot" type="float"> @@ -8964,19 +10234,23 @@ </description> </method> <method name="draw_set_transform_matrix"> + <return type="void"> + </return> <argument index="0" name="xform" type="Transform2D"> </argument> <description> </description> </method> <method name="draw_string"> + <return type="void"> + </return> <argument index="0" name="font" type="Font"> </argument> <argument index="1" name="pos" type="Vector2"> </argument> <argument index="2" name="text" type="String"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="clip_w" type="int" default="-1"> </argument> @@ -8985,6 +10259,8 @@ </description> </method> <method name="draw_style_box"> + <return type="void"> + </return> <argument index="0" name="style_box" type="StyleBox"> </argument> <argument index="1" name="rect" type="Rect2"> @@ -8994,47 +10270,53 @@ </description> </method> <method name="draw_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="pos" type="Vector2"> </argument> - <argument index="2" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> - <argument index="3" name="normal_map" type="Texture" default="NULL"> + <argument index="3" name="normal_map" type="Texture" default="null"> </argument> <description> Draw a texture at a given position. </description> </method> <method name="draw_texture_rect"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="rect" type="Rect2"> </argument> <argument index="2" name="tile" type="bool"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="transpose" type="bool" default="false"> </argument> - <argument index="5" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="normal_map" type="Texture" default="null"> </argument> <description> Draw a textured rectangle at a given position, optionally modulated by a color. Transpose swaps the x and y coordinates when reading the texture. </description> </method> <method name="draw_texture_rect_region"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="rect" type="Rect2"> </argument> <argument index="2" name="src_rect" type="Rect2"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="transpose" type="bool" default="false"> </argument> - <argument index="5" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="normal_map" type="Texture" default="null"> </argument> <argument index="6" name="clip_uv" type="bool" default="true"> </argument> @@ -9050,6 +10332,8 @@ </description> </method> <method name="edit_rotate"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> @@ -9057,12 +10341,16 @@ </description> </method> <method name="edit_set_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> </description> </method> <method name="edit_set_state"> + <return type="void"> + </return> <argument index="0" name="state" type="Variant"> </argument> <description> @@ -9189,13 +10477,15 @@ </description> </method> <method name="get_world_2d" qualifiers="const"> - <return type="Object"> + <return type="World2D"> </return> <description> Get the [World2D] where this item is in. </description> </method> <method name="hide"> + <return type="void"> + </return> <description> Hide the CanvasItem currently visible. </description> @@ -9248,14 +10538,16 @@ </description> </method> <method name="make_input_local" qualifiers="const"> - <return type="Object"> + <return type="InputEvent"> </return> - <argument index="0" name="event" type="Object"> + <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> </method> <method name="set_as_toplevel"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -9263,6 +10555,8 @@ </description> </method> <method name="set_draw_behind_parent"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -9270,6 +10564,8 @@ </description> </method> <method name="set_light_mask"> + <return type="void"> + </return> <argument index="0" name="light_mask" type="int"> </argument> <description> @@ -9277,6 +10573,8 @@ </description> </method> <method name="set_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> @@ -9284,6 +10582,8 @@ </description> </method> <method name="set_modulate"> + <return type="void"> + </return> <argument index="0" name="modulate" type="Color"> </argument> <description> @@ -9291,18 +10591,24 @@ </description> </method> <method name="set_notify_local_transform"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_notify_transform"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_self_modulate"> + <return type="void"> + </return> <argument index="0" name="self_modulate" type="Color"> </argument> <description> @@ -9310,6 +10616,8 @@ </description> </method> <method name="set_use_parent_material"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -9317,7 +10625,9 @@ </description> </method> <method name="set_visible"> - <argument index="0" name="arg0" type="bool"> + <return type="void"> + </return> + <argument index="0" name="visible" type="bool"> </argument> <description> Set whether this item should be visible or not. @@ -9325,11 +10635,15 @@ </description> </method> <method name="show"> + <return type="void"> + </return> <description> Show the CanvasItem currently hidden. </description> </method> <method name="update"> + <return type="void"> + </return> <description> Queue the CanvasItem for update. [code]NOTIFICATION_DRAW[/code] will be called on idle time to request redraw. </description> @@ -9338,7 +10652,7 @@ <members> <member name="light_mask" type="int" setter="set_light_mask" getter="get_light_mask" brief=""> </member> - <member name="material" type="ShaderMaterial,CanvasItemMaterial" setter="set_material" getter="get_material" brief=""> + <member name="material" type="Material" setter="set_material" getter="get_material" brief=""> </member> <member name="modulate" type="Color" setter="set_modulate" getter="get_modulate" brief=""> </member> @@ -9391,19 +10705,19 @@ <constant name="BLEND_MODE_PREMULT_ALPHA" value="4"> Mix blending mode. Colors are assumed to be premultiplied by the alpha (opacity) value. </constant> - <constant name="NOTIFICATION_DRAW" value="30"> + <constant name="NOTIFICATION_DRAW" value="30" enum=""> CanvasItem is requested to draw. </constant> - <constant name="NOTIFICATION_VISIBILITY_CHANGED" value="31"> + <constant name="NOTIFICATION_VISIBILITY_CHANGED" value="31" enum=""> Canvas item visibility has changed. </constant> - <constant name="NOTIFICATION_ENTER_CANVAS" value="32"> + <constant name="NOTIFICATION_ENTER_CANVAS" value="32" enum=""> Canvas item has entered the canvas. </constant> - <constant name="NOTIFICATION_EXIT_CANVAS" value="33"> + <constant name="NOTIFICATION_EXIT_CANVAS" value="33" enum=""> Canvas item has exited the canvas. </constant> - <constant name="NOTIFICATION_TRANSFORM_CHANGED" value="29"> + <constant name="NOTIFICATION_TRANSFORM_CHANGED" value="29" enum=""> Canvas item transform has changed. Only received if requested. </constant> </constants> @@ -9415,34 +10729,38 @@ </description> <methods> <method name="get_blend_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="CanvasItemMaterial.BlendMode"> </return> <description> </description> </method> <method name="get_light_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="CanvasItemMaterial.LightMode"> </return> <description> </description> </method> <method name="set_blend_mode"> - <argument index="0" name="blend_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="blend_mode" type="int" enum="CanvasItemMaterial.BlendMode"> </argument> <description> </description> </method> <method name="set_light_mode"> - <argument index="0" name="light_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="light_mode" type="int" enum="CanvasItemMaterial.LightMode"> </argument> <description> </description> </method> </methods> <members> - <member name="blend_mode" type="int" setter="set_blend_mode" getter="get_blend_mode" brief=""> + <member name="blend_mode" type="int" setter="set_blend_mode" getter="get_blend_mode" brief="" enum="CanvasItemMaterial.BlendMode"> </member> - <member name="light_mode" type="int" setter="set_light_mode" getter="get_light_mode" brief=""> + <member name="light_mode" type="int" setter="set_light_mode" getter="get_light_mode" brief="" enum="CanvasItemMaterial.LightMode"> </member> </members> <constants> @@ -9473,7 +10791,7 @@ </description> <methods> <method name="get_custom_viewport" qualifiers="const"> - <return type="Viewport"> + <return type="Node"> </return> <description> </description> @@ -9528,12 +10846,16 @@ </description> </method> <method name="set_custom_viewport"> - <argument index="0" name="viewport" type="Viewport"> + <return type="void"> + </return> + <argument index="0" name="viewport" type="Node"> </argument> <description> </description> </method> <method name="set_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -9541,6 +10863,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -9548,6 +10872,8 @@ </description> </method> <method name="set_rotation"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> @@ -9555,6 +10881,8 @@ </description> </method> <method name="set_rotationd"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> @@ -9562,6 +10890,8 @@ </description> </method> <method name="set_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -9569,6 +10899,8 @@ </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="transform" type="Transform2D"> </argument> <description> @@ -9605,6 +10937,8 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -9650,24 +10984,32 @@ </description> </method> <method name="set_mid_height"> + <return type="void"> + </return> <argument index="0" name="mid_height" type="float"> </argument> <description> </description> </method> <method name="set_radial_segments"> + <return type="void"> + </return> <argument index="0" name="segments" type="int"> </argument> <description> </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_rings"> + <return type="void"> + </return> <argument index="0" name="rings" type="int"> </argument> <description> @@ -9710,6 +11052,8 @@ </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> @@ -9717,6 +11061,8 @@ </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> @@ -9756,6 +11102,8 @@ </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> @@ -9763,6 +11111,8 @@ </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> @@ -9795,6 +11145,8 @@ </description> </method> <method name="set_use_top_left"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -9913,6 +11265,8 @@ </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> @@ -10060,7 +11414,7 @@ </description> </method> <method name="class_set_property" qualifiers="const"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="object" type="Object"> </argument> @@ -10130,6 +11484,8 @@ </description> <methods> <method name="_input_event" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="camera" type="Object"> </argument> <argument index="1" name="event" type="InputEvent"> @@ -10143,12 +11499,6 @@ <description> </description> </method> - <method name="get_capture_input_on_drag" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> <method name="create_shape_owner"> <return type="int"> </return> @@ -10158,6 +11508,12 @@ Creates new holder for the shapes. Argument is a [CollisionShape] node. It will return owner_id which usually you will want to save for later use. </description> </method> + <method name="get_capture_input_on_drag" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="get_rid" qualifiers="const"> <return type="RID"> </return> @@ -10171,14 +11527,80 @@ Shape owner is a node which is holding concrete shape resources. This method will return an array which is holding an integer numbers that are representing unique ID of each owner. You can use those ids when you are using others shape_owner methods. </description> </method> + <method name="is_ray_pickable" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="is_shape_owner_disabled" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="remove_shape_owner"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_capture_input_on_drag"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="set_ray_pickable"> + <return type="void"> + </return> + <argument index="0" name="ray_pickable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="shape_find_owner" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="shape_index" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_add_shape"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="shape" type="Shape"> + </argument> + <description> + </description> + </method> <method name="shape_owner_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="owner_id" type="int"> </argument> <description> Will remove all the shapes associated with given owner. </description> </method> - <method name="shape_owner_get_shape"> + <method name="shape_owner_get_owner" qualifiers="const"> + <return type="Object"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_get_shape" qualifiers="const"> <return type="Shape"> </return> <argument index="0" name="owner_id" type="int"> @@ -10189,7 +11611,7 @@ Will return a [Shape]. First argument owner_id is an integer that can be obtained from [method get_shape_owners]. Shape_id is a position of the shape inside owner; it's a value in range from 0 to [method shape_owner_get_shape_count]. </description> </method> - <method name="shape_owner_get_shape_count"> + <method name="shape_owner_get_shape_count" qualifiers="const"> <return type="int"> </return> <argument index="0" name="owner_id" type="int"> @@ -10198,7 +11620,17 @@ Returns number of shapes to which given owner is associated to. </description> </method> - <method name="shape_owner_get_transform"> + <method name="shape_owner_get_shape_index" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="shape_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_get_transform" qualifiers="const"> <return type="Transform"> </return> <argument index="0" name="owner_id" type="int"> @@ -10208,6 +11640,8 @@ </description> </method> <method name="shape_owner_remove_shape"> + <return type="void"> + </return> <argument index="0" name="owner_id" type="int"> </argument> <argument index="1" name="shape_id" type="int"> @@ -10216,20 +11650,22 @@ Removes related shape from the owner. </description> </method> - <method name="is_ray_pickable" qualifiers="const"> - <return type="bool"> + <method name="shape_owner_set_disabled"> + <return type="void"> </return> - <description> - </description> - </method> - <method name="set_capture_input_on_drag"> - <argument index="0" name="enable" type="bool"> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="disabled" type="bool"> </argument> <description> </description> </method> - <method name="set_ray_pickable"> - <argument index="0" name="ray_pickable" type="bool"> + <method name="shape_owner_set_transform"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="transform" type="Transform"> </argument> <description> </description> @@ -10277,6 +11713,8 @@ </description> <methods> <method name="_input_event" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="viewport" type="Object"> </argument> <argument index="1" name="event" type="InputEvent"> @@ -10309,14 +11747,82 @@ Shape owner is a node which is holding concrete shape resources. This method will return an array which is holding an integer numbers that are representing unique ID of each owner. You can use those ids when you are using others shape_owner methods. </description> </method> + <method name="is_pickable" qualifiers="const"> + <return type="bool"> + </return> + <description> + Return whether this object is pickable. + </description> + </method> + <method name="is_shape_owner_disabled" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="is_shape_owner_one_way_collision_enabled" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="remove_shape_owner"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_pickable"> + <return type="void"> + </return> + <argument index="0" name="enabled" type="bool"> + </argument> + <description> + Set whether this object is pickable. A pickable object can detect the mouse pointer enter/leave it and, if the mouse is inside it, report input events. + </description> + </method> + <method name="shape_find_owner" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="shape_index" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_add_shape"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="shape" type="Shape2D"> + </argument> + <description> + </description> + </method> <method name="shape_owner_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="owner_id" type="int"> </argument> <description> Will remove all the shapes associated with given owner. </description> </method> - <method name="shape_owner_get_shape"> + <method name="shape_owner_get_owner" qualifiers="const"> + <return type="Object"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_get_shape" qualifiers="const"> <return type="Shape2D"> </return> <argument index="0" name="owner_id" type="int"> @@ -10327,7 +11833,7 @@ Will return a [Shape2D]. First argument owner_id is an integer that can be obtained from [method get_shape_owners]. Shape_id is a position of the shape inside owner; it's a value in range from 0 to [method shape_owner_get_shape_count]. </description> </method> - <method name="shape_owner_get_shape_count"> + <method name="shape_owner_get_shape_count" qualifiers="const"> <return type="int"> </return> <argument index="0" name="owner_id" type="int"> @@ -10336,7 +11842,17 @@ Returns number of shapes to which given owner is associated to. </description> </method> - <method name="shape_owner_get_transform"> + <method name="shape_owner_get_shape_index" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="shape_id" type="int"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_get_transform" qualifiers="const"> <return type="Transform2D"> </return> <argument index="0" name="owner_id" type="int"> @@ -10346,6 +11862,8 @@ </description> </method> <method name="shape_owner_remove_shape"> + <return type="void"> + </return> <argument index="0" name="owner_id" type="int"> </argument> <argument index="1" name="shape_id" type="int"> @@ -10354,18 +11872,34 @@ Removes related shape from the owner. </description> </method> - <method name="is_pickable" qualifiers="const"> - <return type="bool"> + <method name="shape_owner_set_disabled"> + <return type="void"> </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="disabled" type="bool"> + </argument> <description> - Return whether this object is pickable. </description> </method> - <method name="set_pickable"> - <argument index="0" name="enabled" type="bool"> + <method name="shape_owner_set_one_way_collision"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="shape_owner_set_transform"> + <return type="void"> + </return> + <argument index="0" name="owner_id" type="int"> + </argument> + <argument index="1" name="transform" type="Transform2D"> </argument> <description> - Set whether this object is pickable. A pickable object can detect the mouse pointer enter/leave it and, if the mouse is inside it, report input events. </description> </method> </methods> @@ -10423,18 +11957,24 @@ </description> </method> <method name="set_depth"> + <return type="void"> + </return> <argument index="0" name="depth" type="float"> </argument> <description> </description> </method> <method name="set_disabled"> + <return type="void"> + </return> <argument index="0" name="disabled" type="bool"> </argument> <description> </description> </method> <method name="set_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolVector2Array"> </argument> <description> @@ -10461,7 +12001,7 @@ </description> <methods> <method name="get_build_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="CollisionPolygon2D.BuildMode"> </return> <description> Return whether the polygon is a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]). @@ -10487,25 +12027,33 @@ </description> </method> <method name="set_build_mode"> - <argument index="0" name="build_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="build_mode" type="int" enum="CollisionPolygon2D.BuildMode"> </argument> <description> Set whether the polygon is to be a [ConvexPolygonShape2D] ([code]build_mode==0[/code]), or a [ConcavePolygonShape2D] ([code]build_mode==1[/code]). </description> </method> <method name="set_disabled"> + <return type="void"> + </return> <argument index="0" name="disabled" type="bool"> </argument> <description> </description> </method> <method name="set_one_way_collision"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolVector2Array"> </argument> <description> @@ -10515,7 +12063,7 @@ </method> </methods> <members> - <member name="build_mode" type="int" setter="set_build_mode" getter="get_build_mode" brief=""> + <member name="build_mode" type="int" setter="set_build_mode" getter="get_build_mode" brief="" enum="CollisionPolygon2D.BuildMode"> </member> <member name="disabled" type="bool" setter="set_disabled" getter="is_disabled" brief=""> </member> @@ -10534,7 +12082,7 @@ </description> <methods> <method name="get_shape" qualifiers="const"> - <return type="Object"> + <return type="Shape"> </return> <description> </description> @@ -10546,23 +12094,31 @@ </description> </method> <method name="make_convex_from_brothers"> + <return type="void"> + </return> <description> </description> </method> <method name="resource_changed"> - <argument index="0" name="resource" type="Object"> + <return type="void"> + </return> + <argument index="0" name="resource" type="Resource"> </argument> <description> </description> </method> <method name="set_disabled"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_shape"> - <argument index="0" name="shape" type="Object"> + <return type="void"> + </return> + <argument index="0" name="shape" type="Shape"> </argument> <description> </description> @@ -10586,7 +12142,7 @@ </description> <methods> <method name="get_shape" qualifiers="const"> - <return type="Object"> + <return type="Shape2D"> </return> <description> Return this shape's [Shape2D]. @@ -10605,19 +12161,25 @@ </description> </method> <method name="set_disabled"> + <return type="void"> + </return> <argument index="0" name="disabled" type="bool"> </argument> <description> </description> </method> <method name="set_one_way_collision"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_shape"> - <argument index="0" name="shape" type="Object"> + <return type="void"> + </return> + <argument index="0" name="shape" type="Shape2D"> </argument> <description> Set this shape's [Shape2D]. This will not appear as a node, but can be directly edited as a property. @@ -10801,7 +12363,9 @@ </description> <methods> <method name="add_preset"> - <argument index="0" name="arg0" type="Color"> + <return type="void"> + </return> + <argument index="0" name="color" type="Color"> </argument> <description> Adds the current selected to color to a list of colors (presets), the presets will be displayed in the color picker and the user will be able to select them, notice that the presets list is only for this color picker. @@ -10829,6 +12393,8 @@ </description> </method> <method name="set_edit_alpha"> + <return type="void"> + </return> <argument index="0" name="show" type="bool"> </argument> <description> @@ -10836,6 +12402,8 @@ </description> </method> <method name="set_pick_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -10843,6 +12411,8 @@ </description> </method> <method name="set_raw_mode"> + <return type="void"> + </return> <argument index="0" name="mode" type="bool"> </argument> <description> @@ -10910,6 +12480,8 @@ </description> </method> <method name="set_edit_alpha"> + <return type="void"> + </return> <argument index="0" name="show" type="bool"> </argument> <description> @@ -10917,6 +12489,8 @@ </description> </method> <method name="set_pick_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -10978,6 +12552,8 @@ </description> </method> <method name="set_frame_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -11007,6 +12583,8 @@ </description> </method> <method name="set_faces"> + <return type="void"> + </return> <argument index="0" name="faces" type="PoolVector3Array"> </argument> <description> @@ -11034,6 +12612,8 @@ </description> </method> <method name="set_segments"> + <return type="void"> + </return> <argument index="0" name="segments" type="PoolVector2Array"> </argument> <description> @@ -11057,13 +12637,15 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="ConeTwistJoint.Param"> </argument> <description> </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="ConeTwistJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -11120,6 +12702,8 @@ </description> <methods> <method name="erase_section"> + <return type="void"> + </return> <argument index="0" name="section" type="String"> </argument> <description> @@ -11148,7 +12732,7 @@ </argument> <argument index="1" name="key" type="String"> </argument> - <argument index="2" name="default" type="Variant" default="NULL"> + <argument index="2" name="default" type="Variant" default="null"> </argument> <description> Return the current value for the specified section and key. If the section and/or the key do not exist, the method returns the value of the optional [i]default[/i] argument (and thus [code]NULL[/code] if not specified). @@ -11175,7 +12759,7 @@ </description> </method> <method name="load"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -11184,7 +12768,7 @@ </description> </method> <method name="save"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -11194,6 +12778,8 @@ </description> </method> <method name="set_value"> + <return type="void"> + </return> <argument index="0" name="section" type="String"> </argument> <argument index="1" name="key" type="String"> @@ -11237,6 +12823,8 @@ </description> <methods> <method name="fit_child_in_rect"> + <return type="void"> + </return> <argument index="0" name="child" type="Control"> </argument> <argument index="1" name="rect" type="Rect2"> @@ -11246,6 +12834,8 @@ </description> </method> <method name="queue_sort"> + <return type="void"> + </return> <description> Queue resort of the contained children. This is called automatically anyway, but can be called upon request. </description> @@ -11259,7 +12849,7 @@ </signal> </signals> <constants> - <constant name="NOTIFICATION_SORT_CHILDREN" value="50"> + <constant name="NOTIFICATION_SORT_CHILDREN" value="50" enum=""> Notification for when sorting the children, it must be obeyed immediately. </constant> </constants> @@ -11286,17 +12876,23 @@ </description> </method> <method name="_gui_input" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> </method> <method name="accept_event"> + <return type="void"> + </return> <description> Handles the event, no other control will receive it and it will not be sent to nodes waiting on [method Node._unhandled_input] or [method Node._unhandled_key_input]. </description> </method> <method name="add_color_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="color" type="Color"> @@ -11305,6 +12901,8 @@ </description> </method> <method name="add_constant_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="constant" type="int"> @@ -11314,6 +12912,8 @@ </description> </method> <method name="add_font_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="font" type="Font"> @@ -11323,6 +12923,8 @@ </description> </method> <method name="add_icon_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="texture" type="Texture"> @@ -11332,6 +12934,8 @@ </description> </method> <method name="add_shader_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="shader" type="Shader"> @@ -11340,6 +12944,8 @@ </description> </method> <method name="add_style_override"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="stylebox" type="StyleBox"> @@ -11359,6 +12965,8 @@ </description> </method> <method name="drop_data" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <argument index="1" name="data" type="Variant"> @@ -11367,17 +12975,19 @@ </description> </method> <method name="force_drag"> + <return type="void"> + </return> <argument index="0" name="data" type="Variant"> </argument> - <argument index="1" name="preview" type="Object"> + <argument index="1" name="preview" type="Control"> </argument> <description> </description> </method> <method name="get_anchor" qualifiers="const"> - <return type="int"> + <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the anchor type (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) for a given margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). @@ -11416,9 +13026,9 @@ </description> </method> <method name="get_cursor_shape" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.CursorShape"> </return> - <argument index="0" name="pos" type="Vector2" default="Vector2(0, 0)"> + <argument index="0" name="pos" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> Return the cursor shape at a certain position in the control. @@ -11431,7 +13041,7 @@ </description> </method> <method name="get_default_cursor_shape" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.CursorShape"> </return> <description> Return the default cursor shape for this control. See enum CURSOR_* for the list of shapes. @@ -11453,7 +13063,7 @@ </description> </method> <method name="get_focus_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.FocusMode"> </return> <description> Returns the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL) (see [method set_focus_mode]). @@ -11462,7 +13072,7 @@ <method name="get_focus_neighbour" qualifiers="const"> <return type="NodePath"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the forced neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function. @@ -11500,7 +13110,7 @@ </description> </method> <method name="get_h_grow_direction" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.GrowDirection"> </return> <description> </description> @@ -11525,7 +13135,7 @@ <method name="get_margin" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return a margin offset. Margin can be one of (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Offset value being returned depends on the anchor mode. @@ -11539,7 +13149,7 @@ </description> </method> <method name="get_mouse_filter" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.MouseFilter"> </return> <description> Return when the control is ignoring mouse events (even touchpad events send mouse events). @@ -11631,14 +13241,14 @@ <method name="get_tooltip" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="atpos" type="Vector2" default="Vector2(0, 0)"> + <argument index="0" name="atpos" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> Return the tooltip, which will appear when the cursor is resting over this control. </description> </method> <method name="get_v_grow_direction" qualifiers="const"> - <return type="int"> + <return type="int" enum="Control.GrowDirection"> </return> <description> </description> @@ -11651,10 +13261,14 @@ </description> </method> <method name="grab_click_focus"> + <return type="void"> + </return> <description> </description> </method> <method name="grab_focus"> + <return type="void"> + </return> <description> Steal the focus from another control and become the focused control (see [method set_focus_mode]). </description> @@ -11739,6 +13353,8 @@ </description> </method> <method name="has_point" qualifiers="virtual"> + <return type="bool"> + </return> <argument index="0" name="point" type="Vector2"> </argument> <description> @@ -11769,38 +13385,59 @@ </description> </method> <method name="minimum_size_changed"> + <return type="void"> + </return> <description> </description> </method> <method name="release_focus"> + <return type="void"> + </return> <description> Give up the focus, no other control will be able to receive keyboard input. </description> </method> <method name="set_anchor"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> - <argument index="1" name="anchor_mode" type="int"> + <argument index="1" name="anchor" type="float"> </argument> <argument index="2" name="keep_margin" type="bool" default="false"> </argument> + <argument index="3" name="push_opposite_anchor" type="bool" default="true"> + </argument> <description> - Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). Changing the anchor mode converts the current margin offset from the previous anchor mode to the new one, so margin offsets ([method set_margin]) must be done after setting anchors, or at the same time ([method set_anchor_and_margin]) - Additionally, [code]keep_margin[/code] controls whether margins should be left the same, or changed to keep the same position and size on-screen. </description> </method> <method name="set_anchor_and_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> - <argument index="1" name="anchor_mode" type="int"> + <argument index="1" name="anchor" type="float"> </argument> <argument index="2" name="offset" type="float"> </argument> + <argument index="3" name="push_opposite_anchor" type="bool" default="false"> + </argument> + <description> + </description> + </method> + <method name="set_anchors_preset"> + <return type="void"> + </return> + <argument index="0" name="preset" type="int" enum="Control.LayoutPreset"> + </argument> + <argument index="1" name="keep_margin" type="bool" default="false"> + </argument> <description> - Change the anchor (ANCHOR_BEGIN, ANCHOR_END, ANCHOR_RATIO) type for a margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM), and also set its offset. This is a helper (see [method set_anchor] and [method set_margin]). </description> </method> <method name="set_area_as_parent_rect"> + <return type="void"> + </return> <argument index="0" name="margin" type="int" default="0"> </argument> <description> @@ -11808,6 +13445,8 @@ </description> </method> <method name="set_begin"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -11815,37 +13454,49 @@ </description> </method> <method name="set_clip_contents"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_custom_minimum_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="set_default_cursor_shape"> - <argument index="0" name="shape" type="int"> + <return type="void"> + </return> + <argument index="0" name="shape" type="int" enum="Control.CursorShape"> </argument> <description> Set the default cursor shape for this control. See enum CURSOR_* for the list of shapes. </description> </method> <method name="set_drag_forwarding"> + <return type="void"> + </return> <argument index="0" name="target" type="Control"> </argument> <description> </description> </method> <method name="set_drag_preview"> + <return type="void"> + </return> <argument index="0" name="control" type="Control"> </argument> <description> </description> </method> <method name="set_end"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -11853,14 +13504,18 @@ </description> </method> <method name="set_focus_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Control.FocusMode"> </argument> <description> Set the focus access mode for the control (FOCUS_NONE, FOCUS_CLICK, FOCUS_ALL). Only one Control can be focused at the same time, and it will receive keyboard signals. </description> </method> <method name="set_focus_neighbour"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="neighbour" type="NodePath"> </argument> @@ -11869,6 +13524,8 @@ </description> </method> <method name="set_global_position"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -11876,12 +13533,16 @@ </description> </method> <method name="set_h_grow_direction"> - <argument index="0" name="direction" type="int"> + <return type="void"> + </return> + <argument index="0" name="direction" type="int" enum="Control.GrowDirection"> </argument> <description> </description> </method> <method name="set_h_size_flags"> + <return type="void"> + </return> <argument index="0" name="flags" type="int"> </argument> <description> @@ -11889,7 +13550,9 @@ </description> </method> <method name="set_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="offset" type="float"> </argument> @@ -11898,19 +13561,25 @@ </description> </method> <method name="set_mouse_filter"> - <argument index="0" name="filter" type="int"> + <return type="void"> + </return> + <argument index="0" name="filter" type="int" enum="Control.MouseFilter"> </argument> <description> Set when the control is ignoring mouse events (even touchpad events send mouse events). (see the MOUSE_FILTER_* constants) </description> </method> <method name="set_pivot_offset"> + <return type="void"> + </return> <argument index="0" name="pivot_offset" type="Vector2"> </argument> <description> </description> </method> <method name="set_position"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -11918,6 +13587,8 @@ </description> </method> <method name="set_rotation"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> @@ -11925,6 +13596,8 @@ </description> </method> <method name="set_rotation_deg"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> @@ -11932,12 +13605,16 @@ </description> </method> <method name="set_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> @@ -11945,6 +13622,8 @@ </description> </method> <method name="set_stretch_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> @@ -11952,6 +13631,8 @@ </description> </method> <method name="set_theme"> + <return type="void"> + </return> <argument index="0" name="theme" type="Theme"> </argument> <description> @@ -11959,6 +13640,8 @@ </description> </method> <method name="set_tooltip"> + <return type="void"> + </return> <argument index="0" name="tooltip" type="String"> </argument> <description> @@ -11966,12 +13649,16 @@ </description> </method> <method name="set_v_grow_direction"> - <argument index="0" name="direction" type="int"> + <return type="void"> + </return> + <argument index="0" name="direction" type="int" enum="Control.GrowDirection"> </argument> <description> </description> </method> <method name="set_v_size_flags"> + <return type="void"> + </return> <argument index="0" name="flags" type="int"> </argument> <description> @@ -11979,6 +13666,8 @@ </description> </method> <method name="show_modal"> + <return type="void"> + </return> <argument index="0" name="exclusive" type="bool" default="false"> </argument> <description> @@ -11986,6 +13675,8 @@ </description> </method> <method name="warp_mouse"> + <return type="void"> + </return> <argument index="0" name="to_pos" type="Vector2"> </argument> <description> @@ -11993,13 +13684,13 @@ </method> </methods> <members> - <member name="anchor_bottom" type="int" setter="_set_anchor" getter="get_anchor" brief=""> + <member name="anchor_bottom" type="float" setter="_set_anchor" getter="get_anchor" brief=""> </member> - <member name="anchor_left" type="int" setter="_set_anchor" getter="get_anchor" brief=""> + <member name="anchor_left" type="float" setter="_set_anchor" getter="get_anchor" brief=""> </member> - <member name="anchor_right" type="int" setter="_set_anchor" getter="get_anchor" brief=""> + <member name="anchor_right" type="float" setter="_set_anchor" getter="get_anchor" brief=""> </member> - <member name="anchor_top" type="int" setter="_set_anchor" getter="get_anchor" brief=""> + <member name="anchor_top" type="float" setter="_set_anchor" getter="get_anchor" brief=""> </member> <member name="focus_neighbour_bottom" type="NodePath" setter="set_focus_neighbour" getter="get_focus_neighbour" brief=""> </member> @@ -12009,21 +13700,21 @@ </member> <member name="focus_neighbour_top" type="NodePath" setter="set_focus_neighbour" getter="get_focus_neighbour" brief=""> </member> - <member name="grow_horizontal" type="int" setter="set_h_grow_direction" getter="get_h_grow_direction" brief=""> + <member name="grow_horizontal" type="int" setter="set_h_grow_direction" getter="get_h_grow_direction" brief="" enum="Control.GrowDirection"> </member> - <member name="grow_vertical" type="int" setter="set_v_grow_direction" getter="get_v_grow_direction" brief=""> + <member name="grow_vertical" type="int" setter="set_v_grow_direction" getter="get_v_grow_direction" brief="" enum="Control.GrowDirection"> </member> <member name="hint_tooltip" type="String" setter="set_tooltip" getter="_get_tooltip" brief=""> </member> - <member name="margin_bottom" type="int" setter="set_margin" getter="get_margin" brief=""> + <member name="margin_bottom" type="float" setter="set_margin" getter="get_margin" brief=""> </member> - <member name="margin_left" type="int" setter="set_margin" getter="get_margin" brief=""> + <member name="margin_left" type="float" setter="set_margin" getter="get_margin" brief=""> </member> - <member name="margin_right" type="int" setter="set_margin" getter="get_margin" brief=""> + <member name="margin_right" type="float" setter="set_margin" getter="get_margin" brief=""> </member> - <member name="margin_top" type="int" setter="set_margin" getter="get_margin" brief=""> + <member name="margin_top" type="float" setter="set_margin" getter="get_margin" brief=""> </member> - <member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" brief=""> + <member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" brief="" enum="Control.MouseFilter"> </member> <member name="rect_clip_content" type="bool" setter="set_clip_contents" getter="is_clipping_contents" brief=""> </member> @@ -12041,7 +13732,7 @@ </member> <member name="size_flags_horizontal" type="int" setter="set_h_size_flags" getter="get_h_size_flags" brief=""> </member> - <member name="size_flags_stretch_ratio" type="int" setter="set_stretch_ratio" getter="get_stretch_ratio" brief=""> + <member name="size_flags_stretch_ratio" type="float" setter="set_stretch_ratio" getter="get_stretch_ratio" brief=""> </member> <member name="size_flags_vertical" type="int" setter="set_v_size_flags" getter="get_v_size_flags" brief=""> </member> @@ -12096,14 +13787,6 @@ </signal> </signals> <constants> - <constant name="ANCHOR_BEGIN" value="0"> - X is relative to MARGIN_LEFT, Y is relative to MARGIN_TOP. - </constant> - <constant name="ANCHOR_END" value="1"> - X is relative to -MARGIN_RIGHT, Y is relative to -MARGIN_BOTTOM. - </constant> - <constant name="ANCHOR_CENTER" value="2"> - </constant> <constant name="FOCUS_NONE" value="0"> Control can't acquire focus. </constant> @@ -12113,25 +13796,25 @@ <constant name="FOCUS_ALL" value="2"> Control can acquire focus if clicked, or by pressing TAB/Directionals in the keyboard from another Control. </constant> - <constant name="NOTIFICATION_RESIZED" value="40"> + <constant name="NOTIFICATION_RESIZED" value="40" enum=""> Control changed size (get_size() reports the new size). </constant> - <constant name="NOTIFICATION_MOUSE_ENTER" value="41"> + <constant name="NOTIFICATION_MOUSE_ENTER" value="41" enum=""> Mouse pointer entered the area of the Control. </constant> - <constant name="NOTIFICATION_MOUSE_EXIT" value="42"> + <constant name="NOTIFICATION_MOUSE_EXIT" value="42" enum=""> Mouse pointer exited the area of the Control. </constant> - <constant name="NOTIFICATION_FOCUS_ENTER" value="43"> + <constant name="NOTIFICATION_FOCUS_ENTER" value="43" enum=""> Control gained focus. </constant> - <constant name="NOTIFICATION_FOCUS_EXIT" value="44"> + <constant name="NOTIFICATION_FOCUS_EXIT" value="44" enum=""> Control lost focus. </constant> - <constant name="NOTIFICATION_THEME_CHANGED" value="45"> + <constant name="NOTIFICATION_THEME_CHANGED" value="45" enum=""> Theme changed. Redrawing is desired. </constant> - <constant name="NOTIFICATION_MODAL_CLOSE" value="46"> + <constant name="NOTIFICATION_MODAL_CLOSE" value="46" enum=""> Modal control was closed. </constant> <constant name="CURSOR_ARROW" value="0"> @@ -12168,6 +13851,38 @@ </constant> <constant name="CURSOR_HELP" value="16"> </constant> + <constant name="PRESET_TOP_LEFT" value="0"> + </constant> + <constant name="PRESET_TOP_RIGHT" value="1"> + </constant> + <constant name="PRESET_BOTTOM_LEFT" value="2"> + </constant> + <constant name="PRESET_BOTTOM_RIGHT" value="3"> + </constant> + <constant name="PRESET_CENTER_LEFT" value="4"> + </constant> + <constant name="PRESET_CENTER_TOP" value="5"> + </constant> + <constant name="PRESET_CENTER_RIGHT" value="6"> + </constant> + <constant name="PRESET_CENTER_BOTTOM" value="7"> + </constant> + <constant name="PRESET_CENTER" value="8"> + </constant> + <constant name="PRESET_LEFT_WIDE" value="9"> + </constant> + <constant name="PRESET_TOP_WIDE" value="10"> + </constant> + <constant name="PRESET_RIGHT_WIDE" value="11"> + </constant> + <constant name="PRESET_BOTTOM_WIDE" value="12"> + </constant> + <constant name="PRESET_VCENTER_WIDE" value="13"> + </constant> + <constant name="PRESET_HCENTER_WIDE" value="14"> + </constant> + <constant name="PRESET_WIDE" value="15"> + </constant> <constant name="SIZE_EXPAND" value="2"> </constant> <constant name="SIZE_FILL" value="1"> @@ -12188,6 +13903,12 @@ </constant> <constant name="GROW_DIRECTION_END" value="1"> </constant> + <constant name="ANCHOR_BEGIN" value="0"> + X is relative to MARGIN_LEFT, Y is relative to MARGIN_TOP. + </constant> + <constant name="ANCHOR_END" value="1"> + X is relative to -MARGIN_RIGHT, Y is relative to -MARGIN_BOTTOM. + </constant> </constants> </class> <class name="ConvexPolygonShape" inherits="Shape" category="Core"> @@ -12205,6 +13926,8 @@ </description> </method> <method name="set_points"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector3Array"> </argument> <description> @@ -12212,7 +13935,7 @@ </method> </methods> <members> - <member name="points" type="Array" setter="set_points" getter="get_points" brief=""> + <member name="points" type="PoolVector3Array" setter="set_points" getter="get_points" brief=""> </member> </members> <constants> @@ -12235,6 +13958,8 @@ </description> </method> <method name="set_point_cloud"> + <return type="void"> + </return> <argument index="0" name="point_cloud" type="PoolVector2Array"> </argument> <description> @@ -12242,6 +13967,8 @@ </description> </method> <method name="set_points"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <description> @@ -12281,15 +14008,15 @@ </description> </method> <method name="get_side" qualifiers="const"> - <return type="Object"> + <return type="Image"> </return> - <argument index="0" name="side" type="int"> + <argument index="0" name="side" type="int" enum="CubeMap.Side"> </argument> <description> </description> </method> <method name="get_storage" qualifiers="const"> - <return type="int"> + <return type="int" enum="CubeMap.Storage"> </return> <description> </description> @@ -12301,27 +14028,35 @@ </description> </method> <method name="set_flags"> + <return type="void"> + </return> <argument index="0" name="flags" type="int"> </argument> <description> </description> </method> <method name="set_lossy_storage_quality"> + <return type="void"> + </return> <argument index="0" name="quality" type="float"> </argument> <description> </description> </method> <method name="set_side"> - <argument index="0" name="side" type="int"> + <return type="void"> + </return> + <argument index="0" name="side" type="int" enum="CubeMap.Side"> </argument> - <argument index="1" name="image" type="Object"> + <argument index="1" name="image" type="Image"> </argument> <description> </description> </method> <method name="set_storage"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="CubeMap.Storage"> </argument> <description> </description> @@ -12387,24 +14122,32 @@ </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector3"> </argument> <description> </description> </method> <method name="set_subdivide_depth"> + <return type="void"> + </return> <argument index="0" name="divisions" type="int"> </argument> <description> </description> </method> <method name="set_subdivide_height"> + <return type="void"> + </return> <argument index="0" name="divisions" type="int"> </argument> <description> </description> </method> <method name="set_subdivide_width"> + <return type="void"> + </return> <argument index="0" name="subdivide" type="int"> </argument> <description> @@ -12412,7 +14155,7 @@ </method> </methods> <members> - <member name="size" type="Vector2" setter="set_size" getter="get_size" brief=""> + <member name="size" type="Vector3" setter="set_size" getter="get_size" brief=""> </member> <member name="subdivide_depth" type="int" setter="set_subdivide_depth" getter="get_subdivide_depth" brief=""> </member> @@ -12439,22 +14182,28 @@ </argument> <argument index="2" name="right_tangent" type="float" default="0"> </argument> - <argument index="3" name="left_mode" type="int" default="0"> + <argument index="3" name="left_mode" type="int" enum="Curve.TangentMode" default="0"> </argument> - <argument index="4" name="right_mode" type="int" default="0"> + <argument index="4" name="right_mode" type="int" enum="Curve.TangentMode" default="0"> </argument> <description> </description> </method> <method name="bake"> + <return type="void"> + </return> <description> </description> </method> <method name="clean_dupes"> + <return type="void"> + </return> <description> </description> </method> <method name="clear_points"> + <return type="void"> + </return> <description> </description> </method> @@ -12477,7 +14226,7 @@ </description> </method> <method name="get_point_left_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Curve.TangentMode"> </return> <argument index="0" name="index" type="int"> </argument> @@ -12501,7 +14250,7 @@ </description> </method> <method name="get_point_right_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Curve.TangentMode"> </return> <argument index="0" name="index" type="int"> </argument> @@ -12533,38 +14282,50 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> </description> </method> <method name="set_bake_resolution"> + <return type="void"> + </return> <argument index="0" name="resolution" type="int"> </argument> <description> </description> </method> <method name="set_max_value"> + <return type="void"> + </return> <argument index="0" name="max" type="float"> </argument> <description> </description> </method> <method name="set_min_value"> + <return type="void"> + </return> <argument index="0" name="min" type="float"> </argument> <description> </description> </method> <method name="set_point_left_mode"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Curve.TangentMode"> </argument> <description> </description> </method> <method name="set_point_left_tangent"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="tangent" type="float"> @@ -12573,6 +14334,8 @@ </description> </method> <method name="set_point_offset"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="offset" type="float"> @@ -12581,14 +14344,18 @@ </description> </method> <method name="set_point_right_mode"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Curve.TangentMode"> </argument> <description> </description> </method> <method name="set_point_right_tangent"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="tangent" type="float"> @@ -12597,6 +14364,8 @@ </description> </method> <method name="set_point_value"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="y" type="float"> @@ -12606,7 +14375,7 @@ </method> </methods> <members> - <member name="_data" type="int" setter="_set_data" getter="_get_data" brief=""> + <member name="_data" type="Array" setter="_set_data" getter="_get_data" brief=""> </member> <member name="bake_resolution" type="int" setter="set_bake_resolution" getter="get_bake_resolution" brief=""> </member> @@ -12634,11 +14403,13 @@ </description> <methods> <method name="add_point"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> - <argument index="1" name="in" type="Vector2" default="Vector2(0, 0)"> + <argument index="1" name="in" type="Vector2" default="Vector2( 0, 0 )"> </argument> - <argument index="2" name="out" type="Vector2" default="Vector2(0, 0)"> + <argument index="2" name="out" type="Vector2" default="Vector2( 0, 0 )"> </argument> <argument index="3" name="atpos" type="int" default="-1"> </argument> @@ -12648,6 +14419,8 @@ </description> </method> <method name="clear_points"> + <return type="void"> + </return> <description> </description> </method> @@ -12741,6 +14514,8 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -12748,6 +14523,8 @@ </description> </method> <method name="set_bake_interval"> + <return type="void"> + </return> <argument index="0" name="distance" type="float"> </argument> <description> @@ -12755,6 +14532,8 @@ </description> </method> <method name="set_point_in"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector2"> @@ -12764,6 +14543,8 @@ </description> </method> <method name="set_point_out"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector2"> @@ -12773,6 +14554,8 @@ </description> </method> <method name="set_point_pos"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector2"> @@ -12781,7 +14564,7 @@ Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console. </description> </method> - <method name="tesselate" qualifiers="const"> + <method name="tessellate" qualifiers="const"> <return type="PoolVector2Array"> </return> <argument index="0" name="max_stages" type="int" default="5"> @@ -12797,7 +14580,7 @@ </method> </methods> <members> - <member name="_data" type="int" setter="_set_data" getter="_get_data" brief=""> + <member name="_data" type="Dictionary" setter="_set_data" getter="_get_data" brief=""> </member> <member name="bake_interval" type="float" setter="set_bake_interval" getter="get_bake_interval" brief=""> </member> @@ -12815,11 +14598,13 @@ </description> <methods> <method name="add_point"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector3"> </argument> - <argument index="1" name="in" type="Vector3" default="Vector3(0, 0, 0)"> + <argument index="1" name="in" type="Vector3" default="Vector3( 0, 0, 0 )"> </argument> - <argument index="2" name="out" type="Vector3" default="Vector3(0, 0, 0)"> + <argument index="2" name="out" type="Vector3" default="Vector3( 0, 0, 0 )"> </argument> <argument index="3" name="atpos" type="int" default="-1"> </argument> @@ -12829,6 +14614,8 @@ </description> </method> <method name="clear_points"> + <return type="void"> + </return> <description> </description> </method> @@ -12938,6 +14725,8 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -12945,6 +14734,8 @@ </description> </method> <method name="set_bake_interval"> + <return type="void"> + </return> <argument index="0" name="distance" type="float"> </argument> <description> @@ -12952,6 +14743,8 @@ </description> </method> <method name="set_point_in"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector3"> @@ -12961,6 +14754,8 @@ </description> </method> <method name="set_point_out"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector3"> @@ -12970,6 +14765,8 @@ </description> </method> <method name="set_point_pos"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="pos" type="Vector3"> @@ -12979,6 +14776,8 @@ </description> </method> <method name="set_point_tilt"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="tilt" type="float"> @@ -12988,7 +14787,7 @@ The tilt controls the rotation along the look-at axis an object traveling the path would have. In the case of a curve controlling a [PathFollow], this tilt is an offset over the natural tilt the PathFollow calculates. </description> </method> - <method name="tesselate" qualifiers="const"> + <method name="tessellate" qualifiers="const"> <return type="PoolVector3Array"> </return> <argument index="0" name="max_stages" type="int" default="5"> @@ -13004,7 +14803,7 @@ </method> </methods> <members> - <member name="_data" type="int" setter="_set_data" getter="_get_data" brief=""> + <member name="_data" type="Dictionary" setter="_set_data" getter="_get_data" brief=""> </member> <member name="bake_interval" type="float" setter="set_bake_interval" getter="get_bake_interval" brief=""> </member> @@ -13025,12 +14824,16 @@ </description> </method> <method name="set_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="Curve"> </argument> <description> </description> </method> <method name="set_width"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <description> @@ -13083,30 +14886,40 @@ </description> </method> <method name="set_bottom_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> </description> </method> <method name="set_radial_segments"> + <return type="void"> + </return> <argument index="0" name="segments" type="int"> </argument> <description> </description> </method> <method name="set_rings"> + <return type="void"> + </return> <argument index="0" name="rings" type="int"> </argument> <description> </description> </method> <method name="set_top_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> @@ -13165,6 +14978,8 @@ </description> </method> <method name="set_damping"> + <return type="void"> + </return> <argument index="0" name="damping" type="float"> </argument> <description> @@ -13172,6 +14987,8 @@ </description> </method> <method name="set_length"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> @@ -13179,6 +14996,8 @@ </description> </method> <method name="set_rest_length"> + <return type="void"> + </return> <argument index="0" name="rest_length" type="float"> </argument> <description> @@ -13186,6 +15005,8 @@ </description> </method> <method name="set_stiffness"> + <return type="void"> + </return> <argument index="0" name="stiffness" type="float"> </argument> <description> @@ -13292,7 +15113,7 @@ </description> <methods> <method name="get_shadow_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="DirectionalLight.ShadowMode"> </return> <description> </description> @@ -13304,22 +15125,28 @@ </description> </method> <method name="set_blend_splits"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_shadow_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="DirectionalLight.ShadowMode"> </argument> <description> </description> </method> </methods> <members> + <member name="directional_shadow_bias_split_scale" type="float" setter="set_param" getter="get_param" brief=""> + </member> <member name="directional_shadow_blend_splits" type="bool" setter="set_blend_splits" getter="is_blend_splits_enabled" brief=""> </member> - <member name="directional_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" brief=""> + <member name="directional_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" brief="" enum="DirectionalLight.ShadowMode"> </member> <member name="directional_shadow_normal_bias" type="float" setter="set_param" getter="get_param" brief=""> </member> @@ -13364,7 +15191,7 @@ </description> <methods> <method name="change_dir"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="todir" type="String"> </argument> @@ -13374,7 +15201,7 @@ </description> </method> <method name="copy"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="from" type="String"> </argument> @@ -13455,7 +15282,7 @@ </description> </method> <method name="list_dir_begin"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="skip_navigational" type="bool" default="false"> </argument> @@ -13468,12 +15295,14 @@ </description> </method> <method name="list_dir_end"> + <return type="void"> + </return> <description> Close the current stream opened with [method list_dir_begin] (whether it has been fully processed with [method get_next] or not does not matter). </description> </method> <method name="make_dir"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -13483,7 +15312,7 @@ </description> </method> <method name="make_dir_recursive"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -13493,7 +15322,7 @@ </description> </method> <method name="open"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -13503,7 +15332,7 @@ </description> </method> <method name="remove"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -13513,7 +15342,7 @@ </description> </method> <method name="rename"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="from" type="String"> </argument> @@ -13535,6 +15364,8 @@ </description> <methods> <method name="add_fallback"> + <return type="void"> + </return> <argument index="0" name="data" type="DynamicFontData"> </argument> <description> @@ -13587,12 +15418,16 @@ </description> </method> <method name="remove_fallback"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> </description> </method> <method name="set_fallback"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="data" type="DynamicFontData"> @@ -13601,18 +15436,24 @@ </description> </method> <method name="set_font_data"> + <return type="void"> + </return> <argument index="0" name="data" type="DynamicFontData"> </argument> <description> </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="data" type="int"> </argument> <description> </description> </method> <method name="set_spacing"> + <return type="void"> + </return> <argument index="0" name="type" type="int"> </argument> <argument index="1" name="value" type="int"> @@ -13621,12 +15462,16 @@ </description> </method> <method name="set_use_filter"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_use_mipmaps"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -13675,6 +15520,8 @@ </description> </method> <method name="set_font_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -13695,17 +15542,21 @@ </description> <methods> <method name="add_filter"> + <return type="void"> + </return> <argument index="0" name="filter" type="String"> </argument> <description> </description> </method> <method name="clear_filters"> + <return type="void"> + </return> <description> </description> </method> <method name="get_access" qualifiers="const"> - <return type="int"> + <return type="int" enum="EditorFileDialog.Access"> </return> <description> </description> @@ -13729,13 +15580,13 @@ </description> </method> <method name="get_display_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="EditorFileDialog.DisplayMode"> </return> <description> </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="EditorFileDialog.Mode"> </return> <description> </description> @@ -13747,6 +15598,8 @@ </description> </method> <method name="invalidate"> + <return type="void"> + </return> <description> </description> </method> @@ -13763,48 +15616,64 @@ </description> </method> <method name="set_access"> - <argument index="0" name="access" type="int"> + <return type="void"> + </return> + <argument index="0" name="access" type="int" enum="EditorFileDialog.Access"> </argument> <description> </description> </method> <method name="set_current_dir"> + <return type="void"> + </return> <argument index="0" name="dir" type="String"> </argument> <description> </description> </method> <method name="set_current_file"> + <return type="void"> + </return> <argument index="0" name="file" type="String"> </argument> <description> </description> </method> <method name="set_current_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> </description> </method> <method name="set_disable_overwrite_warning"> + <return type="void"> + </return> <argument index="0" name="disable" type="bool"> </argument> <description> </description> </method> <method name="set_display_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="EditorFileDialog.DisplayMode"> </argument> <description> </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="EditorFileDialog.Mode"> </argument> <description> </description> </method> <method name="set_show_hidden_files"> + <return type="void"> + </return> <argument index="0" name="show" type="bool"> </argument> <description> @@ -13897,16 +15766,22 @@ </description> </method> <method name="scan"> + <return type="void"> + </return> <description> Scan the filesystem for changes. </description> </method> <method name="scan_sources"> + <return type="void"> + </return> <description> Check if the source of any imported resource changed. </description> </method> <method name="update_file"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -13920,6 +15795,12 @@ Emitted if the filesystem changed. </description> </signal> + <signal name="resources_reimported"> + <argument index="0" name="resources" type="PoolStringArray"> + </argument> + <description> + </description> + </signal> <signal name="sources_changed"> <argument index="0" name="exist" type="bool"> </argument> @@ -13968,6 +15849,14 @@ <description> </description> </method> + <method name="get_file_import_is_valid" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + </description> + </method> <method name="get_file_path" qualifiers="const"> <return type="String"> </return> @@ -14003,7 +15892,7 @@ </description> </method> <method name="get_subdir"> - <return type="Object"> + <return type="EditorFileSystemDirectory"> </return> <argument index="0" name="idx" type="int"> </argument> @@ -14108,6 +15997,130 @@ <constants> </constants> </class> +<class name="EditorInterface" inherits="Node" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="edit_resource"> + <return type="void"> + </return> + <argument index="0" name="resource" type="Resource"> + </argument> + <description> + </description> + </method> + <method name="get_base_control"> + <return type="Control"> + </return> + <description> + </description> + </method> + <method name="get_edited_scene_root"> + <return type="Node"> + </return> + <description> + </description> + </method> + <method name="get_editor_settings"> + <return type="EditorSettings"> + </return> + <description> + </description> + </method> + <method name="get_editor_viewport"> + <return type="Control"> + </return> + <description> + </description> + </method> + <method name="get_open_scenes" qualifiers="const"> + <return type="Array"> + </return> + <description> + </description> + </method> + <method name="get_resource_filesystem"> + <return type="EditorFileSystem"> + </return> + <description> + </description> + </method> + <method name="get_resource_previewer"> + <return type="EditorResourcePreview"> + </return> + <description> + </description> + </method> + <method name="get_script_editor"> + <return type="ScriptEditor"> + </return> + <description> + </description> + </method> + <method name="get_selection"> + <return type="EditorSelection"> + </return> + <description> + </description> + </method> + <method name="inspect_object"> + <return type="void"> + </return> + <argument index="0" name="object" type="Object"> + </argument> + <argument index="1" name="for_property" type="String" default=""""> + </argument> + <description> + </description> + </method> + <method name="make_mesh_previews"> + <return type="Array"> + </return> + <argument index="0" name="arg0" type="Array"> + </argument> + <argument index="1" name="arg1" type="int"> + </argument> + <description> + </description> + </method> + <method name="open_scene_from_path"> + <return type="void"> + </return> + <argument index="0" name="scene_filepath" type="String"> + </argument> + <description> + </description> + </method> + <method name="reload_scene_from_path"> + <return type="void"> + </return> + <argument index="0" name="scene_filepath" type="String"> + </argument> + <description> + </description> + </method> + <method name="save_scene"> + <return type="int" enum="Error"> + </return> + <description> + </description> + </method> + <method name="save_scene_as"> + <return type="void"> + </return> + <argument index="0" name="path" type="String"> + </argument> + <argument index="1" name="with_preview" type="bool" default="true"> + </argument> + <description> + </description> + </method> + </methods> + <constants> + </constants> +</class> <class name="EditorPlugin" inherits="Node" category="Core"> <brief_description> Used by the editor to extend its functionality. @@ -14128,7 +16141,9 @@ </description> </method> <method name="add_control_to_container"> - <argument index="0" name="container" type="int"> + <return type="void"> + </return> + <argument index="0" name="container" type="int" enum="EditorPlugin.CustomControlContainer"> </argument> <argument index="1" name="control" type="Control"> </argument> @@ -14139,7 +16154,9 @@ </description> </method> <method name="add_control_to_dock"> - <argument index="0" name="slot" type="int"> + <return type="void"> + </return> + <argument index="0" name="slot" type="int" enum="EditorPlugin.DockSlot"> </argument> <argument index="1" name="control" type="Control"> </argument> @@ -14150,6 +16167,8 @@ </description> </method> <method name="add_custom_type"> + <return type="void"> + </return> <argument index="0" name="type" type="String"> </argument> <argument index="1" name="base" type="String"> @@ -14166,26 +16185,34 @@ </description> </method> <method name="add_import_plugin"> - <argument index="0" name="arg0" type="Object"> + <return type="void"> + </return> + <argument index="0" name="importer" type="EditorImportPlugin"> </argument> <description> </description> </method> <method name="add_tool_submenu_item"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="submenu" type="PopupMenu"> + <argument index="1" name="submenu" type="Object"> </argument> <description> </description> </method> <method name="apply_changes" qualifiers="virtual"> + <return type="void"> + </return> <description> This method is called when the editor is about to save the project, switch to another tab, etc. It asks the plugin to apply any pending state changes to ensure consistency. This is used, for example, in shader editors to let the plugin know that it must apply the shader code being written by the user to the object. </description> </method> <method name="clear" qualifiers="virtual"> + <return type="void"> + </return> <description> Clear all the state and reset the object being edited to zero. This ensures your plugin does not keep editing a currently existing node, or a node from the wrong scene. </description> @@ -14200,18 +16227,14 @@ </description> </method> <method name="edit" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="object" type="Object"> </argument> <description> This function is used for plugins that edit specific object types (nodes or resources). It requests the editor to edit the given object. </description> </method> - <method name="edit_resource"> - <argument index="0" name="arg0" type="Object"> - </argument> - <description> - </description> - </method> <method name="forward_canvas_gui_input" qualifiers="virtual"> <return type="bool"> </return> @@ -14223,6 +16246,8 @@ </description> </method> <method name="forward_draw_over_canvas" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="canvas_xform" type="Transform2D"> </argument> <argument index="1" name="canvas" type="Control"> @@ -14243,13 +16268,6 @@ If you would like to always gets those input events then additionally use [method set_input_forwarding_always_enabled]. </description> </method> - <method name="get_base_control"> - <return type="Control"> - </return> - <description> - Get a base control where it's safe to place dialogs. Many plugins open dialogs and they need a control as a base to make sure they use the editor icons and theme. - </description> - </method> <method name="get_breakpoints" qualifiers="virtual"> <return type="PoolStringArray"> </return> @@ -14257,67 +16275,16 @@ This is for editors that edit script based objects. You can return a list of breakpoints in the format (script:line), for example: res://path_to_script.gd:25 </description> </method> - <method name="get_editor_settings"> - <return type="EditorSettings"> - </return> - <description> - Get the general settings for the editor (the same window that appears in the Settings menu). - </description> - </method> - <method name="get_edited_scene_root"> - <return type="Node"> + <method name="get_editor_interface"> + <return type="EditorInterface"> </return> <description> - Returns root node of currently edited scene. </description> </method> - <method name="get_editor_viewport"> - <return type="Control"> - </return> - <description> - Get the main editor control. Use this as a parent for main screens. - </description> - </method> - <method name="get_name" qualifiers="virtual"> + <method name="get_plugin_name" qualifiers="virtual"> <return type="String"> </return> <description> - Get the name of the editor plugin. For main scren plugins this is what will appear in the selector (which by default is 2D, 3D, Script). - </description> - </method> - <method name="get_open_scenes"> - <return type="Array"> - </return> - <description> - Will return an Array of Strings which represent file paths to currently open scenes. - </description> - </method> - <method name="get_resource_filesystem"> - <return type="EditorFileSystem"> - </return> - <description> - Get the filesystem cache for all resources in the project. - </description> - </method> - <method name="get_resource_previewer"> - <return type="EditorResourcePreview"> - </return> - <description> - Get tool for generating resource previews. - </description> - </method> - <method name="get_script_editor"> - <return type="ScriptEditor"> - </return> - <description> - Will return ScriptEditor object which contains informations about state of the scripts which are currently open by the editor. - </description> - </method> - <method name="get_selection"> - <return type="EditorSelection"> - </return> - <description> - Get the object that handles the selection of nodes in the Scene Tree editor. </description> </method> <method name="get_state" qualifiers="virtual"> @@ -14335,6 +16302,8 @@ </description> </method> <method name="get_window_layout" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="layout" type="ConfigFile"> </argument> <description> @@ -14358,25 +16327,22 @@ </description> </method> <method name="hide_bottom_panel"> + <return type="void"> + </return> <description> </description> </method> - <method name="inspect_object"> - <argument index="0" name="object" type="Object"> - </argument> - <argument index="1" name="for_property" type="String" default=""""> - </argument> - <description> - Inspect an object in the inspector. - </description> - </method> <method name="make_bottom_panel_item_visible"> + <return type="void"> + </return> <argument index="0" name="item" type="Control"> </argument> <description> </description> </method> <method name="make_visible" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="visible" type="bool"> </argument> <description> @@ -14384,26 +16350,16 @@ Remember that you have to manage the visibility of all your editor controls manually. </description> </method> - <method name="open_scene_from_path"> - <argument index="0" name="scene_filepath" type="String"> - </argument> - <description> - Opens scene in editor. Do not use during plugin initialization. If you need, then use it together with [method Object.call_deferred]. - </description> - </method> <method name="queue_save_layout" qualifiers="const"> + <return type="void"> + </return> <description> Queue save the project's editor layout. </description> </method> - <method name="reload_scene_from_path"> - <argument index="0" name="scene_filepath" type="String"> - </argument> - <description> - Reloads already loaded editor scene. - </description> - </method> <method name="remove_control_from_bottom_panel"> + <return type="void"> + </return> <argument index="0" name="control" type="Control"> </argument> <description> @@ -14411,6 +16367,8 @@ </description> </method> <method name="remove_control_from_docks"> + <return type="void"> + </return> <argument index="0" name="control" type="Control"> </argument> <description> @@ -14418,6 +16376,8 @@ </description> </method> <method name="remove_custom_type"> + <return type="void"> + </return> <argument index="0" name="type" type="String"> </argument> <description> @@ -14425,22 +16385,30 @@ </description> </method> <method name="remove_import_plugin"> - <argument index="0" name="arg0" type="Object"> + <return type="void"> + </return> + <argument index="0" name="importer" type="EditorImportPlugin"> </argument> <description> </description> </method> <method name="save_external_data" qualifiers="virtual"> + <return type="void"> + </return> <description> This method is called after the editor saves the project or when it's closed. It asks the plugin to save edited external scenes/resources. </description> </method> <method name="set_input_event_forwarding_always_enabled"> + <return type="void"> + </return> <description> Use this method if you always want to receive inputs from 3D view screen inside [method forward_spatial_gui_input]. It might be especially usable if your plugin will want to use raycast in the scene. </description> </method> <method name="set_state" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="state" type="Dictionary"> </argument> <description> @@ -14448,6 +16416,8 @@ </description> </method> <method name="set_window_layout" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="layout" type="ConfigFile"> </argument> <description> @@ -14455,11 +16425,36 @@ </description> </method> <method name="update_canvas"> + <return type="void"> + </return> <description> Updates the control used to draw the edited scene over the 2D canvas. This is used together with [method forward_canvas_input_event]. </description> </method> </methods> + <signals> + <signal name="main_screen_changed"> + <argument index="0" name="screen_name" type="String"> + </argument> + <description> + Emitted when user change main screen view (2D, 3D, Script, AssetLib). Works also with screens which are defined by plugins. + </description> + </signal> + <signal name="scene_changed"> + <argument index="0" name="scene_root" type="Object"> + </argument> + <description> + Emitted when user change scene. The argument is a root node of freshly opened scene. + </description> + </signal> + <signal name="scene_closed"> + <argument index="0" name="filepath" type="String"> + </argument> + <description> + Emitted when user close scene. The argument is file path to a closed scene. + </description> + </signal> + </signals> <constants> <constant name="CONTAINER_TOOLBAR" value="0"> </constant> @@ -14494,29 +16489,6 @@ <constant name="DOCK_SLOT_MAX" value="8"> </constant> </constants> - <signals> - <signal name="main_screen_changed"> - <argument index="0" name="screen_name" type="String"> - </argument> - <description> - Emitted when user change main screen view (2D, 3D, Script, AssetLib). Works also with screens which are defined by plugins. - </description> - </signal> - <signal name="scene_changed"> - <argument index="0" name="scene_root" type="Node"> - </argument> - <description> - Emitted when user change scene. The argument is a root node of freshly opened scene. - </description> - </signal> - <signal name="scene_closed"> - <argument index="0" name="filepath" type="String"> - </argument> - <description> - Emitted when user close scene. The argument is file path to a closed scene. - </description> - </signal> - </signals> </class> <class name="EditorResourcePreview" inherits="Node" category="Core"> <brief_description> @@ -14527,6 +16499,8 @@ </description> <methods> <method name="add_preview_generator"> + <return type="void"> + </return> <argument index="0" name="generator" type="EditorResourcePreviewGenerator"> </argument> <description> @@ -14534,6 +16508,8 @@ </description> </method> <method name="check_for_invalidation"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -14541,6 +16517,8 @@ </description> </method> <method name="queue_edited_resource_preview"> + <return type="void"> + </return> <argument index="0" name="resource" type="Resource"> </argument> <argument index="1" name="receiver" type="Object"> @@ -14554,6 +16532,8 @@ </description> </method> <method name="queue_resource_preview"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <argument index="1" name="receiver" type="Object"> @@ -14567,6 +16547,8 @@ </description> </method> <method name="remove_preview_generator"> + <return type="void"> + </return> <argument index="0" name="generator" type="EditorResourcePreviewGenerator"> </argument> <description> @@ -14638,17 +16620,27 @@ </description> <methods> <method name="_run" qualifiers="virtual"> + <return type="void"> + </return> <description> </description> </method> <method name="add_root_node"> - <argument index="0" name="node" type="Object"> + <return type="void"> + </return> + <argument index="0" name="node" type="Node"> </argument> <description> </description> </method> + <method name="get_editor_interface"> + <return type="EditorInterface"> + </return> + <description> + </description> + </method> <method name="get_scene"> - <return type="Object"> + <return type="Node"> </return> <description> </description> @@ -14666,6 +16658,8 @@ </description> <methods> <method name="add_node"> + <return type="void"> + </return> <argument index="0" name="node" type="Node"> </argument> <description> @@ -14673,6 +16667,8 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear the selection. </description> @@ -14692,6 +16688,8 @@ </description> </method> <method name="remove_node"> + <return type="void"> + </return> <argument index="0" name="node" type="Node"> </argument> <description> @@ -14724,6 +16722,8 @@ </description> <methods> <method name="add_property_info"> + <return type="void"> + </return> <argument index="0" name="info" type="Dictionary"> </argument> <description> @@ -14744,6 +16744,8 @@ </description> </method> <method name="erase"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <description> @@ -14761,7 +16763,7 @@ <return type="String"> </return> <description> - Get the specific project settings path. Projects all have an unique sub-directory inside the settings path where project specific settings are saved. + Get the specific project settings path. Projects all have a unique sub-directory inside the settings path where project specific settings are saved. </description> </method> <method name="get_recent_dirs" qualifiers="const"> @@ -14781,6 +16783,8 @@ </description> </method> <method name="set_favorite_dirs"> + <return type="void"> + </return> <argument index="0" name="dirs" type="PoolStringArray"> </argument> <description> @@ -14788,6 +16792,8 @@ </description> </method> <method name="set_recent_dirs"> + <return type="void"> + </return> <argument index="0" name="dirs" type="PoolStringArray"> </argument> <description> @@ -14813,12 +16819,16 @@ </description> <methods> <method name="add_collision_segments"> + <return type="void"> + </return> <argument index="0" name="segments" type="PoolVector3Array"> </argument> <description> </description> </method> <method name="add_collision_triangles"> + <return type="void"> + </return> <argument index="0" name="triangles" type="TriangleMesh"> </argument> <description> @@ -14826,6 +16836,8 @@ </description> </method> <method name="add_handles"> + <return type="void"> + </return> <argument index="0" name="handles" type="PoolVector3Array"> </argument> <argument index="1" name="billboard" type="bool" default="false"> @@ -14838,6 +16850,8 @@ </description> </method> <method name="add_lines"> + <return type="void"> + </return> <argument index="0" name="lines" type="PoolVector3Array"> </argument> <argument index="1" name="material" type="Material"> @@ -14849,17 +16863,20 @@ </description> </method> <method name="add_mesh"> - <argument index="0" name="mesh" type="Mesh"> + <return type="void"> + </return> + <argument index="0" name="mesh" type="ArrayMesh"> </argument> <argument index="1" name="billboard" type="bool" default="false"> </argument> - <argument index="2" name="skeleton" type="RID" default="[RID]"> + <argument index="2" name="skeleton" type="RID"> </argument> <description> - Add a mesh to the gizmo, this is used for visualization. Call this function during [method redraw]. </description> </method> <method name="add_unscaled_billboard"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <argument index="1" name="default_scale" type="float" default="1"> @@ -14869,15 +16886,19 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> </description> </method> <method name="commit_handle" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="restore" type="Variant"> </argument> - <argument index="2" name="cancel" type="bool"> + <argument index="2" name="cancel" type="bool" default="false"> </argument> <description> Commit a handle being edited (handles must have been prevously added by [method add_handles]). @@ -14904,11 +16925,15 @@ </description> </method> <method name="redraw" qualifiers="virtual"> + <return type="void"> + </return> <description> This function is called when the Spatial this gizmo refers to changes (the [method Spatial.update_gizmo] is called). </description> </method> <method name="set_handle" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <argument index="1" name="camera" type="Camera"> @@ -14921,10 +16946,35 @@ </description> </method> <method name="set_spatial_node"> - <argument index="0" name="node" type="Spatial"> + <return type="void"> + </return> + <argument index="0" name="node" type="Node"> + </argument> + <description> + </description> + </method> + </methods> + <constants> + </constants> +</class> +<class name="EncodedObjectAsID" inherits="Reference" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_object_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="set_object_id"> + <return type="void"> + </return> + <argument index="0" name="id" type="int"> </argument> <description> - Call this function once and upon creation of the gizmo, otherwise no other function will work. The argument is the node being edited by the gizmo. </description> </method> </methods> @@ -14991,13 +17041,29 @@ "string" - major + minor + patch + status + revision in a single String </description> </method> + <method name="is_editor_hint" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="is_in_fixed_frame" qualifiers="const"> <return type="bool"> </return> <description> </description> </method> + <method name="set_editor_hint"> + <return type="void"> + </return> + <argument index="0" name="enabled" type="bool"> + </argument> + <description> + </description> + </method> <method name="set_iterations_per_second"> + <return type="void"> + </return> <argument index="0" name="iterations_per_second" type="int"> </argument> <description> @@ -15005,12 +17071,16 @@ </description> </method> <method name="set_target_fps"> + <return type="void"> + </return> <argument index="0" name="target_fps" type="int"> </argument> <description> </description> </method> <method name="set_time_scale"> + <return type="void"> + </return> <argument index="0" name="time_scale" type="float"> </argument> <description> @@ -15033,7 +17103,7 @@ </description> </method> <method name="get_adjustment_color_correction" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> @@ -15069,7 +17139,7 @@ </description> </method> <method name="get_background" qualifiers="const"> - <return type="int"> + <return type="int" enum="Environment.BGMode"> </return> <description> </description> @@ -15105,7 +17175,7 @@ </description> </method> <method name="get_dof_blur_far_quality" qualifiers="const"> - <return type="int"> + <return type="int" enum="Environment.DOFBlurQuality"> </return> <description> </description> @@ -15129,7 +17199,7 @@ </description> </method> <method name="get_dof_blur_near_quality" qualifiers="const"> - <return type="int"> + <return type="int" enum="Environment.DOFBlurQuality"> </return> <description> </description> @@ -15195,7 +17265,7 @@ </description> </method> <method name="get_glow_blend_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Environment.GlowBlendMode"> </return> <description> </description> @@ -15231,7 +17301,7 @@ </description> </method> <method name="get_sky" qualifiers="const"> - <return type="CubeMap"> + <return type="Sky"> </return> <description> </description> @@ -15351,7 +17421,7 @@ </description> </method> <method name="get_tonemapper" qualifiers="const"> - <return type="int"> + <return type="int" enum="Environment.ToneMapper"> </return> <description> </description> @@ -15443,258 +17513,344 @@ </description> </method> <method name="set_adjustment_brightness"> + <return type="void"> + </return> <argument index="0" name="brightness" type="float"> </argument> <description> </description> </method> <method name="set_adjustment_color_correction"> - <argument index="0" name="color_correction" type="Object"> + <return type="void"> + </return> + <argument index="0" name="color_correction" type="Texture"> </argument> <description> </description> </method> <method name="set_adjustment_contrast"> + <return type="void"> + </return> <argument index="0" name="contrast" type="float"> </argument> <description> </description> </method> <method name="set_adjustment_enable"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_adjustment_saturation"> + <return type="void"> + </return> <argument index="0" name="saturation" type="float"> </argument> <description> </description> </method> <method name="set_ambient_light_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_ambient_light_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_ambient_light_sky_contribution"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_background"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Environment.BGMode"> </argument> <description> </description> </method> <method name="set_bg_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_bg_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_canvas_max_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> </description> </method> <method name="set_dof_blur_far_amount"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_dof_blur_far_distance"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_dof_blur_far_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_dof_blur_far_quality"> - <argument index="0" name="intensity" type="int"> + <return type="void"> + </return> + <argument index="0" name="intensity" type="int" enum="Environment.DOFBlurQuality"> </argument> <description> </description> </method> <method name="set_dof_blur_far_transition"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_dof_blur_near_amount"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_dof_blur_near_distance"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_dof_blur_near_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_dof_blur_near_quality"> - <argument index="0" name="level" type="int"> + <return type="void"> + </return> + <argument index="0" name="level" type="int" enum="Environment.DOFBlurQuality"> </argument> <description> </description> </method> <method name="set_dof_blur_near_transition"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_fog_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_fog_depth_begin"> + <return type="void"> + </return> <argument index="0" name="distance" type="float"> </argument> <description> </description> </method> <method name="set_fog_depth_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_fog_depth_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_fog_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_fog_height_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_fog_height_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_fog_height_max"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> </description> </method> <method name="set_fog_height_min"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> </description> </method> <method name="set_fog_sun_amount"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_fog_sun_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_fog_transmit_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_fog_transmit_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_glow_bicubic_upscale"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_glow_blend_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Environment.GlowBlendMode"> </argument> <description> </description> </method> <method name="set_glow_bloom"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_glow_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_glow_hdr_bleed_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> </description> </method> <method name="set_glow_hdr_bleed_threshold"> + <return type="void"> + </return> <argument index="0" name="threshold" type="float"> </argument> <description> </description> </method> <method name="set_glow_intensity"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_glow_level"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="enabled" type="bool"> @@ -15703,157 +17859,209 @@ </description> </method> <method name="set_glow_strength"> + <return type="void"> + </return> <argument index="0" name="strength" type="float"> </argument> <description> </description> </method> <method name="set_sky"> + <return type="void"> + </return> <argument index="0" name="sky" type="Sky"> </argument> <description> </description> </method> <method name="set_sky_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> </description> </method> <method name="set_ssao_bias"> + <return type="void"> + </return> <argument index="0" name="bias" type="float"> </argument> <description> </description> </method> <method name="set_ssao_blur"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_ssao_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_ssao_direct_light_affect"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_ssao_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_ssao_intensity"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_ssao_intensity2"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_ssao_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_ssao_radius2"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_ssr_depth_tolerance"> + <return type="void"> + </return> <argument index="0" name="depth_tolerance" type="float"> </argument> <description> </description> </method> <method name="set_ssr_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_ssr_fade_in"> + <return type="void"> + </return> <argument index="0" name="fade_in" type="float"> </argument> <description> </description> </method> <method name="set_ssr_fade_out"> + <return type="void"> + </return> <argument index="0" name="fade_out" type="float"> </argument> <description> </description> </method> <method name="set_ssr_max_steps"> + <return type="void"> + </return> <argument index="0" name="max_steps" type="int"> </argument> <description> </description> </method> <method name="set_ssr_rough"> + <return type="void"> + </return> <argument index="0" name="rough" type="bool"> </argument> <description> </description> </method> <method name="set_tonemap_auto_exposure"> + <return type="void"> + </return> <argument index="0" name="auto_exposure" type="bool"> </argument> <description> </description> </method> <method name="set_tonemap_auto_exposure_grey"> + <return type="void"> + </return> <argument index="0" name="exposure_grey" type="float"> </argument> <description> </description> </method> <method name="set_tonemap_auto_exposure_max"> + <return type="void"> + </return> <argument index="0" name="exposure_max" type="float"> </argument> <description> </description> </method> <method name="set_tonemap_auto_exposure_min"> + <return type="void"> + </return> <argument index="0" name="exposure_min" type="float"> </argument> <description> </description> </method> <method name="set_tonemap_auto_exposure_speed"> + <return type="void"> + </return> <argument index="0" name="exposure_speed" type="float"> </argument> <description> </description> </method> <method name="set_tonemap_exposure"> + <return type="void"> + </return> <argument index="0" name="exposure" type="float"> </argument> <description> </description> </method> <method name="set_tonemap_white"> + <return type="void"> + </return> <argument index="0" name="white" type="float"> </argument> <description> </description> </method> <method name="set_tonemapper"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Environment.ToneMapper"> </argument> <description> </description> @@ -15892,7 +18100,7 @@ </member> <member name="background_energy" type="float" setter="set_bg_energy" getter="get_bg_energy" brief=""> </member> - <member name="background_mode" type="int" setter="set_background" getter="get_background" brief=""> + <member name="background_mode" type="int" setter="set_background" getter="get_background" brief="" enum="Environment.BGMode"> </member> <member name="background_sky" type="Sky" setter="set_sky" getter="get_sky" brief=""> </member> @@ -15904,7 +18112,7 @@ </member> <member name="dof_blur_far_enabled" type="bool" setter="set_dof_blur_far_enabled" getter="is_dof_blur_far_enabled" brief=""> </member> - <member name="dof_blur_far_quality" type="int" setter="set_dof_blur_far_quality" getter="get_dof_blur_far_quality" brief=""> + <member name="dof_blur_far_quality" type="int" setter="set_dof_blur_far_quality" getter="get_dof_blur_far_quality" brief="" enum="Environment.DOFBlurQuality"> </member> <member name="dof_blur_far_transition" type="float" setter="set_dof_blur_far_transition" getter="get_dof_blur_far_transition" brief=""> </member> @@ -15914,7 +18122,7 @@ </member> <member name="dof_blur_near_enabled" type="bool" setter="set_dof_blur_near_enabled" getter="is_dof_blur_near_enabled" brief=""> </member> - <member name="dof_blur_near_quality" type="int" setter="set_dof_blur_near_quality" getter="get_dof_blur_near_quality" brief=""> + <member name="dof_blur_near_quality" type="int" setter="set_dof_blur_near_quality" getter="get_dof_blur_near_quality" brief="" enum="Environment.DOFBlurQuality"> </member> <member name="dof_blur_near_transition" type="float" setter="set_dof_blur_near_transition" getter="get_dof_blur_near_transition" brief=""> </member> @@ -15946,7 +18154,7 @@ </member> <member name="glow_bicubic_upscale" type="bool" setter="set_glow_bicubic_upscale" getter="is_glow_bicubic_upscale_enabled" brief=""> </member> - <member name="glow_blend_mode" type="int" setter="set_glow_blend_mode" getter="get_glow_blend_mode" brief=""> + <member name="glow_blend_mode" type="int" setter="set_glow_blend_mode" getter="get_glow_blend_mode" brief="" enum="Environment.GlowBlendMode"> </member> <member name="glow_bloom" type="float" setter="set_glow_bloom" getter="get_glow_bloom" brief=""> </member> @@ -16006,7 +18214,7 @@ </member> <member name="tonemap_exposure" type="float" setter="set_tonemap_exposure" getter="get_tonemap_exposure" brief=""> </member> - <member name="tonemap_mode" type="int" setter="set_tonemapper" getter="get_tonemapper" brief=""> + <member name="tonemap_mode" type="int" setter="set_tonemapper" getter="get_tonemapper" brief="" enum="Environment.ToneMapper"> </member> <member name="tonemap_white" type="float" setter="set_tonemap_white" getter="get_tonemap_white" brief=""> </member> @@ -16072,6 +18280,8 @@ </description> <methods> <method name="close"> + <return type="void"> + </return> <description> Close the currently opened file. </description> @@ -16160,7 +18370,7 @@ </description> </method> <method name="get_error" qualifiers="const"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Get the last error that happened when trying to perform operations. Compare with the [code]ERR_FILE_*[/code] constants from [@Global Scope]. @@ -16235,6 +18445,8 @@ </description> </method> <method name="get_var" qualifiers="const"> + <return type="Variant"> + </return> <description> Get the next Variant value from the file. </description> @@ -16247,7 +18459,7 @@ </description> </method> <method name="open"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -16258,7 +18470,7 @@ </description> </method> <method name="open_compressed"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -16271,7 +18483,7 @@ </description> </method> <method name="open_encrypted"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -16284,7 +18496,7 @@ </description> </method> <method name="open_encrypted_with_pass"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -16297,6 +18509,8 @@ </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="pos" type="int"> </argument> <description> @@ -16304,6 +18518,8 @@ </description> </method> <method name="seek_end"> + <return type="void"> + </return> <argument index="0" name="pos" type="int" default="0"> </argument> <description> @@ -16311,6 +18527,8 @@ </description> </method> <method name="set_endian_swap"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -16319,6 +18537,8 @@ </description> </method> <method name="store_16"> + <return type="void"> + </return> <argument index="0" name="value" type="int"> </argument> <description> @@ -16326,6 +18546,8 @@ </description> </method> <method name="store_32"> + <return type="void"> + </return> <argument index="0" name="value" type="int"> </argument> <description> @@ -16333,6 +18555,8 @@ </description> </method> <method name="store_64"> + <return type="void"> + </return> <argument index="0" name="value" type="int"> </argument> <description> @@ -16340,6 +18564,8 @@ </description> </method> <method name="store_8"> + <return type="void"> + </return> <argument index="0" name="value" type="int"> </argument> <description> @@ -16347,6 +18573,8 @@ </description> </method> <method name="store_buffer"> + <return type="void"> + </return> <argument index="0" name="buffer" type="PoolByteArray"> </argument> <description> @@ -16354,6 +18582,8 @@ </description> </method> <method name="store_double"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -16361,6 +18591,8 @@ </description> </method> <method name="store_float"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -16368,6 +18600,8 @@ </description> </method> <method name="store_line"> + <return type="void"> + </return> <argument index="0" name="line" type="String"> </argument> <description> @@ -16375,6 +18609,8 @@ </description> </method> <method name="store_pascal_string"> + <return type="void"> + </return> <argument index="0" name="string" type="String"> </argument> <description> @@ -16382,6 +18618,8 @@ </description> </method> <method name="store_real"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -16389,6 +18627,8 @@ </description> </method> <method name="store_string"> + <return type="void"> + </return> <argument index="0" name="string" type="String"> </argument> <description> @@ -16396,6 +18636,8 @@ </description> </method> <method name="store_var"> + <return type="void"> + </return> <argument index="0" name="value" type="Variant"> </argument> <description> @@ -16438,6 +18680,8 @@ </description> <methods> <method name="add_filter"> + <return type="void"> + </return> <argument index="0" name="filter" type="String"> </argument> <description> @@ -16445,12 +18689,14 @@ </description> </method> <method name="clear_filters"> + <return type="void"> + </return> <description> Clear all the added filters in the dialog. </description> </method> <method name="get_access" qualifiers="const"> - <return type="int"> + <return type="int" enum="FileDialog.Access"> </return> <description> Return the file access permission of the dialog. @@ -16484,7 +18730,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="FileDialog.Mode"> </return> <description> Get the file dialog mode from the MODE_* enum. @@ -16498,6 +18744,8 @@ </description> </method> <method name="invalidate"> + <return type="void"> + </return> <description> Invalidate and update the current dialog content list. </description> @@ -16510,13 +18758,17 @@ </description> </method> <method name="set_access"> - <argument index="0" name="access" type="int"> + <return type="void"> + </return> + <argument index="0" name="access" type="int" enum="FileDialog.Access"> </argument> <description> Set the file access permission of the dialog(Must be one of [ACCESS_RESOURCES], [ACCESS_USERDATA] or [ACCESS_FILESYSTEM]). </description> </method> <method name="set_current_dir"> + <return type="void"> + </return> <argument index="0" name="dir" type="String"> </argument> <description> @@ -16524,6 +18776,8 @@ </description> </method> <method name="set_current_file"> + <return type="void"> + </return> <argument index="0" name="file" type="String"> </argument> <description> @@ -16531,6 +18785,8 @@ </description> </method> <method name="set_current_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -16538,19 +18794,25 @@ </description> </method> <method name="set_filters"> + <return type="void"> + </return> <argument index="0" name="filters" type="PoolStringArray"> </argument> <description> </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="FileDialog.Mode"> </argument> <description> Set the file dialog mode from the MODE_* enum. </description> </method> <method name="set_show_hidden_files"> + <return type="void"> + </return> <argument index="0" name="show" type="bool"> </argument> <description> @@ -16559,11 +18821,11 @@ </method> </methods> <members> - <member name="access" type="int" setter="set_access" getter="get_access" brief=""> + <member name="access" type="int" setter="set_access" getter="get_access" brief="" enum="FileDialog.Access"> </member> <member name="filters" type="PoolStringArray" setter="set_filters" getter="get_filters" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="FileDialog.Mode"> </member> <member name="show_hidden_files" type="bool" setter="set_show_hidden_files" getter="is_showing_hidden_files" brief=""> </member> @@ -16631,17 +18893,19 @@ Internationalized font and text drawing support. </brief_description> <description> - Font contains an unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc. + Font contains a unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc. </description> <methods> <method name="draw" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="canvas_item" type="RID"> </argument> <argument index="1" name="pos" type="Vector2"> </argument> <argument index="2" name="string" type="String"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="clip_w" type="int" default="-1"> </argument> @@ -16660,7 +18924,7 @@ </argument> <argument index="3" name="next" type="int" default="-1"> </argument> - <argument index="4" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="4" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <description> Draw character "char" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "pos" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character. @@ -16703,6 +18967,8 @@ </description> </method> <method name="update_changes"> + <return type="void"> + </return> <description> After editing a font (changing size, ascent, char rects, etc.). Call this function to propagate changes to controls that might use it. </description> @@ -16727,6 +18993,8 @@ </description> </method> <method name="set_function"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -16734,6 +19002,8 @@ </description> </method> <method name="set_instance"> + <return type="void"> + </return> <argument index="0" name="instance" type="Object"> </argument> <description> @@ -16765,7 +19035,7 @@ <method name="resume"> <return type="Variant"> </return> - <argument index="0" name="arg" type="Variant" default="NULL"> + <argument index="0" name="arg" type="Variant" default="null"> </argument> <description> Resume execution of the yielded function call. @@ -16785,39 +19055,67 @@ <constants> </constants> </class> -<class name="GDNativeClass" inherits="Reference" category="Core"> +<class name="GDNative" inherits="Reference" category="Core"> <brief_description> </brief_description> <description> </description> <methods> - <method name="new"> + <method name="call_native"> + <return type="Variant"> + </return> + <argument index="0" name="procedure_name" type="String"> + </argument> + <argument index="1" name="arguments" type="String"> + </argument> + <argument index="2" name="arg2" type="Array"> + </argument> + <description> + </description> + </method> + <method name="get_library"> + <return type="GDNativeLibrary"> + </return> + <description> + </description> + </method> + <method name="initialize"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="set_library"> + <return type="void"> + </return> + <argument index="0" name="library" type="GDNativeLibrary"> + </argument> + <description> + </description> + </method> + <method name="terminate"> + <return type="bool"> + </return> <description> </description> </method> </methods> + <members> + <member name="library" type="GDNativeLibrary" setter="set_library" getter="get_library" brief=""> + </member> + </members> <constants> </constants> </class> -<class name="GDNativeLibrary" inherits="Resource" category="Core"> +<class name="GDNativeClass" inherits="Reference" category="Core"> <brief_description> </brief_description> <description> </description> <methods> - <method name="get_platform_file" qualifiers="const"> - <return type="String"> + <method name="new"> + <return type="Variant"> </return> - <argument index="0" name="platform" type="String"> - </argument> - <description> - </description> - </method> - <method name="set_platform_file"> - <argument index="0" name="platform" type="String"> - </argument> - <argument index="1" name="file" type="String"> - </argument> <description> </description> </method> @@ -16825,49 +19123,31 @@ <constants> </constants> </class> -<class name="GDNativeScript" inherits="Script" category="Core"> +<class name="GDNativeLibrary" inherits="Resource" category="Core"> <brief_description> </brief_description> <description> </description> <methods> - <method name="get_library" qualifiers="const"> - <return type="Object"> - </return> - <description> - </description> - </method> - <method name="get_script_name" qualifiers="const"> + <method name="get_library_path" qualifiers="const"> <return type="String"> </return> + <argument index="0" name="platform" type="String"> + </argument> <description> </description> </method> - <method name="new" qualifiers="vararg"> - <return type="Object"> + <method name="set_library_path"> + <return type="void"> </return> - <description> - </description> - </method> - <method name="set_library"> - <argument index="0" name="library" type="Object"> + <argument index="0" name="platform" type="String"> </argument> - <description> - </description> - </method> - <method name="set_script_name"> - <argument index="0" name="script_name" type="String"> + <argument index="1" name="path" type="String"> </argument> <description> </description> </method> </methods> - <members> - <member name="library" type="GDNativeLibrary" setter="set_library" getter="get_library" brief=""> - </member> - <member name="script_name" type="String" setter="set_script_name" getter="get_script_name" brief=""> - </member> - </members> <constants> </constants> </class> @@ -16900,7 +19180,9 @@ </description> <methods> <method name="bake"> - <argument index="0" name="from_node" type="Object" default="NULL"> + <return type="void"> + </return> + <argument index="0" name="from_node" type="Node" default="null"> </argument> <argument index="1" name="create_visual_debug" type="bool" default="false"> </argument> @@ -16908,6 +19190,8 @@ </description> </method> <method name="debug_bake"> + <return type="void"> + </return> <description> </description> </method> @@ -16942,7 +19226,7 @@ </description> </method> <method name="get_probe_data" qualifiers="const"> - <return type="Object"> + <return type="GIProbeData"> </return> <description> </description> @@ -16954,7 +19238,7 @@ </description> </method> <method name="get_subdiv" qualifiers="const"> - <return type="int"> + <return type="int" enum="GIProbe.Subdiv"> </return> <description> </description> @@ -16972,61 +19256,81 @@ </description> </method> <method name="set_bias"> + <return type="void"> + </return> <argument index="0" name="max" type="float"> </argument> <description> </description> </method> <method name="set_compress"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_dynamic_range"> + <return type="void"> + </return> <argument index="0" name="max" type="int"> </argument> <description> </description> </method> <method name="set_energy"> + <return type="void"> + </return> <argument index="0" name="max" type="float"> </argument> <description> </description> </method> <method name="set_extents"> + <return type="void"> + </return> <argument index="0" name="extents" type="Vector3"> </argument> <description> </description> </method> <method name="set_interior"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_normal_bias"> + <return type="void"> + </return> <argument index="0" name="max" type="float"> </argument> <description> </description> </method> <method name="set_probe_data"> - <argument index="0" name="data" type="Object"> + <return type="void"> + </return> + <argument index="0" name="data" type="GIProbeData"> </argument> <description> </description> </method> <method name="set_propagation"> + <return type="void"> + </return> <argument index="0" name="max" type="float"> </argument> <description> </description> </method> <method name="set_subdiv"> - <argument index="0" name="subdiv" type="int"> + <return type="void"> + </return> + <argument index="0" name="subdiv" type="int" enum="GIProbe.Subdiv"> </argument> <description> </description> @@ -17051,7 +19355,7 @@ </member> <member name="propagation" type="float" setter="set_propagation" getter="get_propagation" brief=""> </member> - <member name="subdiv" type="int" setter="set_subdiv" getter="get_subdiv" brief=""> + <member name="subdiv" type="int" setter="set_subdiv" getter="get_subdiv" brief="" enum="GIProbe.Subdiv"> </member> </members> <constants> @@ -17138,66 +19442,88 @@ </description> </method> <method name="set_bias"> + <return type="void"> + </return> <argument index="0" name="bias" type="float"> </argument> <description> </description> </method> <method name="set_bounds"> + <return type="void"> + </return> <argument index="0" name="bounds" type="Rect3"> </argument> <description> </description> </method> <method name="set_cell_size"> + <return type="void"> + </return> <argument index="0" name="cell_size" type="float"> </argument> <description> </description> </method> <method name="set_compress"> + <return type="void"> + </return> <argument index="0" name="compress" type="bool"> </argument> <description> </description> </method> <method name="set_dynamic_data"> + <return type="void"> + </return> <argument index="0" name="dynamic_data" type="PoolIntArray"> </argument> <description> </description> </method> <method name="set_dynamic_range"> + <return type="void"> + </return> <argument index="0" name="dynamic_range" type="int"> </argument> <description> </description> </method> <method name="set_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_interior"> + <return type="void"> + </return> <argument index="0" name="interior" type="bool"> </argument> <description> </description> </method> <method name="set_normal_bias"> + <return type="void"> + </return> <argument index="0" name="bias" type="float"> </argument> <description> </description> </method> <method name="set_propagation"> + <return type="void"> + </return> <argument index="0" name="propagation" type="float"> </argument> <description> </description> </method> <method name="set_to_cell_xform"> + <return type="void"> + </return> <argument index="0" name="to_cell_xform" type="Transform"> </argument> <description> @@ -17240,7 +19566,7 @@ <method name="get_flag_x" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <description> </description> @@ -17248,7 +19574,7 @@ <method name="get_flag_y" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <description> </description> @@ -17256,7 +19582,7 @@ <method name="get_flag_z" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <description> </description> @@ -17264,7 +19590,7 @@ <method name="get_param_x" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <description> </description> @@ -17272,7 +19598,7 @@ <method name="get_param_y" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <description> </description> @@ -17280,13 +19606,15 @@ <method name="get_param_z" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <description> </description> </method> <method name="set_flag_x"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <argument index="1" name="value" type="bool"> </argument> @@ -17294,7 +19622,9 @@ </description> </method> <method name="set_flag_y"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <argument index="1" name="value" type="bool"> </argument> @@ -17302,7 +19632,9 @@ </description> </method> <method name="set_flag_z"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="Generic6DOFJoint.Flag"> </argument> <argument index="1" name="value" type="bool"> </argument> @@ -17310,7 +19642,9 @@ </description> </method> <method name="set_param_x"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -17318,7 +19652,9 @@ </description> </method> <method name="set_param_y"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -17326,7 +19662,9 @@ </description> </method> <method name="set_param_z"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="Generic6DOFJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -17504,7 +19842,7 @@ </argument> <argument index="3" name="lats" type="int"> </argument> - <argument index="4" name="axis" type="int" default="2"> + <argument index="4" name="axis" type="int" enum="Vector3.Axis" default="2"> </argument> <description> </description> @@ -17518,7 +19856,7 @@ </argument> <argument index="2" name="sides" type="int"> </argument> - <argument index="3" name="axis" type="int" default="2"> + <argument index="3" name="axis" type="int" enum="Vector3.Axis" default="2"> </argument> <description> </description> @@ -17630,6 +19968,8 @@ </description> </method> <method name="ray_intersects_triangle"> + <return type="Variant"> + </return> <argument index="0" name="from" type="Vector3"> </argument> <argument index="1" name="dir" type="Vector3"> @@ -17684,6 +20024,8 @@ </description> </method> <method name="segment_intersects_segment_2d"> + <return type="Variant"> + </return> <argument index="0" name="from_a" type="Vector2"> </argument> <argument index="1" name="to_a" type="Vector2"> @@ -17710,6 +20052,8 @@ </description> </method> <method name="segment_intersects_triangle"> + <return type="Variant"> + </return> <argument index="0" name="from" type="Vector3"> </argument> <argument index="1" name="to" type="Vector3"> @@ -17744,7 +20088,7 @@ </description> <methods> <method name="get_cast_shadows_setting" qualifiers="const"> - <return type="int"> + <return type="int" enum="GeometryInstance.ShadowCastingSetting"> </return> <description> </description> @@ -17758,7 +20102,7 @@ <method name="get_flag" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="GeometryInstance.Flags"> </argument> <description> </description> @@ -17788,26 +20132,32 @@ </description> </method> <method name="get_material_override" qualifiers="const"> - <return type="Object"> + <return type="Material"> </return> <description> Return the material override for the whole geometry. </description> </method> <method name="set_cast_shadows_setting"> - <argument index="0" name="shadow_casting_setting" type="int"> + <return type="void"> + </return> + <argument index="0" name="shadow_casting_setting" type="int" enum="GeometryInstance.ShadowCastingSetting"> </argument> <description> </description> </method> <method name="set_extra_cull_margin"> + <return type="void"> + </return> <argument index="0" name="margin" type="float"> </argument> <description> </description> </method> <method name="set_flag"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="GeometryInstance.Flags"> </argument> <argument index="1" name="value" type="bool"> </argument> @@ -17815,31 +20165,41 @@ </description> </method> <method name="set_lod_max_distance"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_lod_max_hysteresis"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_lod_min_distance"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_lod_min_hysteresis"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_material_override"> - <argument index="0" name="material" type="Object"> + <return type="void"> + </return> + <argument index="0" name="material" type="Material"> </argument> <description> Set the material override for the whole geometry. @@ -17847,188 +20207,36 @@ </method> </methods> <members> - <member name="cast_shadow" type="int" setter="set_cast_shadows_setting" getter="get_cast_shadows_setting" brief=""> + <member name="cast_shadow" type="int" setter="set_cast_shadows_setting" getter="get_cast_shadows_setting" brief="" enum="GeometryInstance.ShadowCastingSetting"> </member> <member name="extra_cull_margin" type="float" setter="set_extra_cull_margin" getter="get_extra_cull_margin" brief=""> </member> - <member name="lod_max_distance" type="int" setter="set_lod_max_distance" getter="get_lod_max_distance" brief=""> + <member name="lod_max_distance" type="float" setter="set_lod_max_distance" getter="get_lod_max_distance" brief=""> </member> - <member name="lod_max_hysteresis" type="int" setter="set_lod_max_hysteresis" getter="get_lod_max_hysteresis" brief=""> + <member name="lod_max_hysteresis" type="float" setter="set_lod_max_hysteresis" getter="get_lod_max_hysteresis" brief=""> </member> - <member name="lod_min_distance" type="int" setter="set_lod_min_distance" getter="get_lod_min_distance" brief=""> + <member name="lod_min_distance" type="float" setter="set_lod_min_distance" getter="get_lod_min_distance" brief=""> </member> - <member name="lod_min_hysteresis" type="int" setter="set_lod_min_hysteresis" getter="get_lod_min_hysteresis" brief=""> + <member name="lod_min_hysteresis" type="float" setter="set_lod_min_hysteresis" getter="get_lod_min_hysteresis" brief=""> </member> - <member name="material_override" type="ShaderMaterial,SpatialMaterial" setter="set_material_override" getter="get_material_override" brief=""> + <member name="material_override" type="Material" setter="set_material_override" getter="get_material_override" brief=""> </member> <member name="use_in_baked_light" type="bool" setter="set_flag" getter="get_flag" brief=""> </member> - <member name="visible_in_all_rooms" type="bool" setter="set_flag" getter="get_flag" brief=""> - </member> </members> <constants> - <constant name="FLAG_CAST_SHADOW" value="0"> - </constant> - <constant name="FLAG_VISIBLE_IN_ALL_ROOMS" value="1"> + <constant name="FLAG_MAX" value="1" enum=""> </constant> - <constant name="FLAG_MAX" value="3"> - </constant> - <constant name="SHADOW_CASTING_SETTING_OFF" value="0"> + <constant name="SHADOW_CASTING_SETTING_OFF" value="0" enum=""> </constant> - <constant name="SHADOW_CASTING_SETTING_ON" value="1"> + <constant name="SHADOW_CASTING_SETTING_ON" value="1" enum=""> </constant> - <constant name="SHADOW_CASTING_SETTING_DOUBLE_SIDED" value="2"> + <constant name="SHADOW_CASTING_SETTING_DOUBLE_SIDED" value="2" enum=""> </constant> - <constant name="SHADOW_CASTING_SETTING_SHADOWS_ONLY" value="3"> + <constant name="SHADOW_CASTING_SETTING_SHADOWS_ONLY" value="3" enum=""> </constant> </constants> </class> -<class name="ProjectSettings" inherits="Object" category="Core"> - <brief_description> - Contains global variables accessible from everywhere. - </brief_description> - <description> - Contains global variables accessible from everywhere. Use the normal [Object] API, such as "ProjectSettings.get(variable)", "ProjectSettings.set(variable,value)" or "ProjectSettings.has(variable)" to access them. Variables stored in project.godot are also loaded into ProjectSettings, making this object very useful for reading custom game configuration options. - </description> - <methods> - <method name="add_property_info"> - <argument index="0" name="hint" type="Dictionary"> - </argument> - <description> - Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String]. - Example: - [codeblock] - ProjectSettings.set("category/property_name", 0) - - var property_info = { - "name": "category/property_name", - "type": TYPE_INT, - "hint": PROPERTY_HINT_ENUM, - "hint_string": "one,two,three" - } - - ProjectSettings.add_property_info(property_info) - [/codeblock] - </description> - </method> - <method name="clear"> - <argument index="0" name="name" type="String"> - </argument> - <description> - Clear the whole configuration (not recommended, may break things). - </description> - </method> - <method name="get_order" qualifiers="const"> - <return type="int"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - Return the order of a configuration value (influences when saved to the config file). - </description> - </method> - <method name="get_singleton" qualifiers="const"> - <return type="Object"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - </description> - </method> - <method name="globalize_path" qualifiers="const"> - <return type="String"> - </return> - <argument index="0" name="path" type="String"> - </argument> - <description> - Convert a localized path (res://) to a full native OS path. - </description> - </method> - <method name="has" qualifiers="const"> - <return type="bool"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - Return true if a configuration value is present. - </description> - </method> - <method name="has_singleton" qualifiers="const"> - <return type="bool"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - </description> - </method> - <method name="load_resource_pack"> - <return type="bool"> - </return> - <argument index="0" name="pack" type="String"> - </argument> - <description> - </description> - </method> - <method name="localize_path" qualifiers="const"> - <return type="String"> - </return> - <argument index="0" name="path" type="String"> - </argument> - <description> - Convert a path to a localized path (res:// path). - </description> - </method> - <method name="property_can_revert"> - <return type="bool"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - </description> - </method> - <method name="property_get_revert"> - <return type="Variant"> - </return> - <argument index="0" name="name" type="String"> - </argument> - <description> - </description> - </method> - <method name="save"> - <return type="int"> - </return> - <description> - </description> - </method> - <method name="save_custom"> - <return type="int"> - </return> - <argument index="0" name="file" type="String"> - </argument> - <description> - </description> - </method> - <method name="set_initial_value"> - <argument index="0" name="name" type="String"> - </argument> - <argument index="1" name="value" type="Variant"> - </argument> - <description> - </description> - </method> - <method name="set_order"> - <argument index="0" name="name" type="String"> - </argument> - <argument index="1" name="pos" type="int"> - </argument> - <description> - Set the order of a configuration value (influences when saved to the config file). - </description> - </method> - </methods> - <constants> - </constants> -</class> <class name="Gradient" inherits="Resource" category="Core"> <brief_description> Color interpolator node @@ -18038,6 +20246,8 @@ </description> <methods> <method name="add_point"> + <return type="void"> + </return> <argument index="0" name="offset" type="float"> </argument> <argument index="1" name="color" type="Color"> @@ -18095,6 +20305,8 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="offset" type="int"> </argument> <description> @@ -18102,6 +20314,8 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="point" type="int"> </argument> <argument index="1" name="color" type="Color"> @@ -18111,6 +20325,8 @@ </description> </method> <method name="set_colors"> + <return type="void"> + </return> <argument index="0" name="colors" type="PoolColorArray"> </argument> <description> @@ -18118,6 +20334,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="point" type="int"> </argument> <argument index="1" name="offset" type="float"> @@ -18127,6 +20345,8 @@ </description> </method> <method name="set_offsets"> + <return type="void"> + </return> <argument index="0" name="offsets" type="PoolRealArray"> </argument> <description> @@ -18135,9 +20355,9 @@ </method> </methods> <members> - <member name="colors" type="float" setter="set_colors" getter="get_colors" brief=""> + <member name="colors" type="PoolColorArray" setter="set_colors" getter="get_colors" brief=""> </member> - <member name="offsets" type="float" setter="set_offsets" getter="get_offsets" brief=""> + <member name="offsets" type="PoolRealArray" setter="set_offsets" getter="get_offsets" brief=""> </member> </members> <constants> @@ -18156,12 +20376,16 @@ </description> </method> <method name="set_gradient"> + <return type="void"> + </return> <argument index="0" name="gradient" type="Gradient"> </argument> <description> </description> </method> <method name="set_width"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <description> @@ -18182,12 +20406,12 @@ GraphEdit is an area capable of showing various GraphNodes. It manages connection events between them. </brief_description> <description> - GraphEdit manages the showing of GraphNodes it contains, as well as connections an disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default. + GraphEdit manages the showing of GraphNodes it contains, as well as connections and disconnections between them. Signals are sent for each of these two events. Disconnection between GraphNodes slots is disabled by default. It is greatly advised to enable low processor usage mode (see [method OS.set_low_processor_usage_mode]) when using GraphEdits. </description> <methods> <method name="connect_node"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="from" type="String"> </argument> @@ -18202,6 +20426,8 @@ </description> </method> <method name="disconnect_node"> + <return type="void"> + </return> <argument index="0" name="from" type="String"> </argument> <argument index="1" name="from_port" type="int"> @@ -18270,6 +20496,8 @@ </description> </method> <method name="set_right_disconnects"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -18277,30 +20505,40 @@ </description> </method> <method name="set_scroll_ofs"> + <return type="void"> + </return> <argument index="0" name="ofs" type="Vector2"> </argument> <description> </description> </method> <method name="set_selected"> - <argument index="0" name="node" type="Object"> + <return type="void"> + </return> + <argument index="0" name="node" type="Node"> </argument> <description> </description> </method> <method name="set_snap"> + <return type="void"> + </return> <argument index="0" name="pixels" type="int"> </argument> <description> </description> </method> <method name="set_use_snap"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_zoom"> + <return type="void"> + </return> <argument index="0" name="p_zoom" type="float"> </argument> <description> @@ -18417,11 +20655,15 @@ </description> <methods> <method name="clear_all_slots"> + <return type="void"> + </return> <description> Disable all input and output slots of the GraphNode. </description> </method> <method name="clear_slot"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -18504,7 +20746,7 @@ </description> </method> <method name="get_overlay" qualifiers="const"> - <return type="int"> + <return type="int" enum="GraphNode.Overlay"> </return> <description> </description> @@ -18596,12 +20838,16 @@ </description> </method> <method name="set_comment"> + <return type="void"> + </return> <argument index="0" name="comment" type="bool"> </argument> <description> </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -18609,24 +20855,32 @@ </description> </method> <method name="set_overlay"> - <argument index="0" name="overlay" type="int"> + <return type="void"> + </return> + <argument index="0" name="overlay" type="int" enum="GraphNode.Overlay"> </argument> <description> </description> </method> <method name="set_resizeable"> + <return type="void"> + </return> <argument index="0" name="resizeable" type="bool"> </argument> <description> </description> </method> <method name="set_selected"> + <return type="void"> + </return> <argument index="0" name="selected" type="bool"> </argument> <description> </description> </method> <method name="set_show_close_button"> + <return type="void"> + </return> <argument index="0" name="show" type="bool"> </argument> <description> @@ -18634,6 +20888,8 @@ </description> </method> <method name="set_slot"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="enable_left" type="bool"> @@ -18648,14 +20904,16 @@ </argument> <argument index="6" name="color_right" type="Color"> </argument> - <argument index="7" name="custom_left" type="Object" default="NULL"> + <argument index="7" name="custom_left" type="Texture" default="null"> </argument> - <argument index="8" name="custom_right" type="Object" default="NULL"> + <argument index="8" name="custom_right" type="Texture" default="null"> </argument> <description> </description> </method> <method name="set_title"> + <return type="void"> + </return> <argument index="0" name="title" type="String"> </argument> <description> @@ -18764,6 +21022,8 @@ </description> </method> <method name="set_columns"> + <return type="void"> + </return> <argument index="0" name="columns" type="int"> </argument> <description> @@ -18790,95 +21050,9 @@ <description> </description> <methods> - <method name="area_get_bounds" qualifiers="const"> - <return type="Rect3"> - </return> - <argument index="0" name="area" type="int"> - </argument> - <description> - </description> - </method> - <method name="area_get_name" qualifiers="const"> - <return type="String"> - </return> - <argument index="0" name="area" type="int"> - </argument> - <description> - </description> - </method> - <method name="area_get_portal_disable_color" qualifiers="const"> - <return type="Color"> - </return> - <argument index="0" name="area" type="int"> - </argument> - <description> - </description> - </method> - <method name="area_get_portal_disable_distance" qualifiers="const"> - <return type="float"> - </return> - <argument index="0" name="area" type="int"> - </argument> - <description> - </description> - </method> - <method name="area_is_exterior_portal" qualifiers="const"> - <return type="bool"> - </return> - <argument index="0" name="area" type="int"> - </argument> - <description> - </description> - </method> - <method name="area_set_exterior_portal"> - <argument index="0" name="area" type="int"> - </argument> - <argument index="1" name="enable" type="bool"> - </argument> - <description> - </description> - </method> - <method name="area_set_name"> - <argument index="0" name="area" type="int"> - </argument> - <argument index="1" name="name" type="String"> - </argument> - <description> - </description> - </method> - <method name="area_set_portal_disable_color"> - <argument index="0" name="area" type="int"> - </argument> - <argument index="1" name="color" type="Color"> - </argument> - <description> - </description> - </method> - <method name="area_set_portal_disable_distance"> - <argument index="0" name="area" type="int"> - </argument> - <argument index="1" name="distance" type="float"> - </argument> - <description> - </description> - </method> <method name="clear"> - <description> - </description> - </method> - <method name="create_area"> - <return type="int"> + <return type="void"> </return> - <argument index="0" name="id" type="int"> - </argument> - <argument index="1" name="area" type="Rect3"> - </argument> - <description> - </description> - </method> - <method name="erase_area"> - <argument index="0" name="area" type="int"> - </argument> <description> </description> </method> @@ -18907,7 +21081,7 @@ </description> </method> <method name="get_cell_size" qualifiers="const"> - <return type="float"> + <return type="Vector3"> </return> <description> </description> @@ -18948,19 +21122,17 @@ <description> </description> </method> - <method name="get_unused_area_id" qualifiers="const"> - <return type="int"> - </return> - <description> - </description> - </method> <method name="resource_changed"> - <argument index="0" name="resource" type="Object"> + <return type="void"> + </return> + <argument index="0" name="resource" type="Resource"> </argument> <description> </description> </method> <method name="set_cell_item"> + <return type="void"> + </return> <argument index="0" name="x" type="int"> </argument> <argument index="1" name="y" type="int"> @@ -18975,48 +21147,62 @@ </description> </method> <method name="set_cell_size"> - <argument index="0" name="size" type="float"> + <return type="void"> + </return> + <argument index="0" name="size" type="Vector3"> </argument> <description> </description> </method> <method name="set_center_x"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_center_y"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_center_z"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_clip"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <argument index="1" name="clipabove" type="bool" default="true"> </argument> <argument index="2" name="floor" type="int" default="0"> </argument> - <argument index="3" name="axis" type="int" default="0"> + <argument index="3" name="axis" type="int" enum="Vector3.Axis" default="0"> </argument> <description> </description> </method> <method name="set_octant_size"> + <return type="void"> + </return> <argument index="0" name="size" type="int"> </argument> <description> </description> </method> <method name="set_theme"> + <return type="void"> + </return> <argument index="0" name="theme" type="MeshLibrary"> </argument> <description> @@ -19024,7 +21210,7 @@ </method> </methods> <constants> - <constant name="INVALID_CELL_ITEM" value="-1"> + <constant name="INVALID_CELL_ITEM" value="-1" enum=""> </constant> </constants> </class> @@ -19051,6 +21237,8 @@ </description> </method> <method name="set_initial_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="float"> </argument> <description> @@ -19058,6 +21246,8 @@ </description> </method> <method name="set_length"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> @@ -19110,6 +21300,8 @@ </theme_item> <theme_item name="grabber_highlight" type="StyleBox"> </theme_item> + <theme_item name="grabber_pressed" type="StyleBox"> + </theme_item> <theme_item name="increment" type="Texture"> </theme_item> <theme_item name="increment_highlight" type="Texture"> @@ -19200,12 +21392,14 @@ </description> <methods> <method name="close"> + <return type="void"> + </return> <description> Cloces the current connection, allows for reusal of [HTTPClient]. </description> </method> <method name="connect_to_host"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="host" type="String"> </argument> @@ -19259,7 +21453,7 @@ </description> </method> <method name="get_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="HTTPClient.Status"> </return> <description> Returns a STATUS_* enum constant. Need to call [method poll] in order to get status updates. @@ -19287,7 +21481,7 @@ </description> </method> <method name="poll"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> This needs to be called in order to have any request processed. Check results with [method get_status] @@ -19315,9 +21509,9 @@ </description> </method> <method name="request"> - <return type="int"> + <return type="int" enum="Error"> </return> - <argument index="0" name="method" type="int"> + <argument index="0" name="method" type="int" enum="HTTPClient.Method"> </argument> <argument index="1" name="url" type="String"> </argument> @@ -19338,9 +21532,9 @@ </description> </method> <method name="request_raw"> - <return type="int"> + <return type="int" enum="Error"> </return> - <argument index="0" name="method" type="int"> + <argument index="0" name="method" type="int" enum="HTTPClient.Method"> </argument> <argument index="1" name="url" type="String"> </argument> @@ -19355,7 +21549,7 @@ </description> </method> <method name="send_body_data"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="body" type="PoolByteArray"> </argument> @@ -19364,7 +21558,7 @@ </description> </method> <method name="send_body_text"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="body" type="String"> </argument> @@ -19373,6 +21567,8 @@ </description> </method> <method name="set_blocking_mode"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -19380,6 +21576,8 @@ </description> </method> <method name="set_connection"> + <return type="void"> + </return> <argument index="0" name="connection" type="StreamPeer"> </argument> <description> @@ -19387,6 +21585,8 @@ </description> </method> <method name="set_read_chunk_size"> + <return type="void"> + </return> <argument index="0" name="bytes" type="int"> </argument> <description> @@ -19543,6 +21743,8 @@ </description> <methods> <method name="cancel_request"> + <return type="void"> + </return> <description> Cancel the current request. </description> @@ -19576,7 +21778,7 @@ </description> </method> <method name="get_http_client_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="HTTPClient.Status"> </return> <description> Return the current status of the underlying [HTTPClient]. @@ -19597,15 +21799,15 @@ </description> </method> <method name="request"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="url" type="String"> </argument> - <argument index="1" name="custom_headers" type="PoolStringArray" default="PoolStringArray([])"> + <argument index="1" name="custom_headers" type="PoolStringArray" default="PoolStringArray( )"> </argument> <argument index="2" name="ssl_validate_domain" type="bool" default="true"> </argument> - <argument index="3" name="method" type="int" default="0"> + <argument index="3" name="method" type="int" enum="HTTPClient.Method" default="0"> </argument> <argument index="4" name="request_data" type="String" default=""""> </argument> @@ -19613,6 +21815,8 @@ </description> </method> <method name="set_body_size_limit"> + <return type="void"> + </return> <argument index="0" name="bytes" type="int"> </argument> <description> @@ -19620,6 +21824,8 @@ </description> </method> <method name="set_download_file"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -19627,6 +21833,8 @@ </description> </method> <method name="set_max_redirects"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -19634,6 +21842,8 @@ </description> </method> <method name="set_use_threads"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -19711,7 +21921,7 @@ <method name="get_flag" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="HingeJoint.Flag"> </argument> <description> </description> @@ -19719,13 +21929,15 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="HingeJoint.Param"> </argument> <description> </description> </method> <method name="set_flag"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="HingeJoint.Flag"> </argument> <argument index="1" name="enabled" type="bool"> </argument> @@ -19733,7 +21945,9 @@ </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="HingeJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -19799,12 +22013,16 @@ </description> <methods> <method name="clear_cache"> - <argument index="0" name="arg0" type="String" default=""""> + <return type="void"> + </return> + <argument index="0" name="hostname" type="String" default=""""> </argument> <description> </description> </method> <method name="erase_resolve_item"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -19827,7 +22045,7 @@ </description> </method> <method name="get_resolve_item_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="IP.ResolverStatus"> </return> <argument index="0" name="id" type="int"> </argument> @@ -19840,7 +22058,7 @@ </return> <argument index="0" name="host" type="String"> </argument> - <argument index="1" name="ip_type" type="int" default="3"> + <argument index="1" name="ip_type" type="int" enum="IP.Type" default="3"> </argument> <description> Resolve a given hostname, blocking. Resolved hostname is returned as an IPv4 or IPv6 depending on "ip_type". @@ -19851,7 +22069,7 @@ </return> <argument index="0" name="host" type="String"> </argument> - <argument index="1" name="ip_type" type="int" default="3"> + <argument index="1" name="ip_type" type="int" enum="IP.Type" default="3"> </argument> <description> Create a queue item for resolving a given hostname to an IPv4 or IPv6 depending on "ip_type". The queue ID is returned, or RESOLVER_INVALID_ID on error. @@ -19867,9 +22085,9 @@ </constant> <constant name="RESOLVER_STATUS_ERROR" value="3"> </constant> - <constant name="RESOLVER_MAX_QUERIES" value="32"> + <constant name="RESOLVER_MAX_QUERIES" value="32" enum=""> </constant> - <constant name="RESOLVER_INVALID_ID" value="-1"> + <constant name="RESOLVER_INVALID_ID" value="-1" enum=""> </constant> <constant name="TYPE_NONE" value="0"> </constant> @@ -19900,6 +22118,8 @@ </description> <methods> <method name="blend_rect"> + <return type="void"> + </return> <argument index="0" name="src" type="Image"> </argument> <argument index="1" name="src_rect" type="Rect2"> @@ -19911,6 +22131,8 @@ </description> </method> <method name="blend_rect_mask"> + <return type="void"> + </return> <argument index="0" name="src" type="Image"> </argument> <argument index="1" name="mask" type="Image"> @@ -19924,6 +22146,8 @@ </description> </method> <method name="blit_rect"> + <return type="void"> + </return> <argument index="0" name="src" type="Image"> </argument> <argument index="1" name="src_rect" type="Rect2"> @@ -19935,6 +22159,8 @@ </description> </method> <method name="blit_rect_mask"> + <return type="void"> + </return> <argument index="0" name="src" type="Image"> </argument> <argument index="1" name="mask" type="Image"> @@ -19948,54 +22174,64 @@ </description> </method> <method name="clear_mipmaps"> + <return type="void"> + </return> <description> </description> </method> <method name="compress"> - <return type="int"> + <return type="int" enum="Error"> </return> - <argument index="0" name="mode" type="int"> + <argument index="0" name="mode" type="int" enum="Image.CompressMode"> </argument> - <argument index="1" name="arg1" type="int"> + <argument index="1" name="source" type="int" enum="Image.CompressSource"> </argument> - <argument index="2" name="arg2" type="float"> + <argument index="2" name="lossy_quality" type="float"> </argument> <description> </description> </method> <method name="convert"> - <argument index="0" name="format" type="int"> + <return type="void"> + </return> + <argument index="0" name="format" type="int" enum="Image.Format"> </argument> <description> </description> </method> <method name="copy_from"> + <return type="void"> + </return> <argument index="0" name="src" type="Image"> </argument> <description> </description> </method> <method name="create"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <argument index="1" name="height" type="int"> </argument> <argument index="2" name="use_mipmaps" type="bool"> </argument> - <argument index="3" name="format" type="int"> + <argument index="3" name="format" type="int" enum="Image.Format"> </argument> <description> Create an empty image of a specific size and format. </description> </method> <method name="create_from_data"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <argument index="1" name="height" type="int"> </argument> <argument index="2" name="use_mipmaps" type="bool"> </argument> - <argument index="3" name="format" type="int"> + <argument index="3" name="format" type="int" enum="Image.Format"> </argument> <argument index="4" name="data" type="PoolByteArray"> </argument> @@ -20003,6 +22239,8 @@ </description> </method> <method name="crop"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <argument index="1" name="height" type="int"> @@ -20011,22 +22249,26 @@ </description> </method> <method name="decompress"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> </description> </method> <method name="detect_alpha" qualifiers="const"> - <return type="int"> + <return type="int" enum="Image.AlphaMode"> </return> <description> </description> </method> <method name="expand_x2_hq2x"> + <return type="void"> + </return> <description> </description> </method> <method name="fill"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -20034,19 +22276,25 @@ </description> </method> <method name="fix_alpha_edges"> + <return type="void"> + </return> <description> </description> </method> <method name="flip_x"> + <return type="void"> + </return> <description> </description> </method> <method name="flip_y"> + <return type="void"> + </return> <description> </description> </method> <method name="generate_mipmaps"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> </description> @@ -20059,7 +22307,7 @@ </description> </method> <method name="get_format" qualifiers="const"> - <return type="int"> + <return type="int" enum="Image.Format"> </return> <description> Return the format of the [Image], one of [Image].FORMAT_*. @@ -20099,6 +22347,12 @@ Return a new [Image] that is a copy of "area" in this [Image]. </description> </method> + <method name="get_size" qualifiers="const"> + <return type="Vector2"> + </return> + <description> + </description> + </method> <method name="get_used_rect" qualifiers="const"> <return type="Rect2"> </return> @@ -20138,7 +22392,7 @@ </description> </method> <method name="load"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -20147,35 +22401,45 @@ </description> </method> <method name="lock"> + <return type="void"> + </return> <description> </description> </method> <method name="normalmap_to_xy"> + <return type="void"> + </return> <description> </description> </method> <method name="premultiply_alpha"> + <return type="void"> + </return> <description> </description> </method> <method name="resize"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <argument index="1" name="height" type="int"> </argument> - <argument index="2" name="interpolation" type="int" default="1"> + <argument index="2" name="interpolation" type="int" enum="Image.Interpolation" default="1"> </argument> <description> </description> </method> <method name="resize_to_po2"> + <return type="void"> + </return> <argument index="0" name="square" type="bool" default="false"> </argument> <description> </description> </method> <method name="save_png" qualifiers="const"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -20184,6 +22448,8 @@ </description> </method> <method name="set_pixel"> + <return type="void"> + </return> <argument index="0" name="x" type="int"> </argument> <argument index="1" name="y" type="int"> @@ -20194,14 +22460,20 @@ </description> </method> <method name="shrink_x2"> + <return type="void"> + </return> <description> </description> </method> <method name="srgb_to_linear"> + <return type="void"> + </return> <description> </description> </method> <method name="unlock"> + <return type="void"> + </return> <description> </description> </method> @@ -20326,11 +22598,13 @@ </description> <methods> <method name="create"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <argument index="1" name="height" type="int"> </argument> - <argument index="2" name="format" type="int"> + <argument index="2" name="format" type="int" enum="Image.Format"> </argument> <argument index="3" name="flags" type="int" default="7"> </argument> @@ -20341,6 +22615,8 @@ </description> </method> <method name="create_from_image"> + <return type="void"> + </return> <argument index="0" name="image" type="Image"> </argument> <argument index="1" name="flags" type="int" default="7"> @@ -20349,15 +22625,8 @@ Create a new [ImageTexture] from an [Image] with "flags" from [Texture].FLAG_*. </description> </method> - <method name="get_data" qualifiers="const"> - <return type="Image"> - </return> - <description> - Return the [Image] of this [ImageTexture]. - </description> - </method> <method name="get_format" qualifiers="const"> - <return type="int"> + <return type="int" enum="Image.Format"> </return> <description> Return the format of the [ImageTexture], one of [Image].FORMAT_*. @@ -20371,13 +22640,15 @@ </description> </method> <method name="get_storage" qualifiers="const"> - <return type="int"> + <return type="int" enum="ImageTexture.Storage"> </return> <description> Return the storage type. One of [ImageTexture].STORAGE_*. </description> </method> <method name="load"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -20385,6 +22656,8 @@ </description> </method> <method name="set_data"> + <return type="void"> + </return> <argument index="0" name="image" type="Image"> </argument> <description> @@ -20392,6 +22665,8 @@ </description> </method> <method name="set_lossy_storage_quality"> + <return type="void"> + </return> <argument index="0" name="quality" type="float"> </argument> <description> @@ -20399,13 +22674,17 @@ </description> </method> <method name="set_size_override"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="set_storage"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="ImageTexture.Storage"> </argument> <description> Set the storage type. One of [ImageTexture].STORAGE_*. @@ -20432,6 +22711,8 @@ </description> <methods> <method name="add_sphere"> + <return type="void"> + </return> <argument index="0" name="lats" type="int"> </argument> <argument index="1" name="lons" type="int"> @@ -20441,10 +22722,12 @@ <argument index="3" name="add_uv" type="bool" default="true"> </argument> <description> - Simple helper to draw an uvsphere, with given latitudes, longitude and radius. + Simple helper to draw a uvsphere, with given latitudes, longitude and radius. </description> </method> <method name="add_vertex"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector3"> </argument> <description> @@ -20452,9 +22735,11 @@ </description> </method> <method name="begin"> - <argument index="0" name="primitive" type="int"> + <return type="void"> + </return> + <argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType"> </argument> - <argument index="1" name="texture" type="Texture" default="NULL"> + <argument index="1" name="texture" type="Texture" default="null"> </argument> <description> Begin drawing (And optionally pass a texture override). When done call end(). For more information on how this works, search for glBegin() glEnd() references. @@ -20462,16 +22747,22 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear everything that was drawn using begin/end. </description> </method> <method name="end"> + <return type="void"> + </return> <description> Call this when done adding a batch of geometry, otherwise it can't be displayed. </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -20479,6 +22770,8 @@ </description> </method> <method name="set_normal"> + <return type="void"> + </return> <argument index="0" name="normal" type="Vector3"> </argument> <description> @@ -20486,6 +22779,8 @@ </description> </method> <method name="set_tangent"> + <return type="void"> + </return> <argument index="0" name="tangent" type="Plane"> </argument> <description> @@ -20493,6 +22788,8 @@ </description> </method> <method name="set_uv"> + <return type="void"> + </return> <argument index="0" name="uv" type="Vector2"> </argument> <description> @@ -20500,6 +22797,8 @@ </description> </method> <method name="set_uv2"> + <return type="void"> + </return> <argument index="0" name="uv" type="Vector2"> </argument> <description> @@ -20519,6 +22818,8 @@ </description> <methods> <method name="action_press"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> @@ -20526,6 +22827,8 @@ </description> </method> <method name="action_release"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> @@ -20533,6 +22836,8 @@ </description> </method> <method name="add_joy_mapping"> + <return type="void"> + </return> <argument index="0" name="mapping" type="String"> </argument> <argument index="1" name="update_existing" type="bool" default="false"> @@ -20669,7 +22974,7 @@ </description> </method> <method name="get_mouse_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Input.MouseMode"> </return> <description> Return the mouse mode. See the constants for more information. @@ -20739,12 +23044,16 @@ </description> </method> <method name="parse_input_event"> - <argument index="0" name="event" type="Object"> + <return type="void"> + </return> + <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> </method> <method name="remove_joy_mapping"> + <return type="void"> + </return> <argument index="0" name="guid" type="String"> </argument> <description> @@ -20752,22 +23061,27 @@ </description> </method> <method name="set_custom_mouse_cursor"> - <argument index="0" name="image" type="Texture"> + <return type="void"> + </return> + <argument index="0" name="image" type="Resource"> </argument> - <argument index="1" name="hotspot" type="Vector2" default="Vector2(0, 0)"> + <argument index="1" name="hotspot" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> - Set a custom mouse cursor image, which is only visible inside the game window. The hotspot can also be specified. </description> </method> <method name="set_mouse_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Input.MouseMode"> </argument> <description> Set the mouse mode. See the constants for more information. </description> </method> <method name="start_joy_vibration"> + <return type="void"> + </return> <argument index="0" name="device" type="int"> </argument> <argument index="1" name="weak_magnitude" type="float"> @@ -20782,6 +23096,8 @@ </description> </method> <method name="stop_joy_vibration"> + <return type="void"> + </return> <argument index="0" name="device" type="int"> </argument> <description> @@ -20789,6 +23105,8 @@ </description> </method> <method name="warp_mouse_pos"> + <return type="void"> + </return> <argument index="0" name="to" type="Vector2"> </argument> <description> @@ -20913,12 +23231,16 @@ </description> </method> <method name="set_device"> + <return type="void"> + </return> <argument index="0" name="device" type="int"> </argument> <description> </description> </method> <method name="set_id"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -20937,7 +23259,7 @@ </return> <argument index="0" name="xform" type="Transform2D"> </argument> - <argument index="1" name="local_ofs" type="Vector2" default="Vector2(0, 0)"> + <argument index="1" name="local_ofs" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> </description> @@ -20964,12 +23286,16 @@ </description> </method> <method name="set_action"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> @@ -21005,18 +23331,24 @@ </description> </method> <method name="set_button_index"> + <return type="void"> + </return> <argument index="0" name="button_index" type="int"> </argument> <description> </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> </description> </method> <method name="set_pressure"> + <return type="void"> + </return> <argument index="0" name="pressure" type="float"> </argument> <description> @@ -21057,12 +23389,16 @@ </description> </method> <method name="set_axis"> + <return type="void"> + </return> <argument index="0" name="axis" type="int"> </argument> <description> </description> </method> <method name="set_axis_value"> + <return type="void"> + </return> <argument index="0" name="axis_value" type="float"> </argument> <description> @@ -21106,24 +23442,32 @@ </description> </method> <method name="set_echo"> + <return type="void"> + </return> <argument index="0" name="echo" type="bool"> </argument> <description> </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> </description> </method> <method name="set_scancode"> + <return type="void"> + </return> <argument index="0" name="scancode" type="int"> </argument> <description> </description> </method> <method name="set_unicode"> + <return type="void"> + </return> <argument index="0" name="unicode" type="int"> </argument> <description> @@ -21131,7 +23475,7 @@ </method> </methods> <members> - <member name="echo" type="int" setter="set_echo" getter="is_echo" brief=""> + <member name="echo" type="bool" setter="set_echo" getter="is_echo" brief=""> Echo state of the key, i.e. whether it's a repeat event or not. </member> <member name="pressed" type="bool" setter="set_pressed" getter="is_pressed" brief=""> @@ -21173,18 +23517,24 @@ </description> </method> <method name="set_button_mask"> + <return type="void"> + </return> <argument index="0" name="button_mask" type="int"> </argument> <description> </description> </method> <method name="set_global_position"> + <return type="void"> + </return> <argument index="0" name="global_position" type="Vector2"> </argument> <description> </description> </method> <method name="set_position"> + <return type="void"> + </return> <argument index="0" name="position" type="Vector2"> </argument> <description> @@ -21231,24 +23581,32 @@ </description> </method> <method name="set_button_index"> + <return type="void"> + </return> <argument index="0" name="button_index" type="int"> </argument> <description> </description> </method> <method name="set_doubleclick"> + <return type="void"> + </return> <argument index="0" name="doubleclick" type="bool"> </argument> <description> </description> </method> <method name="set_factor"> + <return type="void"> + </return> <argument index="0" name="factor" type="float"> </argument> <description> </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> @@ -21291,12 +23649,16 @@ </description> </method> <method name="set_relative"> + <return type="void"> + </return> <argument index="0" name="relative" type="Vector2"> </argument> <description> </description> </method> <method name="set_speed"> + <return type="void"> + </return> <argument index="0" name="speed" type="Vector2"> </argument> <description> @@ -21346,24 +23708,32 @@ </description> </method> <method name="set_index"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> </description> </method> <method name="set_position"> + <return type="void"> + </return> <argument index="0" name="position" type="Vector2"> </argument> <description> </description> </method> <method name="set_relative"> + <return type="void"> + </return> <argument index="0" name="relative" type="Vector2"> </argument> <description> </description> </method> <method name="set_speed"> + <return type="void"> + </return> <argument index="0" name="speed" type="Vector2"> </argument> <description> @@ -21407,18 +23777,24 @@ </description> </method> <method name="set_index"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> </description> </method> <method name="set_position"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> </description> </method> <method name="set_pressed"> + <return type="void"> + </return> <argument index="0" name="pressed" type="bool"> </argument> <description> @@ -21477,30 +23853,40 @@ </description> </method> <method name="set_alt"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_command"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_control"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_metakey"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_shift"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -21535,18 +23921,22 @@ </description> <methods> <method name="action_add_event"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> - <argument index="1" name="event" type="Object"> + <argument index="1" name="event" type="InputEvent"> </argument> <description> Add an [InputEvent] to an action. This [InputEvent] will trigger the action. </description> </method> <method name="action_erase_event"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> - <argument index="1" name="event" type="Object"> + <argument index="1" name="event" type="InputEvent"> </argument> <description> Remove an [InputEvent] from an action. @@ -21557,13 +23947,15 @@ </return> <argument index="0" name="action" type="String"> </argument> - <argument index="1" name="event" type="Object"> + <argument index="1" name="event" type="InputEvent"> </argument> <description> Whether an action has an [InputEvent] associated with it. </description> </method> <method name="add_action"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> @@ -21571,6 +23963,8 @@ </description> </method> <method name="erase_action"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> @@ -21580,7 +23974,7 @@ <method name="event_is_action" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="event" type="Object"> + <argument index="0" name="event" type="InputEvent"> </argument> <argument index="1" name="action" type="String"> </argument> @@ -21614,6 +24008,8 @@ </description> </method> <method name="load_from_globals"> + <return type="void"> + </return> <description> Clear the [InputMap] and load it anew from [ProjectSettings]. </description> @@ -21647,7 +24043,9 @@ </description> </method> <method name="replace_by_instance"> - <argument index="0" name="custom_scene" type="PackedScene" default="NULL"> + <return type="void"> + </return> + <argument index="0" name="custom_scene" type="PackedScene" default="null"> </argument> <description> Replace this placeholder by the scene handed as an argument, or the original scene if no argument is given. As for all resources, the scene is loaded only if it's not loaded already. By manually loading the scene beforehand, delays caused by this function can be avoided. @@ -21682,24 +24080,32 @@ </description> </method> <method name="set_interpolation_enabled"> + <return type="void"> + </return> <argument index="0" name="target_path" type="bool"> </argument> <description> </description> </method> <method name="set_speed"> + <return type="void"> + </return> <argument index="0" name="speed" type="float"> </argument> <description> </description> </method> <method name="set_target"> - <argument index="0" name="target" type="Camera"> + <return type="void"> + </return> + <argument index="0" name="target" type="Object"> </argument> <description> </description> </method> <method name="set_target_path"> + <return type="void"> + </return> <argument index="0" name="target_path" type="NodePath"> </argument> <description> @@ -21729,6 +24135,8 @@ </description> <methods> <method name="add_icon_item"> + <return type="void"> + </return> <argument index="0" name="icon" type="Texture"> </argument> <argument index="1" name="selectable" type="bool" default="true"> @@ -21738,9 +24146,11 @@ </description> </method> <method name="add_item"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> - <argument index="1" name="icon" type="Texture" default="NULL"> + <argument index="1" name="icon" type="Texture" default="null"> </argument> <argument index="2" name="selectable" type="bool" default="true"> </argument> @@ -21750,11 +24160,15 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Remove all items from the list. </description> </method> <method name="ensure_current_is_visible"> + <return type="void"> + </return> <description> Ensure selection is visible, adjusting the scroll position as necessary. </description> @@ -21780,7 +24194,7 @@ </description> </method> <method name="get_icon_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="ItemList.IconMode"> </return> <description> </description> @@ -21874,7 +24288,7 @@ </description> </method> <method name="get_select_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="ItemList.SelectMode"> </return> <description> </description> @@ -21887,12 +24301,18 @@ </description> </method> <method name="get_v_scroll"> - <return type="Object"> + <return type="VScrollBar"> </return> <description> Returns the current vertical scroll bar for the List. </description> </method> + <method name="has_auto_height" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="is_item_disabled" qualifiers="const"> <return type="bool"> </return> @@ -21921,7 +24341,7 @@ </description> </method> <method name="is_same_column_width" qualifiers="const"> - <return type="int"> + <return type="bool"> </return> <description> Returns whether or not all columns of the list are of the same size. @@ -21937,6 +24357,8 @@ </description> </method> <method name="remove_item"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -21944,6 +24366,8 @@ </description> </method> <method name="select"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="single" type="bool" default="true"> @@ -21954,13 +24378,25 @@ </description> </method> <method name="set_allow_rmb_select"> + <return type="void"> + </return> <argument index="0" name="allow" type="bool"> </argument> <description> Allow (or disallow) selection of (selectable) items in the list using right mouse button. </description> </method> + <method name="set_auto_height"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> <method name="set_fixed_column_width"> + <return type="void"> + </return> <argument index="0" name="width" type="int"> </argument> <description> @@ -21968,24 +24404,32 @@ </description> </method> <method name="set_fixed_icon_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="set_icon_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="ItemList.IconMode"> </argument> <description> </description> </method> <method name="set_icon_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> </description> </method> <method name="set_item_custom_bg_color"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="custom_bg_color" type="Color"> @@ -21994,6 +24438,8 @@ </description> </method> <method name="set_item_disabled"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="disabled" type="bool"> @@ -22004,6 +24450,8 @@ </description> </method> <method name="set_item_icon"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="icon" type="Texture"> @@ -22013,6 +24461,8 @@ </description> </method> <method name="set_item_icon_region"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="rect" type="Rect2"> @@ -22021,6 +24471,8 @@ </description> </method> <method name="set_item_metadata"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="metadata" type="Variant"> @@ -22030,6 +24482,8 @@ </description> </method> <method name="set_item_selectable"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="selectable" type="bool"> @@ -22039,6 +24493,8 @@ </description> </method> <method name="set_item_text"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="text" type="String"> @@ -22048,6 +24504,8 @@ </description> </method> <method name="set_item_tooltip"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="tooltip" type="String"> @@ -22057,6 +24515,8 @@ </description> </method> <method name="set_item_tooltip_enabled"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -22066,6 +24526,8 @@ </description> </method> <method name="set_max_columns"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -22073,6 +24535,8 @@ </description> </method> <method name="set_max_text_lines"> + <return type="void"> + </return> <argument index="0" name="lines" type="int"> </argument> <description> @@ -22080,6 +24544,8 @@ </description> </method> <method name="set_same_column_width"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -22087,17 +24553,23 @@ </description> </method> <method name="set_select_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="ItemList.SelectMode"> </argument> <description> </description> </method> <method name="sort_items_by_text"> + <return type="void"> + </return> <description> Sorts items in the list by their text. </description> </method> <method name="unselect"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -22108,9 +24580,11 @@ <members> <member name="allow_rmb_select" type="bool" setter="set_allow_rmb_select" getter="get_allow_rmb_select" brief=""> </member> + <member name="auto_height" type="bool" setter="set_auto_height" getter="has_auto_height" brief=""> + </member> <member name="fixed_column_width" type="int" setter="set_fixed_column_width" getter="get_fixed_column_width" brief=""> </member> - <member name="icon_mode" type="int" setter="set_icon_mode" getter="get_icon_mode" brief=""> + <member name="icon_mode" type="int" setter="set_icon_mode" getter="get_icon_mode" brief="" enum="ItemList.IconMode"> </member> <member name="icon_scale" type="float" setter="set_icon_scale" getter="get_icon_scale" brief=""> </member> @@ -22122,7 +24596,7 @@ </member> <member name="same_column_width" type="bool" setter="set_same_column_width" getter="is_same_column_width" brief=""> </member> - <member name="select_mode" type="int" setter="set_select_mode" getter="get_select_mode" brief=""> + <member name="select_mode" type="int" setter="set_select_mode" getter="get_select_mode" brief="" enum="ItemList.SelectMode"> </member> </members> <signals> @@ -22233,24 +24707,32 @@ </description> </method> <method name="set_exclude_nodes_from_collision"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_node_a"> + <return type="void"> + </return> <argument index="0" name="node" type="NodePath"> </argument> <description> </description> </method> <method name="set_node_b"> + <return type="void"> + </return> <argument index="0" name="node" type="NodePath"> </argument> <description> </description> </method> <method name="set_solver_priority"> + <return type="void"> + </return> <argument index="0" name="priority" type="int"> </argument> <description> @@ -22305,18 +24787,24 @@ </description> </method> <method name="set_bias"> + <return type="void"> + </return> <argument index="0" name="bias" type="float"> </argument> <description> </description> </method> <method name="set_exclude_nodes_from_collision"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_node_a"> + <return type="void"> + </return> <argument index="0" name="node" type="NodePath"> </argument> <description> @@ -22324,6 +24812,8 @@ </description> </method> <method name="set_node_b"> + <return type="void"> + </return> <argument index="0" name="node" type="NodePath"> </argument> <description> @@ -22371,6 +24861,8 @@ </description> </method> <method name="get_collision_collider_metadata" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="collision" type="int"> </argument> <description> @@ -22499,7 +24991,7 @@ </return> <argument index="0" name="linear_velocity" type="Vector3"> </argument> - <argument index="1" name="floor_normal" type="Vector3" default="Vector3(0, 0, 0)"> + <argument index="1" name="floor_normal" type="Vector3" default="Vector3( 0, 0, 0 )"> </argument> <argument index="2" name="slope_stop_min_velocity" type="float" default="0.05"> </argument> @@ -22511,6 +25003,8 @@ </description> </method> <method name="set_safe_margin"> + <return type="void"> + </return> <argument index="0" name="pixels" type="float"> </argument> <description> @@ -22561,6 +25055,8 @@ </description> </method> <method name="get_collision_collider_metadata" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="collision" type="int"> </argument> <description> @@ -22690,7 +25186,7 @@ </return> <argument index="0" name="linear_velocity" type="Vector2"> </argument> - <argument index="1" name="floor_normal" type="Vector2" default="Vector2(0, 0)"> + <argument index="1" name="floor_normal" type="Vector2" default="Vector2( 0, 0 )"> </argument> <argument index="2" name="slope_stop_min_velocity" type="float" default="5"> </argument> @@ -22702,6 +25198,8 @@ </description> </method> <method name="set_safe_margin"> + <return type="void"> + </return> <argument index="0" name="pixels" type="float"> </argument> <description> @@ -22735,7 +25233,7 @@ </description> <methods> <method name="get_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="Label.Align"> </return> <description> Return the alignment mode (any of the ALIGN_* enumeration values). @@ -22791,7 +25289,7 @@ </description> </method> <method name="get_valign" qualifiers="const"> - <return type="int"> + <return type="int" enum="Label.VAlign"> </return> <description> Return the vertical alignment mode (any of the VALIGN_* enumeration values). @@ -22832,13 +25330,17 @@ </description> </method> <method name="set_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="Label.Align"> </argument> <description> Sets the alignment mode to any of the ALIGN_* enumeration values. </description> </method> <method name="set_autowrap"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -22846,6 +25348,8 @@ </description> </method> <method name="set_clip_text"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -22853,6 +25357,8 @@ </description> </method> <method name="set_lines_skipped"> + <return type="void"> + </return> <argument index="0" name="lines_skipped" type="int"> </argument> <description> @@ -22860,6 +25366,8 @@ </description> </method> <method name="set_max_lines_visible"> + <return type="void"> + </return> <argument index="0" name="lines_visible" type="int"> </argument> <description> @@ -22867,6 +25375,8 @@ </description> </method> <method name="set_percent_visible"> + <return type="void"> + </return> <argument index="0" name="percent_visible" type="float"> </argument> <description> @@ -22874,6 +25384,8 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -22881,6 +25393,8 @@ </description> </method> <method name="set_uppercase"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -22888,13 +25402,17 @@ </description> </method> <method name="set_valign"> - <argument index="0" name="valign" type="int"> + <return type="void"> + </return> + <argument index="0" name="valign" type="int" enum="Label.VAlign"> </argument> <description> Sets the vertical alignment mode to any of the VALIGN_* enumeration values. </description> </method> <method name="set_visible_characters"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -22903,7 +25421,7 @@ </method> </methods> <members> - <member name="align" type="int" setter="set_align" getter="get_align" brief=""> + <member name="align" type="int" setter="set_align" getter="get_align" brief="" enum="Label.Align"> </member> <member name="autowrap" type="bool" setter="set_autowrap" getter="has_autowrap" brief=""> </member> @@ -22919,7 +25437,7 @@ </member> <member name="uppercase" type="bool" setter="set_uppercase" getter="is_uppercase" brief=""> </member> - <member name="valign" type="int" setter="set_valign" getter="get_valign" brief=""> + <member name="valign" type="int" setter="set_valign" getter="get_valign" brief="" enum="Label.VAlign"> </member> </members> <constants> @@ -22957,6 +25475,8 @@ </theme_item> <theme_item name="line_spacing" type="int"> </theme_item> + <theme_item name="normal" type="StyleBox"> + </theme_item> <theme_item name="shadow_as_outline" type="int"> </theme_item> <theme_item name="shadow_offset_x" type="int"> @@ -22986,6 +25506,8 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear the [LargeTexture]. </description> @@ -23016,6 +25538,8 @@ </description> </method> <method name="set_piece_offset"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="ofs" type="Vector2"> @@ -23025,6 +25549,8 @@ </description> </method> <method name="set_piece_texture"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="texture" type="Texture"> @@ -23034,6 +25560,8 @@ </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> @@ -23071,7 +25599,7 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="Light.Param"> </argument> <description> </description> @@ -23082,6 +25610,12 @@ <description> </description> </method> + <method name="get_shadow_reverse_cull_face" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="has_shadow" qualifiers="const"> <return type="bool"> </return> @@ -23101,31 +25635,41 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_cull_mask"> + <return type="void"> + </return> <argument index="0" name="cull_mask" type="int"> </argument> <description> </description> </method> <method name="set_editor_only"> + <return type="void"> + </return> <argument index="0" name="editor_only" type="bool"> </argument> <description> </description> </method> <method name="set_negative"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="Light.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -23133,17 +25677,29 @@ </description> </method> <method name="set_shadow"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_shadow_color"> + <return type="void"> + </return> <argument index="0" name="shadow_color" type="Color"> </argument> <description> </description> </method> + <method name="set_shadow_reverse_cull_face"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> </methods> <members> <member name="editor_only" type="bool" setter="set_editor_only" getter="is_editor_only" brief=""> @@ -23168,6 +25724,8 @@ </member> <member name="shadow_max_distance" type="float" setter="set_param" getter="get_param" brief=""> </member> + <member name="shadow_reverse_cull_face" type="bool" setter="set_shadow_reverse_cull_face" getter="get_shadow_reverse_cull_face" brief=""> + </member> </members> <constants> <constant name="PARAM_ENERGY" value="0"> @@ -23196,7 +25754,7 @@ </constant> <constant name="PARAM_SHADOW_BIAS" value="12"> </constant> - <constant name="PARAM_MAX" value="13"> + <constant name="PARAM_MAX" value="14"> </constant> </constants> </class> @@ -23256,7 +25814,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Light2D.Mode"> </return> <description> Return the current mode set to the Light2D. @@ -23277,7 +25835,7 @@ </description> </method> <method name="get_shadow_filter" qualifiers="const"> - <return type="int"> + <return type="int" enum="Light2D.ShadowFilter"> </return> <description> </description> @@ -23295,7 +25853,7 @@ </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> Return the texture of the Light2D. @@ -23350,6 +25908,8 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -23357,12 +25917,16 @@ </description> </method> <method name="set_editor_only"> + <return type="void"> + </return> <argument index="0" name="editor_only" type="bool"> </argument> <description> </description> </method> <method name="set_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -23370,6 +25934,8 @@ </description> </method> <method name="set_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> @@ -23377,6 +25943,8 @@ </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> @@ -23384,6 +25952,8 @@ </description> </method> <method name="set_item_cull_mask"> + <return type="void"> + </return> <argument index="0" name="item_cull_mask" type="int"> </argument> <description> @@ -23391,6 +25961,8 @@ </description> </method> <method name="set_item_shadow_cull_mask"> + <return type="void"> + </return> <argument index="0" name="item_shadow_cull_mask" type="int"> </argument> <description> @@ -23398,6 +25970,8 @@ </description> </method> <method name="set_layer_range_max"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -23405,6 +25979,8 @@ </description> </method> <method name="set_layer_range_min"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -23412,13 +25988,17 @@ </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Light2D.Mode"> </argument> <description> Set the behaviour mode of the Light2D. Use constants defined in the constants section. </description> </method> <method name="set_shadow_buffer_size"> + <return type="void"> + </return> <argument index="0" name="size" type="int"> </argument> <description> @@ -23426,6 +26006,8 @@ </description> </method> <method name="set_shadow_color"> + <return type="void"> + </return> <argument index="0" name="shadow_color" type="Color"> </argument> <description> @@ -23433,6 +26015,8 @@ </description> </method> <method name="set_shadow_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -23440,31 +26024,41 @@ </description> </method> <method name="set_shadow_filter"> - <argument index="0" name="filter" type="int"> + <return type="void"> + </return> + <argument index="0" name="filter" type="int" enum="Light2D.ShadowFilter"> </argument> <description> </description> </method> <method name="set_shadow_gradient_length"> + <return type="void"> + </return> <argument index="0" name="multiplier" type="float"> </argument> <description> </description> </method> <method name="set_shadow_smooth"> + <return type="void"> + </return> <argument index="0" name="smooth" type="float"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> Set the texture of the Light2D. </description> </method> <method name="set_texture_offset"> + <return type="void"> + </return> <argument index="0" name="texture_offset" type="Vector2"> </argument> <description> @@ -23472,6 +26066,8 @@ </description> </method> <method name="set_texture_scale"> + <return type="void"> + </return> <argument index="0" name="texture_scale" type="float"> </argument> <description> @@ -23479,6 +26075,8 @@ </description> </method> <method name="set_z_range_max"> + <return type="void"> + </return> <argument index="0" name="z" type="int"> </argument> <description> @@ -23486,6 +26084,8 @@ </description> </method> <method name="set_z_range_min"> + <return type="void"> + </return> <argument index="0" name="z" type="int"> </argument> <description> @@ -23502,7 +26102,7 @@ </member> <member name="energy" type="float" setter="set_energy" getter="get_energy" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="Light2D.Mode"> </member> <member name="offset" type="Vector2" setter="set_texture_offset" getter="get_texture_offset" brief=""> </member> @@ -23518,15 +26118,13 @@ </member> <member name="range_z_min" type="int" setter="set_z_range_min" getter="get_z_range_min" brief=""> </member> - <member name="scale" type="float" setter="set_texture_scale" getter="get_texture_scale" brief=""> - </member> <member name="shadow_buffer_size" type="int" setter="set_shadow_buffer_size" getter="get_shadow_buffer_size" brief=""> </member> <member name="shadow_color" type="Color" setter="set_shadow_color" getter="get_shadow_color" brief=""> </member> <member name="shadow_enabled" type="bool" setter="set_shadow_enabled" getter="is_shadow_enabled" brief=""> </member> - <member name="shadow_filter" type="float" setter="set_shadow_filter" getter="get_shadow_filter" brief=""> + <member name="shadow_filter" type="int" setter="set_shadow_filter" getter="get_shadow_filter" brief="" enum="Light2D.ShadowFilter"> </member> <member name="shadow_filter_smooth" type="float" setter="set_shadow_smooth" getter="get_shadow_smooth" brief=""> </member> @@ -23536,6 +26134,8 @@ </member> <member name="texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> + <member name="texture_scale" type="float" setter="set_texture_scale" getter="get_texture_scale" brief=""> + </member> </members> <constants> <constant name="MODE_ADD" value="0"> @@ -23575,6 +26175,8 @@ </description> </method> <method name="set_occluder_light_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -23582,6 +26184,8 @@ </description> </method> <method name="set_occluder_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="OccluderPolygon2D"> </argument> <description> @@ -23605,13 +26209,15 @@ </description> <methods> <method name="add_point"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> </description> </method> <method name="get_begin_cap_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="LineCapMode"> </return> <description> </description> @@ -23623,19 +26229,19 @@ </description> </method> <method name="get_end_cap_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="LineCapMode"> </return> <description> </description> </method> <method name="get_gradient" qualifiers="const"> - <return type="Object"> + <return type="Gradient"> </return> <description> </description> </method> <method name="get_joint_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="LineJointMode"> </return> <description> </description> @@ -23673,13 +26279,13 @@ </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="get_texture_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="LineTextureMode"> </return> <description> </description> @@ -23691,42 +26297,56 @@ </description> </method> <method name="remove_point"> + <return type="void"> + </return> <argument index="0" name="i" type="int"> </argument> <description> </description> </method> <method name="set_begin_cap_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="LineCapMode"> </argument> <description> </description> </method> <method name="set_default_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_end_cap_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="LineCapMode"> </argument> <description> </description> </method> <method name="set_gradient"> - <argument index="0" name="color" type="Object"> + <return type="void"> + </return> + <argument index="0" name="color" type="Gradient"> </argument> <description> </description> </method> <method name="set_joint_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="LineJointMode"> </argument> <description> </description> </method> <method name="set_point_pos"> + <return type="void"> + </return> <argument index="0" name="i" type="int"> </argument> <argument index="1" name="pos" type="Vector2"> @@ -23735,36 +26355,48 @@ </description> </method> <method name="set_points"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <description> </description> </method> <method name="set_round_precision"> + <return type="void"> + </return> <argument index="0" name="precision" type="int"> </argument> <description> </description> </method> <method name="set_sharp_limit"> + <return type="void"> + </return> <argument index="0" name="limit" type="float"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_texture_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="LineTextureMode"> </argument> <description> </description> </method> <method name="set_width"> + <return type="void"> + </return> <argument index="0" name="width" type="float"> </argument> <description> @@ -23772,15 +26404,15 @@ </method> </methods> <members> - <member name="begin_cap_mode" type="int" setter="set_begin_cap_mode" getter="get_begin_cap_mode" brief=""> + <member name="begin_cap_mode" type="int" setter="set_begin_cap_mode" getter="get_begin_cap_mode" brief="" enum="LineCapMode"> </member> <member name="default_color" type="Color" setter="set_default_color" getter="get_default_color" brief=""> </member> - <member name="end_cap_mode" type="int" setter="set_end_cap_mode" getter="get_end_cap_mode" brief=""> + <member name="end_cap_mode" type="int" setter="set_end_cap_mode" getter="get_end_cap_mode" brief="" enum="LineCapMode"> </member> <member name="gradient" type="Gradient" setter="set_gradient" getter="get_gradient" brief=""> </member> - <member name="joint_mode" type="int" setter="set_joint_mode" getter="get_joint_mode" brief=""> + <member name="joint_mode" type="int" setter="set_joint_mode" getter="get_joint_mode" brief="" enum="LineJointMode"> </member> <member name="points" type="PoolVector2Array" setter="set_points" getter="get_points" brief=""> </member> @@ -23790,7 +26422,7 @@ </member> <member name="texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> - <member name="texture_mode" type="int" setter="set_texture_mode" getter="get_texture_mode" brief=""> + <member name="texture_mode" type="int" setter="set_texture_mode" getter="get_texture_mode" brief="" enum="LineTextureMode"> </member> <member name="width" type="float" setter="set_width" getter="get_width" brief=""> </member> @@ -23823,6 +26455,8 @@ </description> <methods> <method name="append_at_cursor"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -23830,6 +26464,8 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear the [LineEdit] text. </description> @@ -23849,6 +26485,8 @@ </description> </method> <method name="cursor_set_blink_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -23856,6 +26494,8 @@ </description> </method> <method name="cursor_set_blink_speed"> + <return type="void"> + </return> <argument index="0" name="blink_speed" type="float"> </argument> <description> @@ -23863,7 +26503,7 @@ </description> </method> <method name="get_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="LineEdit.Align"> </return> <description> </description> @@ -23928,12 +26568,16 @@ </description> </method> <method name="menu_option"> + <return type="void"> + </return> <argument index="0" name="option" type="int"> </argument> <description> </description> </method> <method name="select"> + <return type="void"> + </return> <argument index="0" name="from" type="int" default="0"> </argument> <argument index="1" name="to" type="int" default="-1"> @@ -23942,17 +26586,23 @@ </description> </method> <method name="select_all"> + <return type="void"> + </return> <description> Select the whole string. </description> </method> <method name="set_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="LineEdit.Align"> </argument> <description> </description> </method> <method name="set_cursor_pos"> + <return type="void"> + </return> <argument index="0" name="pos" type="int"> </argument> <description> @@ -23960,6 +26610,8 @@ </description> </method> <method name="set_editable"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -23967,12 +26619,16 @@ </description> </method> <method name="set_expand_to_text_length"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_max_length"> + <return type="void"> + </return> <argument index="0" name="chars" type="int"> </argument> <description> @@ -23980,18 +26636,24 @@ </description> </method> <method name="set_placeholder"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> </description> </method> <method name="set_placeholder_alpha"> + <return type="void"> + </return> <argument index="0" name="alpha" type="float"> </argument> <description> </description> </method> <method name="set_secret"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -23999,6 +26661,8 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -24007,7 +26671,7 @@ </method> </methods> <members> - <member name="align" type="int" setter="set_align" getter="get_align" brief=""> + <member name="align" type="int" setter="set_align" getter="get_align" brief="" enum="LineEdit.Align"> </member> <member name="caret_blink" type="bool" setter="cursor_set_blink_enabled" getter="cursor_get_blink_enabled" brief=""> </member> @@ -24017,7 +26681,7 @@ </member> <member name="expand_to_len" type="bool" setter="set_expand_to_text_length" getter="get_expand_to_text_length" brief=""> </member> - <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" brief=""> + <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" brief="" enum="Control.FocusMode"> </member> <member name="max_length" type="int" setter="set_max_length" getter="get_max_length" brief=""> </member> @@ -24114,6 +26778,8 @@ </description> </method> <method name="set_d"> + <return type="void"> + </return> <argument index="0" name="d" type="float"> </argument> <description> @@ -24121,6 +26787,8 @@ </description> </method> <method name="set_normal"> + <return type="void"> + </return> <argument index="0" name="normal" type="Vector2"> </argument> <description> @@ -24153,13 +26821,15 @@ </description> </method> <method name="get_underline_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="LinkButton.UnderlineMode"> </return> <description> Returns the underline mode for this button. </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -24167,7 +26837,9 @@ </description> </method> <method name="set_underline_mode"> - <argument index="0" name="underline_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="underline_mode" type="int" enum="LinkButton.UnderlineMode"> </argument> <description> Sets the underline mode for this button, the argument must be one of the [LinkButton] constants (see constants section). @@ -24177,7 +26849,7 @@ <members> <member name="text" type="String" setter="set_text" getter="get_text" brief=""> </member> - <member name="underline" type="int" setter="set_underline_mode" getter="get_underline_mode" brief=""> + <member name="underline" type="int" setter="set_underline_mode" getter="get_underline_mode" brief="" enum="LinkButton.UnderlineMode"> </member> </members> <constants> @@ -24211,6 +26883,8 @@ </description> <methods> <method name="clear_current"> + <return type="void"> + </return> <description> </description> </method> @@ -24227,6 +26901,8 @@ </description> </method> <method name="make_current"> + <return type="void"> + </return> <description> </description> </method> @@ -24243,6 +26919,8 @@ </description> <methods> <method name="_drop_files" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="files" type="PoolStringArray"> </argument> <argument index="1" name="screen" type="int"> @@ -24251,38 +26929,52 @@ </description> </method> <method name="_finalize" qualifiers="virtual"> + <return type="void"> + </return> <description> </description> </method> <method name="_idle" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> </description> </method> <method name="_initialize" qualifiers="virtual"> + <return type="void"> + </return> <description> </description> </method> <method name="_input_event" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="ev" type="InputEvent"> </argument> <description> </description> </method> <method name="_input_text" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> </description> </method> <method name="_iteration" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> </description> </method> <method name="finish"> + <return type="void"> + </return> <description> </description> </method> @@ -24295,16 +26987,22 @@ </description> </method> <method name="init"> + <return type="void"> + </return> <description> </description> </method> <method name="input_event"> - <argument index="0" name="ev" type="Object"> + <return type="void"> + </return> + <argument index="0" name="ev" type="InputEvent"> </argument> <description> </description> </method> <method name="input_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -24320,19 +27018,23 @@ </method> </methods> <constants> - <constant name="NOTIFICATION_WM_MOUSE_ENTER" value="2"> + <constant name="NOTIFICATION_WM_MOUSE_ENTER" value="2" enum=""> + </constant> + <constant name="NOTIFICATION_WM_MOUSE_EXIT" value="3" enum=""> + </constant> + <constant name="NOTIFICATION_WM_FOCUS_IN" value="4" enum=""> </constant> - <constant name="NOTIFICATION_WM_MOUSE_EXIT" value="3"> + <constant name="NOTIFICATION_WM_FOCUS_OUT" value="5" enum=""> </constant> - <constant name="NOTIFICATION_WM_FOCUS_IN" value="4"> + <constant name="NOTIFICATION_WM_QUIT_REQUEST" value="6" enum=""> </constant> - <constant name="NOTIFICATION_WM_FOCUS_OUT" value="5"> + <constant name="NOTIFICATION_WM_UNFOCUS_REQUEST" value="8" enum=""> </constant> - <constant name="NOTIFICATION_WM_QUIT_REQUEST" value="6"> + <constant name="NOTIFICATION_OS_MEMORY_WARNING" value="9" enum=""> </constant> - <constant name="NOTIFICATION_WM_UNFOCUS_REQUEST" value="8"> + <constant name="NOTIFICATION_TRANSLATION_CHANGED" value="90" enum=""> </constant> - <constant name="NOTIFICATION_OS_MEMORY_WARNING" value="9"> + <constant name="NOTIFICATION_WM_ABOUT" value="91" enum=""> </constant> </constants> </class> @@ -24430,18 +27132,40 @@ <description> </description> </method> + <method name="get_render_priority" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> <method name="set_next_pass"> + <return type="void"> + </return> <argument index="0" name="next_pass" type="Material"> </argument> <description> </description> </method> + <method name="set_render_priority"> + <return type="void"> + </return> + <argument index="0" name="priority" type="int"> + </argument> + <description> + </description> + </method> </methods> <members> <member name="next_pass" type="Material" setter="set_next_pass" getter="get_next_pass" brief=""> </member> + <member name="render_priority" type="int" setter="set_render_priority" getter="get_render_priority" brief=""> + </member> </members> <constants> + <constant name="RENDER_PRIORITY_MAX" value="127" enum=""> + </constant> + <constant name="RENDER_PRIORITY_MIN" value="-128" enum=""> + </constant> </constants> </class> <class name="MenuButton" inherits="Button" category="Core"> @@ -24512,7 +27236,7 @@ </description> </method> <method name="create_outline" qualifiers="const"> - <return type="ArrayMesh"> + <return type="Mesh"> </return> <argument index="0" name="margin" type="float"> </argument> @@ -24569,21 +27293,23 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> </description> </method> <method name="commit_to_surface"> - <return type="int"> + <return type="int" enum="Error"> </return> - <argument index="0" name="mesh" type="Object"> + <argument index="0" name="mesh" type="ArrayMesh"> </argument> <description> </description> </method> <method name="create_from_surface"> - <return type="int"> + <return type="int" enum="Error"> </return> - <argument index="0" name="mesh" type="Object"> + <argument index="0" name="mesh" type="ArrayMesh"> </argument> <argument index="1" name="surface" type="int"> </argument> @@ -24671,7 +27397,7 @@ </description> </method> <method name="get_material" qualifiers="const"> - <return type="Object"> + <return type="Material"> </return> <description> </description> @@ -24771,6 +27497,8 @@ </description> </method> <method name="set_edge_meta"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="meta" type="Variant"> @@ -24779,6 +27507,8 @@ </description> </method> <method name="set_face_meta"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="meta" type="Variant"> @@ -24787,12 +27517,16 @@ </description> </method> <method name="set_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> </description> </method> <method name="set_vertex"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="vertex" type="Vector3"> @@ -24801,6 +27535,8 @@ </description> </method> <method name="set_vertex_bones"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="bones" type="PoolIntArray"> @@ -24809,6 +27545,8 @@ </description> </method> <method name="set_vertex_color"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="color" type="Color"> @@ -24817,6 +27555,8 @@ </description> </method> <method name="set_vertex_meta"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="meta" type="Variant"> @@ -24825,6 +27565,8 @@ </description> </method> <method name="set_vertex_normal"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="normal" type="Vector3"> @@ -24833,6 +27575,8 @@ </description> </method> <method name="set_vertex_tangent"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="tangent" type="Plane"> @@ -24841,6 +27585,8 @@ </description> </method> <method name="set_vertex_uv"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="uv" type="Vector2"> @@ -24849,6 +27595,8 @@ </description> </method> <method name="set_vertex_uv2"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="uv2" type="Vector2"> @@ -24857,6 +27605,8 @@ </description> </method> <method name="set_vertex_weights"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="weights" type="PoolRealArray"> @@ -24877,14 +27627,20 @@ </description> <methods> <method name="create_convex_collision"> + <return type="void"> + </return> <description> </description> </method> <method name="create_debug_tangents"> + <return type="void"> + </return> <description> </description> </method> <method name="create_trimesh_collision"> + <return type="void"> + </return> <description> This helper creates a [StaticBody] child [Node] using the mesh geometry as collision. It's mainly used for testing. </description> @@ -24911,6 +27667,8 @@ </description> </method> <method name="set_mesh"> + <return type="void"> + </return> <argument index="0" name="mesh" type="Mesh"> </argument> <description> @@ -24918,12 +27676,16 @@ </description> </method> <method name="set_skeleton_path"> + <return type="void"> + </return> <argument index="0" name="skeleton_path" type="NodePath"> </argument> <description> </description> </method> <method name="set_surface_material"> + <return type="void"> + </return> <argument index="0" name="surface" type="int"> </argument> <argument index="1" name="material" type="Material"> @@ -24950,11 +27712,15 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> Clear the library. </description> </method> <method name="create_item"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -24994,8 +27760,16 @@ <description> </description> </method> - <method name="get_item_shape" qualifiers="const"> - <return type="Shape"> + <method name="get_item_preview" qualifiers="const"> + <return type="Texture"> + </return> + <argument index="0" name="id" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_item_shapes" qualifiers="const"> + <return type="Array"> </return> <argument index="0" name="id" type="int"> </argument> @@ -25010,6 +27784,8 @@ </description> </method> <method name="remove_item"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -25017,6 +27793,8 @@ </description> </method> <method name="set_item_mesh"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="mesh" type="Mesh"> @@ -25026,6 +27804,8 @@ </description> </method> <method name="set_item_name"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="name" type="String"> @@ -25035,6 +27815,8 @@ </description> </method> <method name="set_item_navmesh"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="navmesh" type="NavigationMesh"> @@ -25042,10 +27824,22 @@ <description> </description> </method> - <method name="set_item_shape"> + <method name="set_item_preview"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> - <argument index="1" name="shape" type="Shape"> + <argument index="1" name="texture" type="Texture"> + </argument> + <description> + </description> + </method> + <method name="set_item_shapes"> + <return type="void"> + </return> + <argument index="0" name="id" type="int"> + </argument> + <argument index="1" name="shapes" type="Array"> </argument> <description> </description> @@ -25073,7 +27867,7 @@ </description> </method> <method name="get_color_format" qualifiers="const"> - <return type="int"> + <return type="int" enum="MultiMesh.ColorFormat"> </return> <description> </description> @@ -25111,18 +27905,22 @@ </description> </method> <method name="get_transform_format" qualifiers="const"> - <return type="int"> + <return type="int" enum="MultiMesh.TransformFormat"> </return> <description> </description> </method> <method name="set_color_format"> - <argument index="0" name="format" type="int"> + <return type="void"> + </return> + <argument index="0" name="format" type="int" enum="MultiMesh.ColorFormat"> </argument> <description> </description> </method> <method name="set_instance_color"> + <return type="void"> + </return> <argument index="0" name="instance" type="int"> </argument> <argument index="1" name="color" type="Color"> @@ -25132,6 +27930,8 @@ </description> </method> <method name="set_instance_count"> + <return type="void"> + </return> <argument index="0" name="count" type="int"> </argument> <description> @@ -25139,6 +27939,8 @@ </description> </method> <method name="set_instance_transform"> + <return type="void"> + </return> <argument index="0" name="instance" type="int"> </argument> <argument index="1" name="transform" type="Transform"> @@ -25148,6 +27950,8 @@ </description> </method> <method name="set_mesh"> + <return type="void"> + </return> <argument index="0" name="mesh" type="Mesh"> </argument> <description> @@ -25155,7 +27959,9 @@ </description> </method> <method name="set_transform_format"> - <argument index="0" name="format" type="int"> + <return type="void"> + </return> + <argument index="0" name="format" type="int" enum="MultiMesh.TransformFormat"> </argument> <description> </description> @@ -25164,7 +27970,7 @@ <members> <member name="color_array" type="PoolColorArray" setter="_set_color_array" getter="_get_color_array" brief=""> </member> - <member name="color_format" type="int" setter="set_color_format" getter="get_color_format" brief=""> + <member name="color_format" type="int" setter="set_color_format" getter="get_color_format" brief="" enum="MultiMesh.ColorFormat"> </member> <member name="instance_count" type="int" setter="set_instance_count" getter="get_instance_count" brief=""> </member> @@ -25172,7 +27978,7 @@ </member> <member name="transform_array" type="PoolVector3Array" setter="_set_transform_array" getter="_get_transform_array" brief=""> </member> - <member name="transform_format" type="int" setter="set_transform_format" getter="get_transform_format" brief=""> + <member name="transform_format" type="int" setter="set_transform_format" getter="get_transform_format" brief="" enum="MultiMesh.TransformFormat"> </member> </members> <constants> @@ -25197,17 +28003,19 @@ </description> <methods> <method name="get_multimesh" qualifiers="const"> - <return type="Object"> + <return type="MultiMesh"> </return> <description> Return the [MultiMesh] that is used for instancing. </description> </method> <method name="set_multimesh"> - <argument index="0" name="multimesh" type="Object"> + <return type="void"> + </return> + <argument index="0" name="multimesh" type="MultiMesh"> </argument> <description> - Set the [MultiMesh] to be instance. + Set the [MultiMesh] to be instanced. </description> </method> </methods> @@ -25227,18 +28035,22 @@ </description> <methods> <method name="lock"> + <return type="void"> + </return> <description> Lock this [Mutex], blocks until it is unlocked by the current owner. </description> </method> <method name="try_lock"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Try locking this [Mutex], does not block. Returns [OK] on success else [ERR_BUSY]. </description> </method> <method name="unlock"> + <return type="void"> + </return> <description> Unlock this [Mutex], leaving it to others threads. </description> @@ -25247,6 +28059,56 @@ <constants> </constants> </class> +<class name="NativeScript" inherits="Script" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_class_name" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> + <method name="get_library" qualifiers="const"> + <return type="GDNativeLibrary"> + </return> + <description> + </description> + </method> + <method name="new" qualifiers="vararg"> + <return type="Object"> + </return> + <description> + </description> + </method> + <method name="set_class_name"> + <return type="void"> + </return> + <argument index="0" name="class_name" type="String"> + </argument> + <description> + </description> + </method> + <method name="set_library"> + <return type="void"> + </return> + <argument index="0" name="library" type="GDNativeLibrary"> + </argument> + <description> + </description> + </method> + </methods> + <members> + <member name="class_name" type="String" setter="set_class_name" getter="get_class_name" brief=""> + </member> + <member name="library" type="GDNativeLibrary" setter="set_library" getter="get_library" brief=""> + </member> + </members> + <constants> + </constants> +</class> <class name="Navigation" inherits="Spatial" category="Core"> <brief_description> </brief_description> @@ -25314,18 +28176,22 @@ </argument> <argument index="1" name="xform" type="Transform"> </argument> - <argument index="2" name="owner" type="Object" default="NULL"> + <argument index="2" name="owner" type="Object" default="null"> </argument> <description> </description> </method> <method name="navmesh_remove"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> </description> </method> <method name="navmesh_set_transform"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="xform" type="Transform"> @@ -25334,6 +28200,8 @@ </description> </method> <method name="set_up_vector"> + <return type="void"> + </return> <argument index="0" name="up" type="Vector3"> </argument> <description> @@ -25388,18 +28256,22 @@ </argument> <argument index="1" name="xform" type="Transform2D"> </argument> - <argument index="2" name="owner" type="Object" default="NULL"> + <argument index="2" name="owner" type="Object" default="null"> </argument> <description> </description> </method> <method name="navpoly_remove"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> </description> </method> <method name="navpoly_set_transform"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="xform" type="Transform2D"> @@ -25418,12 +28290,24 @@ </description> <methods> <method name="add_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolIntArray"> </argument> <description> </description> </method> <method name="clear_polygons"> + <return type="void"> + </return> + <description> + </description> + </method> + <method name="create_from_mesh"> + <return type="void"> + </return> + <argument index="0" name="mesh" type="Mesh"> + </argument> <description> </description> </method> @@ -25448,6 +28332,8 @@ </description> </method> <method name="set_vertices"> + <return type="void"> + </return> <argument index="0" name="vertices" type="PoolVector3Array"> </argument> <description> @@ -25470,7 +28356,7 @@ </description> <methods> <method name="get_navigation_mesh" qualifiers="const"> - <return type="Object"> + <return type="NavigationMesh"> </return> <description> </description> @@ -25482,13 +28368,17 @@ </description> </method> <method name="set_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_navigation_mesh"> - <argument index="0" name="navmesh" type="Object"> + <return type="void"> + </return> + <argument index="0" name="navmesh" type="NavigationMesh"> </argument> <description> </description> @@ -25510,12 +28400,16 @@ </description> <methods> <method name="add_outline"> + <return type="void"> + </return> <argument index="0" name="outline" type="PoolVector2Array"> </argument> <description> </description> </method> <method name="add_outline_at_index"> + <return type="void"> + </return> <argument index="0" name="outline" type="PoolVector2Array"> </argument> <argument index="1" name="index" type="int"> @@ -25524,16 +28418,22 @@ </description> </method> <method name="add_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolIntArray"> </argument> <description> </description> </method> <method name="clear_outlines"> + <return type="void"> + </return> <description> </description> </method> <method name="clear_polygons"> + <return type="void"> + </return> <description> </description> </method> @@ -25572,16 +28472,22 @@ </description> </method> <method name="make_polygons_from_outlines"> + <return type="void"> + </return> <description> </description> </method> <method name="remove_outline"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> </description> </method> <method name="set_outline"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="outline" type="PoolVector2Array"> @@ -25590,6 +28496,8 @@ </description> </method> <method name="set_vertices"> + <return type="void"> + </return> <argument index="0" name="vertices" type="PoolVector2Array"> </argument> <description> @@ -25601,7 +28509,7 @@ </member> <member name="polygons" type="Array" setter="_set_polygons" getter="_get_polygons" brief=""> </member> - <member name="vertices" type="PoolVector3Array" setter="set_vertices" getter="get_vertices" brief=""> + <member name="vertices" type="PoolVector2Array" setter="set_vertices" getter="get_vertices" brief=""> </member> </members> <constants> @@ -25626,12 +28534,16 @@ </description> </method> <method name="set_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_navigation_polygon"> + <return type="void"> + </return> <argument index="0" name="navpoly" type="NavigationPolygon"> </argument> <description> @@ -25656,11 +28568,13 @@ </description> <methods> <method name="close_connection"> + <return type="void"> + </return> <description> </description> </method> <method name="create_client"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="ip" type="String"> </argument> @@ -25674,7 +28588,7 @@ </description> </method> <method name="create_server"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="port" type="int"> </argument> @@ -25688,19 +28602,23 @@ </description> </method> <method name="get_compression_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="NetworkedMultiplayerENet.CompressionMode"> </return> <description> </description> </method> <method name="set_bind_ip"> + <return type="void"> + </return> <argument index="0" name="ip" type="String"> </argument> <description> </description> </method> <method name="set_compression_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="NetworkedMultiplayerENet.CompressionMode"> </argument> <description> </description> @@ -25726,7 +28644,7 @@ </description> <methods> <method name="get_connection_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="NetworkedMultiplayerPeer.ConnectionStatus"> </return> <description> </description> @@ -25750,23 +28668,31 @@ </description> </method> <method name="poll"> + <return type="void"> + </return> <description> </description> </method> <method name="set_refuse_new_connections"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_target_peer"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> </description> </method> <method name="set_transfer_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="NetworkedMultiplayerPeer.TransferMode"> </argument> <description> </description> @@ -25811,9 +28737,9 @@ </constant> <constant name="CONNECTION_CONNECTED" value="2"> </constant> - <constant name="TARGET_PEER_BROADCAST" value="0"> + <constant name="TARGET_PEER_BROADCAST" value="0" enum=""> </constant> - <constant name="TARGET_PEER_SERVER" value="1"> + <constant name="TARGET_PEER_SERVER" value="1" enum=""> </constant> </constants> </class> @@ -25989,14 +28915,8 @@ <description> </description> <methods> - <method name="is_draw_center_enabled" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> <method name="get_h_axis_stretch_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="NinePatchRect.AxisStretchMode"> </return> <description> </description> @@ -26004,7 +28924,7 @@ <method name="get_patch_margin" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> </description> @@ -26016,31 +28936,43 @@ </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="get_v_axis_stretch_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="NinePatchRect.AxisStretchMode"> + </return> + <description> + </description> + </method> + <method name="is_draw_center_enabled" qualifiers="const"> + <return type="bool"> </return> <description> </description> </method> <method name="set_draw_center"> + <return type="void"> + </return> <argument index="0" name="draw_center" type="bool"> </argument> <description> </description> </method> <method name="set_h_axis_stretch_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="NinePatchRect.AxisStretchMode"> </argument> <description> </description> </method> <method name="set_patch_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="value" type="int"> </argument> @@ -26048,28 +28980,34 @@ </description> </method> <method name="set_region_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_v_axis_stretch_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="NinePatchRect.AxisStretchMode"> </argument> <description> </description> </method> </methods> <members> - <member name="axis_stretch_horizontal" type="int" setter="set_h_axis_stretch_mode" getter="get_h_axis_stretch_mode" brief=""> + <member name="axis_stretch_horizontal" type="int" setter="set_h_axis_stretch_mode" getter="get_h_axis_stretch_mode" brief="" enum="NinePatchRect.AxisStretchMode"> </member> - <member name="axis_stretch_vertical" type="int" setter="set_v_axis_stretch_mode" getter="get_v_axis_stretch_mode" brief=""> + <member name="axis_stretch_vertical" type="int" setter="set_v_axis_stretch_mode" getter="get_v_axis_stretch_mode" brief="" enum="NinePatchRect.AxisStretchMode"> </member> <member name="draw_center" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief=""> </member> @@ -26119,18 +29057,24 @@ </description> <methods> <method name="_enter_tree" qualifiers="virtual"> + <return type="void"> + </return> <description> Called when the node enters the [SceneTree] (e.g. upon instancing, scene changing or after calling [method add_child] in a script). If the node has children, its [method _enter_tree] callback will be called first, and then that of the children. Corresponds to the NOTIFICATION_ENTER_TREE notification in [method Object._notification]. </description> </method> <method name="_exit_tree" qualifiers="virtual"> + <return type="void"> + </return> <description> Called when the node leaves the [SceneTree] (e.g. upon freeing, scene changing or after calling [method remove_child] in a script). If the node has children, its [method _exit_tree] callback will be called last, after all its children have left the tree. Corresponds to the NOTIFICATION_EXIT_TREE notification in [method Object._notification]. </description> </method> <method name="_fixed_process" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> @@ -26140,12 +29084,16 @@ </description> </method> <method name="_input" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> </method> <method name="_process" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <description> @@ -26155,24 +29103,32 @@ </description> </method> <method name="_ready" qualifiers="virtual"> + <return type="void"> + </return> <description> Called when the node is "ready", i.e. when both the node and its children have entered the scene tree. If the node has children, their [method _ready] callback gets triggered first, and the node will receive the ready notification only afterwards. Corresponds to the NOTIFICATION_READY notification in [method Object._notification]. </description> </method> <method name="_unhandled_input" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> </method> <method name="_unhandled_key_input" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="event" type="InputEventKey"> </argument> <description> </description> </method> <method name="add_child"> + <return type="void"> + </return> <argument index="0" name="node" type="Node"> </argument> <argument index="1" name="legible_unique_name" type="bool" default="false"> @@ -26183,6 +29139,8 @@ </description> </method> <method name="add_to_group"> + <return type="void"> + </return> <argument index="0" name="group" type="String"> </argument> <argument index="1" name="persistent" type="bool" default="false"> @@ -26352,7 +29310,7 @@ </description> </method> <method name="get_pause_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Node.PauseMode"> </return> <description> </description> @@ -26383,7 +29341,7 @@ </description> </method> <method name="get_viewport" qualifiers="const"> - <return type="Object"> + <return type="Viewport"> </return> <description> </description> @@ -26495,6 +29453,8 @@ </description> </method> <method name="move_child"> + <return type="void"> + </return> <argument index="0" name="child_node" type="Node"> </argument> <argument index="1" name="to_pos" type="int"> @@ -26504,25 +29464,24 @@ </description> </method> <method name="print_stray_nodes"> + <return type="void"> + </return> <description> </description> </method> <method name="print_tree"> + <return type="void"> + </return> <description> Print the scene to stdout. Used mainly for debugging purposes. </description> </method> - <method name="propagate_notification"> - <argument index="0" name="what" type="int"> - </argument> - <description> - Notify the current node and all its children recursively by calling notification() in all of them. - </description> - </method> <method name="propagate_call"> + <return type="void"> + </return> <argument index="0" name="method" type="String"> </argument> - <argument index="1" name="args" type="Array" default="[]"> + <argument index="1" name="args" type="Array" default="[ ]"> </argument> <argument index="2" name="parent_first" type="bool" default="false"> </argument> @@ -26530,21 +29489,38 @@ Calls the method (if present) with the arguments given in "args" on this Node and recursively on all children. If the parent_first argument is true then the method will be called on the current [Node] first, then on all children. If it is false then the children will get called first. </description> </method> + <method name="propagate_notification"> + <return type="void"> + </return> + <argument index="0" name="what" type="int"> + </argument> + <description> + Notify the current node and all its children recursively by calling notification() in all of them. + </description> + </method> <method name="queue_free"> + <return type="void"> + </return> <description> </description> </method> <method name="raise"> + <return type="void"> + </return> <description> Move this node to the top of the array of nodes of the parent node. This is often useful on GUIs ([Control]), because their order of drawing fully depends on their order in the tree. </description> </method> <method name="remove_and_skip"> + <return type="void"> + </return> <description> Remove a node and set all its children as children of the parent node (if exists). All even subscriptions that pass by the removed node will be unsubscribed. </description> </method> <method name="remove_child"> + <return type="void"> + </return> <argument index="0" name="node" type="Node"> </argument> <description> @@ -26552,6 +29528,8 @@ </description> </method> <method name="remove_from_group"> + <return type="void"> + </return> <argument index="0" name="group" type="String"> </argument> <description> @@ -26559,6 +29537,8 @@ </description> </method> <method name="replace_by"> + <return type="void"> + </return> <argument index="0" name="node" type="Node"> </argument> <argument index="1" name="keep_data" type="bool" default="false"> @@ -26568,10 +29548,14 @@ </description> </method> <method name="request_ready"> + <return type="void"> + </return> <description> </description> </method> <method name="rpc" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="method" type="String"> </argument> <description> @@ -26579,15 +29563,19 @@ </description> </method> <method name="rpc_config"> + <return type="void"> + </return> <argument index="0" name="method" type="String"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Node.RPCMode"> </argument> <description> Change the method's RPC mode (one of RPC_MODE_* constants). </description> </method> <method name="rpc_id" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="peer_id" type="int"> </argument> <argument index="1" name="method" type="String"> @@ -26597,6 +29585,8 @@ </description> </method> <method name="rpc_unreliable" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="method" type="String"> </argument> <description> @@ -26604,6 +29594,8 @@ </description> </method> <method name="rpc_unreliable_id" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="peer_id" type="int"> </argument> <argument index="1" name="method" type="String"> @@ -26613,6 +29605,8 @@ </description> </method> <method name="rset"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -26622,15 +29616,19 @@ </description> </method> <method name="rset_config"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Node.RPCMode"> </argument> <description> Change the property's RPC mode (one of RPC_MODE_* constants). </description> </method> <method name="rset_id"> + <return type="void"> + </return> <argument index="0" name="peer_id" type="int"> </argument> <argument index="1" name="property" type="String"> @@ -26642,6 +29640,8 @@ </description> </method> <method name="rset_unreliable"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -26651,6 +29651,8 @@ </description> </method> <method name="rset_unreliable_id"> + <return type="void"> + </return> <argument index="0" name="peer_id" type="int"> </argument> <argument index="1" name="property" type="String"> @@ -26662,12 +29664,16 @@ </description> </method> <method name="set_display_folded"> + <return type="void"> + </return> <argument index="0" name="fold" type="bool"> </argument> <description> </description> </method> <method name="set_filename"> + <return type="void"> + </return> <argument index="0" name="filename" type="String"> </argument> <description> @@ -26675,6 +29681,8 @@ </description> </method> <method name="set_fixed_process"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -26682,12 +29690,16 @@ </description> </method> <method name="set_fixed_process_internal"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -26695,6 +29707,8 @@ </description> </method> <method name="set_network_master"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="recursive" type="bool" default="true"> @@ -26703,6 +29717,8 @@ </description> </method> <method name="set_owner"> + <return type="void"> + </return> <argument index="0" name="owner" type="Node"> </argument> <description> @@ -26710,12 +29726,16 @@ </description> </method> <method name="set_pause_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Node.PauseMode"> </argument> <description> </description> </method> <method name="set_process"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -26723,6 +29743,8 @@ </description> </method> <method name="set_process_input"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -26730,12 +29752,16 @@ </description> </method> <method name="set_process_internal"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_process_unhandled_input"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -26743,12 +29769,16 @@ </description> </method> <method name="set_process_unhandled_key_input"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_scene_instance_load_placeholder"> + <return type="void"> + </return> <argument index="0" name="load_placeholder" type="bool"> </argument> <description> @@ -26760,7 +29790,7 @@ </member> <member name="editor/display_folded" type="bool" setter="set_display_folded" getter="is_displayed_folded" brief=""> </member> - <member name="pause_mode" type="int" setter="set_pause_mode" getter="get_pause_mode" brief=""> + <member name="pause_mode" type="int" setter="set_pause_mode" getter="get_pause_mode" brief="" enum="Node.PauseMode"> </member> </members> <signals> @@ -26779,42 +29809,42 @@ </signal> </signals> <constants> - <constant name="NOTIFICATION_ENTER_TREE" value="10"> + <constant name="NOTIFICATION_ENTER_TREE" value="10" enum=""> </constant> - <constant name="NOTIFICATION_EXIT_TREE" value="11"> + <constant name="NOTIFICATION_EXIT_TREE" value="11" enum=""> </constant> - <constant name="NOTIFICATION_MOVED_IN_PARENT" value="12"> + <constant name="NOTIFICATION_MOVED_IN_PARENT" value="12" enum=""> </constant> - <constant name="NOTIFICATION_READY" value="13"> + <constant name="NOTIFICATION_READY" value="13" enum=""> </constant> - <constant name="NOTIFICATION_FIXED_PROCESS" value="16"> + <constant name="NOTIFICATION_FIXED_PROCESS" value="16" enum=""> </constant> - <constant name="NOTIFICATION_PROCESS" value="17"> + <constant name="NOTIFICATION_PROCESS" value="17" enum=""> Notification received every frame when the process flag is set (see [method set_process]). </constant> - <constant name="NOTIFICATION_PARENTED" value="18"> + <constant name="NOTIFICATION_PARENTED" value="18" enum=""> Notification received when a node is set as a child of another node. Note that this doesn't mean that a node entered the Scene Tree. </constant> - <constant name="NOTIFICATION_UNPARENTED" value="19"> + <constant name="NOTIFICATION_UNPARENTED" value="19" enum=""> Notification received when a node is unparented (parent removed it from the list of children). </constant> - <constant name="NOTIFICATION_PAUSED" value="14"> + <constant name="NOTIFICATION_PAUSED" value="14" enum=""> </constant> - <constant name="NOTIFICATION_UNPAUSED" value="15"> + <constant name="NOTIFICATION_UNPAUSED" value="15" enum=""> </constant> - <constant name="NOTIFICATION_INSTANCED" value="20"> + <constant name="NOTIFICATION_INSTANCED" value="20" enum=""> </constant> - <constant name="NOTIFICATION_DRAG_BEGIN" value="21"> + <constant name="NOTIFICATION_DRAG_BEGIN" value="21" enum=""> </constant> - <constant name="NOTIFICATION_DRAG_END" value="22"> + <constant name="NOTIFICATION_DRAG_END" value="22" enum=""> </constant> - <constant name="NOTIFICATION_PATH_CHANGED" value="23"> + <constant name="NOTIFICATION_PATH_CHANGED" value="23" enum=""> </constant> - <constant name="NOTIFICATION_TRANSLATION_CHANGED" value="24"> + <constant name="NOTIFICATION_TRANSLATION_CHANGED" value="24" enum=""> </constant> - <constant name="NOTIFICATION_INTERNAL_PROCESS" value="25"> + <constant name="NOTIFICATION_INTERNAL_PROCESS" value="25" enum=""> </constant> - <constant name="NOTIFICATION_INTERNAL_FIXED_PROCESS" value="26"> + <constant name="NOTIFICATION_INTERNAL_FIXED_PROCESS" value="26" enum=""> </constant> <constant name="RPC_MODE_DISABLED" value="0"> </constant> @@ -26850,7 +29880,18 @@ Base node for 2D system. Node2D contains a position, rotation and scale, which is used to position and animate. It can alternatively be used with a custom 2D transform ([Transform2D]). A tree of Node2Ds allows complex hierarchies for animation and positioning. </description> <methods> + <method name="apply_scale"> + <return type="void"> + </return> + <argument index="0" name="ratio" type="Vector2"> + </argument> + <description> + Apply the 'ratio' scale to the 2D node, according to its current scale value. + </description> + </method> <method name="edit_set_pivot"> + <return type="void"> + </return> <argument index="0" name="pivot" type="Vector2"> </argument> <description> @@ -26904,7 +29945,7 @@ <method name="get_relative_transform_to_parent" qualifiers="const"> <return type="Transform2D"> </return> - <argument index="0" name="parent" type="Object"> + <argument index="0" name="parent" type="Node"> </argument> <description> Return the transform [Transform2D] calculated relatively to the parent of this 2D node. @@ -26939,6 +29980,8 @@ </description> </method> <method name="global_translate"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -26953,6 +29996,8 @@ </description> </method> <method name="look_at"> + <return type="void"> + </return> <argument index="0" name="point" type="Vector2"> </argument> <description> @@ -26960,6 +30005,8 @@ </description> </method> <method name="move_local_x"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <argument index="1" name="scaled" type="bool" default="false"> @@ -26969,6 +30016,8 @@ </description> </method> <method name="move_local_y"> + <return type="void"> + </return> <argument index="0" name="delta" type="float"> </argument> <argument index="1" name="scaled" type="bool" default="false"> @@ -26978,20 +30027,17 @@ </description> </method> <method name="rotate"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> Apply a rotation (in radians) to the 2D node, starting from its current rotation. </description> </method> - <method name="scale"> - <argument index="0" name="ratio" type="Vector2"> - </argument> - <description> - Apply the 'ratio' scale to the 2D node, according to its current scale value. - </description> - </method> <method name="set_global_position"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -26999,6 +30045,8 @@ </description> </method> <method name="set_global_rotation"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> @@ -27006,6 +30054,8 @@ </description> </method> <method name="set_global_rotation_in_degrees"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> @@ -27013,6 +30063,8 @@ </description> </method> <method name="set_global_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -27020,6 +30072,8 @@ </description> </method> <method name="set_global_transform"> + <return type="void"> + </return> <argument index="0" name="xform" type="Transform2D"> </argument> <description> @@ -27027,6 +30081,8 @@ </description> </method> <method name="set_position"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -27034,6 +30090,8 @@ </description> </method> <method name="set_rotation"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> @@ -27041,6 +30099,8 @@ </description> </method> <method name="set_rotation_in_degrees"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> @@ -27048,6 +30108,8 @@ </description> </method> <method name="set_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -27055,6 +30117,8 @@ </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="xform" type="Transform2D"> </argument> <description> @@ -27062,6 +30126,8 @@ </description> </method> <method name="set_z"> + <return type="void"> + </return> <argument index="0" name="z" type="int"> </argument> <description> @@ -27069,13 +30135,33 @@ </description> </method> <method name="set_z_as_relative"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> Set the Z-index value as relative to the parent node of this 2D node. Thus, if this 2D node's Z-index value is 2 and its parent's effective Z-index is 3, then the effective Z-index value of this 2D node would be 3 + 2 = 5. </description> </method> + <method name="to_global" qualifiers="const"> + <return type="Vector2"> + </return> + <argument index="0" name="local_point" type="Vector2"> + </argument> + <description> + </description> + </method> + <method name="to_local" qualifiers="const"> + <return type="Vector2"> + </return> + <argument index="0" name="global_point" type="Vector2"> + </argument> + <description> + </description> + </method> <method name="translate"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -27084,13 +30170,13 @@ </method> </methods> <members> - <member name="global_position" type="float" setter="set_global_position" getter="get_global_position" brief=""> + <member name="global_position" type="Vector2" setter="set_global_position" getter="get_global_position" brief=""> </member> <member name="global_rotation" type="float" setter="set_global_rotation" getter="get_global_rotation" brief=""> </member> <member name="global_rotation_deg" type="float" setter="set_global_rotation_in_degrees" getter="get_global_rotation_in_degrees" brief=""> </member> - <member name="global_scale" type="float" setter="set_global_scale" getter="get_global_scale" brief=""> + <member name="global_scale" type="Vector2" setter="set_global_scale" getter="get_global_scale" brief=""> </member> <member name="global_transform" type="Transform2D" setter="set_global_transform" getter="get_global_transform" brief=""> </member> @@ -27197,6 +30283,8 @@ </description> <methods> <method name="alert"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <argument index="1" name="title" type="String" default=""Alert!""> @@ -27220,6 +30308,8 @@ </description> </method> <method name="delay_msec" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="msec" type="int"> </argument> <description> @@ -27227,6 +30317,8 @@ </description> </method> <method name="delay_usec" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="usec" type="int"> </argument> <description> @@ -27234,6 +30326,8 @@ </description> </method> <method name="dump_memory_to_file"> + <return type="void"> + </return> <argument index="0" name="file" type="String"> </argument> <description> @@ -27242,6 +30336,8 @@ </description> </method> <method name="dump_resources_to_file"> + <return type="void"> + </return> <argument index="0" name="file" type="String"> </argument> <description> @@ -27259,7 +30355,7 @@ </argument> <argument index="2" name="blocking" type="bool"> </argument> - <argument index="3" name="output" type="Array" default="[]"> + <argument index="3" name="output" type="Array" default="[ ]"> </argument> <description> Execute the binary file in given path, optionally blocking until it returns. A process ID is returned. @@ -27408,7 +30504,7 @@ </description> </method> <method name="get_power_state"> - <return type="int"> + <return type="int" enum="PowerState"> </return> <description> </description> @@ -27446,7 +30542,7 @@ <method name="get_screen_dpi" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="screen" type="int" default="0"> + <argument index="0" name="screen" type="int" default="-1"> </argument> <description> Returns the dots per inch density of the specified screen. @@ -27461,7 +30557,7 @@ </description> </method> <method name="get_screen_orientation" qualifiers="const"> - <return type="int"> + <return type="int" enum="_OS.ScreenOrientation"> </return> <description> Returns the current screen orientation, the return value will be one of the SCREEN_ORIENTATION constants in this class. @@ -27470,7 +30566,7 @@ <method name="get_screen_position" qualifiers="const"> <return type="Vector2"> </return> - <argument index="0" name="screen" type="int" default="0"> + <argument index="0" name="screen" type="int" default="-1"> </argument> <description> </description> @@ -27478,7 +30574,7 @@ <method name="get_screen_size" qualifiers="const"> <return type="Vector2"> </return> - <argument index="0" name="screen" type="int" default="0"> + <argument index="0" name="screen" type="int" default="-1"> </argument> <description> Returns the dimensions in pixels of the specified screen. @@ -27506,7 +30602,7 @@ <method name="get_system_dir" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="dir" type="int"> + <argument index="0" name="dir" type="int" enum="_OS.SystemDir"> </argument> <description> </description> @@ -27600,6 +30696,8 @@ </description> </method> <method name="hide_virtual_keyboard"> + <return type="void"> + </return> <description> Hides the virtual keyboard if it is shown, does nothing otherwise. </description> @@ -27680,7 +30778,7 @@ </description> </method> <method name="kill"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="pid" type="int"> </argument> @@ -27695,11 +30793,13 @@ </description> </method> <method name="native_video_pause"> + <return type="void"> + </return> <description> </description> </method> <method name="native_video_play"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -27713,47 +30813,65 @@ </description> </method> <method name="native_video_stop"> + <return type="void"> + </return> <description> </description> </method> <method name="native_video_unpause"> + <return type="void"> + </return> <description> </description> </method> <method name="print_all_resources"> + <return type="void"> + </return> <argument index="0" name="tofile" type="String" default=""""> </argument> <description> </description> </method> <method name="print_all_textures_by_size"> + <return type="void"> + </return> <description> </description> </method> <method name="print_resources_by_type"> + <return type="void"> + </return> <argument index="0" name="types" type="PoolStringArray"> </argument> <description> </description> </method> <method name="print_resources_in_use"> + <return type="void"> + </return> <argument index="0" name="short" type="bool" default="false"> </argument> <description> </description> </method> <method name="request_attention"> + <return type="void"> + </return> <description> Request the user attention to the window. It'll flash the taskbar button on Windows or bounce the dock icon on OSX. </description> </method> <method name="set_borderless_window"> + <return type="void"> + </return> <argument index="0" name="borderless" type="bool"> </argument> <description> </description> </method> <method name="set_clipboard"> + <return type="void"> + </return> <argument index="0" name="clipboard" type="String"> </argument> <description> @@ -27761,30 +30879,40 @@ </description> </method> <method name="set_current_screen"> + <return type="void"> + </return> <argument index="0" name="screen" type="int"> </argument> <description> </description> </method> <method name="set_exit_code"> + <return type="void"> + </return> <argument index="0" name="code" type="int"> </argument> <description> </description> </method> <method name="set_icon"> - <argument index="0" name="icon" type="Object"> + <return type="void"> + </return> + <argument index="0" name="icon" type="Image"> </argument> <description> </description> </method> <method name="set_ime_position"> - <argument index="0" name="arg0" type="Vector2"> + <return type="void"> + </return> + <argument index="0" name="position" type="Vector2"> </argument> <description> </description> </method> <method name="set_keep_screen_on"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -27792,6 +30920,8 @@ </description> </method> <method name="set_low_processor_usage_mode"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -27799,14 +30929,16 @@ </description> </method> <method name="set_screen_orientation"> - <argument index="0" name="orientation" type="int"> + <return type="void"> + </return> + <argument index="0" name="orientation" type="int" enum="_OS.ScreenOrientation"> </argument> <description> Sets the current screen orientation, the argument value must be one of the SCREEN_ORIENTATION constants in this class. </description> </method> <method name="set_thread_name"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="name" type="String"> </argument> @@ -27814,18 +30946,24 @@ </description> </method> <method name="set_use_file_access_save_and_swap"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_use_vsync"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_window_fullscreen"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -27833,6 +30971,8 @@ </description> </method> <method name="set_window_maximized"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -27840,6 +30980,8 @@ </description> </method> <method name="set_window_minimized"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -27847,6 +30989,8 @@ </description> </method> <method name="set_window_position"> + <return type="void"> + </return> <argument index="0" name="position" type="Vector2"> </argument> <description> @@ -27854,6 +30998,8 @@ </description> </method> <method name="set_window_resizable"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -27861,6 +31007,8 @@ </description> </method> <method name="set_window_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> @@ -27868,6 +31016,8 @@ </description> </method> <method name="set_window_title"> + <return type="void"> + </return> <argument index="0" name="title" type="String"> </argument> <description> @@ -27875,7 +31025,7 @@ </description> </method> <method name="shell_open"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="uri" type="String"> </argument> @@ -27883,6 +31033,8 @@ </description> </method> <method name="show_virtual_keyboard"> + <return type="void"> + </return> <argument index="0" name="existing_text" type="String" default=""""> </argument> <description> @@ -27984,6 +31136,8 @@ </description> <methods> <method name="_get" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <description> @@ -27998,10 +31152,14 @@ </description> </method> <method name="_init" qualifiers="virtual"> + <return type="void"> + </return> <description> </description> </method> <method name="_notification" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="what" type="int"> </argument> <description> @@ -28009,6 +31167,8 @@ </description> </method> <method name="_set" qualifiers="virtual"> + <return type="bool"> + </return> <argument index="0" name="property" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -28018,9 +31178,11 @@ </description> </method> <method name="add_user_signal"> + <return type="void"> + </return> <argument index="0" name="signal" type="String"> </argument> - <argument index="1" name="arguments" type="Array" default="[]"> + <argument index="1" name="arguments" type="Array" default="[ ]"> </argument> <description> Add a user signal (can be added anytime). Arguments are optional, but can be added as an array of dictionaries, each containing "name" and "type" (from [@Global Scope] TYPE_*). @@ -28035,6 +31197,8 @@ </description> </method> <method name="call_deferred" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="method" type="String"> </argument> <description> @@ -28058,7 +31222,7 @@ </description> </method> <method name="connect"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="signal" type="String"> </argument> @@ -28066,7 +31230,7 @@ </argument> <argument index="2" name="method" type="String"> </argument> - <argument index="3" name="binds" type="Array" default="[]"> + <argument index="3" name="binds" type="Array" default="[ ]"> </argument> <argument index="4" name="flags" type="int" default="0"> </argument> @@ -28075,6 +31239,8 @@ </description> </method> <method name="disconnect"> + <return type="void"> + </return> <argument index="0" name="signal" type="String"> </argument> <argument index="1" name="target" type="Object"> @@ -28086,12 +31252,16 @@ </description> </method> <method name="emit_signal" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="signal" type="String"> </argument> <description> </description> </method> <method name="free"> + <return type="void"> + </return> <description> </description> </method> @@ -28159,7 +31329,7 @@ </description> </method> <method name="get_script" qualifiers="const"> - <return type="Script"> + <return type="Reference"> </return> <description> Return the object script (or null if it doesn't have one). @@ -28241,6 +31411,8 @@ </description> </method> <method name="notification"> + <return type="void"> + </return> <argument index="0" name="what" type="int"> </argument> <argument index="1" name="reversed" type="bool" default="false"> @@ -28250,10 +31422,14 @@ </description> </method> <method name="property_list_changed_notify"> + <return type="void"> + </return> <description> </description> </method> <method name="set"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -28263,6 +31439,8 @@ </description> </method> <method name="set_block_signals"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -28270,6 +31448,8 @@ </description> </method> <method name="set_message_translation"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -28277,6 +31457,8 @@ </description> </method> <method name="set_meta"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -28286,7 +31468,9 @@ </description> </method> <method name="set_script"> - <argument index="0" name="script" type="Script"> + <return type="void"> + </return> + <argument index="0" name="script" type="Reference"> </argument> <description> Set a script into the object, scripts extend the object functionality. @@ -28309,10 +31493,10 @@ </signal> </signals> <constants> - <constant name="NOTIFICATION_POSTINITIALIZE" value="0"> + <constant name="NOTIFICATION_POSTINITIALIZE" value="0" enum=""> Called right when the object is initialized. Not available in script. </constant> - <constant name="NOTIFICATION_PREDELETE" value="1"> + <constant name="NOTIFICATION_PREDELETE" value="1" enum=""> Called before the object is about to be deleted. </constant> <constant name="CONNECT_DEFERRED" value="1"> @@ -28333,7 +31517,7 @@ </description> <methods> <method name="get_cull_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="OccluderPolygon2D.CullMode"> </return> <description> </description> @@ -28351,18 +31535,24 @@ </description> </method> <method name="set_closed"> + <return type="void"> + </return> <argument index="0" name="closed" type="bool"> </argument> <description> </description> </method> <method name="set_cull_mode"> - <argument index="0" name="cull_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="cull_mode" type="int" enum="OccluderPolygon2D.CullMode"> </argument> <description> </description> </method> <method name="set_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolVector2Array"> </argument> <description> @@ -28372,7 +31562,7 @@ <members> <member name="closed" type="bool" setter="set_closed" getter="is_closed" brief=""> </member> - <member name="cull_mode" type="int" setter="set_cull_mode" getter="get_cull_mode" brief=""> + <member name="cull_mode" type="int" setter="set_cull_mode" getter="get_cull_mode" brief="" enum="OccluderPolygon2D.CullMode"> </member> <member name="polygon" type="PoolVector2Array" setter="set_polygon" getter="get_polygon" brief=""> </member> @@ -28395,25 +31585,29 @@ </description> <methods> <method name="get_shadow_detail" qualifiers="const"> - <return type="int"> + <return type="int" enum="OmniLight.ShadowDetail"> </return> <description> </description> </method> <method name="get_shadow_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="OmniLight.ShadowMode"> </return> <description> </description> </method> <method name="set_shadow_detail"> - <argument index="0" name="detail" type="int"> + <return type="void"> + </return> + <argument index="0" name="detail" type="int" enum="OmniLight.ShadowDetail"> </argument> <description> </description> </method> <method name="set_shadow_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="OmniLight.ShadowMode"> </argument> <description> </description> @@ -28424,9 +31618,9 @@ </member> <member name="omni_range" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="omni_shadow_detail" type="int" setter="set_shadow_detail" getter="get_shadow_detail" brief=""> + <member name="omni_shadow_detail" type="int" setter="set_shadow_detail" getter="get_shadow_detail" brief="" enum="OmniLight.ShadowDetail"> </member> - <member name="omni_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" brief=""> + <member name="omni_shadow_mode" type="int" setter="set_shadow_mode" getter="get_shadow_mode" brief="" enum="OmniLight.ShadowMode"> </member> </members> <constants> @@ -28441,6 +31635,8 @@ </description> <methods> <method name="add_icon_item"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="label" type="String"> @@ -28452,6 +31648,8 @@ </description> </method> <method name="add_item"> + <return type="void"> + </return> <argument index="0" name="label" type="String"> </argument> <argument index="1" name="id" type="int" default="-1"> @@ -28461,22 +31659,17 @@ </description> </method> <method name="add_separator"> + <return type="void"> + </return> <description> Add a separator to the list of items. Separators help to group items. Separator also takes up an index and is appended at the end. </description> </method> <method name="clear"> - <description> - Clear all the items in the [OptionButton]. - </description> - </method> - <method name="get_item_id" qualifiers="const"> - <return type="int"> + <return type="void"> </return> - <argument index="0" name="idx" type="int"> - </argument> <description> - Return the ID of the item at index "idx". + Clear all the items in the [OptionButton]. </description> </method> <method name="get_item_count" qualifiers="const"> @@ -28495,6 +31688,15 @@ Return the icon of the item at index "idx". </description> </method> + <method name="get_item_id" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + Return the ID of the item at index "idx". + </description> + </method> <method name="get_item_metadata" qualifiers="const"> <return type="Variant"> </return> @@ -28540,45 +31742,57 @@ </description> </method> <method name="remove_item"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> </description> </method> <method name="select"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> Select an item by index and make it the current item. </description> </method> - <method name="set_item_id"> + <method name="set_item_disabled"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="id" type="int"> + <argument index="1" name="disabled" type="bool"> </argument> <description> - Set the ID of an item at index "idx". </description> </method> - <method name="set_item_disabled"> + <method name="set_item_icon"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="disabled" type="bool"> + <argument index="1" name="texture" type="Texture"> </argument> <description> + Set the icon of an item at index "idx". </description> </method> - <method name="set_item_icon"> + <method name="set_item_id"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="texture" type="Texture"> + <argument index="1" name="id" type="int"> </argument> <description> - Set the icon of an item at index "idx". + Set the ID of an item at index "idx". </description> </method> <method name="set_item_metadata"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="metadata" type="Variant"> @@ -28587,6 +31801,8 @@ </description> </method> <method name="set_item_text"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="text" type="String"> @@ -28649,7 +31865,7 @@ </description> <methods> <method name="add_file"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="pck_path" type="String"> </argument> @@ -28659,7 +31875,7 @@ </description> </method> <method name="flush"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="verbose" type="bool"> </argument> @@ -28667,7 +31883,7 @@ </description> </method> <method name="pck_start"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="pck_name" type="String"> </argument> @@ -28689,6 +31905,8 @@ </description> <methods> <method name="generate"> + <return type="void"> + </return> <argument index="0" name="from" type="Translation"> </argument> <description> @@ -28705,7 +31923,7 @@ </description> <methods> <method name="pack"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="value" type="Variant"> </argument> @@ -28764,13 +31982,13 @@ <method name="instance" qualifiers="const"> <return type="Node"> </return> - <argument index="0" name="edit_state" type="int" default="0"> + <argument index="0" name="edit_state" type="int" enum="PackedScene.GenEditState" default="0"> </argument> <description> </description> </method> <method name="pack"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="Node"> </argument> @@ -28815,7 +32033,7 @@ </description> </method> <method name="get_packet_error" qualifiers="const"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Return the error state of the last packet received (via [method get_packet] and [method get_var]). @@ -28828,8 +32046,14 @@ Get a Variant. </description> </method> + <method name="is_object_decoding_allowed" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="put_packet"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="buffer" type="PoolByteArray"> </argument> @@ -28838,7 +32062,7 @@ </description> </method> <method name="put_var"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="var" type="Variant"> </argument> @@ -28846,6 +32070,14 @@ Send a Variant as a packet. </description> </method> + <method name="set_allow_object_decoding"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> </methods> <constants> </constants> @@ -28858,11 +32090,41 @@ PacketStreamPeer provides a wrapper for working using packets over a stream. This allows for using packet based code with StreamPeers. PacketPeerStream implements a custom protocol over the StreamPeer, so the user should not read or write to the wrapped StreamPeer directly. </description> <methods> + <method name="get_input_buffer_max_size" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_output_buffer_max_size" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="set_input_buffer_max_size"> + <return type="void"> + </return> + <argument index="0" name="max_size_bytes" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_output_buffer_max_size"> + <return type="void"> + </return> + <argument index="0" name="max_size_bytes" type="int"> + </argument> + <description> + </description> + </method> <method name="set_stream_peer"> - <argument index="0" name="peer" type="StreamPeer"> + <return type="void"> + </return> + <argument index="0" name="peer" type="Reference"> </argument> <description> - Set the StreamPeer object to be wrapped + Set the [StreamPeer] object to be wrapped. </description> </method> </methods> @@ -28878,6 +32140,8 @@ </description> <methods> <method name="close"> + <return type="void"> + </return> <description> Close the UDP socket the [PacketPeerUDP] is currently listening on. </description> @@ -28904,7 +32168,7 @@ </description> </method> <method name="listen"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="port" type="int"> </argument> @@ -28920,7 +32184,7 @@ </description> </method> <method name="set_dest_address"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="host" type="String"> </argument> @@ -28931,7 +32195,7 @@ </description> </method> <method name="wait"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Wait for a packet to arrive on the listening port, see [method listen]. @@ -28990,6 +32254,8 @@ </description> </method> <method name="set_panorama"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> @@ -29053,6 +32319,8 @@ </description> </method> <method name="set_ignore_camera_zoom"> + <return type="void"> + </return> <argument index="0" name="ignore" type="bool"> </argument> <description> @@ -29060,6 +32328,8 @@ </description> </method> <method name="set_limit_begin"> + <return type="void"> + </return> <argument index="0" name="ofs" type="Vector2"> </argument> <description> @@ -29067,6 +32337,8 @@ </description> </method> <method name="set_limit_end"> + <return type="void"> + </return> <argument index="0" name="ofs" type="Vector2"> </argument> <description> @@ -29074,6 +32346,8 @@ </description> </method> <method name="set_scroll_base_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="Vector2"> </argument> <description> @@ -29081,6 +32355,8 @@ </description> </method> <method name="set_scroll_base_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -29088,6 +32364,8 @@ </description> </method> <method name="set_scroll_offset"> + <return type="void"> + </return> <argument index="0" name="ofs" type="Vector2"> </argument> <description> @@ -29140,6 +32418,8 @@ </description> </method> <method name="set_mirroring"> + <return type="void"> + </return> <argument index="0" name="mirror" type="Vector2"> </argument> <description> @@ -29147,12 +32427,16 @@ </description> </method> <method name="set_motion_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> </description> </method> <method name="set_motion_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -29190,7 +32474,7 @@ </description> </method> <method name="get_draw_order" qualifiers="const"> - <return type="int"> + <return type="int" enum="Particles.DrawOrder"> </return> <description> </description> @@ -29282,22 +32566,30 @@ </description> </method> <method name="restart"> + <return type="void"> + </return> <description> </description> </method> <method name="set_amount"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> </description> </method> <method name="set_draw_order"> - <argument index="0" name="order" type="int"> + <return type="void"> + </return> + <argument index="0" name="order" type="int" enum="Particles.DrawOrder"> </argument> <description> </description> </method> <method name="set_draw_pass_mesh"> + <return type="void"> + </return> <argument index="0" name="pass" type="int"> </argument> <argument index="1" name="mesh" type="Mesh"> @@ -29306,78 +32598,104 @@ </description> </method> <method name="set_draw_passes"> + <return type="void"> + </return> <argument index="0" name="passes" type="int"> </argument> <description> </description> </method> <method name="set_emitting"> + <return type="void"> + </return> <argument index="0" name="emitting" type="bool"> </argument> <description> </description> </method> <method name="set_explosiveness_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> </description> </method> <method name="set_fixed_fps"> + <return type="void"> + </return> <argument index="0" name="fps" type="int"> </argument> <description> </description> </method> <method name="set_fractional_delta"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_lifetime"> + <return type="void"> + </return> <argument index="0" name="secs" type="float"> </argument> <description> </description> </method> <method name="set_one_shot"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_pre_process_time"> + <return type="void"> + </return> <argument index="0" name="secs" type="float"> </argument> <description> </description> </method> <method name="set_process_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> </description> </method> <method name="set_randomness_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> </description> </method> <method name="set_speed_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> </description> </method> <method name="set_use_local_coordinates"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_visibility_aabb"> + <return type="void"> + </return> <argument index="0" name="aabb" type="Rect3"> </argument> <description> @@ -29387,7 +32705,7 @@ <members> <member name="amount" type="int" setter="set_amount" getter="get_amount" brief=""> </member> - <member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" brief=""> + <member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" brief="" enum="Particles.DrawOrder"> </member> <member name="draw_pass_1" type="Mesh" setter="set_draw_pass_mesh" getter="get_draw_pass_mesh" brief=""> </member> @@ -29415,7 +32733,7 @@ </member> <member name="preprocess" type="float" setter="set_pre_process_time" getter="get_pre_process_time" brief=""> </member> - <member name="process_material" type="ShaderMaterial,ParticlesMaterial" setter="set_process_material" getter="get_process_material" brief=""> + <member name="process_material" type="Material" setter="set_process_material" getter="get_process_material" brief=""> </member> <member name="randomness" type="float" setter="set_randomness_ratio" getter="get_randomness_ratio" brief=""> </member> @@ -29431,7 +32749,7 @@ </constant> <constant name="DRAW_ORDER_VIEW_DEPTH" value="2"> </constant> - <constant name="MAX_DRAW_PASSES" value="4"> + <constant name="MAX_DRAW_PASSES" value="4" enum=""> </constant> </constants> </class> @@ -29457,7 +32775,7 @@ </description> </method> <method name="get_draw_order" qualifiers="const"> - <return type="int"> + <return type="int" enum="Particles2D.DrawOrder"> </return> <description> </description> @@ -29562,10 +32880,14 @@ </description> </method> <method name="restart"> + <return type="void"> + </return> <description> </description> </method> <method name="set_amount"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -29573,12 +32895,16 @@ </description> </method> <method name="set_draw_order"> - <argument index="0" name="order" type="int"> + <return type="void"> + </return> + <argument index="0" name="order" type="int" enum="Particles2D.DrawOrder"> </argument> <description> </description> </method> <method name="set_emitting"> + <return type="void"> + </return> <argument index="0" name="emitting" type="bool"> </argument> <description> @@ -29586,30 +32912,40 @@ </description> </method> <method name="set_explosiveness_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> </description> </method> <method name="set_fixed_fps"> + <return type="void"> + </return> <argument index="0" name="fps" type="int"> </argument> <description> </description> </method> <method name="set_fractional_delta"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_h_frames"> + <return type="void"> + </return> <argument index="0" name="frames" type="int"> </argument> <description> </description> </method> <method name="set_lifetime"> + <return type="void"> + </return> <argument index="0" name="secs" type="float"> </argument> <description> @@ -29617,60 +32953,80 @@ </description> </method> <method name="set_normal_map"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_one_shot"> + <return type="void"> + </return> <argument index="0" name="secs" type="bool"> </argument> <description> </description> </method> <method name="set_pre_process_time"> + <return type="void"> + </return> <argument index="0" name="secs" type="float"> </argument> <description> </description> </method> <method name="set_process_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> </description> </method> <method name="set_randomness_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float"> </argument> <description> </description> </method> <method name="set_speed_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="float"> </argument> <description> </description> </method> <method name="set_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_use_local_coordinates"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_v_frames"> + <return type="void"> + </return> <argument index="0" name="frames" type="int"> </argument> <description> </description> </method> <method name="set_visibility_rect"> + <return type="void"> + </return> <argument index="0" name="aabb" type="Rect2"> </argument> <description> @@ -29680,7 +33036,7 @@ <members> <member name="amount" type="int" setter="set_amount" getter="get_amount" brief=""> </member> - <member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" brief=""> + <member name="draw_order" type="int" setter="set_draw_order" getter="get_draw_order" brief="" enum="Particles2D.DrawOrder"> </member> <member name="emitting" type="bool" setter="set_emitting" getter="is_emitting" brief=""> </member> @@ -29702,7 +33058,7 @@ </member> <member name="preprocess" type="float" setter="set_pre_process_time" getter="get_pre_process_time" brief=""> </member> - <member name="process_material" type="ShaderMaterial,ParticlesMaterial" setter="set_process_material" getter="get_process_material" brief=""> + <member name="process_material" type="Material" setter="set_process_material" getter="get_process_material" brief=""> </member> <member name="randomness" type="float" setter="set_randomness_ratio" getter="get_randomness_ratio" brief=""> </member> @@ -29712,7 +33068,7 @@ </member> <member name="v_frames" type="int" setter="set_v_frames" getter="get_v_frames" brief=""> </member> - <member name="visibility_rect" type="Rect3" setter="set_visibility_rect" getter="get_visibility_rect" brief=""> + <member name="visibility_rect" type="Rect2" setter="set_visibility_rect" getter="get_visibility_rect" brief=""> </member> </members> <constants> @@ -29771,7 +33127,7 @@ </description> </method> <method name="get_emission_shape" qualifiers="const"> - <return type="int"> + <return type="int" enum="ParticlesMaterial.EmissionShape"> </return> <description> </description> @@ -29785,7 +33141,7 @@ <method name="get_flag" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="ParticlesMaterial.Flags"> </argument> <description> </description> @@ -29805,7 +33161,7 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> <description> </description> @@ -29813,15 +33169,15 @@ <method name="get_param_randomness" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> <description> </description> </method> <method name="get_param_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> <description> </description> @@ -29851,61 +33207,81 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_color_ramp"> + <return type="void"> + </return> <argument index="0" name="ramp" type="Texture"> </argument> <description> </description> </method> <method name="set_emission_box_extents"> + <return type="void"> + </return> <argument index="0" name="extents" type="Vector3"> </argument> <description> </description> </method> <method name="set_emission_color_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_emission_normal_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_emission_point_count"> + <return type="void"> + </return> <argument index="0" name="point_count" type="int"> </argument> <description> </description> </method> <method name="set_emission_point_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_emission_shape"> - <argument index="0" name="shape" type="int"> + <return type="void"> + </return> + <argument index="0" name="shape" type="int" enum="ParticlesMaterial.EmissionShape"> </argument> <description> </description> </method> <method name="set_emission_sphere_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_flag"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="ParticlesMaterial.Flags"> </argument> <argument index="1" name="enable" type="bool"> </argument> @@ -29913,19 +33289,25 @@ </description> </method> <method name="set_flatness"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_gravity"> + <return type="void"> + </return> <argument index="0" name="accel_vec" type="Vector3"> </argument> <description> </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -29933,7 +33315,9 @@ </description> </method> <method name="set_param_randomness"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> <argument index="1" name="randomness" type="float"> </argument> @@ -29941,32 +33325,42 @@ </description> </method> <method name="set_param_texture"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="ParticlesMaterial.Parameter"> </argument> - <argument index="1" name="texture" type="Object"> + <argument index="1" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_spread"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_trail_color_modifier"> + <return type="void"> + </return> <argument index="0" name="texture" type="GradientTexture"> </argument> <description> </description> </method> <method name="set_trail_divisor"> + <return type="void"> + </return> <argument index="0" name="divisor" type="int"> </argument> <description> </description> </method> <method name="set_trail_size_modifier"> + <return type="void"> + </return> <argument index="0" name="texture" type="CurveTexture"> </argument> <description> @@ -29976,13 +33370,13 @@ <members> <member name="angle" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="angle_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="angle_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="angle_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="angular_velocity" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="angular_velocity_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="angular_velocity_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="angular_velocity_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> @@ -29990,23 +33384,23 @@ </member> <member name="anim_offset" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="anim_offset_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="anim_offset_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="anim_offset_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="anim_speed" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="anim_speed_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="anim_speed_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="anim_speed_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="color" type="Color" setter="set_color" getter="get_color" brief=""> </member> - <member name="color_ramp" type="GradientTexture" setter="set_color_ramp" getter="get_color_ramp" brief=""> + <member name="color_ramp" type="Texture" setter="set_color_ramp" getter="get_color_ramp" brief=""> </member> <member name="damping" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="damping_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="damping_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="damping_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> @@ -30020,7 +33414,7 @@ </member> <member name="emission_point_texture" type="Texture" setter="set_emission_point_texture" getter="get_emission_point_texture" brief=""> </member> - <member name="emission_shape" type="int" setter="set_emission_shape" getter="get_emission_shape" brief=""> + <member name="emission_shape" type="int" setter="set_emission_shape" getter="get_emission_shape" brief="" enum="ParticlesMaterial.EmissionShape"> </member> <member name="emission_sphere_radius" type="float" setter="set_emission_sphere_radius" getter="get_emission_sphere_radius" brief=""> </member> @@ -30036,7 +33430,7 @@ </member> <member name="hue_variation" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="hue_variation_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="hue_variation_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="hue_variation_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> @@ -30046,25 +33440,25 @@ </member> <member name="linear_accel" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="linear_accel_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="linear_accel_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="linear_accel_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="orbit_velocity" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="orbit_velocity_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="orbit_velocity_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="orbit_velocity_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="radial_accel" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="radial_accel_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="radial_accel_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="radial_accel_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> <member name="scale" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="scale_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="scale_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="scale_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> @@ -30072,7 +33466,7 @@ </member> <member name="tangential_accel" type="float" setter="set_param" getter="get_param" brief=""> </member> - <member name="tangential_accel_curve" type="CurveTexture" setter="set_param_texture" getter="get_param_texture" brief=""> + <member name="tangential_accel_curve" type="Texture" setter="set_param_texture" getter="get_param_texture" brief=""> </member> <member name="tangential_accel_random" type="float" setter="set_param_randomness" getter="get_param_randomness" brief=""> </member> @@ -30144,6 +33538,8 @@ </description> </method> <method name="set_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="Curve3D"> </argument> <description> @@ -30174,6 +33570,8 @@ </description> </method> <method name="set_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="Curve2D"> </argument> <description> @@ -30219,7 +33617,7 @@ </description> </method> <method name="get_rotation_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="PathFollow.RotationMode"> </return> <description> Returns the rotation mode. The constants below list which axes are allowed to rotate for each mode. @@ -30247,6 +33645,8 @@ </description> </method> <method name="set_cubic_interpolation"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -30256,6 +33656,8 @@ </description> </method> <method name="set_h_offset"> + <return type="void"> + </return> <argument index="0" name="h_offset" type="float"> </argument> <description> @@ -30264,6 +33666,8 @@ </description> </method> <method name="set_loop"> + <return type="void"> + </return> <argument index="0" name="loop" type="bool"> </argument> <description> @@ -30271,6 +33675,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="float"> </argument> <description> @@ -30278,13 +33684,17 @@ </description> </method> <method name="set_rotation_mode"> - <argument index="0" name="rotation_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="rotation_mode" type="int" enum="PathFollow.RotationMode"> </argument> <description> Allows or forbids rotation on one or more axes, per the constants below. </description> </method> <method name="set_unit_offset"> + <return type="void"> + </return> <argument index="0" name="unit_offset" type="float"> </argument> <description> @@ -30292,6 +33702,8 @@ </description> </method> <method name="set_v_offset"> + <return type="void"> + </return> <argument index="0" name="v_offset" type="float"> </argument> <description> @@ -30373,6 +33785,8 @@ </description> </method> <method name="set_cubic_interpolation"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -30382,6 +33796,8 @@ </description> </method> <method name="set_h_offset"> + <return type="void"> + </return> <argument index="0" name="h_offset" type="float"> </argument> <description> @@ -30390,6 +33806,8 @@ </description> </method> <method name="set_loop"> + <return type="void"> + </return> <argument index="0" name="loop" type="bool"> </argument> <description> @@ -30397,6 +33815,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="float"> </argument> <description> @@ -30404,6 +33824,8 @@ </description> </method> <method name="set_rotate"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -30411,6 +33833,8 @@ </description> </method> <method name="set_unit_offset"> + <return type="void"> + </return> <argument index="0" name="unit_offset" type="float"> </argument> <description> @@ -30418,6 +33842,8 @@ </description> </method> <method name="set_v_offset"> + <return type="void"> + </return> <argument index="0" name="v_offset" type="float"> </argument> <description> @@ -30437,7 +33863,7 @@ <method name="get_monitor" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="monitor" type="int"> + <argument index="0" name="monitor" type="int" enum="Performance.Monitor"> </argument> <description> </description> @@ -30678,6 +34104,8 @@ </description> </method> <method name="integrate_forces"> + <return type="void"> + </return> <description> Call the built-in force integration code. </description> @@ -30690,6 +34118,8 @@ </description> </method> <method name="set_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="velocity" type="float"> </argument> <description> @@ -30697,6 +34127,8 @@ </description> </method> <method name="set_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="velocity" type="Vector2"> </argument> <description> @@ -30704,6 +34136,8 @@ </description> </method> <method name="set_sleep_state"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -30711,6 +34145,8 @@ </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="transform" type="Transform2D"> </argument> <description> @@ -30787,7 +34223,7 @@ </argument> <argument index="1" name="max_results" type="int" default="32"> </argument> - <argument index="2" name="exclude" type="Array" default="[]"> + <argument index="2" name="exclude" type="Array" default="[ ]"> </argument> <argument index="3" name="collision_layer" type="int" default="2147483647"> </argument> @@ -30810,7 +34246,7 @@ </argument> <argument index="1" name="to" type="Vector2"> </argument> - <argument index="2" name="exclude" type="Array" default="[]"> + <argument index="2" name="exclude" type="Array" default="[ ]"> </argument> <argument index="3" name="collision_layer" type="int" default="2147483647"> </argument> @@ -30877,17 +34313,21 @@ </description> <methods> <method name="area_add_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape" type="RID"> </argument> - <argument index="2" name="transform" type="Transform2D" default="((1, 0), (0, 1), (0, 0))"> + <argument index="2" name="transform" type="Transform2D" default="Transform2D( 1, 0, 0, 1, 0, 0 )"> </argument> <description> Add a shape to the area, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index. </description> </method> <method name="area_attach_object_instance_id"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="id" type="int"> @@ -30897,6 +34337,8 @@ </description> </method> <method name="area_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <description> @@ -30920,9 +34362,11 @@ </description> </method> <method name="area_get_param" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.AreaParameter"> </argument> <description> Return an area parameter value. @@ -30969,7 +34413,7 @@ </description> </method> <method name="area_get_space_override_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Physics2DServer.AreaSpaceOverrideMode"> </return> <argument index="0" name="area" type="RID"> </argument> @@ -30987,6 +34431,8 @@ </description> </method> <method name="area_remove_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -30996,6 +34442,8 @@ </description> </method> <method name="area_set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="layer" type="int"> @@ -31005,6 +34453,8 @@ </description> </method> <method name="area_set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="mask" type="int"> @@ -31014,6 +34464,8 @@ </description> </method> <method name="area_set_monitor_callback"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="receiver" type="Object"> @@ -31030,9 +34482,11 @@ </description> </method> <method name="area_set_param"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.AreaParameter"> </argument> <argument index="2" name="value" type="Variant"> </argument> @@ -31041,6 +34495,8 @@ </description> </method> <method name="area_set_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31052,6 +34508,8 @@ </description> </method> <method name="area_set_shape_disabled"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31062,6 +34520,8 @@ </description> </method> <method name="area_set_shape_transform"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31073,6 +34533,8 @@ </description> </method> <method name="area_set_space"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="space" type="RID"> @@ -31082,15 +34544,19 @@ </description> </method> <method name="area_set_space_override_mode"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Physics2DServer.AreaSpaceOverrideMode"> </argument> <description> Set the space override mode for the area. The modes are described in the constants AREA_SPACE_OVERRIDE_*. </description> </method> <method name="area_set_transform"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="transform" type="Transform2D"> @@ -31100,6 +34566,8 @@ </description> </method> <method name="body_add_collision_exception"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="excepted_body" type="RID"> @@ -31109,6 +34577,8 @@ </description> </method> <method name="body_add_force"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="offset" type="Vector2"> @@ -31120,17 +34590,21 @@ </description> </method> <method name="body_add_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape" type="RID"> </argument> - <argument index="2" name="transform" type="Transform2D" default="((1, 0), (0, 1), (0, 0))"> + <argument index="2" name="transform" type="Transform2D" default="Transform2D( 1, 0, 0, 1, 0, 0 )"> </argument> <description> Add a shape to the body, along with a transform matrix. Shapes are usually referenced by their index, so you should track which shape has a given index. </description> </method> <method name="body_apply_impulse"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="pos" type="Vector2"> @@ -31142,6 +34616,8 @@ </description> </method> <method name="body_attach_object_instance_id"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="id" type="int"> @@ -31151,6 +34627,8 @@ </description> </method> <method name="body_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <description> @@ -31160,7 +34638,7 @@ <method name="body_create"> <return type="RID"> </return> - <argument index="0" name="mode" type="int" default="2"> + <argument index="0" name="mode" type="int" enum="Physics2DServer.BodyMode" default="2"> </argument> <argument index="1" name="init_sleeping" type="bool" default="false"> </argument> @@ -31187,7 +34665,7 @@ </description> </method> <method name="body_get_continuous_collision_detection_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Physics2DServer.CCDMode"> </return> <argument index="0" name="body" type="RID"> </argument> @@ -31205,7 +34683,7 @@ </description> </method> <method name="body_get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Physics2DServer.BodyMode"> </return> <argument index="0" name="body" type="RID"> </argument> @@ -31227,7 +34705,7 @@ </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.BodyParameter"> </argument> <description> Return the value of a body parameter. @@ -31254,6 +34732,8 @@ </description> </method> <method name="body_get_shape_metadata" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31283,9 +34763,11 @@ </description> </method> <method name="body_get_state" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="state" type="int"> + <argument index="1" name="state" type="int" enum="Physics2DServer.BodyState"> </argument> <description> Return a body state. @@ -31301,6 +34783,8 @@ </description> </method> <method name="body_remove_collision_exception"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="excepted_body" type="RID"> @@ -31310,6 +34794,8 @@ </description> </method> <method name="body_remove_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31319,6 +34805,8 @@ </description> </method> <method name="body_set_axis_velocity"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="axis_velocity" type="Vector2"> @@ -31328,6 +34816,8 @@ </description> </method> <method name="body_set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="layer" type="int"> @@ -31337,6 +34827,8 @@ </description> </method> <method name="body_set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="mask" type="int"> @@ -31346,9 +34838,11 @@ </description> </method> <method name="body_set_continuous_collision_detection_mode"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Physics2DServer.CCDMode"> </argument> <description> Set the continuous collision detection mode from any of the CCD_MODE_* constants. @@ -31356,19 +34850,23 @@ </description> </method> <method name="body_set_force_integration_callback"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="receiver" type="Object"> </argument> <argument index="2" name="method" type="String"> </argument> - <argument index="3" name="userdata" type="Variant" default="NULL"> + <argument index="3" name="userdata" type="Variant" default="null"> </argument> <description> Set the function used to calculate physics for an object, if that object allows it (see [method body_set_omit_force integration]). </description> </method> <method name="body_set_max_contacts_reported"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="amount" type="int"> @@ -31378,15 +34876,19 @@ </description> </method> <method name="body_set_mode"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="Physics2DServer.BodyMode"> </argument> <description> Set the body mode, from one of the constants BODY_MODE*. </description> </method> <method name="body_set_omit_force_integration"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="enable" type="bool"> @@ -31396,9 +34898,11 @@ </description> </method> <method name="body_set_param"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.BodyParameter"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -31407,6 +34911,8 @@ </description> </method> <method name="body_set_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31418,6 +34924,8 @@ </description> </method> <method name="body_set_shape_as_one_way_collision"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31428,6 +34936,8 @@ </description> </method> <method name="body_set_shape_disabled"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31438,6 +34948,8 @@ </description> </method> <method name="body_set_shape_metadata"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31449,6 +34961,8 @@ </description> </method> <method name="body_set_shape_transform"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -31460,6 +34974,8 @@ </description> </method> <method name="body_set_space"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="space" type="RID"> @@ -31469,9 +34985,11 @@ </description> </method> <method name="body_set_state"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="state" type="int"> + <argument index="1" name="state" type="int" enum="Physics2DServer.BodyState"> </argument> <argument index="2" name="value" type="Variant"> </argument> @@ -31490,7 +35008,7 @@ </argument> <argument index="3" name="margin" type="float" default="0.08"> </argument> - <argument index="4" name="result" type="Physics2DTestMotionResult" default="NULL"> + <argument index="4" name="result" type="Physics2DTestMotionResult" default="null"> </argument> <description> Return whether a body can move from a given point in a given direction. Apart from the boolean return value, a [Physics2DTestMotionResult] can be passed to return additional information in. @@ -31505,7 +35023,7 @@ </argument> <argument index="2" name="body_a" type="RID"> </argument> - <argument index="3" name="body_b" type="RID" default="[RID]"> + <argument index="3" name="body_b" type="RID"> </argument> <description> Create a damped spring joint between two bodies. If not specified, the second body is assumed to be the joint itself. @@ -31516,16 +35034,18 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.DampedStringParam"> </argument> <description> Return the value of a damped spring joint parameter. </description> </method> <method name="damped_string_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.DampedStringParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -31534,6 +35054,8 @@ </description> </method> <method name="free_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> @@ -31543,7 +35065,7 @@ <method name="get_process_info"> <return type="int"> </return> - <argument index="0" name="process_info" type="int"> + <argument index="0" name="process_info" type="int" enum="Physics2DServer.ProcessInfo"> </argument> <description> Return information about the current state of the 2D physics engine. The states are listed under the INFO_* constants. @@ -31558,9 +35080,9 @@ </argument> <argument index="2" name="anchor_b" type="Vector2"> </argument> - <argument index="3" name="body_a" type="RID" default="[RID]"> + <argument index="3" name="body_a" type="RID"> </argument> - <argument index="4" name="body_b" type="RID" default="[RID]"> + <argument index="4" name="body_b" type="RID"> </argument> <description> Create a groove joint between two bodies. If not specified, the bodyies are assumed to be the joint itself. @@ -31571,14 +35093,14 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.JointParam"> </argument> <description> Return the value of a joint parameter. </description> </method> <method name="joint_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Physics2DServer.JointType"> </return> <argument index="0" name="joint" type="RID"> </argument> @@ -31587,9 +35109,11 @@ </description> </method> <method name="joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.JointParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -31604,13 +35128,15 @@ </argument> <argument index="1" name="body_a" type="RID"> </argument> - <argument index="2" name="body_b" type="RID" default="[RID]"> + <argument index="2" name="body_b" type="RID"> </argument> <description> Create a pin joint between two bodies. If not specified, the second body is assumed to be the joint itself. </description> </method> <method name="set_active"> + <return type="void"> + </return> <argument index="0" name="active" type="bool"> </argument> <description> @@ -31620,13 +35146,15 @@ <method name="shape_create"> <return type="RID"> </return> - <argument index="0" name="type" type="int"> + <argument index="0" name="type" type="int" enum="Physics2DServer.ShapeType"> </argument> <description> Create a shape of type SHAPE_*. Does not assign it to a body or an area. To do so, you must use [method area_set_shape] or [method body_set_shape]. </description> </method> <method name="shape_get_data" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="shape" type="RID"> </argument> <description> @@ -31634,7 +35162,7 @@ </description> </method> <method name="shape_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Physics2DServer.ShapeType"> </return> <argument index="0" name="shape" type="RID"> </argument> @@ -31643,6 +35171,8 @@ </description> </method> <method name="shape_set_data"> + <return type="void"> + </return> <argument index="0" name="shape" type="RID"> </argument> <argument index="1" name="data" type="Variant"> @@ -31672,7 +35202,7 @@ </return> <argument index="0" name="space" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.SpaceParameter"> </argument> <description> Return the value of a space parameter. @@ -31688,6 +35218,8 @@ </description> </method> <method name="space_set_active"> + <return type="void"> + </return> <argument index="0" name="space" type="RID"> </argument> <argument index="1" name="active" type="bool"> @@ -31697,9 +35229,11 @@ </description> </method> <method name="space_set_param"> + <return type="void"> + </return> <argument index="0" name="space" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="Physics2DServer.SpaceParameter"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -31956,6 +35490,8 @@ </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="collision_layer" type="int"> </argument> <description> @@ -31963,6 +35499,8 @@ </description> </method> <method name="set_exclude"> + <return type="void"> + </return> <argument index="0" name="exclude" type="Array"> </argument> <description> @@ -31970,6 +35508,8 @@ </description> </method> <method name="set_margin"> + <return type="void"> + </return> <argument index="0" name="margin" type="float"> </argument> <description> @@ -31977,6 +35517,8 @@ </description> </method> <method name="set_motion"> + <return type="void"> + </return> <argument index="0" name="motion" type="Vector2"> </argument> <description> @@ -31984,6 +35526,8 @@ </description> </method> <method name="set_object_type_mask"> + <return type="void"> + </return> <argument index="0" name="object_type_mask" type="int"> </argument> <description> @@ -31991,13 +35535,17 @@ </description> </method> <method name="set_shape"> - <argument index="0" name="shape" type="Shape2D"> + <return type="void"> + </return> + <argument index="0" name="shape" type="Resource"> </argument> <description> Set the [Shape2D] that will be used for collision/intersection queries. </description> </method> <method name="set_shape_rid"> + <return type="void"> + </return> <argument index="0" name="shape" type="RID"> </argument> <description> @@ -32005,6 +35553,8 @@ </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="transform" type="Transform2D"> </argument> <description> @@ -32136,9 +35686,12 @@ </description> <methods> <method name="add_collision_exception_with"> - <argument index="0" name="body" type="PhysicsBody"> + <return type="void"> + </return> + <argument index="0" name="body" type="Node"> </argument> <description> + Adds a body to the collision exception list. This list contains bodies that this body will not collide with. </description> </method> <method name="get_collision_layer" qualifiers="const"> @@ -32170,18 +35723,25 @@ </description> </method> <method name="remove_collision_exception_with"> - <argument index="0" name="body" type="PhysicsBody"> + <return type="void"> + </return> + <argument index="0" name="body" type="Node"> </argument> <description> + Removes a body from the collision exception list. </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> </description> </method> <method name="set_collision_layer_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -32190,12 +35750,16 @@ </description> </method> <method name="set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> </description> </method> <method name="set_collision_mask_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -32222,10 +35786,11 @@ </description> <methods> <method name="add_collision_exception_with"> - <argument index="0" name="body" type="PhysicsBody2D"> + <return type="void"> + </return> + <argument index="0" name="body" type="Node"> </argument> <description> - Adds a body to the collision exception list. This list contains bodies that this body will not collide with. </description> </method> <method name="get_collision_layer" qualifiers="const"> @@ -32261,13 +35826,16 @@ </description> </method> <method name="remove_collision_exception_with"> - <argument index="0" name="body" type="PhysicsBody2D"> + <return type="void"> + </return> + <argument index="0" name="body" type="Node"> </argument> <description> - Removes a body from the collision exception list. </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -32277,6 +35845,8 @@ </description> </method> <method name="set_collision_layer_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -32286,6 +35856,8 @@ </description> </method> <method name="set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -32293,6 +35865,8 @@ </description> </method> <method name="set_collision_mask_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -32320,6 +35894,8 @@ </description> <methods> <method name="add_force"> + <return type="void"> + </return> <argument index="0" name="force" type="Vector3"> </argument> <argument index="1" name="pos" type="Vector3"> @@ -32328,6 +35904,8 @@ </description> </method> <method name="apply_impulse"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector3"> </argument> <argument index="1" name="j" type="Vector3"> @@ -32336,6 +35914,8 @@ </description> </method> <method name="apply_torqe_impulse"> + <return type="void"> + </return> <argument index="0" name="j" type="Vector3"> </argument> <description> @@ -32492,6 +36072,8 @@ </description> </method> <method name="integrate_forces"> + <return type="void"> + </return> <description> </description> </method> @@ -32502,24 +36084,32 @@ </description> </method> <method name="set_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="velocity" type="Vector3"> </argument> <description> </description> </method> <method name="set_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="velocity" type="Vector3"> </argument> <description> </description> </method> <method name="set_sleep_state"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="transform" type="Transform"> </argument> <description> @@ -32580,7 +36170,7 @@ </argument> <argument index="1" name="to" type="Vector3"> </argument> - <argument index="2" name="exclude" type="Array" default="[]"> + <argument index="2" name="exclude" type="Array" default="[ ]"> </argument> <argument index="3" name="collision_layer" type="int" default="2147483647"> </argument> @@ -32622,16 +36212,20 @@ </description> <methods> <method name="area_add_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape" type="RID"> </argument> - <argument index="2" name="transform" type="Transform" default="Transform()"> + <argument index="2" name="transform" type="Transform" default="Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )"> </argument> <description> </description> </method> <method name="area_attach_object_instance_id"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="id" type="int"> @@ -32640,6 +36234,8 @@ </description> </method> <method name="area_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <description> @@ -32660,9 +36256,11 @@ </description> </method> <method name="area_get_param" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.AreaParameter"> </argument> <description> </description> @@ -32704,7 +36302,7 @@ </description> </method> <method name="area_get_space_override_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="PhysicsServer.AreaSpaceOverrideMode"> </return> <argument index="0" name="area" type="RID"> </argument> @@ -32728,6 +36326,8 @@ </description> </method> <method name="area_remove_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -32736,6 +36336,8 @@ </description> </method> <method name="area_set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="layer" type="int"> @@ -32744,6 +36346,8 @@ </description> </method> <method name="area_set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="mask" type="int"> @@ -32752,6 +36356,8 @@ </description> </method> <method name="area_set_monitor_callback"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="receiver" type="Object"> @@ -32762,9 +36368,11 @@ </description> </method> <method name="area_set_param"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.AreaParameter"> </argument> <argument index="2" name="value" type="Variant"> </argument> @@ -32772,6 +36380,8 @@ </description> </method> <method name="area_set_ray_pickable"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="enable" type="bool"> @@ -32780,6 +36390,8 @@ </description> </method> <method name="area_set_shape"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -32790,6 +36402,8 @@ </description> </method> <method name="area_set_shape_transform"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -32800,6 +36414,8 @@ </description> </method> <method name="area_set_space"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="space" type="RID"> @@ -32808,14 +36424,18 @@ </description> </method> <method name="area_set_space_override_mode"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="PhysicsServer.AreaSpaceOverrideMode"> </argument> <description> </description> </method> <method name="area_set_transform"> + <return type="void"> + </return> <argument index="0" name="area" type="RID"> </argument> <argument index="1" name="transform" type="Transform"> @@ -32824,6 +36444,8 @@ </description> </method> <method name="body_add_collision_exception"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="excepted_body" type="RID"> @@ -32832,16 +36454,20 @@ </description> </method> <method name="body_add_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape" type="RID"> </argument> - <argument index="2" name="transform" type="Transform" default="Transform()"> + <argument index="2" name="transform" type="Transform" default="Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )"> </argument> <description> </description> </method> <method name="body_apply_impulse"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="pos" type="Vector3"> @@ -32852,6 +36478,8 @@ </description> </method> <method name="body_apply_torque_impulse"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="impulse" type="Vector3"> @@ -32860,6 +36488,8 @@ </description> </method> <method name="body_attach_object_instance_id"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="id" type="int"> @@ -32868,6 +36498,8 @@ </description> </method> <method name="body_clear_shapes"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <description> @@ -32876,7 +36508,7 @@ <method name="body_create"> <return type="RID"> </return> - <argument index="0" name="mode" type="int" default="2"> + <argument index="0" name="mode" type="int" enum="PhysicsServer.BodyMode" default="2"> </argument> <argument index="1" name="init_sleeping" type="bool" default="false"> </argument> @@ -32884,7 +36516,7 @@ </description> </method> <method name="body_get_axis_lock" qualifiers="const"> - <return type="int"> + <return type="int" enum="PhysicsServer.BodyAxisLock"> </return> <argument index="0" name="body" type="RID"> </argument> @@ -32916,7 +36548,7 @@ </description> </method> <method name="body_get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="PhysicsServer.BodyMode"> </return> <argument index="0" name="body" type="RID"> </argument> @@ -32936,7 +36568,7 @@ </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.BodyParameter"> </argument> <description> </description> @@ -32978,9 +36610,11 @@ </description> </method> <method name="body_get_state" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="state" type="int"> + <argument index="1" name="state" type="int" enum="PhysicsServer.BodyState"> </argument> <description> </description> @@ -33010,6 +36644,8 @@ </description> </method> <method name="body_remove_collision_exception"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="excepted_body" type="RID"> @@ -33018,6 +36654,8 @@ </description> </method> <method name="body_remove_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -33026,14 +36664,18 @@ </description> </method> <method name="body_set_axis_lock"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="axis" type="int"> + <argument index="1" name="axis" type="int" enum="PhysicsServer.BodyAxisLock"> </argument> <description> </description> </method> <method name="body_set_axis_velocity"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="axis_velocity" type="Vector3"> @@ -33042,6 +36684,8 @@ </description> </method> <method name="body_set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="layer" type="int"> @@ -33050,6 +36694,8 @@ </description> </method> <method name="body_set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="mask" type="int"> @@ -33058,6 +36704,8 @@ </description> </method> <method name="body_set_enable_continuous_collision_detection"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="enable" type="bool"> @@ -33066,18 +36714,22 @@ </description> </method> <method name="body_set_force_integration_callback"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="receiver" type="Object"> </argument> <argument index="2" name="method" type="String"> </argument> - <argument index="3" name="userdata" type="Variant" default="NULL"> + <argument index="3" name="userdata" type="Variant" default="null"> </argument> <description> </description> </method> <method name="body_set_max_contacts_reported"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="amount" type="int"> @@ -33086,14 +36738,18 @@ </description> </method> <method name="body_set_mode"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="PhysicsServer.BodyMode"> </argument> <description> </description> </method> <method name="body_set_omit_force_integration"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="enable" type="bool"> @@ -33102,9 +36758,11 @@ </description> </method> <method name="body_set_param"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.BodyParameter"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33112,6 +36770,8 @@ </description> </method> <method name="body_set_ray_pickable"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="enable" type="bool"> @@ -33120,6 +36780,8 @@ </description> </method> <method name="body_set_shape"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -33130,6 +36792,8 @@ </description> </method> <method name="body_set_shape_transform"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="shape_idx" type="int"> @@ -33140,6 +36804,8 @@ </description> </method> <method name="body_set_space"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> <argument index="1" name="space" type="RID"> @@ -33148,9 +36814,11 @@ </description> </method> <method name="body_set_state"> + <return type="void"> + </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="state" type="int"> + <argument index="1" name="state" type="int" enum="PhysicsServer.BodyState"> </argument> <argument index="2" name="value" type="Variant"> </argument> @@ -33162,15 +36830,17 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.ConeTwistJointParam"> </argument> <description> </description> </method> <method name="cone_twist_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.ConeTwistJointParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33178,6 +36848,8 @@ </description> </method> <method name="free_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> @@ -33188,9 +36860,9 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="axis" type="int"> + <argument index="1" name="axis" type="int" enum="Vector3.Axis"> </argument> - <argument index="2" name="flag" type="int"> + <argument index="2" name="flag" type="int" enum="PhysicsServer.G6DOFJointAxisFlag"> </argument> <description> </description> @@ -33200,19 +36872,21 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="axis" type="int"> + <argument index="1" name="axis" type="int" enum="Vector3.Axis"> </argument> - <argument index="2" name="param" type="int"> + <argument index="2" name="param" type="int" enum="PhysicsServer.G6DOFJointAxisParam"> </argument> <description> </description> </method> <method name="generic_6dof_joint_set_flag"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="axis" type="int"> + <argument index="1" name="axis" type="int" enum="Vector3.Axis"> </argument> - <argument index="2" name="flag" type="int"> + <argument index="2" name="flag" type="int" enum="PhysicsServer.G6DOFJointAxisFlag"> </argument> <argument index="3" name="enable" type="bool"> </argument> @@ -33220,11 +36894,13 @@ </description> </method> <method name="generic_6dof_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="axis" type="int"> + <argument index="1" name="axis" type="int" enum="Vector3.Axis"> </argument> - <argument index="2" name="param" type="int"> + <argument index="2" name="param" type="int" enum="PhysicsServer.G6DOFJointAxisParam"> </argument> <argument index="3" name="value" type="float"> </argument> @@ -33234,7 +36910,7 @@ <method name="get_process_info"> <return type="int"> </return> - <argument index="0" name="process_info" type="int"> + <argument index="0" name="process_info" type="int" enum="PhysicsServer.ProcessInfo"> </argument> <description> </description> @@ -33244,7 +36920,7 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="flag" type="int"> + <argument index="1" name="flag" type="int" enum="PhysicsServer.HingeJointFlag"> </argument> <description> </description> @@ -33254,15 +36930,17 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.HingeJointParam"> </argument> <description> </description> </method> <method name="hinge_joint_set_flag"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="flag" type="int"> + <argument index="1" name="flag" type="int" enum="PhysicsServer.HingeJointFlag"> </argument> <argument index="2" name="enabled" type="bool"> </argument> @@ -33270,9 +36948,11 @@ </description> </method> <method name="hinge_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.HingeJointParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33358,7 +37038,7 @@ </description> </method> <method name="joint_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="PhysicsServer.JointType"> </return> <argument index="0" name="joint" type="RID"> </argument> @@ -33366,6 +37046,8 @@ </description> </method> <method name="joint_set_solver_priority"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> <argument index="1" name="priority" type="int"> @@ -33394,12 +37076,14 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.PinJointParam"> </argument> <description> </description> </method> <method name="pin_joint_set_local_a"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> <argument index="1" name="local_A" type="Vector3"> @@ -33408,6 +37092,8 @@ </description> </method> <method name="pin_joint_set_local_b"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> <argument index="1" name="local_B" type="Vector3"> @@ -33416,9 +37102,11 @@ </description> </method> <method name="pin_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.PinJointParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33426,6 +37114,8 @@ </description> </method> <method name="set_active"> + <return type="void"> + </return> <argument index="0" name="active" type="bool"> </argument> <description> @@ -33434,19 +37124,21 @@ <method name="shape_create"> <return type="RID"> </return> - <argument index="0" name="type" type="int"> + <argument index="0" name="type" type="int" enum="PhysicsServer.ShapeType"> </argument> <description> </description> </method> <method name="shape_get_data" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="shape" type="RID"> </argument> <description> </description> </method> <method name="shape_get_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="PhysicsServer.ShapeType"> </return> <argument index="0" name="shape" type="RID"> </argument> @@ -33454,6 +37146,8 @@ </description> </method> <method name="shape_set_data"> + <return type="void"> + </return> <argument index="0" name="shape" type="RID"> </argument> <argument index="1" name="data" type="Variant"> @@ -33466,15 +37160,17 @@ </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.SliderJointParam"> </argument> <description> </description> </method> <method name="slider_joint_set_param"> + <return type="void"> + </return> <argument index="0" name="joint" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.SliderJointParam"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33500,7 +37196,7 @@ </return> <argument index="0" name="space" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.SpaceParameter"> </argument> <description> </description> @@ -33514,6 +37210,8 @@ </description> </method> <method name="space_set_active"> + <return type="void"> + </return> <argument index="0" name="space" type="RID"> </argument> <argument index="1" name="active" type="bool"> @@ -33522,9 +37220,11 @@ </description> </method> <method name="space_set_param"> + <return type="void"> + </return> <argument index="0" name="space" type="RID"> </argument> - <argument index="1" name="param" type="int"> + <argument index="1" name="param" type="int" enum="PhysicsServer.SpaceParameter"> </argument> <argument index="2" name="value" type="float"> </argument> @@ -33805,42 +37505,56 @@ </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="collision_layer" type="int"> </argument> <description> </description> </method> <method name="set_exclude"> + <return type="void"> + </return> <argument index="0" name="exclude" type="Array"> </argument> <description> </description> </method> <method name="set_margin"> + <return type="void"> + </return> <argument index="0" name="margin" type="float"> </argument> <description> </description> </method> <method name="set_object_type_mask"> + <return type="void"> + </return> <argument index="0" name="object_type_mask" type="int"> </argument> <description> </description> </method> <method name="set_shape"> - <argument index="0" name="shape" type="Shape"> + <return type="void"> + </return> + <argument index="0" name="shape" type="Resource"> </argument> <description> </description> </method> <method name="set_shape_rid"> + <return type="void"> + </return> <argument index="0" name="shape" type="RID"> </argument> <description> </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="transform" type="Transform"> </argument> <description> @@ -33908,13 +37622,15 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="PinJoint.Param"> </argument> <description> </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="PinJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -33954,6 +37670,8 @@ </description> </method> <method name="set_softness"> + <return type="void"> + </return> <argument index="0" name="softness" type="float"> </argument> <description> @@ -34147,18 +37865,24 @@ </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="set_subdivide_depth"> + <return type="void"> + </return> <argument index="0" name="subdivide" type="int"> </argument> <description> </description> </method> <method name="set_subdivide_width"> + <return type="void"> + </return> <argument index="0" name="subdivide" type="int"> </argument> <description> @@ -34189,6 +37913,8 @@ </description> </method> <method name="set_plane"> + <return type="void"> + </return> <argument index="0" name="plane" type="Plane"> </argument> <description> @@ -34210,6 +37936,12 @@ A Polygon2D is defined by a set of n vertices connected together by line segments, meaning that the vertex 1 will be connected with vertex 2, vertex 2 with vertex 3 ..., vertex n-1 with vertex n and vertex n with vertex 1 in order to close the loop and define a polygon. </description> <methods> + <method name="get_antialiased" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="get_color" qualifiers="const"> <return type="Color"> </return> @@ -34246,7 +37978,7 @@ </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> Return the polygon texture @@ -34287,7 +38019,17 @@ Return the list of vertex colors. </description> </method> + <method name="set_antialiased"> + <return type="void"> + </return> + <argument index="0" name="antialiased" type="bool"> + </argument> + <description> + </description> + </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -34295,6 +38037,8 @@ </description> </method> <method name="set_invert"> + <return type="void"> + </return> <argument index="0" name="invert" type="bool"> </argument> <description> @@ -34302,6 +38046,8 @@ </description> </method> <method name="set_invert_border"> + <return type="void"> + </return> <argument index="0" name="invert_border" type="float"> </argument> <description> @@ -34309,6 +38055,8 @@ </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -34316,6 +38064,8 @@ </description> </method> <method name="set_polygon"> + <return type="void"> + </return> <argument index="0" name="polygon" type="PoolVector2Array"> </argument> <description> @@ -34323,13 +38073,16 @@ </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> - Set the polygon texture. </description> </method> <method name="set_texture_offset"> + <return type="void"> + </return> <argument index="0" name="texture_offset" type="Vector2"> </argument> <description> @@ -34337,6 +38090,8 @@ </description> </method> <method name="set_texture_rotation"> + <return type="void"> + </return> <argument index="0" name="texture_rotation" type="float"> </argument> <description> @@ -34344,6 +38099,8 @@ </description> </method> <method name="set_texture_scale"> + <return type="void"> + </return> <argument index="0" name="texture_scale" type="Vector2"> </argument> <description> @@ -34351,6 +38108,8 @@ </description> </method> <method name="set_uv"> + <return type="void"> + </return> <argument index="0" name="uv" type="PoolVector2Array"> </argument> <description> @@ -34358,6 +38117,8 @@ </description> </method> <method name="set_vertex_colors"> + <return type="void"> + </return> <argument index="0" name="vertex_colors" type="PoolColorArray"> </argument> <description> @@ -34367,6 +38128,8 @@ </method> </methods> <members> + <member name="antialiased" type="bool" setter="set_antialiased" getter="get_antialiased" brief=""> + </member> <member name="color" type="Color" setter="set_color" getter="get_color" brief=""> </member> <member name="invert_border" type="float" setter="set_invert_border" getter="get_invert_border" brief=""> @@ -34450,6 +38213,8 @@ </description> </method> <method name="set_point_penalty"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="penalty" type="float"> @@ -34458,6 +38223,8 @@ </description> </method> <method name="setup"> + <return type="void"> + </return> <argument index="0" name="points" type="PoolVector2Array"> </argument> <argument index="1" name="connections" type="PoolIntArray"> @@ -35157,27 +38924,35 @@ </description> </method> <method name="popup"> - <argument index="0" name="bounds" type="Rect2" default="Rect2(0, 0, 0, 0)"> + <return type="void"> + </return> + <argument index="0" name="bounds" type="Rect2" default="Rect2( 0, 0, 0, 0 )"> </argument> <description> Popup (show the control in modal form). </description> </method> <method name="popup_centered"> - <argument index="0" name="size" type="Vector2" default="Vector2(0, 0)"> + <return type="void"> + </return> + <argument index="0" name="size" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> Popup (show the control in modal form) in the center of the screen, at the current size, or at a size determined by "size". </description> </method> <method name="popup_centered_minsize"> - <argument index="0" name="minsize" type="Vector2" default="Vector2(0, 0)"> + <return type="void"> + </return> + <argument index="0" name="minsize" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> Popup (show the control in modal form) in the center of the screen, ensuring the size is never smaller than [code]minsize[/code]. </description> </method> <method name="popup_centered_ratio"> + <return type="void"> + </return> <argument index="0" name="ratio" type="float" default="0.75"> </argument> <description> @@ -35185,6 +38960,8 @@ </description> </method> <method name="set_exclusive"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -35209,10 +38986,10 @@ </signal> </signals> <constants> - <constant name="NOTIFICATION_POST_POPUP" value="80"> + <constant name="NOTIFICATION_POST_POPUP" value="80" enum=""> Notification sent right after the popup is shown. </constant> - <constant name="NOTIFICATION_POPUP_HIDE" value="81"> + <constant name="NOTIFICATION_POPUP_HIDE" value="81" enum=""> Notification sent right after the popup is hidden. </constant> </constants> @@ -35238,6 +39015,8 @@ </description> <methods> <method name="add_check_item"> + <return type="void"> + </return> <argument index="0" name="label" type="String"> </argument> <argument index="1" name="id" type="int" default="-1"> @@ -35249,6 +39028,8 @@ </description> </method> <method name="add_check_shortcut"> + <return type="void"> + </return> <argument index="0" name="shortcut" type="ShortCut"> </argument> <argument index="1" name="id" type="int" default="-1"> @@ -35259,7 +39040,9 @@ </description> </method> <method name="add_icon_check_item"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="label" type="String"> </argument> @@ -35268,11 +39051,14 @@ <argument index="3" name="accel" type="int" default="0"> </argument> <description> - Add a new checkable item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. + Add a new checkable item with text "label" and icon "texture". An id can optionally be provided, as well as an accelerator. If no id is provided, one will be + created from the index. Note that checkable items just display a checkmark, but don't have any built-in checking behavior and must be checked/unchecked manually. </description> </method> <method name="add_icon_check_shortcut"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="shortcut" type="ShortCut"> </argument> @@ -35284,7 +39070,9 @@ </description> </method> <method name="add_icon_item"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="label" type="String"> </argument> @@ -35297,7 +39085,9 @@ </description> </method> <method name="add_icon_shortcut"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <argument index="1" name="shortcut" type="ShortCut"> </argument> @@ -35309,6 +39099,8 @@ </description> </method> <method name="add_item"> + <return type="void"> + </return> <argument index="0" name="label" type="String"> </argument> <argument index="1" name="id" type="int" default="-1"> @@ -35320,11 +39112,15 @@ </description> </method> <method name="add_separator"> + <return type="void"> + </return> <description> Add a separator between items. Separators also occupy an index. </description> </method> <method name="add_shortcut"> + <return type="void"> + </return> <argument index="0" name="shortcut" type="ShortCut"> </argument> <argument index="1" name="id" type="int" default="-1"> @@ -35335,6 +39131,8 @@ </description> </method> <method name="add_submenu_item"> + <return type="void"> + </return> <argument index="0" name="label" type="String"> </argument> <argument index="1" name="submenu" type="String"> @@ -35346,17 +39144,10 @@ </description> </method> <method name="clear"> - <description> - Clear the popup menu, in effect removing all items. - </description> - </method> - <method name="get_item_id" qualifiers="const"> - <return type="int"> + <return type="void"> </return> - <argument index="0" name="idx" type="int"> - </argument> <description> - Return the id of the item at index "idx". + Clear the popup menu, in effect removing all items. </description> </method> <method name="get_item_accelerator" qualifiers="const"> @@ -35376,7 +39167,7 @@ </description> </method> <method name="get_item_icon" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <argument index="0" name="idx" type="int"> </argument> @@ -35384,6 +39175,15 @@ Return the icon of the item at index "idx". </description> </method> + <method name="get_item_id" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + Return the id of the item at index "idx". + </description> + </method> <method name="get_item_index" qualifiers="const"> <return type="int"> </return> @@ -35487,6 +39287,8 @@ </description> </method> <method name="remove_item"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -35494,6 +39296,8 @@ </description> </method> <method name="set_hide_on_checkable_item_selection"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -35501,22 +39305,17 @@ </description> </method> <method name="set_hide_on_item_selection"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> Sets whether or not the PopupMenu will hide on item selection. </description> </method> - <method name="set_item_id"> - <argument index="0" name="idx" type="int"> - </argument> - <argument index="1" name="id" type="int"> - </argument> - <description> - Set the id of the item at index "idx". - </description> - </method> <method name="set_item_accelerator"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="accel" type="int"> @@ -35526,6 +39325,8 @@ </description> </method> <method name="set_item_as_checkable"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -35535,6 +39336,8 @@ </description> </method> <method name="set_item_as_separator"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -35544,6 +39347,8 @@ </description> </method> <method name="set_item_checked"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="checked" type="bool"> @@ -35553,6 +39358,8 @@ </description> </method> <method name="set_item_disabled"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="disabled" type="bool"> @@ -35562,15 +39369,29 @@ </description> </method> <method name="set_item_icon"> + <return type="void"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <argument index="1" name="icon" type="Texture"> + </argument> + <description> + </description> + </method> + <method name="set_item_id"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="icon" type="Object"> + <argument index="1" name="id" type="int"> </argument> <description> - Set the icon of the item at index "idx". + Set the id of the item at index "idx". </description> </method> <method name="set_item_metadata"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="metadata" type="Variant"> @@ -35580,6 +39401,8 @@ </description> </method> <method name="set_item_shortcut"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="shortcut" type="ShortCut"> @@ -35590,6 +39413,8 @@ </description> </method> <method name="set_item_submenu"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="submenu" type="String"> @@ -35599,6 +39424,8 @@ </description> </method> <method name="set_item_text"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="text" type="String"> @@ -35608,6 +39435,8 @@ </description> </method> <method name="set_item_tooltip"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <argument index="1" name="tooltip" type="String"> @@ -35616,6 +39445,8 @@ </description> </method> <method name="toggle_item_checked"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -35695,88 +39526,6 @@ </theme_item> </theme_items> </class> -<class name="Portal" inherits="VisualInstance" category="Core"> - <brief_description> - Portals provide virtual openings to rooms. - </brief_description> - <description> - Portals provide virtual openings to [VisualInstance] nodes, so cameras can look at them from the outside. Note that portals are a visibility optimization technique, and are in no way related to the game of the same name (as in, they are not used for teleportation). For more information on how rooms and portals work, see [VisualInstance]. Portals are represented as 2D convex polygon shapes (in the X,Y local plane), and are placed on the surface of the areas occupied by a [VisualInstance], to indicate that the room can be accessed or looked-at through them. If two rooms are next to each other, and two similar portals in each of them share the same world position (and are parallel and opposed to each other), they will automatically "connect" and form "doors" (for example, the portals that connect a kitchen to a living room are placed in the door they share). Portals must always have a [VisualInstance] node as a parent, grandparent or far parent, or else they will not be active. - </description> - <methods> - <method name="get_connect_range" qualifiers="const"> - <return type="float"> - </return> - <description> - Return the range for auto-connecting two portals from different rooms sharing the same space. - </description> - </method> - <method name="get_disable_distance" qualifiers="const"> - <return type="float"> - </return> - <description> - Return the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]). - </description> - </method> - <method name="get_disabled_color" qualifiers="const"> - <return type="Color"> - </return> - <description> - Return the color for when the portal goes beyond the disable distance (see [method set_disable_distance]) and becomes disabled. - </description> - </method> - <method name="get_shape" qualifiers="const"> - <return type="PoolVector2Array"> - </return> - <description> - Return the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane. - </description> - </method> - <method name="is_enabled" qualifiers="const"> - <return type="bool"> - </return> - <description> - Return whether the portal is active. When disabled it causes the parent [VisualInstance] to not be visible any longer when looking through the portal. - </description> - </method> - <method name="set_connect_range"> - <argument index="0" name="range" type="float"> - </argument> - <description> - Set the range for auto-connecting two portals from different rooms sharing the same space. - </description> - </method> - <method name="set_disable_distance"> - <argument index="0" name="distance" type="float"> - </argument> - <description> - Set the distance threshold for disabling the portal. Every time that the portal goes beyond "distance", it disables itself, becoming the opaque color (see [method set_disabled_color]). - </description> - </method> - <method name="set_disabled_color"> - <argument index="0" name="color" type="Color"> - </argument> - <description> - When the portal goes beyond the disable distance (see [method set_disable_distance]), it becomes opaque and displayed with color "color". - </description> - </method> - <method name="set_enabled"> - <argument index="0" name="enable" type="bool"> - </argument> - <description> - Enable the portal (it is enabled by default though), disabling it will cause the parent [VisualInstance] to not be visible any longer when looking through the portal. - </description> - </method> - <method name="set_shape"> - <argument index="0" name="points" type="PoolVector2Array"> - </argument> - <description> - Set the portal shape. The shape is an array of [Vector2] points, representing a convex polygon in the X,Y plane. - </description> - </method> - </methods> - <constants> - </constants> -</class> <class name="Position2D" inherits="Node2D" category="Core"> <brief_description> Generic 2D Position hint for editing. @@ -35814,6 +39563,8 @@ </description> </method> <method name="set_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> @@ -35864,30 +39615,40 @@ </description> </method> <method name="set_left_to_right"> + <return type="void"> + </return> <argument index="0" name="left_to_right" type="float"> </argument> <description> </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector3"> </argument> <description> </description> </method> <method name="set_subdivide_depth"> + <return type="void"> + </return> <argument index="0" name="segments" type="int"> </argument> <description> </description> </method> <method name="set_subdivide_height"> + <return type="void"> + </return> <argument index="0" name="segments" type="int"> </argument> <description> </description> </method> <method name="set_subdivide_width"> + <return type="void"> + </return> <argument index="0" name="segments" type="int"> </argument> <description> @@ -35897,7 +39658,7 @@ <members> <member name="left_to_right" type="float" setter="set_left_to_right" getter="get_left_to_right" brief=""> </member> - <member name="size" type="Vector2" setter="set_size" getter="get_size" brief=""> + <member name="size" type="Vector3" setter="set_size" getter="get_size" brief=""> </member> <member name="subdivide_depth" type="int" setter="set_subdivide_depth" getter="get_subdivide_depth" brief=""> </member> @@ -36006,103 +39767,135 @@ </description> </method> <method name="get_texture_size" qualifiers="const"> - <return type="int"> + <return type="int" enum="ProceduralSky.TextureSize"> </return> <description> </description> </method> <method name="set_ground_bottom_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_ground_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_ground_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_ground_horizon_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_sky_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_sky_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_sky_horizon_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_sky_top_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_sun_angle_max"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_sun_angle_min"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_sun_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_sun_curve"> + <return type="void"> + </return> <argument index="0" name="curve" type="float"> </argument> <description> </description> </method> <method name="set_sun_energy"> + <return type="void"> + </return> <argument index="0" name="energy" type="float"> </argument> <description> </description> </method> <method name="set_sun_latitude"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_sun_longitude"> + <return type="void"> + </return> <argument index="0" name="degrees" type="float"> </argument> <description> </description> </method> <method name="set_texture_size"> - <argument index="0" name="size" type="int"> + <return type="void"> + </return> + <argument index="0" name="size" type="int" enum="ProceduralSky.TextureSize"> </argument> <description> </description> @@ -36139,10 +39932,22 @@ </member> <member name="sun_longitude" type="float" setter="set_sun_longitude" getter="get_sun_longitude" brief=""> </member> - <member name="texture_size" type="int" setter="set_texture_size" getter="get_texture_size" brief=""> + <member name="texture_size" type="int" setter="set_texture_size" getter="get_texture_size" brief="" enum="ProceduralSky.TextureSize"> </member> </members> <constants> + <constant name="TEXTURE_SIZE_256" value="0"> + </constant> + <constant name="TEXTURE_SIZE_512" value="1"> + </constant> + <constant name="TEXTURE_SIZE_1024" value="2"> + </constant> + <constant name="TEXTURE_SIZE_2048" value="3"> + </constant> + <constant name="TEXTURE_SIZE_4096" value="4"> + </constant> + <constant name="TEXTURE_SIZE_MAX" value="5"> + </constant> </constants> </class> <class name="ProgressBar" inherits="Range" category="Core"> @@ -36160,6 +39965,8 @@ </description> </method> <method name="set_percent_visible"> + <return type="void"> + </return> <argument index="0" name="visible" type="bool"> </argument> <description> @@ -36185,6 +39992,160 @@ </theme_item> </theme_items> </class> +<class name="ProjectSettings" inherits="Object" category="Core"> + <brief_description> + Contains global variables accessible from everywhere. + </brief_description> + <description> + Contains global variables accessible from everywhere. Use the normal [Object] API, such as "ProjectSettings.get(variable)", "ProjectSettings.set(variable,value)" or "ProjectSettings.has(variable)" to access them. Variables stored in project.godot are also loaded into ProjectSettings, making this object very useful for reading custom game configuration options. + </description> + <methods> + <method name="add_property_info"> + <return type="void"> + </return> + <argument index="0" name="hint" type="Dictionary"> + </argument> + <description> + Add a custom property info to a property. The dictionary must contain: name:[String](the name of the property) and type:[int](see TYPE_* in [@Global Scope]), and optionally hint:[int](see PROPERTY_HINT_* in [@Global Scope]), hint_string:[String]. + Example: + [codeblock] + ProjectSettings.set("category/property_name", 0) + + var property_info = { + "name": "category/property_name", + "type": TYPE_INT, + "hint": PROPERTY_HINT_ENUM, + "hint_string": "one,two,three" + } + + ProjectSettings.add_property_info(property_info) + [/codeblock] + </description> + </method> + <method name="clear"> + <return type="void"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + Clear the whole configuration (not recommended, may break things). + </description> + </method> + <method name="get_order" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + Return the order of a configuration value (influences when saved to the config file). + </description> + </method> + <method name="get_singleton" qualifiers="const"> + <return type="Object"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </method> + <method name="globalize_path" qualifiers="const"> + <return type="String"> + </return> + <argument index="0" name="path" type="String"> + </argument> + <description> + Convert a localized path (res://) to a full native OS path. + </description> + </method> + <method name="has" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + Return true if a configuration value is present. + </description> + </method> + <method name="has_singleton" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </method> + <method name="load_resource_pack"> + <return type="bool"> + </return> + <argument index="0" name="pack" type="String"> + </argument> + <description> + </description> + </method> + <method name="localize_path" qualifiers="const"> + <return type="String"> + </return> + <argument index="0" name="path" type="String"> + </argument> + <description> + Convert a path to a localized path (res:// path). + </description> + </method> + <method name="property_can_revert"> + <return type="bool"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </method> + <method name="property_get_revert"> + <return type="Variant"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <description> + </description> + </method> + <method name="save"> + <return type="int" enum="Error"> + </return> + <description> + </description> + </method> + <method name="save_custom"> + <return type="int" enum="Error"> + </return> + <argument index="0" name="file" type="String"> + </argument> + <description> + </description> + </method> + <method name="set_initial_value"> + <return type="void"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <argument index="1" name="value" type="Variant"> + </argument> + <description> + </description> + </method> + <method name="set_order"> + <return type="void"> + </return> + <argument index="0" name="name" type="String"> + </argument> + <argument index="1" name="pos" type="int"> + </argument> + <description> + Set the order of a configuration value (influences when saved to the config file). + </description> + </method> + </methods> + <constants> + </constants> +</class> <class name="ProximityGroup" inherits="Spatial" category="Core"> <brief_description> General purpose proximity-detection node. @@ -36194,6 +40155,8 @@ </description> <methods> <method name="broadcast"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="parameters" type="Variant"> @@ -36208,18 +40171,24 @@ </description> </method> <method name="set_dispatch_mode"> + <return type="void"> + </return> <argument index="0" name="mode" type="int"> </argument> <description> </description> </method> <method name="set_grid_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="Vector3"> </argument> <description> </description> </method> <method name="set_group_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -36486,6 +40455,8 @@ </description> </method> <method name="set_as_ratio"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -36493,18 +40464,24 @@ </description> </method> <method name="set_exp_ratio"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_max"> + <return type="void"> + </return> <argument index="0" name="maximum" type="float"> </argument> <description> </description> </method> <method name="set_min"> + <return type="void"> + </return> <argument index="0" name="minimum" type="float"> </argument> <description> @@ -36512,6 +40489,8 @@ </description> </method> <method name="set_page"> + <return type="void"> + </return> <argument index="0" name="pagesize" type="float"> </argument> <description> @@ -36519,6 +40498,8 @@ </description> </method> <method name="set_step"> + <return type="void"> + </return> <argument index="0" name="step" type="float"> </argument> <description> @@ -36526,24 +40507,32 @@ </description> </method> <method name="set_use_rounded_values"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_value"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> </description> </method> <method name="share"> - <argument index="0" name="with" type="Object"> + <return type="void"> + </return> + <argument index="0" name="with" type="Node"> </argument> <description> </description> </method> <method name="unshare"> + <return type="void"> + </return> <description> </description> </method> @@ -36596,6 +40585,8 @@ </description> <methods> <method name="add_exception"> + <return type="void"> + </return> <argument index="0" name="node" type="Object"> </argument> <description> @@ -36603,17 +40594,23 @@ </description> </method> <method name="add_exception_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> </description> </method> <method name="clear_exceptions"> + <return type="void"> + </return> <description> Removes all collision exception for this ray. </description> </method> <method name="force_raycast_update"> + <return type="void"> + </return> <description> Updates the collision information in case if this object's properties changed during the current frame (for example position, rotation or the cast_point). Note, [code]set_enabled[/code] is not required for this to work. </description> @@ -36682,6 +40679,8 @@ </description> </method> <method name="remove_exception"> + <return type="void"> + </return> <argument index="0" name="node" type="Object"> </argument> <description> @@ -36689,12 +40688,16 @@ </description> </method> <method name="remove_exception_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> </description> </method> <method name="set_cast_to"> + <return type="void"> + </return> <argument index="0" name="local_point" type="Vector3"> </argument> <description> @@ -36702,6 +40705,8 @@ </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -36709,6 +40714,8 @@ </description> </method> <method name="set_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -36716,6 +40723,8 @@ </description> </method> <method name="set_type_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -36751,6 +40760,8 @@ </description> <methods> <method name="add_exception"> + <return type="void"> + </return> <argument index="0" name="node" type="Object"> </argument> <description> @@ -36758,17 +40769,23 @@ </description> </method> <method name="add_exception_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> </description> </method> <method name="clear_exceptions"> + <return type="void"> + </return> <description> Removes all collision exception for this ray. </description> </method> <method name="force_raycast_update"> + <return type="void"> + </return> <description> Updates the collision information in case if this object's properties changed during the current frame (for example position, rotation or the cast_point). Note, [code]set_enabled[/code] is not required for this to work. </description> @@ -36844,6 +40861,8 @@ </description> </method> <method name="remove_exception"> + <return type="void"> + </return> <argument index="0" name="node" type="Object"> </argument> <description> @@ -36851,12 +40870,16 @@ </description> </method> <method name="remove_exception_rid"> + <return type="void"> + </return> <argument index="0" name="rid" type="RID"> </argument> <description> </description> </method> <method name="set_cast_to"> + <return type="void"> + </return> <argument index="0" name="local_point" type="Vector2"> </argument> <description> @@ -36864,6 +40887,8 @@ </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -36871,6 +40896,8 @@ </description> </method> <method name="set_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -36878,6 +40905,8 @@ </description> </method> <method name="set_exclude_parent_body"> + <return type="void"> + </return> <argument index="0" name="mask" type="bool"> </argument> <description> @@ -36885,6 +40914,8 @@ </description> </method> <method name="set_type_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -36920,6 +40951,8 @@ </description> </method> <method name="set_length"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> @@ -36949,6 +40982,8 @@ </description> </method> <method name="set_length"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> @@ -37326,6 +41361,8 @@ </description> </method> <method name="set_extents"> + <return type="void"> + </return> <argument index="0" name="extents" type="Vector2"> </argument> <description> @@ -37355,6 +41392,8 @@ </description> </method> <method name="reference"> + <return type="void"> + </return> <description> Increase the internal reference counter. Use this only if you really know what you are doing. </description> @@ -37447,7 +41486,7 @@ </description> </method> <method name="get_update_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="ReflectionProbe.UpdateMode"> </return> <description> </description> @@ -37465,73 +41504,97 @@ </description> </method> <method name="set_as_interior"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_cull_mask"> + <return type="void"> + </return> <argument index="0" name="layers" type="int"> </argument> <description> </description> </method> <method name="set_enable_box_projection"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_enable_shadows"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_extents"> + <return type="void"> + </return> <argument index="0" name="extents" type="Vector3"> </argument> <description> </description> </method> <method name="set_intensity"> + <return type="void"> + </return> <argument index="0" name="intensity" type="float"> </argument> <description> </description> </method> <method name="set_interior_ambient"> + <return type="void"> + </return> <argument index="0" name="ambient" type="Color"> </argument> <description> </description> </method> <method name="set_interior_ambient_energy"> + <return type="void"> + </return> <argument index="0" name="ambient_energy" type="float"> </argument> <description> </description> </method> <method name="set_interior_ambient_probe_contribution"> + <return type="void"> + </return> <argument index="0" name="ambient_probe_contribution" type="float"> </argument> <description> </description> </method> <method name="set_max_distance"> + <return type="void"> + </return> <argument index="0" name="max_distance" type="float"> </argument> <description> </description> </method> <method name="set_origin_offset"> + <return type="void"> + </return> <argument index="0" name="origin_offset" type="Vector3"> </argument> <description> </description> </method> <method name="set_update_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="ReflectionProbe.UpdateMode"> </argument> <description> </description> @@ -37544,7 +41607,7 @@ </member> <member name="enable_shadows" type="bool" setter="set_enable_shadows" getter="are_shadows_enabled" brief=""> </member> - <member name="extents" type="Vector2" setter="set_extents" getter="get_extents" brief=""> + <member name="extents" type="Vector3" setter="set_extents" getter="get_extents" brief=""> </member> <member name="intensity" type="float" setter="set_intensity" getter="get_intensity" brief=""> </member> @@ -37558,9 +41621,9 @@ </member> <member name="max_distance" type="float" setter="set_max_distance" getter="get_max_distance" brief=""> </member> - <member name="origin_offset" type="Vector2" setter="set_origin_offset" getter="get_origin_offset" brief=""> + <member name="origin_offset" type="Vector3" setter="set_origin_offset" getter="get_origin_offset" brief=""> </member> - <member name="update_mode" type="int" setter="set_update_mode" getter="get_update_mode" brief=""> + <member name="update_mode" type="int" setter="set_update_mode" getter="get_update_mode" brief="" enum="ReflectionProbe.UpdateMode"> </member> </members> <constants> @@ -37570,7 +41633,7 @@ </constant> </constants> </class> -<class name="RegEx" inherits="Resource" category="Core"> +<class name="RegEx" inherits="Reference" category="Core"> <brief_description> Simple regular expression matcher. </brief_description> @@ -37602,12 +41665,14 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> This method resets the state of the object, as it was freshly created. Namely, it unassigns the regular expression of this object. </description> </method> <method name="compile"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="pattern" type="String"> </argument> @@ -37646,9 +41711,9 @@ <method name="search" qualifiers="const"> <return type="RegExMatch"> </return> - <argument index="0" name="text" type="String"> + <argument index="0" name="subject" type="String"> </argument> - <argument index="1" name="start" type="int" default="0"> + <argument index="1" name="offset" type="int" default="0"> </argument> <argument index="2" name="end" type="int" default="-1"> </argument> @@ -37659,13 +41724,13 @@ <method name="sub" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="text" type="String"> + <argument index="0" name="subject" type="String"> </argument> <argument index="1" name="replacement" type="String"> </argument> <argument index="2" name="all" type="bool" default="false"> </argument> - <argument index="3" name="start" type="int" default="0"> + <argument index="3" name="offset" type="int" default="0"> </argument> <argument index="4" name="end" type="int" default="-1"> </argument> @@ -37674,10 +41739,6 @@ </description> </method> </methods> - <members> - <member name="pattern" type="String" setter="compile" getter="get_pattern" brief=""> - </member> - </members> <constants> </constants> </class> @@ -37687,15 +41748,6 @@ <description> </description> <methods> - <method name="expand" qualifiers="const"> - <return type="String"> - </return> - <argument index="0" name="template" type="String"> - </argument> - <description> - Using results from the search, returns the specified string with escapes and backreferences such as [code]\1[/code] and [code]\g<name>[/code] expanded and resolved. - </description> - </method> <method name="get_end" qualifiers="const"> <return type="int"> </return> @@ -37705,13 +41757,6 @@ Returns the end position of the match in the string. An integer can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). </description> </method> - <method name="get_group_array" qualifiers="const"> - <return type="Array"> - </return> - <description> - Returns an array of the results of the numeric groups. - </description> - </method> <method name="get_group_count" qualifiers="const"> <return type="int"> </return> @@ -37719,15 +41764,8 @@ Returns the number of numeric capturing groups. </description> </method> - <method name="get_name_dict" qualifiers="const"> - <return type="Dictionary"> - </return> - <description> - Returns a dictionary containing the named capturing groups and their results. - </description> - </method> <method name="get_names" qualifiers="const"> - <return type="Array"> + <return type="Dictionary"> </return> <description> Returns an array of names of named capturing groups. @@ -37751,6 +41789,18 @@ Returns the result of the match in the string. An integer can be specified for numeric groups or a string for named groups. Returns -1 if that group wasn't found or doesn't exist. Defaults to 0 (whole pattern). </description> </method> + <method name="get_strings" qualifiers="const"> + <return type="Array"> + </return> + <description> + </description> + </method> + <method name="get_subject" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -37792,30 +41842,40 @@ </description> </method> <method name="set_remote_node"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> </description> </method> <method name="set_update_position"> + <return type="void"> + </return> <argument index="0" name="update_remote_position" type="bool"> </argument> <description> </description> </method> <method name="set_update_rotation"> + <return type="void"> + </return> <argument index="0" name="update_remote_rotation" type="bool"> </argument> <description> </description> </method> <method name="set_update_scale"> + <return type="void"> + </return> <argument index="0" name="update_remote_scale" type="bool"> </argument> <description> </description> </method> <method name="set_use_global_coordinates"> + <return type="void"> + </return> <argument index="0" name="use_global_coordinates" type="bool"> </argument> <description> @@ -37874,30 +41934,40 @@ </description> </method> <method name="set_remote_node"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> </description> </method> <method name="set_update_position"> + <return type="void"> + </return> <argument index="0" name="update_remote_position" type="bool"> </argument> <description> </description> </method> <method name="set_update_rotation"> + <return type="void"> + </return> <argument index="0" name="update_remote_rotation" type="bool"> </argument> <description> </description> </method> <method name="set_update_scale"> + <return type="void"> + </return> <argument index="0" name="update_remote_scale" type="bool"> </argument> <description> </description> </method> <method name="set_use_global_coordinates"> + <return type="void"> + </return> <argument index="0" name="use_global_coordinates" type="bool"> </argument> <description> @@ -37928,11 +41998,13 @@ </description> <methods> <method name="_setup_local_to_scene" qualifiers="virtual"> + <return type="void"> + </return> <description> </description> </method> <method name="duplicate" qualifiers="const"> - <return type="Object"> + <return type="Resource"> </return> <argument index="0" name="subresources" type="bool" default="false"> </argument> @@ -37973,12 +42045,16 @@ </description> </method> <method name="set_local_to_scene"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -37986,6 +42062,8 @@ </description> </method> <method name="set_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -37993,10 +42071,14 @@ </description> </method> <method name="setup_local_to_scene"> + <return type="void"> + </return> <description> </description> </method> <method name="take_over_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -38050,7 +42132,7 @@ </description> <methods> <method name="get_resource"> - <return type="Object"> + <return type="Resource"> </return> <description> Return the loaded resource (only if loaded). Otherwise, returns null. @@ -38071,14 +42153,14 @@ </description> </method> <method name="poll"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> Poll the load. If OK is returned, this means poll will have to be called again. If ERR_FILE_EOF is returned, them the load has finished and the resource can be obtained by calling [method get_resource]. </description> </method> <method name="wait"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> </description> @@ -38144,6 +42226,8 @@ </description> </method> <method name="set_abort_on_missing_resources"> + <return type="void"> + </return> <argument index="0" name="abort" type="bool"> </argument> <description> @@ -38163,16 +42247,17 @@ </description> <methods> <method name="add_resource"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="resource" type="Object"> + <argument index="1" name="resource" type="Resource"> </argument> <description> - Add a resource to the preloader. Set the text-id that will be used to identify it (retrieve it/erase it/etc). </description> </method> <method name="get_resource" qualifiers="const"> - <return type="Object"> + <return type="Resource"> </return> <argument index="0" name="name" type="String"> </argument> @@ -38197,6 +42282,8 @@ </description> </method> <method name="remove_resource"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -38204,6 +42291,8 @@ </description> </method> <method name="rename_resource"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="newname" type="String"> @@ -38231,14 +42320,14 @@ <method name="get_recognized_extensions"> <return type="PoolStringArray"> </return> - <argument index="0" name="type" type="Object"> + <argument index="0" name="type" type="Resource"> </argument> <description> Return the list of extensions available for saving a resource of a given type. </description> </method> <method name="save"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -38275,19 +42364,23 @@ </description> <methods> <method name="add_image"> + <return type="void"> + </return> <argument index="0" name="image" type="Texture"> </argument> <description> </description> </method> <method name="add_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> </description> </method> <method name="append_bbcode"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="bbcode" type="String"> </argument> @@ -38295,6 +42388,8 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> </description> </method> @@ -38373,11 +42468,13 @@ </description> </method> <method name="newline"> + <return type="void"> + </return> <description> </description> </method> <method name="parse_bbcode"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="bbcode" type="String"> </argument> @@ -38385,104 +42482,138 @@ </description> </method> <method name="pop"> + <return type="void"> + </return> <description> </description> </method> <method name="push_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="RichTextLabel.Align"> </argument> <description> </description> </method> <method name="push_cell"> + <return type="void"> + </return> <description> </description> </method> <method name="push_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="push_font"> + <return type="void"> + </return> <argument index="0" name="font" type="Font"> </argument> <description> </description> </method> <method name="push_indent"> + <return type="void"> + </return> <argument index="0" name="level" type="int"> </argument> <description> </description> </method> <method name="push_list"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="RichTextLabel.ListType"> </argument> <description> </description> </method> <method name="push_meta"> + <return type="void"> + </return> <argument index="0" name="data" type="Variant"> </argument> <description> </description> </method> <method name="push_table"> + <return type="void"> + </return> <argument index="0" name="columns" type="int"> </argument> <description> </description> </method> <method name="push_underline"> + <return type="void"> + </return> <description> </description> </method> <method name="remove_line"> <return type="bool"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="line" type="int"> </argument> <description> </description> </method> <method name="scroll_to_line"> + <return type="void"> + </return> <argument index="0" name="line" type="int"> </argument> <description> </description> </method> <method name="set_bbcode"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> </description> </method> <method name="set_meta_underline"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_percent_visible"> + <return type="void"> + </return> <argument index="0" name="percent_visible" type="float"> </argument> <description> </description> </method> <method name="set_scroll_active"> + <return type="void"> + </return> <argument index="0" name="active" type="bool"> </argument> <description> </description> </method> <method name="set_scroll_follow"> + <return type="void"> + </return> <argument index="0" name="follow" type="bool"> </argument> <description> </description> </method> <method name="set_selection_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -38490,12 +42621,16 @@ </description> </method> <method name="set_tab_size"> + <return type="void"> + </return> <argument index="0" name="spaces" type="int"> </argument> <description> </description> </method> <method name="set_table_column_expand"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="expand" type="bool"> @@ -38506,18 +42641,24 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> </description> </method> <method name="set_use_bbcode"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_visible_characters"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -38616,6 +42757,8 @@ </description> <methods> <method name="_integrate_forces" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="state" type="PhysicsDirectBodyState"> </argument> <description> @@ -38623,6 +42766,8 @@ </description> </method> <method name="apply_impulse"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector3"> </argument> <argument index="1" name="impulse" type="Vector3"> @@ -38646,7 +42791,7 @@ </description> </method> <method name="get_axis_lock" qualifiers="const"> - <return type="int"> + <return type="int" enum="RigidBody.AxisLock"> </return> <description> Return the current axis lock of the body. One of AXIS_LOCK_* enum. @@ -38709,7 +42854,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="RigidBody.Mode"> </return> <description> Return the current body mode, see [method set_mode]. @@ -38758,6 +42903,8 @@ </description> </method> <method name="set_angular_damp"> + <return type="void"> + </return> <argument index="0" name="angular_damp" type="float"> </argument> <description> @@ -38765,6 +42912,8 @@ </description> </method> <method name="set_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="angular_velocity" type="Vector3"> </argument> <description> @@ -38772,13 +42921,17 @@ </description> </method> <method name="set_axis_lock"> - <argument index="0" name="axis_lock" type="int"> + <return type="void"> + </return> + <argument index="0" name="axis_lock" type="int" enum="RigidBody.AxisLock"> </argument> <description> Set the axis lock of the body, from the AXIS_LOCK_* enum. Axis lock stops the body from moving along the specified axis(X/Y/Z) and rotating along the other two axes. </description> </method> <method name="set_axis_velocity"> + <return type="void"> + </return> <argument index="0" name="axis_velocity" type="Vector3"> </argument> <description> @@ -38786,6 +42939,8 @@ </description> </method> <method name="set_bounce"> + <return type="void"> + </return> <argument index="0" name="bounce" type="float"> </argument> <description> @@ -38793,6 +42948,8 @@ </description> </method> <method name="set_can_sleep"> + <return type="void"> + </return> <argument index="0" name="able_to_sleep" type="bool"> </argument> <description> @@ -38801,6 +42958,8 @@ </description> </method> <method name="set_contact_monitor"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -38808,6 +42967,8 @@ </description> </method> <method name="set_friction"> + <return type="void"> + </return> <argument index="0" name="friction" type="float"> </argument> <description> @@ -38815,6 +42976,8 @@ </description> </method> <method name="set_gravity_scale"> + <return type="void"> + </return> <argument index="0" name="gravity_scale" type="float"> </argument> <description> @@ -38822,6 +42985,8 @@ </description> </method> <method name="set_linear_damp"> + <return type="void"> + </return> <argument index="0" name="linear_damp" type="float"> </argument> <description> @@ -38829,6 +42994,8 @@ </description> </method> <method name="set_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="linear_velocity" type="Vector3"> </argument> <description> @@ -38836,6 +43003,8 @@ </description> </method> <method name="set_mass"> + <return type="void"> + </return> <argument index="0" name="mass" type="float"> </argument> <description> @@ -38843,6 +43012,8 @@ </description> </method> <method name="set_max_contacts_reported"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -38850,13 +43021,17 @@ </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="RigidBody.Mode"> </argument> <description> Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body. </description> </method> <method name="set_sleeping"> + <return type="void"> + </return> <argument index="0" name="sleeping" type="bool"> </argument> <description> @@ -38864,6 +43039,8 @@ </description> </method> <method name="set_use_continuous_collision_detection"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -38872,6 +43049,8 @@ </description> </method> <method name="set_use_custom_integrator"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -38879,6 +43058,8 @@ </description> </method> <method name="set_weight"> + <return type="void"> + </return> <argument index="0" name="weight" type="float"> </argument> <description> @@ -38891,7 +43072,7 @@ </member> <member name="angular_velocity" type="Vector3" setter="set_angular_velocity" getter="get_angular_velocity" brief=""> </member> - <member name="axis_lock" type="int" setter="set_axis_lock" getter="get_axis_lock" brief=""> + <member name="axis_lock" type="int" setter="set_axis_lock" getter="get_axis_lock" brief="" enum="RigidBody.AxisLock"> </member> <member name="bounce" type="float" setter="set_bounce" getter="get_bounce" brief=""> </member> @@ -38915,7 +43096,7 @@ </member> <member name="mass" type="float" setter="set_mass" getter="get_mass" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="RigidBody.Mode"> </member> <member name="sleeping" type="bool" setter="set_sleeping" getter="is_sleeping" brief=""> </member> @@ -38997,6 +43178,8 @@ </description> <methods> <method name="_integrate_forces" qualifiers="virtual"> + <return type="void"> + </return> <argument index="0" name="state" type="Physics2DDirectBodyState"> </argument> <description> @@ -39004,6 +43187,8 @@ </description> </method> <method name="add_force"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <argument index="1" name="force" type="Vector2"> @@ -39013,6 +43198,8 @@ </description> </method> <method name="apply_impulse"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <argument index="1" name="impulse" type="Vector2"> @@ -39064,7 +43251,7 @@ </description> </method> <method name="get_continuous_collision_detection_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="RigidBody2D.CCDMode"> </return> <description> Return whether this body is using continuous collision detection. @@ -39120,7 +43307,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="RigidBody2D.Mode"> </return> <description> Return the current body mode, see [method set_mode]. @@ -39162,6 +43349,8 @@ </description> </method> <method name="set_angular_damp"> + <return type="void"> + </return> <argument index="0" name="angular_damp" type="float"> </argument> <description> @@ -39169,6 +43358,8 @@ </description> </method> <method name="set_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="angular_velocity" type="float"> </argument> <description> @@ -39176,6 +43367,8 @@ </description> </method> <method name="set_applied_force"> + <return type="void"> + </return> <argument index="0" name="force" type="Vector2"> </argument> <description> @@ -39183,6 +43376,8 @@ </description> </method> <method name="set_applied_torque"> + <return type="void"> + </return> <argument index="0" name="torque" type="float"> </argument> <description> @@ -39190,6 +43385,8 @@ </description> </method> <method name="set_axis_velocity"> + <return type="void"> + </return> <argument index="0" name="axis_velocity" type="Vector2"> </argument> <description> @@ -39197,6 +43394,8 @@ </description> </method> <method name="set_bounce"> + <return type="void"> + </return> <argument index="0" name="bounce" type="float"> </argument> <description> @@ -39204,6 +43403,8 @@ </description> </method> <method name="set_can_sleep"> + <return type="void"> + </return> <argument index="0" name="able_to_sleep" type="bool"> </argument> <description> @@ -39212,6 +43413,8 @@ </description> </method> <method name="set_contact_monitor"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -39219,7 +43422,9 @@ </description> </method> <method name="set_continuous_collision_detection_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="RigidBody2D.CCDMode"> </argument> <description> Set the continuous collision detection mode from the enum CCD_MODE_*. @@ -39227,6 +43432,8 @@ </description> </method> <method name="set_friction"> + <return type="void"> + </return> <argument index="0" name="friction" type="float"> </argument> <description> @@ -39234,6 +43441,8 @@ </description> </method> <method name="set_gravity_scale"> + <return type="void"> + </return> <argument index="0" name="gravity_scale" type="float"> </argument> <description> @@ -39241,6 +43450,8 @@ </description> </method> <method name="set_inertia"> + <return type="void"> + </return> <argument index="0" name="inertia" type="float"> </argument> <description> @@ -39248,6 +43459,8 @@ </description> </method> <method name="set_linear_damp"> + <return type="void"> + </return> <argument index="0" name="linear_damp" type="float"> </argument> <description> @@ -39255,6 +43468,8 @@ </description> </method> <method name="set_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="linear_velocity" type="Vector2"> </argument> <description> @@ -39262,6 +43477,8 @@ </description> </method> <method name="set_mass"> + <return type="void"> + </return> <argument index="0" name="mass" type="float"> </argument> <description> @@ -39269,6 +43486,8 @@ </description> </method> <method name="set_max_contacts_reported"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -39276,13 +43495,17 @@ </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="RigidBody2D.Mode"> </argument> <description> Set the body mode, from the MODE_* enum. This allows to change to a static body or a character body. </description> </method> <method name="set_sleeping"> + <return type="void"> + </return> <argument index="0" name="sleeping" type="bool"> </argument> <description> @@ -39290,6 +43513,8 @@ </description> </method> <method name="set_use_custom_integrator"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -39297,6 +43522,8 @@ </description> </method> <method name="set_weight"> + <return type="void"> + </return> <argument index="0" name="weight" type="float"> </argument> <description> @@ -39310,7 +43537,7 @@ </argument> <argument index="1" name="margin" type="float" default="0.08"> </argument> - <argument index="2" name="result" type="Physics2DTestMotionResult" default="NULL"> + <argument index="2" name="result" type="Physics2DTestMotionResult" default="null"> </argument> <description> Return whether the body would collide, if it tried to move in the given vector. This method allows two extra parameters: A margin, which increases slightly the size of the shapes involved in the collision detection, and an object of type [Physics2DTestMotionResult], which will store additional information about the collision (should there be one). @@ -39330,7 +43557,7 @@ </member> <member name="contacts_reported" type="int" setter="set_max_contacts_reported" getter="get_max_contacts_reported" brief=""> </member> - <member name="continuous_cd" type="int" setter="set_continuous_collision_detection_mode" getter="get_continuous_collision_detection_mode" brief=""> + <member name="continuous_cd" type="int" setter="set_continuous_collision_detection_mode" getter="get_continuous_collision_detection_mode" brief="" enum="RigidBody2D.CCDMode"> </member> <member name="custom_integrator" type="bool" setter="set_use_custom_integrator" getter="is_using_custom_integrator" brief=""> </member> @@ -39344,7 +43571,7 @@ </member> <member name="mass" type="float" setter="set_mass" getter="get_mass" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="RigidBody2D.Mode"> </member> <member name="sleeping" type="bool" setter="set_sleeping" getter="is_sleeping" brief=""> </member> @@ -39424,60 +43651,6 @@ </constant> </constants> </class> -<class name="Room" inherits="VisualInstance" category="Core"> - <brief_description> - Room data resource. - </brief_description> - <description> - Room contains the data to define the bounds of a scene (using a BSP Tree). It is instanced by a [VisualInstance] node to create rooms. See that class documentation for more information about rooms. - </description> - <methods> - <method name="get_room" qualifiers="const"> - <return type="Room"> - </return> - <description> - </description> - </method> - <method name="set_room"> - <argument index="0" name="room" type="Room"> - </argument> - <description> - </description> - </method> - </methods> - <members> - <member name="room/room" type="Area" setter="set_room" getter="get_room" brief=""> - </member> - </members> - <constants> - </constants> -</class> -<class name="RoomBounds" inherits="Resource" category="Core"> - <brief_description> - </brief_description> - <description> - </description> - <methods> - <method name="get_geometry_hint" qualifiers="const"> - <return type="PoolVector3Array"> - </return> - <description> - </description> - </method> - <method name="set_geometry_hint"> - <argument index="0" name="triangles" type="PoolVector3Array"> - </argument> - <description> - </description> - </method> - </methods> - <members> - <member name="geometry_hint" type="PoolVector3Array" setter="set_geometry_hint" getter="get_geometry_hint" brief=""> - </member> - </members> - <constants> - </constants> -</class> <class name="SceneState" inherits="Reference" category="Core"> <brief_description> </brief_description> @@ -39655,6 +43828,8 @@ </description> <methods> <method name="call_group" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="group" type="String"> </argument> <argument index="1" name="method" type="String"> @@ -39663,6 +43838,8 @@ </description> </method> <method name="call_group_flags" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="flags" type="int"> </argument> <argument index="1" name="group" type="String"> @@ -39673,7 +43850,7 @@ </description> </method> <method name="change_scene"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -39681,7 +43858,7 @@ </description> </method> <method name="change_scene_to"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="packed_scene" type="PackedScene"> </argument> @@ -39705,7 +43882,7 @@ </description> </method> <method name="get_edited_scene_root" qualifiers="const"> - <return type="Object"> + <return type="Node"> </return> <description> </description> @@ -39748,6 +43925,12 @@ <description> </description> </method> + <method name="get_rpc_sender_id" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> <method name="has_group" qualifiers="const"> <return type="bool"> </return> @@ -39775,12 +43958,6 @@ <description> </description> </method> - <method name="is_editor_hint" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> <method name="is_input_handled"> <return type="bool"> </return> @@ -39807,14 +43984,18 @@ </description> </method> <method name="notify_group"> - <argument index="0" name="call_flags" type="String"> + <return type="void"> + </return> + <argument index="0" name="group" type="String"> </argument> - <argument index="1" name="group" type="int"> + <argument index="1" name="notification" type="int"> </argument> <description> </description> </method> <method name="notify_group_flags"> + <return type="void"> + </return> <argument index="0" name="call_flags" type="int"> </argument> <argument index="1" name="group" type="String"> @@ -39825,68 +44006,80 @@ </description> </method> <method name="queue_delete"> + <return type="void"> + </return> <argument index="0" name="obj" type="Object"> </argument> <description> </description> </method> <method name="quit"> + <return type="void"> + </return> <description> </description> </method> <method name="reload_current_scene"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> </description> </method> <method name="set_auto_accept_quit"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_current_scene"> + <return type="void"> + </return> <argument index="0" name="child_node" type="Node"> </argument> <description> </description> </method> <method name="set_debug_collisions_hint"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_debug_navigation_hint"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_edited_scene_root"> - <argument index="0" name="scene" type="Object"> - </argument> - <description> - </description> - </method> - <method name="set_editor_hint"> - <argument index="0" name="enable" type="bool"> + <return type="void"> + </return> + <argument index="0" name="scene" type="Node"> </argument> <description> </description> </method> <method name="set_group"> - <argument index="0" name="call_flags" type="String"> + <return type="void"> + </return> + <argument index="0" name="group" type="String"> </argument> - <argument index="1" name="group" type="String"> + <argument index="1" name="property" type="String"> </argument> - <argument index="2" name="property" type="Variant"> + <argument index="2" name="value" type="Variant"> </argument> <description> </description> </method> <method name="set_group_flags"> + <return type="void"> + </return> <argument index="0" name="call_flags" type="int"> </argument> <argument index="1" name="group" type="String"> @@ -39899,10 +44092,14 @@ </description> </method> <method name="set_input_as_handled"> + <return type="void"> + </return> <description> </description> </method> <method name="set_network_peer"> + <return type="void"> + </return> <argument index="0" name="peer" type="NetworkedMultiplayerPeer"> </argument> <description> @@ -39910,24 +44107,32 @@ </description> </method> <method name="set_pause"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_refuse_new_network_connections"> + <return type="void"> + </return> <argument index="0" name="refuse" type="bool"> </argument> <description> </description> </method> <method name="set_screen_stretch"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="SceneTree.StretchMode"> </argument> - <argument index="1" name="aspect" type="int"> + <argument index="1" name="aspect" type="int" enum="SceneTree.StretchAspect"> </argument> <argument index="2" name="minsize" type="Vector2"> </argument> + <argument index="3" name="shrink" type="int" default="1"> + </argument> <description> </description> </method> @@ -40032,6 +44237,8 @@ </description> </method> <method name="set_time_left"> + <return type="void"> + </return> <argument index="0" name="time" type="float"> </argument> <description> @@ -40062,6 +44269,12 @@ Return true if this script can be instance (ie not a library). </description> </method> + <method name="get_node_type" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> <method name="get_source_code" qualifiers="const"> <return type="String"> </return> @@ -40069,6 +44282,14 @@ Return the script source code (if available). </description> </method> + <method name="has_script_signal" qualifiers="const"> + <return type="bool"> + </return> + <argument index="0" name="signal_name" type="String"> + </argument> + <description> + </description> + </method> <method name="has_source_code" qualifiers="const"> <return type="bool"> </return> @@ -40085,8 +44306,14 @@ Return true if a given object uses an instance of this script. </description> </method> + <method name="is_tool" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="reload"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="keep_state" type="bool" default="false"> </argument> @@ -40094,6 +44321,8 @@ </description> </method> <method name="set_source_code"> + <return type="void"> + </return> <argument index="0" name="source" type="String"> </argument> <description> @@ -40104,6 +44333,46 @@ <constants> </constants> </class> +<class name="ScriptEditor" inherits="PanelContainer" category="Core"> + <brief_description> + </brief_description> + <description> + </description> + <methods> + <method name="get_current_script"> + <return type="Script"> + </return> + <description> + Returns a [Script] that is currently active in editor. + </description> + </method> + <method name="get_open_scripts" qualifiers="const"> + <return type="Array"> + </return> + <description> + Returns an array with all [Script] objects which are currently open in editor. + </description> + </method> + </methods> + <signals> + <signal name="editor_script_changed"> + <argument index="0" name="script" type="Object"> + </argument> + <description> + Emitted when user changed active script. Argument is a freshly activated [Script]. + </description> + </signal> + <signal name="script_close"> + <argument index="0" name="script" type="Object"> + </argument> + <description> + Emitted when editor is about to close the active script. Argument is a [Script] that is going to be closed. + </description> + </signal> + </signals> + <constants> + </constants> +</class> <class name="ScrollBar" inherits="Range" category="Core"> <brief_description> Base class for scroll bars. @@ -40119,6 +44388,8 @@ </description> </method> <method name="set_custom_step"> + <return type="void"> + </return> <argument index="0" name="step" type="float"> </argument> <description> @@ -40129,6 +44400,12 @@ <member name="custom_step" type="float" setter="set_custom_step" getter="get_custom_step" brief=""> </member> </members> + <signals> + <signal name="scrolling"> + <description> + </description> + </signal> + </signals> <constants> </constants> </class> @@ -40169,6 +44446,8 @@ </description> </method> <method name="set_enable_h_scroll"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -40176,6 +44455,8 @@ </description> </method> <method name="set_enable_v_scroll"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -40183,6 +44464,8 @@ </description> </method> <method name="set_h_scroll"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -40190,6 +44473,8 @@ </description> </method> <method name="set_v_scroll"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -40206,44 +44491,6 @@ <constants> </constants> </class> -<class name="ScriptEditor" inherits="PanelContainer" category="Core"> - <brief_description> - </brief_description> - <description> - </description> - <methods> - <method name="get_current_script"> - <return type="Script"> - </return> - <description> - Returns a [Script] that is currently active in editor. - </description> - </method> - <method name="get_open_scripts"> - <return type="Array"> - </return> - <description> - Returns an array with all [Script] objects which are currently open in editor. - </description> - </method> - </methods> - <signals> - <signal name="editor_script_changed"> - <argument index="0" name="script" type="Script"> - </argument> - <description> - Emitted when user changed active script. Argument is a freshly activated [Script]. - </description> - </signal> - <signal name="script_close"> - <argument index="0" name="script" type="Script"> - </argument> - <description> - Emitted when editor is about to close the active script. Argument is a [Script] that is going to be closed. - </description> - </signal> - </signals> -</class> <class name="SegmentShape2D" inherits="Shape2D" category="Core"> <brief_description> Segment Shape for 2D Collision Detection. @@ -40267,6 +44514,8 @@ </description> </method> <method name="set_a"> + <return type="void"> + </return> <argument index="0" name="a" type="Vector2"> </argument> <description> @@ -40274,6 +44523,8 @@ </description> </method> <method name="set_b"> + <return type="void"> + </return> <argument index="0" name="b" type="Vector2"> </argument> <description> @@ -40299,14 +44550,14 @@ </description> <methods> <method name="post"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Lowers the [Semaphore], allowing one more thread in. </description> </method> <method name="wait"> - <return type="Error"> + <return type="int" enum="Error"> </return> <description> Tries to wait for the [Semaphore], if its value is zero, blocks until non-zero. @@ -40351,7 +44602,7 @@ </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Shader.Mode"> </return> <description> </description> @@ -40365,12 +44616,16 @@ </description> </method> <method name="set_code"> + <return type="void"> + </return> <argument index="0" name="code" type="String"> </argument> <description> </description> </method> <method name="set_default_texture_param"> + <return type="void"> + </return> <argument index="0" name="param" type="String"> </argument> <argument index="1" name="texture" type="Texture"> @@ -40413,12 +44668,16 @@ </description> </method> <method name="set_shader"> + <return type="void"> + </return> <argument index="0" name="shader" type="Shader"> </argument> <description> </description> </method> <method name="set_shader_param"> + <return type="void"> + </return> <argument index="0" name="param" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -40520,6 +44779,8 @@ </description> </method> <method name="set_custom_solver_bias"> + <return type="void"> + </return> <argument index="0" name="bias" type="float"> </argument> <description> @@ -40568,6 +44829,8 @@ </description> </method> <method name="set_shortcut"> + <return type="void"> + </return> <argument index="0" name="event" type="InputEvent"> </argument> <description> @@ -40590,6 +44853,8 @@ </description> <methods> <method name="add_bone"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -40597,6 +44862,8 @@ </description> </method> <method name="bind_child_node_to_bone"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="node" type="Node"> @@ -40606,6 +44873,8 @@ </description> </method> <method name="clear_bones"> + <return type="void"> + </return> <description> Clear all the bones in this skeleton. </description> @@ -40704,6 +44973,8 @@ </description> </method> <method name="set_bone_custom_pose"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="custom_pose" type="Transform"> @@ -40712,6 +44983,8 @@ </description> </method> <method name="set_bone_disable_rest"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="disable" type="bool"> @@ -40720,6 +44993,8 @@ </description> </method> <method name="set_bone_global_pose"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="pose" type="Transform"> @@ -40728,6 +45003,8 @@ </description> </method> <method name="set_bone_parent"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="parent_idx" type="int"> @@ -40737,6 +45014,8 @@ </description> </method> <method name="set_bone_pose"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="pose" type="Transform"> @@ -40746,6 +45025,8 @@ </description> </method> <method name="set_bone_rest"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="rest" type="Transform"> @@ -40755,6 +45036,8 @@ </description> </method> <method name="unbind_child_node_from_bone"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <argument index="1" name="node" type="Node"> @@ -40764,6 +45047,8 @@ </description> </method> <method name="unparent_bone_and_rest"> + <return type="void"> + </return> <argument index="0" name="bone_idx" type="int"> </argument> <description> @@ -40771,7 +45056,7 @@ </method> </methods> <constants> - <constant name="NOTIFICATION_UPDATE_SKELETON" value="50"> + <constant name="NOTIFICATION_UPDATE_SKELETON" value="50" enum=""> </constant> </constants> </class> @@ -40782,32 +45067,40 @@ </description> <methods> <method name="get_radiance_size" qualifiers="const"> - <return type="int"> + <return type="int" enum="Sky.RadianceSize"> </return> <description> </description> </method> <method name="set_radiance_size"> - <argument index="0" name="size" type="int"> + <return type="void"> + </return> + <argument index="0" name="size" type="int" enum="Sky.RadianceSize"> </argument> <description> </description> </method> </methods> <members> - <member name="radiance_size" type="int" setter="set_radiance_size" getter="get_radiance_size" brief=""> + <member name="radiance_size" type="int" setter="set_radiance_size" getter="get_radiance_size" brief="" enum="Sky.RadianceSize"> </member> </members> <constants> - <constant name="RADIANCE_SIZE_256" value="0"> + <constant name="RADIANCE_SIZE_32" value="0"> + </constant> + <constant name="RADIANCE_SIZE_64" value="1"> + </constant> + <constant name="RADIANCE_SIZE_128" value="2"> </constant> - <constant name="RADIANCE_SIZE_512" value="1"> + <constant name="RADIANCE_SIZE_256" value="3"> </constant> - <constant name="RADIANCE_SIZE_1024" value="2"> + <constant name="RADIANCE_SIZE_512" value="4"> </constant> - <constant name="RADIANCE_SIZE_2048" value="3"> + <constant name="RADIANCE_SIZE_1024" value="5"> </constant> - <constant name="RADIANCE_SIZE_MAX" value="4"> + <constant name="RADIANCE_SIZE_2048" value="6"> + </constant> + <constant name="RADIANCE_SIZE_MAX" value="7"> </constant> </constants> </class> @@ -40840,12 +45133,16 @@ </description> </method> <method name="set_editable"> + <return type="void"> + </return> <argument index="0" name="editable" type="bool"> </argument> <description> </description> </method> <method name="set_ticks"> + <return type="void"> + </return> <argument index="0" name="count" type="int"> </argument> <description> @@ -40853,6 +45150,8 @@ </description> </method> <method name="set_ticks_on_borders"> + <return type="void"> + </return> <argument index="0" name="ticks_on_border" type="bool"> </argument> <description> @@ -40863,7 +45162,7 @@ <members> <member name="editable" type="bool" setter="set_editable" getter="is_editable" brief=""> </member> - <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" brief=""> + <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" brief="" enum="Control.FocusMode"> </member> <member name="tick_count" type="int" setter="set_ticks" getter="get_ticks" brief=""> </member> @@ -40882,13 +45181,15 @@ <method name="get_param" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="param" type="int"> + <argument index="0" name="param" type="int" enum="SliderJoint.Param"> </argument> <description> </description> </method> <method name="set_param"> - <argument index="0" name="param" type="int"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="SliderJoint.Param"> </argument> <argument index="1" name="value" type="float"> </argument> @@ -41013,7 +45314,7 @@ </description> </method> <method name="get_parent_spatial" qualifiers="const"> - <return type="Object"> + <return type="Spatial"> </return> <description> Return the parent [Spatial], or an empty [Object] if no parent exists or parent is not of type [Spatial]. @@ -41059,6 +45360,8 @@ </description> </method> <method name="global_rotate"> + <return type="void"> + </return> <argument index="0" name="normal" type="Vector3"> </argument> <argument index="1" name="radians" type="float"> @@ -41067,12 +45370,16 @@ </description> </method> <method name="global_translate"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector3"> </argument> <description> </description> </method> <method name="hide"> + <return type="void"> + </return> <description> </description> </method> @@ -41107,6 +45414,8 @@ </description> </method> <method name="look_at"> + <return type="void"> + </return> <argument index="0" name="target" type="Vector3"> </argument> <argument index="1" name="up" type="Vector3"> @@ -41115,6 +45424,8 @@ </description> </method> <method name="look_at_from_pos"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector3"> </argument> <argument index="1" name="target" type="Vector3"> @@ -41125,10 +45436,14 @@ </description> </method> <method name="orthonormalize"> + <return type="void"> + </return> <description> </description> </method> <method name="rotate"> + <return type="void"> + </return> <argument index="0" name="normal" type="Vector3"> </argument> <argument index="1" name="radians" type="float"> @@ -41137,36 +45452,48 @@ </description> </method> <method name="rotate_x"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> </description> </method> <method name="rotate_y"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> </description> </method> <method name="rotate_z"> + <return type="void"> + </return> <argument index="0" name="radians" type="float"> </argument> <description> </description> </method> <method name="set_as_toplevel"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_gizmo"> + <return type="void"> + </return> <argument index="0" name="gizmo" type="SpatialGizmo"> </argument> <description> </description> </method> <method name="set_global_transform"> + <return type="void"> + </return> <argument index="0" name="global" type="Transform"> </argument> <description> @@ -41174,28 +45501,38 @@ </description> </method> <method name="set_identity"> + <return type="void"> + </return> <description> </description> </method> <method name="set_ignore_transform_notification"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_notify_local_transform"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_notify_transform"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_rotation"> + <return type="void"> + </return> <argument index="0" name="rotation_rad" type="Vector3"> </argument> <description> @@ -41203,6 +45540,8 @@ </description> </method> <method name="set_rotation_deg"> + <return type="void"> + </return> <argument index="0" name="rotation_deg" type="Vector3"> </argument> <description> @@ -41210,12 +45549,16 @@ </description> </method> <method name="set_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector3"> </argument> <description> </description> </method> <method name="set_transform"> + <return type="void"> + </return> <argument index="0" name="local" type="Transform"> </argument> <description> @@ -41223,28 +45566,54 @@ </description> </method> <method name="set_translation"> + <return type="void"> + </return> <argument index="0" name="translation" type="Vector3"> </argument> <description> </description> </method> <method name="set_visible"> - <argument index="0" name="arg0" type="bool"> + <return type="void"> + </return> + <argument index="0" name="visible" type="bool"> </argument> <description> </description> </method> <method name="show"> + <return type="void"> + </return> + <description> + </description> + </method> + <method name="to_global" qualifiers="const"> + <return type="Vector3"> + </return> + <argument index="0" name="local_point" type="Vector3"> + </argument> + <description> + </description> + </method> + <method name="to_local" qualifiers="const"> + <return type="Vector3"> + </return> + <argument index="0" name="global_point" type="Vector3"> + </argument> <description> </description> </method> <method name="translate"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector3"> </argument> <description> </description> </method> <method name="update_gizmo"> + <return type="void"> + </return> <description> </description> </method> @@ -41272,14 +45641,14 @@ </signal> </signals> <constants> - <constant name="NOTIFICATION_TRANSFORM_CHANGED" value="29"> + <constant name="NOTIFICATION_TRANSFORM_CHANGED" value="29" enum=""> Spatial nodes receive this notification with their global transform changes. This means that either the current or a parent node changed its transform. </constant> - <constant name="NOTIFICATION_ENTER_WORLD" value="41"> + <constant name="NOTIFICATION_ENTER_WORLD" value="41" enum=""> </constant> - <constant name="NOTIFICATION_EXIT_WORLD" value="42"> + <constant name="NOTIFICATION_EXIT_WORLD" value="42" enum=""> </constant> - <constant name="NOTIFICATION_VISIBILITY_CHANGED" value="43"> + <constant name="NOTIFICATION_VISIBILITY_CHANGED" value="43" enum=""> </constant> </constants> </class> @@ -41305,20 +45674,32 @@ <description> </description> </method> + <method name="get_alpha_scissor_threshold" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> <method name="get_anisotropy" qualifiers="const"> <return type="float"> </return> <description> </description> </method> + <method name="get_ao_texture_channel" qualifiers="const"> + <return type="int" enum="SpatialMaterial.TextureChannel"> + </return> + <description> + </description> + </method> <method name="get_billboard_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.BillboardMode"> </return> <description> </description> </method> <method name="get_blend_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.BlendMode"> </return> <description> </description> @@ -41336,7 +45717,7 @@ </description> </method> <method name="get_cull_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.CullMode"> </return> <description> </description> @@ -41354,7 +45735,7 @@ </description> </method> <method name="get_depth_draw_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.DepthDrawMode"> </return> <description> </description> @@ -41366,19 +45747,19 @@ </description> </method> <method name="get_detail_blend_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.BlendMode"> </return> <description> </description> </method> <method name="get_detail_uv" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.DetailUV"> </return> <description> </description> </method> <method name="get_diffuse_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.DiffuseMode"> </return> <description> </description> @@ -41398,7 +45779,7 @@ <method name="get_feature" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="feature" type="int"> + <argument index="0" name="feature" type="int" enum="SpatialMaterial.Feature"> </argument> <description> </description> @@ -41406,7 +45787,7 @@ <method name="get_flag" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="flag" type="int" enum="SpatialMaterial.Flags"> </argument> <description> </description> @@ -41429,6 +45810,12 @@ <description> </description> </method> + <method name="get_metallic_texture_channel" qualifiers="const"> + <return type="int" enum="SpatialMaterial.TextureChannel"> + </return> + <description> + </description> + </method> <method name="get_normal_scale" qualifiers="const"> <return type="float"> </return> @@ -41465,6 +45852,12 @@ <description> </description> </method> + <method name="get_refraction_texture_channel" qualifiers="const"> + <return type="int" enum="SpatialMaterial.TextureChannel"> + </return> + <description> + </description> + </method> <method name="get_rim" qualifiers="const"> <return type="float"> </return> @@ -41483,6 +45876,12 @@ <description> </description> </method> + <method name="get_roughness_texture_channel" qualifiers="const"> + <return type="int" enum="SpatialMaterial.TextureChannel"> + </return> + <description> + </description> + </method> <method name="get_specular" qualifiers="const"> <return type="float"> </return> @@ -41490,7 +45889,7 @@ </description> </method> <method name="get_specular_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpatialMaterial.SpecularMode"> </return> <description> </description> @@ -41504,7 +45903,7 @@ <method name="get_texture" qualifiers="const"> <return type="Texture"> </return> - <argument index="0" name="param" type="Texture"> + <argument index="0" name="param" type="int" enum="SpatialMaterial.TextureParam"> </argument> <description> </description> @@ -41558,109 +45957,161 @@ </description> </method> <method name="set_albedo"> + <return type="void"> + </return> <argument index="0" name="albedo" type="Color"> </argument> <description> </description> </method> + <method name="set_alpha_scissor_threshold"> + <return type="void"> + </return> + <argument index="0" name="threshold" type="float"> + </argument> + <description> + </description> + </method> <method name="set_anisotropy"> + <return type="void"> + </return> <argument index="0" name="anisotropy" type="float"> </argument> <description> </description> </method> + <method name="set_ao_texture_channel"> + <return type="void"> + </return> + <argument index="0" name="channel" type="int" enum="SpatialMaterial.TextureChannel"> + </argument> + <description> + </description> + </method> <method name="set_billboard_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="SpatialMaterial.BillboardMode"> </argument> <description> </description> </method> <method name="set_blend_mode"> - <argument index="0" name="blend_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="blend_mode" type="int" enum="SpatialMaterial.BlendMode"> </argument> <description> </description> </method> <method name="set_clearcoat"> + <return type="void"> + </return> <argument index="0" name="clearcoat" type="float"> </argument> <description> </description> </method> <method name="set_clearcoat_gloss"> + <return type="void"> + </return> <argument index="0" name="clearcoat_gloss" type="float"> </argument> <description> </description> </method> <method name="set_cull_mode"> - <argument index="0" name="cull_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="cull_mode" type="int" enum="SpatialMaterial.CullMode"> </argument> <description> </description> </method> <method name="set_depth_deep_parallax"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_depth_deep_parallax_max_layers"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> </description> </method> <method name="set_depth_deep_parallax_min_layers"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> </description> </method> <method name="set_depth_draw_mode"> - <argument index="0" name="depth_draw_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="depth_draw_mode" type="int" enum="SpatialMaterial.DepthDrawMode"> </argument> <description> </description> </method> <method name="set_depth_scale"> + <return type="void"> + </return> <argument index="0" name="depth_scale" type="float"> </argument> <description> </description> </method> <method name="set_detail_blend_mode"> - <argument index="0" name="detail_blend_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="detail_blend_mode" type="int" enum="SpatialMaterial.BlendMode"> </argument> <description> </description> </method> <method name="set_detail_uv"> - <argument index="0" name="detail_uv" type="int"> + <return type="void"> + </return> + <argument index="0" name="detail_uv" type="int" enum="SpatialMaterial.DetailUV"> </argument> <description> </description> </method> <method name="set_diffuse_mode"> - <argument index="0" name="diffuse_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="diffuse_mode" type="int" enum="SpatialMaterial.DiffuseMode"> </argument> <description> </description> </method> <method name="set_emission"> + <return type="void"> + </return> <argument index="0" name="emission" type="Color"> </argument> <description> </description> </method> <method name="set_emission_energy"> + <return type="void"> + </return> <argument index="0" name="emission_energy" type="float"> </argument> <description> </description> </method> <method name="set_feature"> - <argument index="0" name="feature" type="int"> + <return type="void"> + </return> + <argument index="0" name="feature" type="int" enum="SpatialMaterial.Feature"> </argument> <argument index="1" name="enable" type="bool"> </argument> @@ -41668,7 +46119,9 @@ </description> </method> <method name="set_flag"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="SpatialMaterial.Flags"> </argument> <argument index="1" name="enable" type="bool"> </argument> @@ -41676,140 +46129,210 @@ </description> </method> <method name="set_grow"> + <return type="void"> + </return> <argument index="0" name="amount" type="float"> </argument> <description> </description> </method> <method name="set_grow_enabled"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_line_width"> + <return type="void"> + </return> <argument index="0" name="line_width" type="float"> </argument> <description> </description> </method> <method name="set_metallic"> + <return type="void"> + </return> <argument index="0" name="metallic" type="float"> </argument> <description> </description> </method> + <method name="set_metallic_texture_channel"> + <return type="void"> + </return> + <argument index="0" name="channel" type="int" enum="SpatialMaterial.TextureChannel"> + </argument> + <description> + </description> + </method> <method name="set_normal_scale"> + <return type="void"> + </return> <argument index="0" name="normal_scale" type="float"> </argument> <description> </description> </method> <method name="set_particles_anim_h_frames"> + <return type="void"> + </return> <argument index="0" name="frames" type="int"> </argument> <description> </description> </method> <method name="set_particles_anim_loop"> + <return type="void"> + </return> <argument index="0" name="frames" type="int"> </argument> <description> </description> </method> <method name="set_particles_anim_v_frames"> + <return type="void"> + </return> <argument index="0" name="frames" type="int"> </argument> <description> </description> </method> <method name="set_point_size"> + <return type="void"> + </return> <argument index="0" name="point_size" type="float"> </argument> <description> </description> </method> <method name="set_refraction"> + <return type="void"> + </return> <argument index="0" name="refraction" type="float"> </argument> <description> </description> </method> + <method name="set_refraction_texture_channel"> + <return type="void"> + </return> + <argument index="0" name="channel" type="int" enum="SpatialMaterial.TextureChannel"> + </argument> + <description> + </description> + </method> <method name="set_rim"> + <return type="void"> + </return> <argument index="0" name="rim" type="float"> </argument> <description> </description> </method> <method name="set_rim_tint"> + <return type="void"> + </return> <argument index="0" name="rim_tint" type="float"> </argument> <description> </description> </method> <method name="set_roughness"> + <return type="void"> + </return> <argument index="0" name="roughness" type="float"> </argument> <description> </description> </method> + <method name="set_roughness_texture_channel"> + <return type="void"> + </return> + <argument index="0" name="channel" type="int" enum="SpatialMaterial.TextureChannel"> + </argument> + <description> + </description> + </method> <method name="set_specular"> + <return type="void"> + </return> <argument index="0" name="specular" type="float"> </argument> <description> </description> </method> <method name="set_specular_mode"> - <argument index="0" name="specular_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="specular_mode" type="int" enum="SpatialMaterial.SpecularMode"> </argument> <description> </description> </method> <method name="set_subsurface_scattering_strength"> + <return type="void"> + </return> <argument index="0" name="strength" type="float"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="param" type="Texture"> + <return type="void"> + </return> + <argument index="0" name="param" type="int" enum="SpatialMaterial.TextureParam"> </argument> - <argument index="1" name="texture" type="Object"> + <argument index="1" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_uv1_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector3"> </argument> <description> </description> </method> <method name="set_uv1_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector3"> </argument> <description> </description> </method> <method name="set_uv1_triplanar_blend_sharpness"> + <return type="void"> + </return> <argument index="0" name="sharpness" type="float"> </argument> <description> </description> </method> <method name="set_uv2_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector3"> </argument> <description> </description> </method> <method name="set_uv2_scale"> + <return type="void"> + </return> <argument index="0" name="scale" type="Vector3"> </argument> <description> </description> </method> <method name="set_uv2_triplanar_blend_sharpness"> + <return type="void"> + </return> <argument index="0" name="sharpness" type="float"> </argument> <description> @@ -41833,6 +46356,8 @@ </member> <member name="ao_texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> + <member name="ao_texture_channel" type="int" setter="set_ao_texture_channel" getter="get_ao_texture_channel" brief="" enum="SpatialMaterial.TextureChannel"> + </member> <member name="clearcoat" type="float" setter="set_clearcoat" getter="get_clearcoat" brief=""> </member> <member name="clearcoat_enabled" type="bool" setter="set_feature" getter="get_feature" brief=""> @@ -41855,7 +46380,7 @@ </member> <member name="detail_albedo" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> - <member name="detail_blend_mode" type="int" setter="set_detail_blend_mode" getter="get_detail_blend_mode" brief=""> + <member name="detail_blend_mode" type="int" setter="set_detail_blend_mode" getter="get_detail_blend_mode" brief="" enum="SpatialMaterial.BlendMode"> </member> <member name="detail_enabled" type="bool" setter="set_feature" getter="get_feature" brief=""> </member> @@ -41863,7 +46388,7 @@ </member> <member name="detail_normal" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> - <member name="detail_uv_layer" type="int" setter="set_detail_uv" getter="get_detail_uv" brief=""> + <member name="detail_uv_layer" type="int" setter="set_detail_uv" getter="get_detail_uv" brief="" enum="SpatialMaterial.DetailUV"> </member> <member name="emission" type="Color" setter="set_emission" getter="get_emission" brief=""> </member> @@ -41875,7 +46400,7 @@ </member> <member name="flags_fixed_size" type="bool" setter="set_flag" getter="get_flag" brief=""> </member> - <member name="flags_on_top" type="bool" setter="set_flag" getter="get_flag" brief=""> + <member name="flags_no_depth_test" type="bool" setter="set_flag" getter="get_flag" brief=""> </member> <member name="flags_transparent" type="bool" setter="set_feature" getter="get_feature" brief=""> </member> @@ -41883,27 +46408,35 @@ </member> <member name="flags_use_point_size" type="bool" setter="set_flag" getter="get_flag" brief=""> </member> + <member name="flags_vertex_lighting" type="bool" setter="set_flag" getter="get_flag" brief=""> + </member> + <member name="flags_world_triplanar" type="bool" setter="set_flag" getter="get_flag" brief=""> + </member> <member name="metallic" type="float" setter="set_metallic" getter="get_metallic" brief=""> </member> <member name="metallic_specular" type="float" setter="set_specular" getter="get_specular" brief=""> </member> <member name="metallic_texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> + <member name="metallic_texture_channel" type="int" setter="set_metallic_texture_channel" getter="get_metallic_texture_channel" brief="" enum="SpatialMaterial.TextureChannel"> + </member> <member name="normal_enabled" type="bool" setter="set_feature" getter="get_feature" brief=""> </member> <member name="normal_scale" type="float" setter="set_normal_scale" getter="get_normal_scale" brief=""> </member> <member name="normal_texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> - <member name="params_billboard_mode" type="int" setter="set_billboard_mode" getter="get_billboard_mode" brief=""> + <member name="params_alpha_scissor_threshold" type="float" setter="set_alpha_scissor_threshold" getter="get_alpha_scissor_threshold" brief=""> + </member> + <member name="params_billboard_mode" type="int" setter="set_billboard_mode" getter="get_billboard_mode" brief="" enum="SpatialMaterial.BillboardMode"> </member> - <member name="params_blend_mode" type="int" setter="set_blend_mode" getter="get_blend_mode" brief=""> + <member name="params_blend_mode" type="int" setter="set_blend_mode" getter="get_blend_mode" brief="" enum="SpatialMaterial.BlendMode"> </member> - <member name="params_cull_mode" type="int" setter="set_cull_mode" getter="get_cull_mode" brief=""> + <member name="params_cull_mode" type="int" setter="set_cull_mode" getter="get_cull_mode" brief="" enum="SpatialMaterial.CullMode"> </member> - <member name="params_depth_draw_mode" type="int" setter="set_depth_draw_mode" getter="get_depth_draw_mode" brief=""> + <member name="params_depth_draw_mode" type="int" setter="set_depth_draw_mode" getter="get_depth_draw_mode" brief="" enum="SpatialMaterial.DepthDrawMode"> </member> - <member name="params_diffuse_mode" type="int" setter="set_diffuse_mode" getter="get_diffuse_mode" brief=""> + <member name="params_diffuse_mode" type="int" setter="set_diffuse_mode" getter="get_diffuse_mode" brief="" enum="SpatialMaterial.DiffuseMode"> </member> <member name="params_grow" type="bool" setter="set_grow_enabled" getter="is_grow_enabled" brief=""> </member> @@ -41913,11 +46446,13 @@ </member> <member name="params_point_size" type="float" setter="set_point_size" getter="get_point_size" brief=""> </member> - <member name="params_specular_mode" type="int" setter="set_specular_mode" getter="get_specular_mode" brief=""> + <member name="params_specular_mode" type="int" setter="set_specular_mode" getter="get_specular_mode" brief="" enum="SpatialMaterial.SpecularMode"> + </member> + <member name="params_use_alpha_scissor" type="bool" setter="set_flag" getter="get_flag" brief=""> </member> <member name="particles_anim_h_frames" type="int" setter="set_particles_anim_h_frames" getter="get_particles_anim_h_frames" brief=""> </member> - <member name="particles_anim_loop" type="bool" setter="set_particles_anim_loop" getter="get_particles_anim_loop" brief=""> + <member name="particles_anim_loop" type="int" setter="set_particles_anim_loop" getter="get_particles_anim_loop" brief=""> </member> <member name="particles_anim_v_frames" type="int" setter="set_particles_anim_v_frames" getter="get_particles_anim_v_frames" brief=""> </member> @@ -41927,6 +46462,8 @@ </member> <member name="refraction_texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> + <member name="refraction_texture_channel" type="int" setter="set_refraction_texture_channel" getter="get_refraction_texture_channel" brief="" enum="SpatialMaterial.TextureChannel"> + </member> <member name="rim" type="float" setter="set_rim" getter="get_rim" brief=""> </member> <member name="rim_enabled" type="bool" setter="set_feature" getter="get_feature" brief=""> @@ -41939,6 +46476,8 @@ </member> <member name="roughness_texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> + <member name="roughness_texture_channel" type="int" setter="set_roughness_texture_channel" getter="get_roughness_texture_channel" brief="" enum="SpatialMaterial.TextureChannel"> + </member> <member name="subsurf_scatter_enabled" type="bool" setter="set_feature" getter="get_feature" brief=""> </member> <member name="subsurf_scatter_strength" type="float" setter="set_subsurface_scattering_strength" getter="get_subsurface_scattering_strength" brief=""> @@ -42051,17 +46590,29 @@ </constant> <constant name="FLAG_UNSHADED" value="0"> </constant> - <constant name="FLAG_ONTOP" value="1"> + <constant name="FLAG_USE_VERTEX_LIGHTING" value="1"> + </constant> + <constant name="FLAG_DISABLE_DEPTH_TEST" value="2"> + </constant> + <constant name="FLAG_ALBEDO_FROM_VERTEX_COLOR" value="3"> </constant> - <constant name="FLAG_ALBEDO_FROM_VERTEX_COLOR" value="2"> + <constant name="FLAG_SRGB_VERTEX_COLOR" value="4"> </constant> - <constant name="FLAG_SRGB_VERTEX_COLOR" value="3"> + <constant name="FLAG_USE_POINT_SIZE" value="5"> </constant> - <constant name="FLAG_USE_POINT_SIZE" value="4"> + <constant name="FLAG_FIXED_SIZE" value="6"> </constant> - <constant name="FLAG_FIXED_SIZE" value="5"> + <constant name="FLAG_UV1_USE_TRIPLANAR" value="7"> </constant> - <constant name="FLAG_MAX" value="9"> + <constant name="FLAG_UV2_USE_TRIPLANAR" value="8"> + </constant> + <constant name="FLAG_AO_ON_UV2" value="10"> + </constant> + <constant name="FLAG_USE_ALPHA_SCISSOR" value="11"> + </constant> + <constant name="FLAG_TRIPLANAR_USE_WORLD" value="9"> + </constant> + <constant name="FLAG_MAX" value="12"> </constant> <constant name="DIFFUSE_LAMBERT" value="0"> </constant> @@ -42091,6 +46642,16 @@ </constant> <constant name="BILLBOARD_PARTICLES" value="3"> </constant> + <constant name="TEXTURE_CHANNEL_RED" value="0"> + </constant> + <constant name="TEXTURE_CHANNEL_GREEN" value="1"> + </constant> + <constant name="TEXTURE_CHANNEL_BLUE" value="2"> + </constant> + <constant name="TEXTURE_CHANNEL_ALPHA" value="3"> + </constant> + <constant name="TEXTURE_CHANNEL_GRAYSCALE" value="4"> + </constant> </constants> </class> <class name="SpatialVelocityTracker" inherits="Reference" category="Core"> @@ -42112,18 +46673,24 @@ </description> </method> <method name="reset"> + <return type="void"> + </return> <argument index="0" name="position" type="Vector3"> </argument> <description> </description> </method> <method name="set_track_fixed_step"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="update_position"> + <return type="void"> + </return> <argument index="0" name="position" type="Vector3"> </argument> <description> @@ -42170,30 +46737,40 @@ </description> </method> <method name="set_height"> + <return type="void"> + </return> <argument index="0" name="height" type="float"> </argument> <description> </description> </method> <method name="set_is_hemisphere"> + <return type="void"> + </return> <argument index="0" name="is_hemisphere" type="bool"> </argument> <description> </description> </method> <method name="set_radial_segments"> + <return type="void"> + </return> <argument index="0" name="radial_segments" type="int"> </argument> <description> </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> </description> </method> <method name="set_rings"> + <return type="void"> + </return> <argument index="0" name="rings" type="int"> </argument> <description> @@ -42228,6 +46805,8 @@ </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="radius" type="float"> </argument> <description> @@ -42250,7 +46829,7 @@ </description> <methods> <method name="get_line_edit"> - <return type="Object"> + <return type="LineEdit"> </return> <description> </description> @@ -42276,6 +46855,8 @@ </description> </method> <method name="set_editable"> + <return type="void"> + </return> <argument index="0" name="editable" type="bool"> </argument> <description> @@ -42283,6 +46864,8 @@ </description> </method> <method name="set_prefix"> + <return type="void"> + </return> <argument index="0" name="prefix" type="String"> </argument> <description> @@ -42290,6 +46873,8 @@ </description> </method> <method name="set_suffix"> + <return type="void"> + </return> <argument index="0" name="suffix" type="String"> </argument> <description> @@ -42321,7 +46906,7 @@ </description> <methods> <method name="get_dragger_visibility" qualifiers="const"> - <return type="int"> + <return type="int" enum="SplitContainer.DraggerVisibility"> </return> <description> Return visibility of the split dragger (one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). @@ -42342,6 +46927,8 @@ </description> </method> <method name="set_collapsed"> + <return type="void"> + </return> <argument index="0" name="collapsed" type="bool"> </argument> <description> @@ -42349,13 +46936,17 @@ </description> </method> <method name="set_dragger_visibility"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="SplitContainer.DraggerVisibility"> </argument> <description> Set visibility of the split dragger ([i]mode[/i] must be one of [DRAGGER_VISIBLE], [DRAGGER_HIDDEN] or [DRAGGER_HIDDEN_COLLAPSED]). </description> </method> <method name="set_split_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="int"> </argument> <description> @@ -42366,7 +46957,7 @@ <members> <member name="collapsed" type="bool" setter="set_collapsed" getter="is_collapsed" brief=""> </member> - <member name="dragger_visibility" type="int" setter="set_dragger_visibility" getter="get_dragger_visibility" brief=""> + <member name="dragger_visibility" type="int" setter="set_dragger_visibility" getter="get_dragger_visibility" brief="" enum="SplitContainer.DraggerVisibility"> </member> <member name="split_offset" type="int" setter="set_split_offset" getter="get_split_offset" brief=""> </member> @@ -42505,6 +47096,8 @@ </description> </method> <method name="set_centered"> + <return type="void"> + </return> <argument index="0" name="centered" type="bool"> </argument> <description> @@ -42512,6 +47105,8 @@ </description> </method> <method name="set_flip_h"> + <return type="void"> + </return> <argument index="0" name="flip_h" type="bool"> </argument> <description> @@ -42519,6 +47114,8 @@ </description> </method> <method name="set_flip_v"> + <return type="void"> + </return> <argument index="0" name="flip_v" type="bool"> </argument> <description> @@ -42526,6 +47123,8 @@ </description> </method> <method name="set_frame"> + <return type="void"> + </return> <argument index="0" name="frame" type="int"> </argument> <description> @@ -42533,6 +47132,8 @@ </description> </method> <method name="set_hframes"> + <return type="void"> + </return> <argument index="0" name="hframes" type="int"> </argument> <description> @@ -42540,12 +47141,16 @@ </description> </method> <method name="set_normal_map"> + <return type="void"> + </return> <argument index="0" name="normal_map" type="Texture"> </argument> <description> </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> @@ -42553,6 +47158,8 @@ </description> </method> <method name="set_region"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -42560,12 +47167,16 @@ </description> </method> <method name="set_region_filter_clip"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_region_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> @@ -42573,6 +47184,8 @@ </description> </method> <method name="set_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> @@ -42580,6 +47193,8 @@ </description> </method> <method name="set_vframes"> + <return type="void"> + </return> <argument index="0" name="vframes" type="int"> </argument> <description> @@ -42669,36 +47284,48 @@ </description> </method> <method name="set_frame"> + <return type="void"> + </return> <argument index="0" name="frame" type="int"> </argument> <description> </description> </method> <method name="set_hframes"> + <return type="void"> + </return> <argument index="0" name="hframes" type="int"> </argument> <description> </description> </method> <method name="set_region"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_region_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> </description> </method> <method name="set_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_vframes"> + <return type="void"> + </return> <argument index="0" name="vframes" type="int"> </argument> <description> @@ -42735,13 +47362,13 @@ </description> <methods> <method name="get_alpha_cut_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="SpriteBase3D.AlphaCutMode"> </return> <description> </description> </method> <method name="get_axis" qualifiers="const"> - <return type="int"> + <return type="int" enum="Vector3.Axis"> </return> <description> </description> @@ -42749,7 +47376,7 @@ <method name="get_draw_flag" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="flag" type="int"> + <argument index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags"> </argument> <description> </description> @@ -42803,25 +47430,33 @@ </description> </method> <method name="set_alpha_cut_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="SpriteBase3D.AlphaCutMode"> </argument> <description> </description> </method> <method name="set_axis"> - <argument index="0" name="axis" type="int"> + <return type="void"> + </return> + <argument index="0" name="axis" type="int" enum="Vector3.Axis"> </argument> <description> </description> </method> <method name="set_centered"> + <return type="void"> + </return> <argument index="0" name="centered" type="bool"> </argument> <description> </description> </method> <method name="set_draw_flag"> - <argument index="0" name="flag" type="int"> + <return type="void"> + </return> + <argument index="0" name="flag" type="int" enum="SpriteBase3D.DrawFlags"> </argument> <argument index="1" name="enabled" type="bool"> </argument> @@ -42829,36 +47464,48 @@ </description> </method> <method name="set_flip_h"> + <return type="void"> + </return> <argument index="0" name="flip_h" type="bool"> </argument> <description> </description> </method> <method name="set_flip_v"> + <return type="void"> + </return> <argument index="0" name="flip_v" type="bool"> </argument> <description> </description> </method> <method name="set_modulate"> + <return type="void"> + </return> <argument index="0" name="modulate" type="Color"> </argument> <description> </description> </method> <method name="set_offset"> + <return type="void"> + </return> <argument index="0" name="offset" type="Vector2"> </argument> <description> </description> </method> <method name="set_opacity"> + <return type="void"> + </return> <argument index="0" name="opacity" type="float"> </argument> <description> </description> </method> <method name="set_pixel_size"> + <return type="void"> + </return> <argument index="0" name="pixel_size" type="float"> </argument> <description> @@ -42866,9 +47513,9 @@ </method> </methods> <members> - <member name="alpha_cut" type="int" setter="set_alpha_cut_mode" getter="get_alpha_cut_mode" brief=""> + <member name="alpha_cut" type="int" setter="set_alpha_cut_mode" getter="get_alpha_cut_mode" brief="" enum="SpriteBase3D.AlphaCutMode"> </member> - <member name="axis" type="int" setter="set_axis" getter="get_axis" brief=""> + <member name="axis" type="int" setter="set_axis" getter="get_axis" brief="" enum="Vector3.Axis"> </member> <member name="centered" type="bool" setter="set_centered" getter="is_centered" brief=""> </member> @@ -42917,15 +47564,19 @@ </description> <methods> <method name="add_animation"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <description> </description> </method> <method name="add_frame"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> - <argument index="1" name="frame" type="Object"> + <argument index="1" name="frame" type="Texture"> </argument> <argument index="2" name="atpos" type="int" default="-1"> </argument> @@ -42933,12 +47584,16 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <description> </description> </method> <method name="clear_all"> + <return type="void"> + </return> <description> </description> </method> @@ -42959,7 +47614,7 @@ </description> </method> <method name="get_frame" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <argument index="0" name="anim" type="String"> </argument> @@ -42985,12 +47640,16 @@ </description> </method> <method name="remove_animation"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <description> </description> </method> <method name="remove_frame"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <argument index="1" name="idx" type="int"> @@ -42999,6 +47658,8 @@ </description> </method> <method name="rename_animation"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <argument index="1" name="newname" type="String"> @@ -43007,6 +47668,8 @@ </description> </method> <method name="set_animation_loop"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <argument index="1" name="loop" type="bool"> @@ -43015,6 +47678,8 @@ </description> </method> <method name="set_animation_speed"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <argument index="1" name="speed" type="float"> @@ -43023,11 +47688,13 @@ </description> </method> <method name="set_frame"> + <return type="void"> + </return> <argument index="0" name="anim" type="String"> </argument> <argument index="1" name="idx" type="int"> </argument> - <argument index="2" name="txt" type="Object"> + <argument index="2" name="txt" type="Texture"> </argument> <description> </description> @@ -43081,6 +47748,8 @@ </description> </method> <method name="set_bounce"> + <return type="void"> + </return> <argument index="0" name="bounce" type="float"> </argument> <description> @@ -43088,6 +47757,8 @@ </description> </method> <method name="set_constant_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="vel" type="Vector3"> </argument> <description> @@ -43095,6 +47766,8 @@ </description> </method> <method name="set_constant_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="vel" type="Vector3"> </argument> <description> @@ -43102,6 +47775,8 @@ </description> </method> <method name="set_friction"> + <return type="void"> + </return> <argument index="0" name="friction" type="float"> </argument> <description> @@ -43161,6 +47836,8 @@ </description> </method> <method name="set_bounce"> + <return type="void"> + </return> <argument index="0" name="bounce" type="float"> </argument> <description> @@ -43168,6 +47845,8 @@ </description> </method> <method name="set_constant_angular_velocity"> + <return type="void"> + </return> <argument index="0" name="vel" type="float"> </argument> <description> @@ -43175,6 +47854,8 @@ </description> </method> <method name="set_constant_linear_velocity"> + <return type="void"> + </return> <argument index="0" name="vel" type="Vector2"> </argument> <description> @@ -43182,6 +47863,8 @@ </description> </method> <method name="set_friction"> + <return type="void"> + </return> <argument index="0" name="friction" type="float"> </argument> <description> @@ -43320,7 +48003,7 @@ <argument index="0" name="bytes" type="int"> </argument> <description> - Get an utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8). + Get a utf8 string with byte-length "bytes" from the stream (this decodes the string sent as utf8). </description> </method> <method name="get_var"> @@ -43338,6 +48021,8 @@ </description> </method> <method name="put_16"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43345,6 +48030,8 @@ </description> </method> <method name="put_32"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43352,6 +48039,8 @@ </description> </method> <method name="put_64"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43359,6 +48048,8 @@ </description> </method> <method name="put_8"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43366,7 +48057,7 @@ </description> </method> <method name="put_data"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="data" type="PoolByteArray"> </argument> @@ -43375,6 +48066,8 @@ </description> </method> <method name="put_double"> + <return type="void"> + </return> <argument index="0" name="val" type="float"> </argument> <description> @@ -43382,6 +48075,8 @@ </description> </method> <method name="put_float"> + <return type="void"> + </return> <argument index="0" name="val" type="float"> </argument> <description> @@ -43398,6 +48093,8 @@ </description> </method> <method name="put_u16"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43405,6 +48102,8 @@ </description> </method> <method name="put_u32"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43412,6 +48111,8 @@ </description> </method> <method name="put_u64"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43419,6 +48120,8 @@ </description> </method> <method name="put_u8"> + <return type="void"> + </return> <argument index="0" name="val" type="int"> </argument> <description> @@ -43426,6 +48129,8 @@ </description> </method> <method name="put_utf8_string"> + <return type="void"> + </return> <argument index="0" name="val" type="String"> </argument> <description> @@ -43433,6 +48138,8 @@ </description> </method> <method name="put_var"> + <return type="void"> + </return> <argument index="0" name="val" type="Variant"> </argument> <description> @@ -43440,6 +48147,8 @@ </description> </method> <method name="set_big_endian"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -43457,6 +48166,8 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> </description> </method> @@ -43485,18 +48196,24 @@ </description> </method> <method name="resize"> + <return type="void"> + </return> <argument index="0" name="size" type="int"> </argument> <description> </description> </method> <method name="seek"> + <return type="void"> + </return> <argument index="0" name="pos" type="int"> </argument> <description> </description> </method> <method name="set_data_array"> + <return type="void"> + </return> <argument index="0" name="data" type="PoolByteArray"> </argument> <description> @@ -43515,7 +48232,7 @@ </description> <methods> <method name="accept_stream"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="stream" type="StreamPeer"> </argument> @@ -43523,7 +48240,7 @@ </description> </method> <method name="connect_to_stream"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="stream" type="StreamPeer"> </argument> @@ -43536,12 +48253,14 @@ </description> </method> <method name="disconnect_from_stream"> + <return type="void"> + </return> <description> Disconnect from host. </description> </method> <method name="get_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="StreamPeerSSL.Status"> </return> <description> Return the status of the connection, one of STATUS_* enum. @@ -43572,7 +48291,7 @@ </description> <methods> <method name="connect_to_host"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="host" type="String"> </argument> @@ -43583,6 +48302,8 @@ </description> </method> <method name="disconnect_from_host"> + <return type="void"> + </return> <description> Disconnect from host. </description> @@ -43602,7 +48323,7 @@ </description> </method> <method name="get_status" qualifiers="const"> - <return type="int"> + <return type="int" enum="StreamPeerTCP.Status"> </return> <description> Return the status of the connection, one of STATUS_* enum. @@ -43643,7 +48364,7 @@ </description> </method> <method name="load"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="path" type="String"> </argument> @@ -44009,7 +48730,7 @@ <return type="int"> </return> <description> - Convert a string containing an hexadecimal number into an int. + Convert a string containing a hexadecimal number into an int. </description> </method> <method name="insert"> @@ -44392,6 +49113,8 @@ </description> <methods> <method name="draw" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="canvas_item" type="RID"> </argument> <argument index="1" name="rect" type="Rect2"> @@ -44408,7 +49131,7 @@ <method name="get_default_margin" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the default offset of the margin "margin" (see MARGIN_* enum) of a StyleBox, Controls that draw styleboxes with context inside need to know the margin, so the border of the stylebox is not occluded. @@ -44417,7 +49140,7 @@ <method name="get_margin" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return the offset of margin "margin" (see MARGIN_* enum). @@ -44438,7 +49161,9 @@ </description> </method> <method name="set_default_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="offset" type="float"> </argument> @@ -44485,12 +49210,35 @@ </class> <class name="StyleBoxFlat" inherits="StyleBox" category="Core"> <brief_description> - Stylebox of a single color. - </brief_description> - <description> - Stylebox of a single color. Displays the stylebox of a single color, alternatively a border with light/dark colors can be assigned. + Customizable Stylebox with a given set of parameters. (no texture required) + </brief_description> + <description> + This stylebox can be used to achieve all kinds of looks without the need of a texture. Those properties are customizable: + - Color + - Border width (individual width for each border) + - Rounded corners (individual radius for each corner) + - Shadow + About corner radius: + Setting corner radius to high values is allowed. As soon as corners would overlap the stylebox will switch to a relative system. Example: + [codeblock] + height = 30 + corner_radius_top_left = 50 + corner_raidus_bottom_left = 100 + [/codeblock] + The relative system now would take the 1:2 ratio of the two left corners to calculate the actual corner width. Both corners added will [b]never[/b] be more than the height. Result: + [codeblock] + corner_radius_top_left: 10 + corner_raidus_bottom_left: 20 + [/codeblock] + </description> <methods> + <method name="get_aa_size" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> <method name="get_bg_color" qualifiers="const"> <return type="Color"> </return> @@ -44503,79 +49251,292 @@ <description> </description> </method> - <method name="get_border_size" qualifiers="const"> + <method name="get_border_color" qualifiers="const"> + <return type="Color"> + </return> + <description> + </description> + </method> + <method name="get_border_width" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> + </argument> + <description> + </description> + </method> + <method name="get_border_width_min" qualifiers="const"> <return type="int"> </return> <description> </description> </method> - <method name="get_dark_color" qualifiers="const"> + <method name="get_corner_detail" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_corner_radius" qualifiers="const"> + <return type="int"> + </return> + <argument index="0" name="corner" type="int" enum="Corner"> + </argument> + <description> + </description> + </method> + <method name="get_expand_margin" qualifiers="const"> + <return type="float"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> + </argument> + <description> + </description> + </method> + <method name="get_shadow_color" qualifiers="const"> <return type="Color"> </return> <description> </description> </method> + <method name="get_shadow_size" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="is_anti_aliased" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="is_draw_center_enabled" qualifiers="const"> <return type="bool"> </return> <description> </description> </method> - <method name="get_light_color" qualifiers="const"> - <return type="Color"> + <method name="set_aa_size"> + <return type="void"> + </return> + <argument index="0" name="size" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_anti_aliased"> + <return type="void"> </return> + <argument index="0" name="anti_aliased" type="bool"> + </argument> <description> </description> </method> <method name="set_bg_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_border_blend"> + <return type="void"> + </return> <argument index="0" name="blend" type="bool"> </argument> <description> </description> </method> - <method name="set_border_size"> - <argument index="0" name="size" type="int"> + <method name="set_border_color"> + <return type="void"> + </return> + <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> - <method name="set_dark_color"> - <argument index="0" name="color" type="Color"> + <method name="set_border_width"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> + </argument> + <argument index="1" name="width" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_border_width_all"> + <return type="void"> + </return> + <argument index="0" name="width" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_corner_detail"> + <return type="void"> + </return> + <argument index="0" name="detail" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_corner_radius"> + <return type="void"> + </return> + <argument index="0" name="corner" type="int" enum="Corner"> + </argument> + <argument index="1" name="radius" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_corner_radius_all"> + <return type="void"> + </return> + <argument index="0" name="radius" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_corner_radius_individual"> + <return type="void"> + </return> + <argument index="0" name="radius_top_left" type="int"> + </argument> + <argument index="1" name="radius_top_right" type="int"> + </argument> + <argument index="2" name="radius_botton_right" type="int"> + </argument> + <argument index="3" name="radius_bottom_left" type="int"> </argument> <description> </description> </method> <method name="set_draw_center"> - <argument index="0" name="size" type="bool"> + <return type="void"> + </return> + <argument index="0" name="draw_center" type="bool"> + </argument> + <description> + </description> + </method> + <method name="set_expand_margin"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> + </argument> + <argument index="1" name="size" type="float"> </argument> <description> </description> </method> - <method name="set_light_color"> + <method name="set_expand_margin_all"> + <return type="void"> + </return> + <argument index="0" name="size" type="float"> + </argument> + <description> + </description> + </method> + <method name="set_expand_margin_individual"> + <return type="void"> + </return> + <argument index="0" name="size_left" type="float"> + </argument> + <argument index="1" name="size_top" type="float"> + </argument> + <argument index="2" name="size_right" type="float"> + </argument> + <argument index="3" name="size_bottom" type="float"> + </argument> + <description> + </description> + </method> + <method name="set_shadow_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> + <method name="set_shadow_size"> + <return type="void"> + </return> + <argument index="0" name="size" type="int"> + </argument> + <description> + </description> + </method> </methods> <members> + <member name="anti_aliasing" type="bool" setter="set_anti_aliased" getter="is_anti_aliased" brief=""> + Anti Aliasing draws a small ring around edges. This ring fades to transparent. As a result edges look much smoother. This is only noticable when using rounded corners. + </member> + <member name="anti_aliasing_size" type="int" setter="set_aa_size" getter="get_aa_size" brief=""> + This changes the size of the faded ring. Higher values can be used to achieve a "blurry" effect. + </member> <member name="bg_color" type="Color" setter="set_bg_color" getter="get_bg_color" brief=""> + The background color of the stylebox. </member> <member name="border_blend" type="bool" setter="set_border_blend" getter="get_border_blend" brief=""> + When set to true, the border will fade into the background color. + </member> + <member name="border_color" type="Color" setter="set_border_color" getter="get_border_color" brief=""> + Sets the color of the border. + </member> + <member name="border_width_bottom" type="int" setter="set_border_width" getter="get_border_width" brief=""> + Border width for the bottom border. + </member> + <member name="border_width_left" type="int" setter="set_border_width" getter="get_border_width" brief=""> + Border width for the left border. + </member> + <member name="border_width_right" type="int" setter="set_border_width" getter="get_border_width" brief=""> + Border width for the right border. + </member> + <member name="border_width_top" type="int" setter="set_border_width" getter="get_border_width" brief=""> + Border width for the top border. + </member> + <member name="corner_detail" type="int" setter="set_corner_detail" getter="get_corner_detail" brief=""> + This sets the amount of vertices used for each corner. Higher values result in rounder corners but take more processing power to compute. When choosing a value you should take the corner radius ([method set_corner_radius]) into account. + For corner radius smaller than 10: 4-5 should be enough + For corner radius smaller than 30: 8-12 should be enough ... + </member> + <member name="corner_radius_bottom_left" type="int" setter="set_corner_radius" getter="get_corner_radius" brief=""> + The corner radius of the bottom left corner. When set to 0 the corner is not rounded. </member> - <member name="border_size" type="int" setter="set_border_size" getter="get_border_size" brief=""> + <member name="corner_radius_bottom_right" type="int" setter="set_corner_radius" getter="get_corner_radius" brief=""> + The corner radius of the bottom right corner. When set to 0 the corner is not rounded. </member> - <member name="dark_color" type="Color" setter="set_dark_color" getter="get_dark_color" brief=""> + <member name="corner_radius_top_left" type="int" setter="set_corner_radius" getter="get_corner_radius" brief=""> + The corner radius of the top left corner. When set to 0 the corner is not rounded. </member> - <member name="draw_bg" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief=""> + <member name="corner_radius_top_right" type="int" setter="set_corner_radius" getter="get_corner_radius" brief=""> + The corner radius of the top right corner. When set to 0 the corner is not rounded. </member> - <member name="light_color" type="Color" setter="set_light_color" getter="get_light_color" brief=""> + <member name="draw_center" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief=""> + Toggels drawing of the inner part of the stylebox. + </member> + <member name="expand_margin_bottom" type="float" setter="set_expand_margin" getter="get_expand_margin" brief=""> + Expands the stylebox outside of the control rect on the bottom edge. Useful in combination with border_width_bottom. To draw a border outside the control rect. + </member> + <member name="expand_margin_left" type="float" setter="set_expand_margin" getter="get_expand_margin" brief=""> + Expands the stylebox outside of the control rect on the left edge. Useful in combination with border_width_left. To draw a border outside the control rect. + </member> + <member name="expand_margin_right" type="float" setter="set_expand_margin" getter="get_expand_margin" brief=""> + Expands the stylebox outside of the control rect on the right edge. Useful in combination with border_width_right. To draw a border outside the control rect. + </member> + <member name="expand_margin_top" type="float" setter="set_expand_margin" getter="get_expand_margin" brief=""> + Expands the stylebox outside of the control rect on the top edge. Useful in combination with border_width_top. To draw a border outside the control rect. + </member> + <member name="shadow_color" type="Color" setter="set_shadow_color" getter="get_shadow_color" brief=""> + The color of the shadow. (This has no effect when shadow_size < 1) + </member> + <member name="shadow_size" type="int" setter="set_shadow_size" getter="get_shadow_size" brief=""> + The shadow size in pixels. </member> </members> <constants> @@ -44589,24 +49550,24 @@ Texture Based 3x3 scale style. This stylebox performs a 3x3 scaling of a texture, where only the center cell is fully stretched. This allows for the easy creation of bordered styles. </description> <methods> - <method name="is_draw_center_enabled" qualifiers="const"> - <return type="bool"> + <method name="get_expand_margin_size" qualifiers="const"> + <return type="float"> </return> + <argument index="0" name="margin" type="int" enum="Margin"> + </argument> <description> </description> </method> - <method name="get_expand_margin_size" qualifiers="const"> - <return type="float"> + <method name="get_h_axis_stretch_mode" qualifiers="const"> + <return type="int" enum="StyleBoxTexture.AxisStretchMode"> </return> - <argument index="0" name="margin" type="int"> - </argument> <description> </description> </method> <method name="get_margin_size" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> </description> @@ -44618,7 +49579,7 @@ </description> </method> <method name="get_normal_map" qualifiers="const"> - <return type="Texture"> + <return type="Resource"> </return> <description> </description> @@ -44630,27 +49591,75 @@ </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Texture"> + <return type="Resource"> + </return> + <description> + </description> + </method> + <method name="get_v_axis_stretch_mode" qualifiers="const"> + <return type="int" enum="StyleBoxTexture.AxisStretchMode"> + </return> + <description> + </description> + </method> + <method name="is_draw_center_enabled" qualifiers="const"> + <return type="bool"> </return> <description> </description> </method> <method name="set_draw_center"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> + <method name="set_expand_margin_all"> + <return type="void"> + </return> + <argument index="0" name="size" type="float"> + </argument> + <description> + </description> + </method> + <method name="set_expand_margin_individual"> + <return type="void"> + </return> + <argument index="0" name="size_left" type="float"> + </argument> + <argument index="1" name="size_top" type="float"> + </argument> + <argument index="2" name="size_right" type="float"> + </argument> + <argument index="3" name="size_bottom" type="float"> + </argument> + <description> + </description> + </method> <method name="set_expand_margin_size"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="size" type="float"> </argument> <description> </description> </method> + <method name="set_h_axis_stretch_mode"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="StyleBoxTexture.AxisStretchMode"> + </argument> + <description> + </description> + </method> <method name="set_margin_size"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <argument index="1" name="size" type="float"> </argument> @@ -44658,31 +49667,51 @@ </description> </method> <method name="set_modulate"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> </description> </method> <method name="set_normal_map"> - <argument index="0" name="normal_map" type="Texture"> + <return type="void"> + </return> + <argument index="0" name="normal_map" type="Resource"> </argument> <description> </description> </method> <method name="set_region_rect"> + <return type="void"> + </return> <argument index="0" name="region" type="Rect2"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Texture"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Resource"> + </argument> + <description> + </description> + </method> + <method name="set_v_axis_stretch_mode"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="StyleBoxTexture.AxisStretchMode"> </argument> <description> </description> </method> </methods> <members> + <member name="axis_stretch_horizontal" type="int" setter="set_h_axis_stretch_mode" getter="get_h_axis_stretch_mode" brief="" enum="StyleBoxTexture.AxisStretchMode"> + </member> + <member name="axis_stretch_vertical" type="int" setter="set_v_axis_stretch_mode" getter="get_v_axis_stretch_mode" brief="" enum="StyleBoxTexture.AxisStretchMode"> + </member> <member name="draw_center" type="bool" setter="set_draw_center" getter="is_draw_center_enabled" brief=""> </member> <member name="expand_margin_bottom" type="float" setter="set_expand_margin_size" getter="get_expand_margin_size" brief=""> @@ -44703,11 +49732,11 @@ </member> <member name="modulate_color" type="Color" setter="set_modulate" getter="get_modulate" brief=""> </member> - <member name="normal_map" type="Texture" setter="set_normal_map" getter="get_normal_map" brief=""> + <member name="normal_map" type="Resource" setter="set_normal_map" getter="get_normal_map" brief=""> </member> <member name="region_rect" type="Rect2" setter="set_region_rect" getter="get_region_rect" brief=""> </member> - <member name="texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> + <member name="texture" type="Resource" setter="set_texture" getter="get_texture" brief=""> </member> </members> <signals> @@ -44717,6 +49746,12 @@ </signal> </signals> <constants> + <constant name="AXIS_STRETCH_MODE_STRETCH" value="0"> + </constant> + <constant name="AXIS_STRETCH_MODE_TILE" value="1"> + </constant> + <constant name="AXIS_STRETCH_MODE_TILE_FIT" value="2"> + </constant> </constants> </class> <class name="SurfaceTool" inherits="Reference" category="Core"> @@ -44737,6 +49772,8 @@ </description> <methods> <method name="add_bones"> + <return type="void"> + </return> <argument index="0" name="bones" type="PoolIntArray"> </argument> <description> @@ -44744,6 +49781,8 @@ </description> </method> <method name="add_color"> + <return type="void"> + </return> <argument index="0" name="color" type="Color"> </argument> <description> @@ -44751,6 +49790,8 @@ </description> </method> <method name="add_index"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> @@ -44758,6 +49799,8 @@ </description> </method> <method name="add_normal"> + <return type="void"> + </return> <argument index="0" name="normal" type="Vector3"> </argument> <description> @@ -44765,6 +49808,8 @@ </description> </method> <method name="add_smooth_group"> + <return type="void"> + </return> <argument index="0" name="smooth" type="bool"> </argument> <description> @@ -44772,30 +49817,44 @@ </description> </method> <method name="add_tangent"> + <return type="void"> + </return> <argument index="0" name="tangent" type="Plane"> </argument> <description> Specify a Tangent for the next Vertex to use. </description> </method> + <method name="add_to_format"> + <return type="void"> + </return> + <argument index="0" name="flags" type="int"> + </argument> + <description> + </description> + </method> <method name="add_triangle_fan"> + <return type="void"> + </return> <argument index="0" name="vertexes" type="PoolVector3Array"> </argument> - <argument index="1" name="uvs" type="PoolVector2Array" default="PoolVector2Array([])"> + <argument index="1" name="uvs" type="PoolVector2Array" default="PoolVector2Array( )"> </argument> - <argument index="2" name="colors" type="PoolColorArray" default="PoolColorArray([PoolColorArray])"> + <argument index="2" name="colors" type="PoolColorArray" default="PoolColorArray( )"> </argument> - <argument index="3" name="uv2s" type="PoolVector2Array" default="PoolVector2Array([])"> + <argument index="3" name="uv2s" type="PoolVector2Array" default="PoolVector2Array( )"> </argument> - <argument index="4" name="normals" type="PoolVector3Array" default="PoolVector3Array([])"> + <argument index="4" name="normals" type="PoolVector3Array" default="PoolVector3Array( )"> </argument> - <argument index="5" name="tangents" type="Array" default="[]"> + <argument index="5" name="tangents" type="Array" default="[ ]"> </argument> <description> Insert a triangle fan made of array data into [Mesh] being constructed. </description> </method> <method name="add_uv"> + <return type="void"> + </return> <argument index="0" name="uv" type="Vector2"> </argument> <description> @@ -44803,6 +49862,8 @@ </description> </method> <method name="add_uv2"> + <return type="void"> + </return> <argument index="0" name="uv2" type="Vector2"> </argument> <description> @@ -44810,6 +49871,8 @@ </description> </method> <method name="add_vertex"> + <return type="void"> + </return> <argument index="0" name="vertex" type="Vector3"> </argument> <description> @@ -44817,49 +49880,91 @@ </description> </method> <method name="add_weights"> + <return type="void"> + </return> <argument index="0" name="weights" type="PoolRealArray"> </argument> <description> Specify weight value for next Vertex to use. </description> </method> + <method name="append_from"> + <return type="void"> + </return> + <argument index="0" name="existing" type="Mesh"> + </argument> + <argument index="1" name="surface" type="int"> + </argument> + <argument index="2" name="transform" type="Transform"> + </argument> + <description> + </description> + </method> <method name="begin"> - <argument index="0" name="primitive" type="int"> + <return type="void"> + </return> + <argument index="0" name="primitive" type="int" enum="Mesh.PrimitiveType"> </argument> <description> Called before adding any Vertices. Takes the primitive type as an argument (e.g. Mesh.PRIMITIVE_TRIANGLES). </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear all information passed into the surface tool so far. </description> </method> <method name="commit"> - <return type="Mesh"> + <return type="ArrayMesh"> </return> - <argument index="0" name="existing" type="Mesh" default="NULL"> + <argument index="0" name="existing" type="ArrayMesh" default="null"> + </argument> + <description> + Returns a constructed [ArrayMesh] from current information passed in. If an existing [ArrayMesh] is passed in as an argument, will add an extra surface to the existing [ArrayMesh]. + </description> + </method> + <method name="create_from"> + <return type="void"> + </return> + <argument index="0" name="existing" type="Mesh"> + </argument> + <argument index="1" name="surface" type="int"> </argument> <description> - Returns a constructed [Mesh] from current information passed in. If an existing [Mesh] is passed in as an argument, will add an extra surface to the existing [Mesh]. </description> </method> <method name="deindex"> + <return type="void"> + </return> <description> Removes index array by expanding Vertex array. </description> </method> <method name="generate_normals"> + <return type="void"> + </return> <description> Generates normals from Vertices so you do not have to do it manually. </description> </method> + <method name="generate_tangents"> + <return type="void"> + </return> + <description> + </description> + </method> <method name="index"> + <return type="void"> + </return> <description> Shrinks Vertex array by creating an index array. Avoids reusing Vertices. </description> </method> <method name="set_material"> + <return type="void"> + </return> <argument index="0" name="material" type="Material"> </argument> <description> @@ -44886,7 +49991,7 @@ </description> </method> <method name="listen"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="port" type="int"> </argument> @@ -44900,12 +50005,14 @@ </description> </method> <method name="stop"> + <return type="void"> + </return> <description> Stop listening. </description> </method> <method name="take_connection"> - <return type="Object"> + <return type="StreamPeerTCP"> </return> <description> If a connection is available, return a StreamPeerTCP with the connection/ @@ -44958,7 +50065,7 @@ </description> </method> <method name="get_tab_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="TabContainer.TabAlign"> </return> <description> Return tab alignment, from the ALIGN_* enum. @@ -45006,6 +50113,8 @@ </description> </method> <method name="set_current_tab"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <description> @@ -45013,19 +50122,25 @@ </description> </method> <method name="set_popup"> - <argument index="0" name="popup" type="Popup"> + <return type="void"> + </return> + <argument index="0" name="popup" type="Node"> </argument> <description> </description> </method> <method name="set_tab_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="TabContainer.TabAlign"> </argument> <description> Set tab alignment, from the ALIGN_* enum. Moves tabs to the left, right or center. </description> </method> <method name="set_tab_disabled"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="disabled" type="bool"> @@ -45034,6 +50149,8 @@ </description> </method> <method name="set_tab_icon"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="icon" type="Texture"> @@ -45043,6 +50160,8 @@ </description> </method> <method name="set_tab_title"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="title" type="String"> @@ -45052,6 +50171,8 @@ </description> </method> <method name="set_tabs_visible"> + <return type="void"> + </return> <argument index="0" name="visible" type="bool"> </argument> <description> @@ -45062,7 +50183,7 @@ <members> <member name="current_tab" type="int" setter="set_current_tab" getter="get_current_tab" brief=""> </member> - <member name="tab_align" type="int" setter="set_tab_align" getter="get_tab_align" brief=""> + <member name="tab_align" type="int" setter="set_tab_align" getter="get_tab_align" brief="" enum="TabContainer.TabAlign"> </member> <member name="tabs_visible" type="bool" setter="set_tabs_visible" getter="are_tabs_visible" brief=""> </member> @@ -45137,14 +50258,18 @@ </description> <methods> <method name="add_tab"> - <argument index="0" name="title" type="String"> + <return type="void"> + </return> + <argument index="0" name="title" type="String" default=""""> </argument> - <argument index="1" name="icon" type="Texture"> + <argument index="1" name="icon" type="Texture" default="null"> </argument> <description> </description> </method> <method name="ensure_tab_visible"> + <return type="void"> + </return> <argument index="0" name="idx" type="int"> </argument> <description> @@ -45157,7 +50282,13 @@ </description> </method> <method name="get_tab_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="Tabs.TabAlign"> + </return> + <description> + </description> + </method> + <method name="get_tab_close_display_policy" qualifiers="const"> + <return type="int" enum="Tabs.CloseButtonDisplayPolicy"> </return> <description> </description> @@ -45184,7 +50315,7 @@ <description> </description> </method> - <method name="get_tab_rect"> + <method name="get_tab_rect" qualifiers="const"> <return type="Rect2"> </return> <argument index="0" name="tab_idx" type="int"> @@ -45202,6 +50333,8 @@ </description> </method> <method name="move_tab"> + <return type="void"> + </return> <argument index="0" name="from" type="int"> </argument> <argument index="1" name="to" type="int"> @@ -45211,24 +50344,40 @@ </description> </method> <method name="remove_tab"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <description> </description> </method> <method name="set_current_tab"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <description> </description> </method> <method name="set_tab_align"> - <argument index="0" name="align" type="int"> + <return type="void"> + </return> + <argument index="0" name="align" type="int" enum="Tabs.TabAlign"> + </argument> + <description> + </description> + </method> + <method name="set_tab_close_display_policy"> + <return type="void"> + </return> + <argument index="0" name="policy" type="int" enum="Tabs.CloseButtonDisplayPolicy"> </argument> <description> </description> </method> <method name="set_tab_disabled"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="disabled" type="bool"> @@ -45237,6 +50386,8 @@ </description> </method> <method name="set_tab_icon"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="icon" type="Texture"> @@ -45245,6 +50396,8 @@ </description> </method> <method name="set_tab_title"> + <return type="void"> + </return> <argument index="0" name="tab_idx" type="int"> </argument> <argument index="1" name="title" type="String"> @@ -45256,6 +50409,8 @@ <members> <member name="current_tab" type="int" setter="set_current_tab" getter="get_current_tab" brief=""> </member> + <member name="tab_close_display_policy" type="int" setter="set_tab_close_display_policy" getter="get_tab_close_display_policy" brief="" enum="Tabs.CloseButtonDisplayPolicy"> + </member> </members> <signals> <signal name="reposition_active_tab_request"> @@ -45276,6 +50431,12 @@ <description> </description> </signal> + <signal name="tab_clicked"> + <argument index="0" name="tab" type="int"> + </argument> + <description> + </description> + </signal> <signal name="tab_close"> <argument index="0" name="tab" type="int"> </argument> @@ -45296,12 +50457,16 @@ </constant> <constant name="ALIGN_RIGHT" value="2"> </constant> + <constant name="ALIGN_MAX" value="3"> + </constant> <constant name="CLOSE_BUTTON_SHOW_ACTIVE_ONLY" value="1"> </constant> <constant name="CLOSE_BUTTON_SHOW_ALWAYS" value="2"> </constant> <constant name="CLOSE_BUTTON_SHOW_NEVER" value="0"> </constant> + <constant name="CLOSE_BUTTON_MAX" value="3"> + </constant> </constants> <theme_items> <theme_item name="button" type="StyleBox"> @@ -45351,6 +50516,8 @@ </description> <methods> <method name="add_color_region"> + <return type="void"> + </return> <argument index="0" name="begin_key" type="String"> </argument> <argument index="1" name="end_key" type="String"> @@ -45364,6 +50531,8 @@ </description> </method> <method name="add_keyword_color"> + <return type="void"> + </return> <argument index="0" name="keyword" type="String"> </argument> <argument index="1" name="color" type="Color"> @@ -45373,16 +50542,22 @@ </description> </method> <method name="clear_colors"> + <return type="void"> + </return> <description> Clear all the syntax coloring information. </description> </method> <method name="clear_undo_history"> + <return type="void"> + </return> <description> Clear the undo history. </description> </method> <method name="copy"> + <return type="void"> + </return> <description> Copy the current selection. </description> @@ -45423,6 +50598,8 @@ </description> </method> <method name="cursor_set_blink_enabled"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45430,6 +50607,8 @@ </description> </method> <method name="cursor_set_blink_speed"> + <return type="void"> + </return> <argument index="0" name="blink_speed" type="float"> </argument> <description> @@ -45437,6 +50616,8 @@ </description> </method> <method name="cursor_set_block_mode"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45444,6 +50625,8 @@ </description> </method> <method name="cursor_set_column"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="adjust_viewport" type="bool" default="true"> @@ -45452,6 +50635,8 @@ </description> </method> <method name="cursor_set_line"> + <return type="void"> + </return> <argument index="0" name="line" type="int"> </argument> <argument index="1" name="adjust_viewport" type="bool" default="true"> @@ -45460,6 +50645,8 @@ </description> </method> <method name="cut"> + <return type="void"> + </return> <description> Cut the current selection. </description> @@ -45528,6 +50715,12 @@ Return the whole text. </description> </method> + <method name="get_v_scroll_speed" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> <method name="get_word_under_cursor" qualifiers="const"> <return type="String"> </return> @@ -45535,6 +50728,8 @@ </description> </method> <method name="insert_text_at_cursor"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> @@ -45562,6 +50757,12 @@ Returns true if line numbers are enabled. </description> </method> + <method name="is_smooth_scroll_enabled" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="is_syntax_coloring_enabled" qualifiers="const"> <return type="bool"> </return> @@ -45570,17 +50771,23 @@ </description> </method> <method name="menu_option"> - <argument index="0" name="arg0" type="int"> + <return type="void"> + </return> + <argument index="0" name="option" type="int"> </argument> <description> </description> </method> <method name="paste"> + <return type="void"> + </return> <description> Paste the current selection. </description> </method> <method name="redo"> + <return type="void"> + </return> <description> Perform redo operation. </description> @@ -45588,19 +50795,21 @@ <method name="search" qualifiers="const"> <return type="PoolIntArray"> </return> - <argument index="0" name="flags" type="String"> + <argument index="0" name="key" type="String"> </argument> - <argument index="1" name="from_line" type="int"> + <argument index="1" name="flags" type="int"> </argument> - <argument index="2" name="from_column" type="int"> + <argument index="2" name="from_line" type="int"> </argument> - <argument index="3" name="to_line" type="int"> + <argument index="3" name="from_column" type="int"> </argument> <description> Perform a search inside the text. Search flags can be specified in the SEARCH_* enum. </description> </method> <method name="select"> + <return type="void"> + </return> <argument index="0" name="from_line" type="int"> </argument> <argument index="1" name="from_column" type="int"> @@ -45614,11 +50823,15 @@ </description> </method> <method name="select_all"> + <return type="void"> + </return> <description> Select all the text. </description> </method> <method name="set_highlight_all_occurrences"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45626,6 +50839,8 @@ </description> </method> <method name="set_max_chars"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -45633,6 +50848,8 @@ </description> </method> <method name="set_readonly"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45640,13 +50857,25 @@ </description> </method> <method name="set_show_line_numbers"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> Set to enable showing line numbers. </description> </method> + <method name="set_smooth_scroll_enable"> + <return type="void"> + </return> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> <method name="set_syntax_coloring"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45654,13 +50883,25 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="text" type="String"> </argument> <description> Set the entire text. </description> </method> + <method name="set_v_scroll_speed"> + <return type="void"> + </return> + <argument index="0" name="speed" type="float"> + </argument> + <description> + </description> + </method> <method name="set_wrap"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -45668,6 +50909,8 @@ </description> </method> <method name="undo"> + <return type="void"> + </return> <description> Perform undo operation. </description> @@ -45684,8 +50927,12 @@ </member> <member name="show_line_numbers" type="bool" setter="set_show_line_numbers" getter="is_show_line_numbers_enabled" brief=""> </member> + <member name="smooth_scrolling" type="bool" setter="set_smooth_scroll_enable" getter="is_smooth_scroll_enabled" brief=""> + </member> <member name="syntax_highlighting" type="bool" setter="set_syntax_coloring" getter="is_syntax_coloring_enabled" brief=""> </member> + <member name="v_scroll_speed" type="float" setter="set_v_scroll_speed" getter="get_v_scroll_speed" brief=""> + </member> </members> <signals> <signal name="breakpoint_toggled"> @@ -45817,53 +51064,65 @@ </description> <methods> <method name="draw" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="canvas_item" type="RID"> </argument> <argument index="1" name="pos" type="Vector2"> </argument> - <argument index="2" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="3" name="transpose" type="bool" default="false"> </argument> - <argument index="4" name="normal_map" type="Texture" default="NULL"> + <argument index="4" name="normal_map" type="Texture" default="null"> </argument> <description> </description> </method> <method name="draw_rect" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="canvas_item" type="RID"> </argument> <argument index="1" name="rect" type="Rect2"> </argument> <argument index="2" name="tile" type="bool"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="transpose" type="bool" default="false"> </argument> - <argument index="5" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="normal_map" type="Texture" default="null"> </argument> <description> </description> </method> <method name="draw_rect_region" qualifiers="const"> + <return type="void"> + </return> <argument index="0" name="canvas_item" type="RID"> </argument> <argument index="1" name="rect" type="Rect2"> </argument> <argument index="2" name="src_rect" type="Rect2"> </argument> - <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> + <argument index="3" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )"> </argument> <argument index="4" name="transpose" type="bool" default="false"> </argument> - <argument index="5" name="normal_map" type="Texture" default="NULL"> + <argument index="5" name="normal_map" type="Texture" default="null"> </argument> <argument index="6" name="clip_uv" type="bool" default="true"> </argument> <description> </description> </method> + <method name="get_data" qualifiers="const"> + <return type="Image"> + </return> + <description> + </description> + </method> <method name="get_flags" qualifiers="const"> <return type="int"> </return> @@ -45899,6 +51158,8 @@ </description> </method> <method name="set_flags"> + <return type="void"> + </return> <argument index="0" name="flags" type="int"> </argument> <description> @@ -45982,55 +51243,71 @@ </description> </method> <method name="get_stretch_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="TextureButton.StretchMode"> </return> <description> </description> </method> <method name="set_click_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="BitMap"> </argument> <description> </description> </method> <method name="set_disabled_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_expand"> + <return type="void"> + </return> <argument index="0" name="p_expand" type="bool"> </argument> <description> </description> </method> <method name="set_focused_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_hover_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_normal_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_pressed_texture"> + <return type="void"> + </return> <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_stretch_mode"> - <argument index="0" name="p_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="p_mode" type="int" enum="TextureButton.StretchMode"> </argument> <description> </description> @@ -46039,7 +51316,7 @@ <members> <member name="expand" type="bool" setter="set_expand" getter="get_expand" brief=""> </member> - <member name="stretch_mode" type="int" setter="set_stretch_mode" getter="get_stretch_mode" brief=""> + <member name="stretch_mode" type="int" setter="set_stretch_mode" getter="get_stretch_mode" brief="" enum="TextureButton.StretchMode"> </member> <member name="texture_click_mask" type="BitMap" setter="set_click_mask" getter="get_click_mask" brief=""> </member> @@ -46091,7 +51368,7 @@ <description> </description> </method> - <method name="get_nine_patch_stretch"> + <method name="get_nine_patch_stretch" qualifiers="const"> <return type="bool"> </return> <description> @@ -46099,13 +51376,13 @@ </description> </method> <method name="get_over_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="get_progress_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> @@ -46125,31 +51402,37 @@ <method name="get_stretch_margin" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="margin" type="int"> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> Return nine-patch texture offset for a given margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). </description> </method> <method name="get_under_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="set_fill_degrees"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_fill_mode"> + <return type="void"> + </return> <argument index="0" name="mode" type="int"> </argument> <description> </description> </method> <method name="set_nine_patch_stretch"> + <return type="void"> + </return> <argument index="0" name="stretch" type="bool"> </argument> <description> @@ -46157,40 +51440,52 @@ </description> </method> <method name="set_over_texture"> - <argument index="0" name="tex" type="Object"> + <return type="void"> + </return> + <argument index="0" name="tex" type="Texture"> </argument> <description> </description> </method> <method name="set_progress_texture"> - <argument index="0" name="tex" type="Object"> + <return type="void"> + </return> + <argument index="0" name="tex" type="Texture"> </argument> <description> </description> </method> <method name="set_radial_center_offset"> + <return type="void"> + </return> <argument index="0" name="mode" type="Vector2"> </argument> <description> </description> </method> <method name="set_radial_initial_angle"> + <return type="void"> + </return> <argument index="0" name="mode" type="float"> </argument> <description> </description> </method> <method name="set_stretch_margin"> - <argument index="0" name="margin" type="int"> + <return type="void"> + </return> + <argument index="0" name="margin" type="int" enum="Margin"> </argument> - <argument index="1" name="size" type="int"> + <argument index="1" name="value" type="int"> </argument> <description> Set nine-patch texture offset for a given margin (MARGIN_LEFT, MARGIN_TOP, MARGIN_RIGHT, MARGIN_BOTTOM). </description> </method> <method name="set_under_texture"> - <argument index="0" name="tex" type="Object"> + <return type="void"> + </return> + <argument index="0" name="tex" type="Texture"> </argument> <description> </description> @@ -46199,27 +51494,27 @@ <members> <member name="fill_mode" type="int" setter="set_fill_mode" getter="get_fill_mode" brief=""> </member> + <member name="nine_patch_stretch" type="bool" setter="set_nine_patch_stretch" getter="get_nine_patch_stretch" brief=""> + </member> <member name="radial_center_offset" type="Vector2" setter="set_radial_center_offset" getter="get_radial_center_offset" brief=""> </member> <member name="radial_fill_degrees" type="float" setter="set_fill_degrees" getter="get_fill_degrees" brief=""> </member> <member name="radial_initial_angle" type="float" setter="set_radial_initial_angle" getter="get_radial_initial_angle" brief=""> </member> - <member name="texture_over" type="Texture" setter="set_over_texture" getter="get_over_texture" brief=""> - </member> - <member name="texture_progress" type="Texture" setter="set_progress_texture" getter="get_progress_texture" brief=""> - </member> - <member name="texture_under" type="Texture" setter="set_under_texture" getter="get_under_texture" brief=""> - </member> - <member name="nine_patch_stretch" type="bool" setter="set_nine_patch_stretch" getter="get_nine_patch_stretch" brief=""> + <member name="stretch_margin_bottom" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> </member> <member name="stretch_margin_left" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> </member> + <member name="stretch_margin_right" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> + </member> <member name="stretch_margin_top" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> </member> - <member name="stretch_margin_right" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> + <member name="texture_over" type="Texture" setter="set_over_texture" getter="get_over_texture" brief=""> </member> - <member name="stretch_margin_bottom" type="int" setter="set_stretch_margin" getter="get_stretch_margin" brief=""> + <member name="texture_progress" type="Texture" setter="set_progress_texture" getter="get_progress_texture" brief=""> + </member> + <member name="texture_under" type="Texture" setter="set_under_texture" getter="get_under_texture" brief=""> </member> </members> <constants> @@ -46246,13 +51541,13 @@ </description> <methods> <method name="get_stretch_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="TextureRect.StretchMode"> </return> <description> </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> @@ -46264,19 +51559,25 @@ </description> </method> <method name="set_expand"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_stretch_mode"> - <argument index="0" name="stretch_mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="stretch_mode" type="int" enum="TextureRect.StretchMode"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> </description> @@ -46285,7 +51586,7 @@ <members> <member name="expand" type="bool" setter="set_expand" getter="has_expand" brief=""> </member> - <member name="stretch_mode" type="int" setter="set_stretch_mode" getter="get_stretch_mode" brief=""> + <member name="stretch_mode" type="int" setter="set_stretch_mode" getter="get_stretch_mode" brief="" enum="TextureRect.StretchMode"> </member> <member name="texture" type="Texture" setter="set_texture" getter="get_texture" brief=""> </member> @@ -46319,6 +51620,8 @@ </description> <methods> <method name="clear_color"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46327,6 +51630,8 @@ </description> </method> <method name="clear_constant"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46335,6 +51640,8 @@ </description> </method> <method name="clear_font"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46343,6 +51650,8 @@ </description> </method> <method name="clear_icon"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46351,6 +51660,8 @@ </description> </method> <method name="clear_stylebox"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46359,6 +51670,8 @@ </description> </method> <method name="copy_default_theme"> + <return type="void"> + </return> <description> </description> </method> @@ -46399,7 +51712,7 @@ </description> </method> <method name="get_default_font" qualifiers="const"> - <return type="Object"> + <return type="Font"> </return> <description> </description> @@ -46523,6 +51836,8 @@ </description> </method> <method name="set_color"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46533,6 +51848,8 @@ </description> </method> <method name="set_constant"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46543,12 +51860,16 @@ </description> </method> <method name="set_default_font"> - <argument index="0" name="font" type="Object"> + <return type="void"> + </return> + <argument index="0" name="font" type="Font"> </argument> <description> </description> </method> <method name="set_font"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46559,6 +51880,8 @@ </description> </method> <method name="set_icon"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46569,6 +51892,8 @@ </description> </method> <method name="set_stylebox"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="type" type="String"> @@ -46609,13 +51934,13 @@ </description> </method> <method name="start"> - <return type="Error"> + <return type="int" enum="Error"> </return> <argument index="0" name="instance" type="Object"> </argument> <argument index="1" name="method" type="String"> </argument> - <argument index="2" name="userdata" type="Variant" default="NULL"> + <argument index="2" name="userdata" type="Variant" default="null"> </argument> <argument index="3" name="priority" type="int" default="1"> </argument> @@ -46651,6 +51976,8 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> Clear all cells. </description> @@ -46755,14 +52082,14 @@ </description> </method> <method name="get_half_offset" qualifiers="const"> - <return type="int"> + <return type="int" enum="TileMap.HalfOffset"> </return> <description> Return the current half offset configuration. </description> </method> <method name="get_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="TileMap.Mode"> </return> <description> Return the orientation mode. @@ -46782,7 +52109,7 @@ </description> </method> <method name="get_tile_origin" qualifiers="const"> - <return type="int"> + <return type="int" enum="TileMap.TileOrigin"> </return> <description> Return the tile origin configuration. @@ -46802,6 +52129,14 @@ Return an array of all cells containing a tile from the tileset (i.e. a tile index different from -1). </description> </method> + <method name="get_used_cells_by_id" qualifiers="const"> + <return type="Array"> + </return> + <argument index="0" name="id" type="int"> + </argument> + <description> + </description> + </method> <method name="get_used_rect"> <return type="Rect2"> </return> @@ -46861,6 +52196,8 @@ </description> </method> <method name="set_cell"> + <return type="void"> + </return> <argument index="0" name="x" type="int"> </argument> <argument index="1" name="y" type="int"> @@ -46880,6 +52217,8 @@ </description> </method> <method name="set_cell_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> @@ -46887,6 +52226,8 @@ </description> </method> <method name="set_cellv"> + <return type="void"> + </return> <argument index="0" name="pos" type="Vector2"> </argument> <argument index="1" name="tile" type="int"> @@ -46904,6 +52245,8 @@ </description> </method> <method name="set_center_x"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -46911,6 +52254,8 @@ </description> </method> <method name="set_center_y"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -46918,6 +52263,8 @@ </description> </method> <method name="set_collision_bounce"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -46925,6 +52272,8 @@ </description> </method> <method name="set_collision_friction"> + <return type="void"> + </return> <argument index="0" name="value" type="float"> </argument> <description> @@ -46932,6 +52281,8 @@ </description> </method> <method name="set_collision_layer"> + <return type="void"> + </return> <argument index="0" name="layer" type="int"> </argument> <description> @@ -46940,6 +52291,8 @@ </description> </method> <method name="set_collision_layer_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -46948,6 +52301,8 @@ </description> </method> <method name="set_collision_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -46956,6 +52311,8 @@ </description> </method> <method name="set_collision_mask_bit"> + <return type="void"> + </return> <argument index="0" name="bit" type="int"> </argument> <argument index="1" name="value" type="bool"> @@ -46964,6 +52321,8 @@ </description> </method> <method name="set_collision_use_kinematic"> + <return type="void"> + </return> <argument index="0" name="use_kinematic" type="bool"> </argument> <description> @@ -46971,6 +52330,8 @@ </description> </method> <method name="set_custom_transform"> + <return type="void"> + </return> <argument index="0" name="custom_transform" type="Transform2D"> </argument> <description> @@ -46978,27 +52339,35 @@ </description> </method> <method name="set_half_offset"> - <argument index="0" name="half_offset" type="int"> + <return type="void"> + </return> + <argument index="0" name="half_offset" type="int" enum="TileMap.HalfOffset"> </argument> <description> - Set an half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument). + Set a half offset on the X coordinate, Y coordinate, or none (use HALF_OFFSET_* constants as argument). Half offset sets every other tile off by a half tile size in the specified direction. </description> </method> <method name="set_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="TileMap.Mode"> </argument> <description> Set the orientation mode as square, isometric or custom (use MODE_* constants as argument). </description> </method> <method name="set_occluder_light_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> </description> </method> <method name="set_quadrant_size"> + <return type="void"> + </return> <argument index="0" name="size" type="int"> </argument> <description> @@ -47007,13 +52376,17 @@ </description> </method> <method name="set_tile_origin"> - <argument index="0" name="origin" type="int"> + <return type="void"> + </return> + <argument index="0" name="origin" type="int" enum="TileMap.TileOrigin"> </argument> <description> Set the tile origin to the tile center or its top-left corner (use TILE_ORIGIN_* constants as argument). </description> </method> <method name="set_tileset"> + <return type="void"> + </return> <argument index="0" name="tileset" type="TileSet"> </argument> <description> @@ -47021,6 +52394,8 @@ </description> </method> <method name="set_y_sort_mode"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -47041,13 +52416,13 @@ <members> <member name="cell_custom_transform" type="Transform2D" setter="set_custom_transform" getter="get_custom_transform" brief=""> </member> - <member name="cell_half_offset" type="int" setter="set_half_offset" getter="get_half_offset" brief=""> + <member name="cell_half_offset" type="int" setter="set_half_offset" getter="get_half_offset" brief="" enum="TileMap.HalfOffset"> </member> <member name="cell_quadrant_size" type="int" setter="set_quadrant_size" getter="get_quadrant_size" brief=""> </member> <member name="cell_size" type="Vector2" setter="set_cell_size" getter="get_cell_size" brief=""> </member> - <member name="cell_tile_origin" type="int" setter="set_tile_origin" getter="get_tile_origin" brief=""> + <member name="cell_tile_origin" type="int" setter="set_tile_origin" getter="get_tile_origin" brief="" enum="TileMap.TileOrigin"> </member> <member name="cell_y_sort" type="bool" setter="set_y_sort_mode" getter="is_y_sort_mode_enabled" brief=""> </member> @@ -47061,11 +52436,11 @@ </member> <member name="collision_use_kinematic" type="bool" setter="set_collision_use_kinematic" getter="get_collision_use_kinematic" brief=""> </member> - <member name="mode" type="int" setter="set_mode" getter="get_mode" brief=""> + <member name="mode" type="int" setter="set_mode" getter="get_mode" brief="" enum="TileMap.Mode"> </member> <member name="occluder_light_mask" type="int" setter="set_occluder_light_mask" getter="get_occluder_light_mask" brief=""> </member> - <member name="tile_data" type="Object" setter="_set_tile_data" getter="_get_tile_data" brief=""> + <member name="tile_data" type="PoolIntArray" setter="_set_tile_data" getter="_get_tile_data" brief=""> </member> <member name="tile_set" type="TileSet" setter="set_tileset" getter="get_tileset" brief=""> </member> @@ -47078,7 +52453,7 @@ </signal> </signals> <constants> - <constant name="INVALID_CELL" value="-1"> + <constant name="INVALID_CELL" value="-1" enum=""> Returned when a cell doesn't exist. </constant> <constant name="MODE_SQUARE" value="0"> @@ -47119,11 +52494,15 @@ </description> <methods> <method name="clear"> + <return type="void"> + </return> <description> Clear all tiles. </description> </method> <method name="create_tile"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -47154,6 +52533,8 @@ </description> </method> <method name="remove_tile"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <description> @@ -47161,6 +52542,8 @@ </description> </method> <method name="tile_add_shape"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="shape" type="Shape2D"> @@ -47309,6 +52692,8 @@ </description> </method> <method name="tile_set_light_occluder"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="light_occluder" type="OccluderPolygon2D"> @@ -47318,6 +52703,8 @@ </description> </method> <method name="tile_set_material"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="material" type="ShaderMaterial"> @@ -47327,6 +52714,8 @@ </description> </method> <method name="tile_set_name"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="name" type="String"> @@ -47336,6 +52725,8 @@ </description> </method> <method name="tile_set_navigation_polygon"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="navigation_polygon" type="NavigationPolygon"> @@ -47345,6 +52736,8 @@ </description> </method> <method name="tile_set_navigation_polygon_offset"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="navigation_polygon_offset" type="Vector2"> @@ -47354,6 +52747,8 @@ </description> </method> <method name="tile_set_normal_map"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="normal_map" type="Texture"> @@ -47362,6 +52757,8 @@ </description> </method> <method name="tile_set_occluder_offset"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="occluder_offset" type="Vector2"> @@ -47371,6 +52768,8 @@ </description> </method> <method name="tile_set_region"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="region" type="Rect2"> @@ -47380,6 +52779,8 @@ </description> </method> <method name="tile_set_shape"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="shape_id" type="int"> @@ -47390,6 +52791,8 @@ </description> </method> <method name="tile_set_shape_one_way"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="shape_id" type="int"> @@ -47400,6 +52803,8 @@ </description> </method> <method name="tile_set_shape_transform"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="shape_id" type="int"> @@ -47410,6 +52815,8 @@ </description> </method> <method name="tile_set_shapes"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="shapes" type="Array"> @@ -47419,6 +52826,8 @@ </description> </method> <method name="tile_set_texture"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="texture" type="Texture"> @@ -47428,6 +52837,8 @@ </description> </method> <method name="tile_set_texture_offset"> + <return type="void"> + </return> <argument index="0" name="id" type="int"> </argument> <argument index="1" name="texture_offset" type="Vector2"> @@ -47456,7 +52867,7 @@ </description> </method> <method name="get_timer_process_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Timer.TimerProcessMode"> </return> <description> Return the timer's processing mode. @@ -47497,6 +52908,8 @@ </description> </method> <method name="set_autostart"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -47504,6 +52917,8 @@ </description> </method> <method name="set_one_shot"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -47511,6 +52926,8 @@ </description> </method> <method name="set_paused"> + <return type="void"> + </return> <argument index="0" name="paused" type="bool"> </argument> <description> @@ -47518,13 +52935,17 @@ </description> </method> <method name="set_timer_process_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Timer.TimerProcessMode"> </argument> <description> Set the timer's processing mode (fixed or idle, use TIMER_PROCESS_* constants as argument). </description> </method> <method name="set_wait_time"> + <return type="void"> + </return> <argument index="0" name="time_sec" type="float"> </argument> <description> @@ -47532,11 +52953,15 @@ </description> </method> <method name="start"> + <return type="void"> + </return> <description> Start the timer. </description> </method> <method name="stop"> + <return type="void"> + </return> <description> Stop (cancel) the timer. </description> @@ -47547,7 +52972,7 @@ </member> <member name="one_shot" type="bool" setter="set_one_shot" getter="is_one_shot" brief=""> </member> - <member name="process_mode" type="int" setter="set_timer_process_mode" getter="get_timer_process_mode" brief=""> + <member name="process_mode" type="int" setter="set_timer_process_mode" getter="get_timer_process_mode" brief="" enum="Timer.TimerProcessMode"> </member> <member name="wait_time" type="float" setter="set_wait_time" getter="get_wait_time" brief=""> </member> @@ -47615,31 +53040,31 @@ </description> </method> <method name="get_bitmask" qualifiers="const"> - <return type="Object"> + <return type="BitMap"> </return> <description> </description> </method> <method name="get_shape" qualifiers="const"> - <return type="Object"> + <return type="Shape2D"> </return> <description> </description> </method> <method name="get_texture" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="get_texture_pressed" qualifiers="const"> - <return type="Object"> + <return type="Texture"> </return> <description> </description> </method> <method name="get_visibility_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="TouchScreenButton.VisibilityMode"> </return> <description> </description> @@ -47669,55 +53094,73 @@ </description> </method> <method name="set_action"> + <return type="void"> + </return> <argument index="0" name="action" type="String"> </argument> <description> </description> </method> <method name="set_bitmask"> - <argument index="0" name="bitmask" type="Object"> + <return type="void"> + </return> + <argument index="0" name="bitmask" type="BitMap"> </argument> <description> </description> </method> <method name="set_passby_press"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> <method name="set_shape"> - <argument index="0" name="shape" type="Object"> + <return type="void"> + </return> + <argument index="0" name="shape" type="Shape2D"> </argument> <description> </description> </method> <method name="set_shape_centered"> + <return type="void"> + </return> <argument index="0" name="bool" type="bool"> </argument> <description> </description> </method> <method name="set_shape_visible"> + <return type="void"> + </return> <argument index="0" name="bool" type="bool"> </argument> <description> </description> </method> <method name="set_texture"> - <argument index="0" name="texture" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture" type="Texture"> </argument> <description> </description> </method> <method name="set_texture_pressed"> - <argument index="0" name="texture_pressed" type="Object"> + <return type="void"> + </return> + <argument index="0" name="texture_pressed" type="Texture"> </argument> <description> </description> </method> <method name="set_visibility_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="TouchScreenButton.VisibilityMode"> </argument> <description> </description> @@ -47740,7 +53183,7 @@ </member> <member name="shape_visible" type="bool" setter="set_shape_visible" getter="is_shape_visible" brief=""> </member> - <member name="visibility_mode" type="int" setter="set_visibility_mode" getter="get_visibility_mode" brief=""> + <member name="visibility_mode" type="int" setter="set_visibility_mode" getter="get_visibility_mode" brief="" enum="TouchScreenButton.VisibilityMode"> </member> </members> <signals> @@ -47824,6 +53267,16 @@ Returns the inverse of the transfrom, under the assumption that the transformation is composed of rotation, scaling and translation. </description> </method> + <method name="interpolate_with"> + <return type="Transform"> + </return> + <argument index="0" name="transform" type="Transform"> + </argument> + <argument index="1" name="weight" type="float"> + </argument> + <description> + </description> + </method> <method name="inverse"> <return type="Transform"> </return> @@ -47991,9 +53444,9 @@ <method name="interpolate_with"> <return type="Transform2D"> </return> - <argument index="0" name="m" type="Transform2D"> + <argument index="0" name="transform" type="Transform2D"> </argument> - <argument index="1" name="c" type="float"> + <argument index="1" name="weight" type="float"> </argument> <description> </description> @@ -48071,6 +53524,8 @@ </description> <methods> <method name="add_message"> + <return type="void"> + </return> <argument index="0" name="src_message" type="String"> </argument> <argument index="1" name="xlated_message" type="String"> @@ -48080,6 +53535,8 @@ </description> </method> <method name="erase_message"> + <return type="void"> + </return> <argument index="0" name="src_message" type="String"> </argument> <description> @@ -48116,6 +53573,8 @@ </description> </method> <method name="set_locale"> + <return type="void"> + </return> <argument index="0" name="locale" type="String"> </argument> <description> @@ -48140,12 +53599,16 @@ </description> <methods> <method name="add_translation"> + <return type="void"> + </return> <argument index="0" name="translation" type="Translation"> </argument> <description> </description> </method> <method name="clear"> + <return type="void"> + </return> <description> </description> </method> @@ -48156,12 +53619,16 @@ </description> </method> <method name="remove_translation"> + <return type="void"> + </return> <argument index="0" name="translation" type="Translation"> </argument> <description> </description> </method> <method name="set_locale"> + <return type="void"> + </return> <argument index="0" name="locale" type="String"> </argument> <description> @@ -48206,24 +53673,34 @@ </description> </method> <method name="clear"> + <return type="void"> + </return> <description> Clear the tree. This erases all of the items. </description> </method> <method name="create_item"> - <return type="TreeItem"> + <return type="Object"> </return> - <argument index="0" name="parent" type="TreeItem" default="NULL"> + <argument index="0" name="parent" type="Object" default="null"> </argument> <description> Create an item in the tree and add it as the last child of [code]parent[/code]. If parent is not given, it will be added as the last child of the root, or it'll the be the root itself if the tree is empty. </description> </method> <method name="ensure_cursor_is_visible"> + <return type="void"> + </return> <description> Make the current selected item visible. This will scroll the tree to make sure the selected item is in sight. </description> </method> + <method name="get_allow_reselect" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="get_allow_rmb_select" qualifiers="const"> <return type="bool"> </return> @@ -48296,7 +53773,7 @@ <method name="get_item_area_rect" qualifiers="const"> <return type="Rect2"> </return> - <argument index="0" name="item" type="TreeItem"> + <argument index="0" name="item" type="Object"> </argument> <argument index="1" name="column" type="int" default="-1"> </argument> @@ -48316,7 +53793,7 @@ <method name="get_next_selected"> <return type="TreeItem"> </return> - <argument index="0" name="from" type="TreeItem"> + <argument index="0" name="from" type="Object"> </argument> <description> Get the next selected item after the given one. @@ -48357,21 +53834,24 @@ Get the column number of the current selection. </description> </method> - <method name="get_single_select_cell_editing_only_when_already_selected" qualifiers="const"> + <method name="is_folding_hidden" qualifiers="const"> <return type="bool"> </return> <description> - Get whether the editing of a cell should only happen when it is already selected. + Get whether the folding arrow is hidden. </description> </method> - <method name="is_folding_hidden" qualifiers="const"> - <return type="bool"> + <method name="set_allow_reselect"> + <return type="void"> </return> + <argument index="0" name="allow" type="bool"> + </argument> <description> - Get whether the folding arrow is hidden. </description> </method> <method name="set_allow_rmb_select"> + <return type="void"> + </return> <argument index="0" name="allow" type="bool"> </argument> <description> @@ -48379,6 +53859,8 @@ </description> </method> <method name="set_column_expand"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="expand" type="bool"> @@ -48388,6 +53870,8 @@ </description> </method> <method name="set_column_min_width"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="min_width" type="int"> @@ -48397,6 +53881,8 @@ </description> </method> <method name="set_column_title"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="title" type="String"> @@ -48406,6 +53892,8 @@ </description> </method> <method name="set_column_titles_visible"> + <return type="void"> + </return> <argument index="0" name="visible" type="bool"> </argument> <description> @@ -48413,6 +53901,8 @@ </description> </method> <method name="set_columns"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> @@ -48420,6 +53910,8 @@ </description> </method> <method name="set_drop_mode_flags"> + <return type="void"> + </return> <argument index="0" name="flags" type="int"> </argument> <description> @@ -48427,6 +53919,8 @@ </description> </method> <method name="set_hide_folding"> + <return type="void"> + </return> <argument index="0" name="hide" type="bool"> </argument> <description> @@ -48434,6 +53928,8 @@ </description> </method> <method name="set_hide_root"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -48441,19 +53937,14 @@ </description> </method> <method name="set_select_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Tree.SelectMode"> </argument> <description> Set the selection mode. Use one of the [code]SELECT_*[/code] constants. </description> </method> - <method name="set_single_select_cell_editing_only_when_already_selected"> - <argument index="0" name="enable" type="bool"> - </argument> - <description> - Set whether the editing of a cell should only happen when it is already selected. - </description> - </method> </methods> <signals> <signal name="button_pressed"> @@ -48517,6 +54008,10 @@ Emitted when an item is editted. </description> </signal> + <signal name="item_rmb_edited"> + <description> + </description> + </signal> <signal name="item_rmb_selected"> <argument index="0" name="pos" type="Vector2"> </argument> @@ -48640,6 +54135,8 @@ </description> <methods> <method name="add_button"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="button" type="Texture"> @@ -48654,24 +54151,32 @@ </description> </method> <method name="clear_custom_bg_color"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <description> </description> </method> <method name="clear_custom_color"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <description> </description> </method> <method name="deselect"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <description> </description> </method> <method name="erase_button"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="button_idx" type="int"> @@ -48698,7 +54203,7 @@ </description> </method> <method name="get_cell_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="TreeItem.TreeCellMode"> </return> <argument index="0" name="column" type="int"> </argument> @@ -48752,6 +54257,8 @@ </description> </method> <method name="get_metadata" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="column" type="int"> </argument> <description> @@ -48812,7 +54319,7 @@ </description> </method> <method name="get_text_align" qualifiers="const"> - <return type="int"> + <return type="int" enum="TreeItem.TextAlign"> </return> <argument index="0" name="column" type="int"> </argument> @@ -48890,15 +54397,19 @@ </description> </method> <method name="move_to_bottom"> + <return type="void"> + </return> <description> </description> </method> <method name="move_to_top"> + <return type="void"> + </return> <description> </description> </method> <method name="remove_child"> - <return type="TreeItem"> + <return type="void"> </return> <argument index="0" name="child" type="Object"> </argument> @@ -48906,12 +54417,16 @@ </description> </method> <method name="select"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <description> </description> </method> <method name="set_button"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="button_idx" type="int"> @@ -48922,14 +54437,18 @@ </description> </method> <method name="set_cell_mode"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> - <argument index="1" name="mode" type="int"> + <argument index="1" name="mode" type="int" enum="TreeItem.TreeCellMode"> </argument> <description> </description> </method> <method name="set_checked"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="checked" type="bool"> @@ -48938,12 +54457,16 @@ </description> </method> <method name="set_collapsed"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_custom_as_button"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -48952,6 +54475,8 @@ </description> </method> <method name="set_custom_bg_color"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="color" type="Color"> @@ -48962,6 +54487,8 @@ </description> </method> <method name="set_custom_color"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="color" type="Color"> @@ -48970,6 +54497,8 @@ </description> </method> <method name="set_custom_draw"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="object" type="Object"> @@ -48980,12 +54509,16 @@ </description> </method> <method name="set_disable_folding"> + <return type="void"> + </return> <argument index="0" name="disable" type="bool"> </argument> <description> </description> </method> <method name="set_editable"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="enabled" type="bool"> @@ -48994,6 +54527,8 @@ </description> </method> <method name="set_expand_right"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="enable" type="bool"> @@ -49002,6 +54537,8 @@ </description> </method> <method name="set_icon"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="texture" type="Texture"> @@ -49010,6 +54547,8 @@ </description> </method> <method name="set_icon_max_width"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="width" type="int"> @@ -49018,6 +54557,8 @@ </description> </method> <method name="set_icon_region"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="region" type="Rect2"> @@ -49026,6 +54567,8 @@ </description> </method> <method name="set_metadata"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="meta" type="Variant"> @@ -49034,6 +54577,8 @@ </description> </method> <method name="set_range"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="value" type="float"> @@ -49042,6 +54587,8 @@ </description> </method> <method name="set_range_config"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="min" type="float"> @@ -49056,6 +54603,8 @@ </description> </method> <method name="set_selectable"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="selectable" type="bool"> @@ -49064,6 +54613,8 @@ </description> </method> <method name="set_text"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="text" type="String"> @@ -49072,14 +54623,18 @@ </description> </method> <method name="set_text_align"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> - <argument index="1" name="text_align" type="int"> + <argument index="1" name="text_align" type="int" enum="TreeItem.TextAlign"> </argument> <description> </description> </method> <method name="set_tooltip"> + <return type="void"> + </return> <argument index="0" name="column" type="int"> </argument> <argument index="1" name="tooltip" type="String"> @@ -49144,9 +54699,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="7" name="ease_type" type="int"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -49170,9 +54725,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="7" name="ease_type" type="int"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -49196,7 +54751,7 @@ </description> </method> <method name="get_tween_process_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Tween.TweenProcessMode"> </return> <description> Returns the process mode that has been set from editor GUI or [method set_tween_process_mode] @@ -49211,15 +54766,15 @@ </argument> <argument index="2" name="callback" type="String"> </argument> - <argument index="3" name="arg1" type="Variant" default="NULL"> + <argument index="3" name="arg1" type="Variant" default="null"> </argument> - <argument index="4" name="arg2" type="Variant" default="NULL"> + <argument index="4" name="arg2" type="Variant" default="null"> </argument> - <argument index="5" name="arg3" type="Variant" default="NULL"> + <argument index="5" name="arg3" type="Variant" default="null"> </argument> - <argument index="6" name="arg4" type="Variant" default="NULL"> + <argument index="6" name="arg4" type="Variant" default="null"> </argument> - <argument index="7" name="arg5" type="Variant" default="NULL"> + <argument index="7" name="arg5" type="Variant" default="null"> </argument> <description> Call [code]callback[/code] of [code]object[/code] after [code]duration[/code]. [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback. @@ -49234,15 +54789,15 @@ </argument> <argument index="2" name="callback" type="String"> </argument> - <argument index="3" name="arg1" type="Variant" default="NULL"> + <argument index="3" name="arg1" type="Variant" default="null"> </argument> - <argument index="4" name="arg2" type="Variant" default="NULL"> + <argument index="4" name="arg2" type="Variant" default="null"> </argument> - <argument index="5" name="arg3" type="Variant" default="NULL"> + <argument index="5" name="arg3" type="Variant" default="null"> </argument> - <argument index="6" name="arg4" type="Variant" default="NULL"> + <argument index="6" name="arg4" type="Variant" default="null"> </argument> - <argument index="7" name="arg5" type="Variant" default="NULL"> + <argument index="7" name="arg5" type="Variant" default="null"> </argument> <description> Call [code]callback[/code] of [code]object[/code] after [code]duration[/code] on the main thread (similar to [methog Object.call_deferred). [code]arg1[/code]-[code]arg5[/code] are arguments to be passed to the callback. @@ -49261,9 +54816,9 @@ </argument> <argument index="4" name="duration" type="float"> </argument> - <argument index="5" name="trans_type" type="int"> + <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="6" name="ease_type" type="int"> + <argument index="6" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="7" name="delay" type="float" default="0"> </argument> @@ -49285,9 +54840,9 @@ </argument> <argument index="4" name="duration" type="float"> </argument> - <argument index="5" name="trans_type" type="int"> + <argument index="5" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="6" name="ease_type" type="int"> + <argument index="6" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="7" name="delay" type="float" default="0"> </argument> @@ -49374,6 +54929,8 @@ </description> </method> <method name="set_active"> + <return type="void"> + </return> <argument index="0" name="active" type="bool"> </argument> <description> @@ -49381,6 +54938,8 @@ </description> </method> <method name="set_repeat"> + <return type="void"> + </return> <argument index="0" name="repeat" type="bool"> </argument> <description> @@ -49388,6 +54947,8 @@ </description> </method> <method name="set_speed_scale"> + <return type="void"> + </return> <argument index="0" name="speed" type="float"> </argument> <description> @@ -49395,7 +54956,9 @@ </description> </method> <method name="set_tween_process_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Tween.TweenProcessMode"> </argument> <description> Set whether the Tween uses [code]_process[/code] or [code]_fixed_process[/code] (accepts TWEEN_PROCESS_IDLE and TWEEN_PROCESS_FIXED constants, respectively). @@ -49441,9 +55004,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="7" name="ease_type" type="int"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -49467,9 +55030,9 @@ </argument> <argument index="5" name="duration" type="float"> </argument> - <argument index="6" name="trans_type" type="int"> + <argument index="6" name="trans_type" type="int" enum="Tween.TransitionType"> </argument> - <argument index="7" name="ease_type" type="int"> + <argument index="7" name="ease_type" type="int" enum="Tween.EaseType"> </argument> <argument index="8" name="delay" type="float" default="0"> </argument> @@ -49487,7 +55050,7 @@ </method> </methods> <members> - <member name="playback_process_mode" type="int" setter="set_tween_process_mode" getter="get_tween_process_mode" brief=""> + <member name="playback_process_mode" type="int" setter="set_tween_process_mode" getter="get_tween_process_mode" brief="" enum="Tween.TweenProcessMode"> </member> </members> <signals> @@ -49546,7 +55109,7 @@ Means that the animation is interpolated with a quadratic (to the power of 2) function. </constant> <constant name="TRANS_EXPO" value="5"> - Means that the animation is interpolated with a exponential (some number to the power of x) function. + Means that the animation is interpolated with an exponential (some number to the power of x) function. </constant> <constant name="TRANS_ELASTIC" value="6"> Means that the animation is interpolated with elasticity, wiggling around the edges. @@ -49587,6 +55150,8 @@ </description> <methods> <method name="add_do_method" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="object" type="Object"> </argument> <argument index="1" name="method" type="String"> @@ -49595,6 +55160,8 @@ </description> </method> <method name="add_do_property"> + <return type="void"> + </return> <argument index="0" name="object" type="Object"> </argument> <argument index="1" name="property" type="String"> @@ -49606,6 +55173,8 @@ </description> </method> <method name="add_do_reference"> + <return type="void"> + </return> <argument index="0" name="object" type="Object"> </argument> <description> @@ -49613,6 +55182,8 @@ </description> </method> <method name="add_undo_method" qualifiers="vararg"> + <return type="Variant"> + </return> <argument index="0" name="object" type="Object"> </argument> <argument index="1" name="method" type="String"> @@ -49621,6 +55192,8 @@ </description> </method> <method name="add_undo_property"> + <return type="void"> + </return> <argument index="0" name="object" type="Object"> </argument> <argument index="1" name="property" type="String"> @@ -49632,6 +55205,8 @@ </description> </method> <method name="add_undo_reference"> + <return type="void"> + </return> <argument index="0" name="object" type="Object"> </argument> <description> @@ -49639,19 +55214,25 @@ </description> </method> <method name="clear_history"> + <return type="void"> + </return> <description> Clear the undo/redo history and associated references. </description> </method> <method name="commit_action"> + <return type="void"> + </return> <description> Commit the action. All 'do' methods/properties are called/set when this function is called. </description> </method> <method name="create_action"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="merge_mode" type="int" default="0"> + <argument index="1" name="merge_mode" type="int" enum="UndoRedo.MergeMode" default="0"> </argument> <description> Create a new action. After this is called, do all your calls to [method add_do_method], [method add_undo_method], [method add_do_property] and [method add_undo_property]. @@ -49717,6 +55298,8 @@ </theme_item> <theme_item name="grabber_highlight" type="StyleBox"> </theme_item> + <theme_item name="grabber_pressed" type="StyleBox"> + </theme_item> <theme_item name="increment" type="Texture"> </theme_item> <theme_item name="increment_highlight" type="Texture"> @@ -49757,6 +55340,8 @@ <constants> </constants> <theme_items> + <theme_item name="focus" type="StyleBox"> + </theme_item> <theme_item name="grabber" type="Texture"> </theme_item> <theme_item name="grabber_disabled" type="Texture"> @@ -50262,13 +55847,13 @@ </member> </members> <constants> - <constant name="AXIS_X" value="0"> + <constant name="AXIS_X" value="0" enum=""> Enumerated value for the X axis. Returned by functions like max_axis or min_axis. </constant> - <constant name="AXIS_Y" value="1"> + <constant name="AXIS_Y" value="1" enum=""> Enumerated value for the Y axis. </constant> - <constant name="AXIS_Z" value="2"> + <constant name="AXIS_Z" value="2" enum=""> Enumerated value for the Z axis. </constant> </constants> @@ -50322,30 +55907,40 @@ </description> </method> <method name="set_brake"> + <return type="void"> + </return> <argument index="0" name="brake" type="float"> </argument> <description> </description> </method> <method name="set_engine_force"> + <return type="void"> + </return> <argument index="0" name="engine_force" type="float"> </argument> <description> </description> </method> <method name="set_friction"> + <return type="void"> + </return> <argument index="0" name="friction" type="float"> </argument> <description> </description> </method> <method name="set_mass"> + <return type="void"> + </return> <argument index="0" name="mass" type="float"> </argument> <description> </description> </method> <method name="set_steering"> + <return type="void"> + </return> <argument index="0" name="steering" type="float"> </argument> <description> @@ -50447,66 +56042,88 @@ </description> </method> <method name="set_damping_compression"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_damping_relaxation"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_friction_slip"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_radius"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_roll_influence"> + <return type="void"> + </return> <argument index="0" name="roll_influence" type="float"> </argument> <description> </description> </method> <method name="set_suspension_max_force"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_suspension_rest_length"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_suspension_stiffness"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_suspension_travel"> + <return type="void"> + </return> <argument index="0" name="length" type="float"> </argument> <description> </description> </method> <method name="set_use_as_steering"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_use_as_traction"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -50633,11 +56250,15 @@ </description> </method> <method name="play"> + <return type="void"> + </return> <description> Start the video playback. </description> </method> <method name="set_audio_track"> + <return type="void"> + </return> <argument index="0" name="track" type="int"> </argument> <description> @@ -50645,6 +56266,8 @@ </description> </method> <method name="set_autoplay"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -50652,6 +56275,8 @@ </description> </method> <method name="set_buffering_msec"> + <return type="void"> + </return> <argument index="0" name="msec" type="int"> </argument> <description> @@ -50659,6 +56284,8 @@ </description> </method> <method name="set_expand"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -50666,6 +56293,8 @@ </description> </method> <method name="set_paused"> + <return type="void"> + </return> <argument index="0" name="paused" type="bool"> </argument> <description> @@ -50673,6 +56302,8 @@ </description> </method> <method name="set_stream"> + <return type="void"> + </return> <argument index="0" name="stream" type="VideoStream"> </argument> <description> @@ -50680,6 +56311,8 @@ </description> </method> <method name="set_volume"> + <return type="void"> + </return> <argument index="0" name="volume" type="float"> </argument> <description> @@ -50687,6 +56320,8 @@ </description> </method> <method name="set_volume_db"> + <return type="void"> + </return> <argument index="0" name="db" type="float"> </argument> <description> @@ -50694,6 +56329,8 @@ </description> </method> <method name="stop"> + <return type="void"> + </return> <description> Stop the video playback. </description> @@ -50739,11 +56376,6 @@ Finally, viewports can also behave as render targets, in which case they will not be visible unless the associated texture is used to draw. </description> <methods> - <method name="clear"> - <description> - Clear the viewport manually. - </description> - </method> <method name="find_world" qualifiers="const"> <return type="World"> </return> @@ -50772,15 +56404,14 @@ Get the canvas transform of the viewport. </description> </method> - <method name="get_clear_on_new_frame" qualifiers="const"> - <return type="bool"> + <method name="get_clear_mode" qualifiers="const"> + <return type="int" enum="Viewport.ClearMode"> </return> <description> - Return whether automatic clearing of the render target on each frame is enabled. </description> </method> <method name="get_debug_draw" qualifiers="const"> - <return type="int"> + <return type="int" enum="Viewport.DebugDraw"> </return> <description> </description> @@ -50814,7 +56445,7 @@ </description> </method> <method name="get_msaa" qualifiers="const"> - <return type="int"> + <return type="int" enum="Viewport.MSAA"> </return> <description> </description> @@ -50829,13 +56460,13 @@ <method name="get_render_info"> <return type="int"> </return> - <argument index="0" name="info" type="int"> + <argument index="0" name="info" type="int" enum="Viewport.RenderInfo"> </argument> <description> </description> </method> <method name="get_shadow_atlas_quadrant_subdiv" qualifiers="const"> - <return type="int"> + <return type="int" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </return> <argument index="0" name="quadrant" type="int"> </argument> @@ -50870,14 +56501,14 @@ </description> </method> <method name="get_update_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="Viewport.UpdateMode"> </return> <description> Get when the viewport would be updated, will be one of the [code]UPDATE_*[/code] constants. </description> </method> <method name="get_usage" qualifiers="const"> - <return type="int"> + <return type="int" enum="Viewport.Usage"> </return> <description> </description> @@ -50939,7 +56570,9 @@ </description> </method> <method name="input"> - <argument index="0" name="local_event" type="Object"> + <return type="void"> + </return> + <argument index="0" name="local_event" type="InputEvent"> </argument> <description> </description> @@ -50993,6 +56626,8 @@ </description> </method> <method name="set_as_audio_listener"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51000,6 +56635,8 @@ </description> </method> <method name="set_as_audio_listener_2d"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51007,37 +56644,49 @@ </description> </method> <method name="set_attach_to_screen_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> </description> </method> <method name="set_canvas_transform"> + <return type="void"> + </return> <argument index="0" name="xform" type="Transform2D"> </argument> <description> Set the canvas transform of the viewport, useful for changing the on-screen positions of all child [CanvasItem]\ s. This is relative to the global canvas transform of the viewport. </description> </method> - <method name="set_clear_on_new_frame"> - <argument index="0" name="enable" type="bool"> + <method name="set_clear_mode"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Viewport.ClearMode"> </argument> <description> </description> </method> <method name="set_debug_draw"> - <argument index="0" name="debug_draw" type="int"> + <return type="void"> + </return> + <argument index="0" name="debug_draw" type="int" enum="Viewport.DebugDraw"> </argument> <description> </description> </method> <method name="set_disable_3d"> + <return type="void"> + </return> <argument index="0" name="disable" type="bool"> </argument> <description> </description> </method> <method name="set_disable_input"> + <return type="void"> + </return> <argument index="0" name="disable" type="bool"> </argument> <description> @@ -51045,6 +56694,8 @@ </description> </method> <method name="set_global_canvas_transform"> + <return type="void"> + </return> <argument index="0" name="xform" type="Transform2D"> </argument> <description> @@ -51052,18 +56703,24 @@ </description> </method> <method name="set_hdr"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_msaa"> - <argument index="0" name="msaa" type="int"> + <return type="void"> + </return> + <argument index="0" name="msaa" type="int" enum="Viewport.MSAA"> </argument> <description> </description> </method> <method name="set_physics_object_picking"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51071,20 +56728,26 @@ </description> </method> <method name="set_shadow_atlas_quadrant_subdiv"> + <return type="void"> + </return> <argument index="0" name="quadrant" type="int"> </argument> - <argument index="1" name="subdiv" type="int"> + <argument index="1" name="subdiv" type="int" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </argument> <description> </description> </method> <method name="set_shadow_atlas_size"> + <return type="void"> + </return> <argument index="0" name="size" type="int"> </argument> <description> </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> @@ -51092,17 +56755,21 @@ </description> </method> <method name="set_size_override"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> - <argument index="1" name="size" type="Vector2" default="Vector2(-1, -1)"> + <argument index="1" name="size" type="Vector2" default="Vector2( -1, -1 )"> </argument> - <argument index="2" name="margin" type="Vector2" default="Vector2(0, 0)"> + <argument index="2" name="margin" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> Set the size override of the viewport. If the enable parameter is true, it would use the override, otherwise it would use the default size. If the size parameter is equal to [code](-1, -1)[/code], it won't update the size. </description> </method> <method name="set_size_override_stretch"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> @@ -51110,6 +56777,8 @@ </description> </method> <method name="set_transparent_background"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51117,19 +56786,33 @@ </description> </method> <method name="set_update_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="Viewport.UpdateMode"> </argument> <description> Set when the render target would be updated, using the [code]UPDATE_*[/code] constants </description> </method> <method name="set_usage"> - <argument index="0" name="usage" type="int"> + <return type="void"> + </return> + <argument index="0" name="usage" type="int" enum="Viewport.Usage"> + </argument> + <description> + </description> + </method> + <method name="set_use_arvr"> + <return type="void"> + </return> + <argument index="0" name="use" type="bool"> </argument> <description> </description> </method> <method name="set_use_own_world"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51137,6 +56820,8 @@ </description> </method> <method name="set_vflip"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51144,6 +56829,8 @@ </description> </method> <method name="set_world"> + <return type="void"> + </return> <argument index="0" name="world" type="World"> </argument> <description> @@ -51151,23 +56838,37 @@ </description> </method> <method name="set_world_2d"> + <return type="void"> + </return> <argument index="0" name="world_2d" type="World2D"> </argument> <description> </description> </method> <method name="unhandled_input"> - <argument index="0" name="local_event" type="Object"> + <return type="void"> + </return> + <argument index="0" name="local_event" type="InputEvent"> </argument> <description> </description> </method> <method name="update_worlds"> + <return type="void"> + </return> <description> Force update of the 2D and 3D worlds. </description> </method> + <method name="use_arvr"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="warp_mouse"> + <return type="void"> + </return> <argument index="0" name="to_pos" type="Vector2"> </argument> <description> @@ -51176,11 +56877,13 @@ </method> </methods> <members> + <member name="arvr" type="bool" setter="set_use_arvr" getter="use_arvr" brief=""> + </member> <member name="audio_listener_enable_2d" type="bool" setter="set_as_audio_listener_2d" getter="is_audio_listener_2d" brief=""> </member> <member name="audio_listener_enable_3d" type="bool" setter="set_as_audio_listener" getter="is_audio_listener" brief=""> </member> - <member name="debug_draw" type="int" setter="set_debug_draw" getter="get_debug_draw" brief=""> + <member name="debug_draw" type="int" setter="set_debug_draw" getter="get_debug_draw" brief="" enum="Viewport.DebugDraw"> </member> <member name="disable_3d" type="bool" setter="set_disable_3d" getter="is_3d_disabled" brief=""> </member> @@ -51188,33 +56891,33 @@ </member> <member name="hdr" type="bool" setter="set_hdr" getter="get_hdr" brief=""> </member> - <member name="msaa" type="int" setter="set_msaa" getter="get_msaa" brief=""> + <member name="msaa" type="int" setter="set_msaa" getter="get_msaa" brief="" enum="Viewport.MSAA"> </member> <member name="own_world" type="bool" setter="set_use_own_world" getter="is_using_own_world" brief=""> </member> <member name="physics_object_picking" type="bool" setter="set_physics_object_picking" getter="get_physics_object_picking" brief=""> </member> - <member name="render_target_clear_on_new_frame" type="bool" setter="set_clear_on_new_frame" getter="get_clear_on_new_frame" brief=""> + <member name="render_target_clear_mode" type="int" setter="set_clear_mode" getter="get_clear_mode" brief="" enum="Viewport.ClearMode"> </member> - <member name="render_target_update_mode" type="int" setter="set_update_mode" getter="get_update_mode" brief=""> + <member name="render_target_update_mode" type="int" setter="set_update_mode" getter="get_update_mode" brief="" enum="Viewport.UpdateMode"> </member> <member name="render_target_v_flip" type="bool" setter="set_vflip" getter="get_vflip" brief=""> </member> - <member name="shadow_atlas_quad_0" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief=""> + <member name="shadow_atlas_quad_0" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief="" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </member> - <member name="shadow_atlas_quad_1" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief=""> + <member name="shadow_atlas_quad_1" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief="" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </member> - <member name="shadow_atlas_quad_2" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief=""> + <member name="shadow_atlas_quad_2" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief="" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </member> - <member name="shadow_atlas_quad_3" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief=""> + <member name="shadow_atlas_quad_3" type="int" setter="set_shadow_atlas_quadrant_subdiv" getter="get_shadow_atlas_quadrant_subdiv" brief="" enum="Viewport.ShadowAtlasQuadrantSubdiv"> </member> <member name="shadow_atlas_size" type="int" setter="set_shadow_atlas_size" getter="get_shadow_atlas_size" brief=""> </member> - <member name="size" type="Rect2" setter="set_size" getter="get_size" brief=""> + <member name="size" type="Vector2" setter="set_size" getter="get_size" brief=""> </member> <member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" brief=""> </member> - <member name="usage" type="int" setter="set_usage" getter="get_usage" brief=""> + <member name="usage" type="int" setter="set_usage" getter="get_usage" brief="" enum="Viewport.Usage"> </member> <member name="world" type="World" setter="set_world" getter="get_world" brief=""> </member> @@ -51301,6 +57004,8 @@ </description> </method> <method name="set_stretch"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -51327,6 +57032,8 @@ </description> </method> <method name="set_viewport_path_in_scene"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> @@ -51351,14 +57058,16 @@ <method name="is_enabler_enabled" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="enabler" type="int"> + <argument index="0" name="enabler" type="int" enum="VisibilityEnabler.Enabler"> </argument> <description> Returns whether the specified enabler was set to true or not. </description> </method> <method name="set_enabler"> - <argument index="0" name="enabler" type="int"> + <return type="void"> + </return> + <argument index="0" name="enabler" type="int" enum="VisibilityEnabler.Enabler"> </argument> <argument index="1" name="enabled" type="bool"> </argument> @@ -51395,14 +57104,16 @@ <method name="is_enabler_enabled" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="enabler" type="int"> + <argument index="0" name="enabler" type="int" enum="VisibilityEnabler2D.Enabler"> </argument> <description> Returns whether the specified enabler was set to true or not. </description> </method> <method name="set_enabler"> - <argument index="0" name="enabler" type="int"> + <return type="void"> + </return> + <argument index="0" name="enabler" type="int" enum="VisibilityEnabler2D.Enabler"> </argument> <argument index="1" name="enabled" type="bool"> </argument> @@ -51470,6 +57181,8 @@ </description> </method> <method name="set_aabb"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect3"> </argument> <description> @@ -51533,6 +57246,8 @@ </description> </method> <method name="set_rect"> + <return type="void"> + </return> <argument index="0" name="rect" type="Rect2"> </argument> <description> @@ -51598,12 +57313,16 @@ </description> </method> <method name="set_base"> + <return type="void"> + </return> <argument index="0" name="base" type="RID"> </argument> <description> </description> </method> <method name="set_layer_mask"> + <return type="void"> + </return> <argument index="0" name="mask" type="int"> </argument> <description> @@ -51624,33 +57343,41 @@ </description> <methods> <method name="add_custom_signal"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="add_function"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="add_node"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="node" type="Object"> + <argument index="2" name="node" type="VisualScriptNode"> </argument> - <argument index="3" name="pos" type="Vector2" default="Vector2(0, 0)"> + <argument index="3" name="pos" type="Vector2" default="Vector2( 0, 0 )"> </argument> <description> </description> </method> <method name="add_variable"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="default_value" type="Variant" default="NULL"> + <argument index="1" name="default_value" type="Variant" default="null"> </argument> <argument index="2" name="export" type="bool" default="false"> </argument> @@ -51658,9 +57385,11 @@ </description> </method> <method name="custom_signal_add_argument"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="type" type="int"> + <argument index="1" name="type" type="int" enum="Variant.Type"> </argument> <argument index="2" name="argname" type="String"> </argument> @@ -51688,7 +57417,7 @@ </description> </method> <method name="custom_signal_get_argument_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <argument index="0" name="name" type="String"> </argument> @@ -51698,14 +57427,18 @@ </description> </method> <method name="custom_signal_remove_argument"> - <argument index="0" name="argidx" type="String"> + <return type="void"> + </return> + <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="arg1" type="int"> + <argument index="1" name="argidx" type="int"> </argument> <description> </description> </method> <method name="custom_signal_set_argument_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="argidx" type="int"> @@ -51716,16 +57449,20 @@ </description> </method> <method name="custom_signal_set_argument_type"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="argidx" type="int"> </argument> - <argument index="2" name="type" type="int"> + <argument index="2" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="custom_signal_swap_argument"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="argidx" type="int"> @@ -51736,6 +57473,8 @@ </description> </method> <method name="data_connect"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="from_node" type="int"> @@ -51750,6 +57489,8 @@ </description> </method> <method name="data_disconnect"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="from_node" type="int"> @@ -51774,13 +57515,13 @@ <method name="get_function_scroll" qualifiers="const"> <return type="Vector2"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="get_node" qualifiers="const"> - <return type="Object"> + <return type="VisualScriptNode"> </return> <argument index="0" name="func" type="String"> </argument> @@ -51800,6 +57541,8 @@ </description> </method> <method name="get_variable_default_value" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -51886,18 +57629,24 @@ </description> </method> <method name="remove_custom_signal"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="remove_function"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="remove_node"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="id" type="int"> @@ -51906,12 +57655,16 @@ </description> </method> <method name="remove_variable"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="rename_custom_signal"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="new_name" type="String"> @@ -51920,6 +57673,8 @@ </description> </method> <method name="rename_function"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="new_name" type="String"> @@ -51928,6 +57683,8 @@ </description> </method> <method name="rename_variable"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="new_name" type="String"> @@ -51936,6 +57693,8 @@ </description> </method> <method name="sequence_connect"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="from_node" type="int"> @@ -51948,6 +57707,8 @@ </description> </method> <method name="sequence_disconnect"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="from_node" type="int"> @@ -51960,20 +57721,26 @@ </description> </method> <method name="set_function_scroll"> - <argument index="0" name="ofs" type="String"> + <return type="void"> + </return> + <argument index="0" name="name" type="String"> </argument> - <argument index="1" name="arg1" type="Vector2"> + <argument index="1" name="ofs" type="Vector2"> </argument> <description> </description> </method> <method name="set_instance_base_type"> + <return type="void"> + </return> <argument index="0" name="type" type="String"> </argument> <description> </description> </method> <method name="set_node_pos"> + <return type="void"> + </return> <argument index="0" name="func" type="String"> </argument> <argument index="1" name="id" type="int"> @@ -51984,6 +57751,8 @@ </description> </method> <method name="set_variable_default_value"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="value" type="Variant"> @@ -51992,6 +57761,8 @@ </description> </method> <method name="set_variable_export"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="enable" type="bool"> @@ -52000,6 +57771,8 @@ </description> </method> <method name="set_variable_info"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <argument index="1" name="value" type="Dictionary"> @@ -52032,7 +57805,7 @@ </description> <methods> <method name="get_basic_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> @@ -52044,12 +57817,16 @@ </description> </method> <method name="set_basic_type"> - <argument index="0" name="name" type="int"> + <return type="void"> + </return> + <argument index="0" name="name" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="set_basic_type_constant"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -52057,9 +57834,9 @@ </method> </methods> <members> - <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief=""> + <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief="" enum="Variant.Type"> </member> - <member name="constant" type="String" setter="set_basic_type_constant" getter="get_basic_type_constant" brief=""> + <member name="constant/constant" type="String" setter="set_basic_type_constant" getter="get_basic_type_constant" brief=""> </member> </members> <constants> @@ -52072,20 +57849,22 @@ </description> <methods> <method name="get_func"> - <return type="int"> + <return type="int" enum="VisualScriptBuiltinFunc.BuiltinFunc"> </return> <description> </description> </method> <method name="set_func"> - <argument index="0" name="which" type="int"> + <return type="void"> + </return> + <argument index="0" name="which" type="int" enum="VisualScriptBuiltinFunc.BuiltinFunc"> </argument> <description> </description> </method> </methods> <members> - <member name="function" type="int" setter="set_func" getter="get_func" brief=""> + <member name="function" type="int" setter="set_func" getter="get_func" brief="" enum="VisualScriptBuiltinFunc.BuiltinFunc"> </member> </members> <constants> @@ -52110,12 +57889,16 @@ </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_class_constant"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -52125,7 +57908,7 @@ <members> <member name="base_type" type="String" setter="set_base_type" getter="get_base_type" brief=""> </member> - <member name="constant" type="String" setter="set_class_constant" getter="get_class_constant" brief=""> + <member name="constant/constant" type="String" setter="set_class_constant" getter="get_class_constant" brief=""> </member> </members> <constants> @@ -52156,18 +57939,24 @@ </description> </method> <method name="set_description"> + <return type="void"> + </return> <argument index="0" name="description" type="String"> </argument> <description> </description> </method> <method name="set_size"> + <return type="void"> + </return> <argument index="0" name="size" type="Vector2"> </argument> <description> </description> </method> <method name="set_title"> + <return type="void"> + </return> <argument index="0" name="title" type="String"> </argument> <description> @@ -52202,7 +57991,7 @@ </description> <methods> <method name="get_constant_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> @@ -52214,12 +58003,16 @@ </description> </method> <method name="set_constant_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="set_constant_value"> + <return type="void"> + </return> <argument index="0" name="value" type="Variant"> </argument> <description> @@ -52227,9 +58020,9 @@ </method> </methods> <members> - <member name="type" type="int" setter="set_constant_type" getter="get_constant_type" brief=""> + <member name="type" type="int" setter="set_constant_type" getter="get_constant_type" brief="" enum="Variant.Type"> </member> - <member name="value" type="Nil" setter="set_constant_value" getter="get_constant_value" brief=""> + <member name="value" type="Variant" setter="set_constant_value" getter="get_constant_value" brief=""> </member> </members> <constants> @@ -52248,19 +58041,23 @@ </description> </method> <method name="get_constructor_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_constructor"> + <return type="void"> + </return> <argument index="0" name="constructor" type="Dictionary"> </argument> <description> </description> </method> <method name="set_constructor_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> @@ -52269,7 +58066,7 @@ <members> <member name="constructor" type="Dictionary" setter="set_constructor" getter="get_constructor" brief=""> </member> - <member name="type" type="int" setter="set_constructor_type" getter="get_constructor_type" brief=""> + <member name="type" type="int" setter="set_constructor_type" getter="get_constructor_type" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -52391,15 +58188,15 @@ </constant> <constant name="START_MODE_RESUME_YIELD" value="2"> </constant> - <constant name="STEP_PUSH_STACK_BIT" value="16777216"> + <constant name="STEP_PUSH_STACK_BIT" value="16777216" enum=""> </constant> - <constant name="STEP_GO_BACK_BIT" value="33554432"> + <constant name="STEP_GO_BACK_BIT" value="33554432" enum=""> </constant> - <constant name="STEP_NO_ADVANCE_BIT" value="67108864"> + <constant name="STEP_NO_ADVANCE_BIT" value="67108864" enum=""> </constant> - <constant name="STEP_EXIT_FUNCTION_BIT" value="134217728"> + <constant name="STEP_EXIT_FUNCTION_BIT" value="134217728" enum=""> </constant> - <constant name="STEP_YIELD_BIT" value="268435456"> + <constant name="STEP_YIELD_BIT" value="268435456" enum=""> </constant> </constants> </class> @@ -52410,13 +58207,15 @@ </description> <methods> <method name="get_deconstruct_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_deconstruct_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> @@ -52425,7 +58224,7 @@ <members> <member name="elem_cache" type="Array" setter="_set_elem_cache" getter="_get_elem_cache" brief=""> </member> - <member name="type" type="int" setter="set_deconstruct_type" getter="get_deconstruct_type" brief=""> + <member name="type" type="int" setter="set_deconstruct_type" getter="get_deconstruct_type" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -52444,6 +58243,8 @@ </description> </method> <method name="set_signal"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -52470,6 +58271,8 @@ </description> </method> <method name="set_singleton"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -52477,7 +58280,7 @@ </method> </methods> <members> - <member name="constant" type="String" setter="set_singleton" getter="get_singleton" brief=""> + <member name="constant/constant" type="String" setter="set_singleton" getter="get_singleton" brief=""> </member> </members> <constants> @@ -52528,13 +58331,13 @@ </description> </method> <method name="get_basic_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="get_call_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptFunctionCall.CallMode"> </return> <description> </description> @@ -52546,7 +58349,7 @@ </description> </method> <method name="get_rpc_call_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptFunctionCall.RPCCallMode"> </return> <description> </description> @@ -52570,60 +58373,80 @@ </description> </method> <method name="set_base_path"> + <return type="void"> + </return> <argument index="0" name="base_path" type="NodePath"> </argument> <description> </description> </method> <method name="set_base_script"> + <return type="void"> + </return> <argument index="0" name="base_script" type="String"> </argument> <description> </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="base_type" type="String"> </argument> <description> </description> </method> <method name="set_basic_type"> - <argument index="0" name="basic_type" type="int"> + <return type="void"> + </return> + <argument index="0" name="basic_type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="set_call_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptFunctionCall.CallMode"> </argument> <description> </description> </method> <method name="set_function"> + <return type="void"> + </return> <argument index="0" name="function" type="String"> </argument> <description> </description> </method> <method name="set_rpc_call_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptFunctionCall.RPCCallMode"> </argument> <description> </description> </method> <method name="set_singleton"> + <return type="void"> + </return> <argument index="0" name="singleton" type="String"> </argument> <description> </description> </method> <method name="set_use_default_args"> + <return type="void"> + </return> <argument index="0" name="amount" type="int"> </argument> <description> </description> </method> <method name="set_validate"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> @@ -52637,15 +58460,15 @@ </member> <member name="base_type" type="String" setter="set_base_type" getter="get_base_type" brief=""> </member> - <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief=""> + <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief="" enum="Variant.Type"> </member> - <member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief=""> + <member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief="" enum="VisualScriptFunctionCall.CallMode"> </member> <member name="function" type="String" setter="set_function" getter="get_function" brief=""> </member> <member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path" brief=""> </member> - <member name="rpc_call_mode" type="int" setter="set_rpc_call_mode" getter="get_rpc_call_mode" brief=""> + <member name="rpc_call_mode" type="int" setter="set_rpc_call_mode" getter="get_rpc_call_mode" brief="" enum="VisualScriptFunctionCall.RPCCallMode"> </member> <member name="singleton" type="String" setter="set_singleton" getter="get_singleton" brief=""> </member> @@ -52672,6 +58495,8 @@ </description> <methods> <method name="connect_to_signal"> + <return type="void"> + </return> <argument index="0" name="obj" type="Object"> </argument> <argument index="1" name="signals" type="String"> @@ -52688,9 +58513,9 @@ </description> </method> <method name="resume"> - <return type="Array"> + <return type="Variant"> </return> - <argument index="0" name="args" type="Array" default="NULL"> + <argument index="0" name="args" type="Array" default="null"> </argument> <description> </description> @@ -52712,6 +58537,8 @@ </description> </method> <method name="set_global_constant"> + <return type="void"> + </return> <argument index="0" name="index" type="int"> </argument> <description> @@ -52719,7 +58546,7 @@ </method> </methods> <members> - <member name="constant" type="int" setter="set_global_constant" getter="get_global_constant" brief=""> + <member name="constant/constant" type="int" setter="set_global_constant" getter="get_global_constant" brief=""> </member> </members> <constants> @@ -52752,7 +58579,7 @@ </description> <methods> <method name="get_action_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptInputAction.Mode"> </return> <description> </description> @@ -52764,12 +58591,16 @@ </description> </method> <method name="set_action_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptInputAction.Mode"> </argument> <description> </description> </method> <method name="set_action_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -52779,7 +58610,7 @@ <members> <member name="action" type="String" setter="set_action_name" getter="get_action_name" brief=""> </member> - <member name="mode" type="int" setter="set_action_mode" getter="get_action_mode" brief=""> + <member name="mode" type="int" setter="set_action_mode" getter="get_action_mode" brief="" enum="VisualScriptInputAction.Mode"> </member> </members> <constants> @@ -52808,26 +58639,30 @@ </description> </method> <method name="get_var_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_var_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_var_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> </methods> <members> - <member name="type" type="int" setter="set_var_type" getter="get_var_type" brief=""> + <member name="type" type="int" setter="set_var_type" getter="get_var_type" brief="" enum="Variant.Type"> </member> <member name="var_name" type="String" setter="set_var_name" getter="get_var_name" brief=""> </member> @@ -52848,26 +58683,30 @@ </description> </method> <method name="get_var_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_var_name"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> </description> </method> <method name="set_var_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> </methods> <members> - <member name="type" type="int" setter="set_var_type" getter="get_var_type" brief=""> + <member name="type" type="int" setter="set_var_type" getter="get_var_type" brief="" enum="Variant.Type"> </member> <member name="var_name" type="String" setter="set_var_name" getter="get_var_name" brief=""> </member> @@ -52882,20 +58721,22 @@ </description> <methods> <method name="get_math_constant"> - <return type="int"> + <return type="int" enum="VisualScriptMathConstant.MathConstant"> </return> <description> </description> </method> <method name="set_math_constant"> - <argument index="0" name="which" type="int"> + <return type="void"> + </return> + <argument index="0" name="which" type="int" enum="VisualScriptMathConstant.MathConstant"> </argument> <description> </description> </method> </methods> <members> - <member name="constant" type="int" setter="set_math_constant" getter="get_math_constant" brief=""> + <member name="constant/constant" type="int" setter="set_math_constant" getter="get_math_constant" brief="" enum="VisualScriptMathConstant.MathConstant"> </member> </members> <constants> @@ -52922,6 +58763,8 @@ </description> </method> <method name="set_default_input_value"> + <return type="void"> + </return> <argument index="0" name="port_idx" type="int"> </argument> <argument index="1" name="value" type="Variant"> @@ -52950,34 +58793,38 @@ </description> <methods> <method name="get_operator" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Operator"> </return> <description> </description> </method> <method name="get_typed" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_operator"> - <argument index="0" name="op" type="int"> + <return type="void"> + </return> + <argument index="0" name="op" type="int" enum="Variant.Operator"> </argument> <description> </description> </method> <method name="set_typed"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> </methods> <members> - <member name="operator" type="int" setter="set_operator" getter="get_operator" brief=""> + <member name="operator" type="int" setter="set_operator" getter="get_operator" brief="" enum="Variant.Operator"> </member> - <member name="type" type="int" setter="set_typed" getter="get_typed" brief=""> + <member name="type" type="int" setter="set_typed" getter="get_typed" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -52990,13 +58837,15 @@ </description> <methods> <method name="get_preload" qualifiers="const"> - <return type="Object"> + <return type="Resource"> </return> <description> </description> </method> <method name="set_preload"> - <argument index="0" name="resource" type="Object"> + <return type="void"> + </return> + <argument index="0" name="resource" type="Resource"> </argument> <description> </description> @@ -53034,13 +58883,13 @@ </description> </method> <method name="get_basic_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="get_call_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptPropertyGet.CallMode"> </return> <description> </description> @@ -53058,42 +58907,56 @@ </description> </method> <method name="set_base_path"> + <return type="void"> + </return> <argument index="0" name="base_path" type="NodePath"> </argument> <description> </description> </method> <method name="set_base_script"> + <return type="void"> + </return> <argument index="0" name="base_script" type="String"> </argument> <description> </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="base_type" type="String"> </argument> <description> </description> </method> <method name="set_basic_type"> - <argument index="0" name="basic_type" type="int"> + <return type="void"> + </return> + <argument index="0" name="basic_type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="set_call_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptPropertyGet.CallMode"> </argument> <description> </description> </method> <method name="set_index"> + <return type="void"> + </return> <argument index="0" name="index" type="String"> </argument> <description> </description> </method> <method name="set_property"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <description> @@ -53105,7 +58968,7 @@ </member> <member name="base_type" type="String" setter="set_base_type" getter="get_base_type" brief=""> </member> - <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief=""> + <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief="" enum="Variant.Type"> </member> <member name="index" type="String" setter="set_index" getter="get_index" brief=""> </member> @@ -53113,9 +58976,9 @@ </member> <member name="property" type="String" setter="set_property" getter="get_property" brief=""> </member> - <member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief=""> + <member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief="" enum="VisualScriptPropertyGet.CallMode"> </member> - <member name="type_cache" type="int" setter="_set_type_cache" getter="_get_type_cache" brief=""> + <member name="type_cache" type="int" setter="_set_type_cache" getter="_get_type_cache" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -53134,7 +58997,7 @@ </description> <methods> <method name="get_assign_op" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptPropertySet.AssignOp"> </return> <description> </description> @@ -53158,13 +59021,13 @@ </description> </method> <method name="get_basic_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="get_call_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptPropertySet.CallMode"> </return> <description> </description> @@ -53182,48 +59045,64 @@ </description> </method> <method name="set_assign_op"> - <argument index="0" name="assign_op" type="int"> + <return type="void"> + </return> + <argument index="0" name="assign_op" type="int" enum="VisualScriptPropertySet.AssignOp"> </argument> <description> </description> </method> <method name="set_base_path"> + <return type="void"> + </return> <argument index="0" name="base_path" type="NodePath"> </argument> <description> </description> </method> <method name="set_base_script"> + <return type="void"> + </return> <argument index="0" name="base_script" type="String"> </argument> <description> </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="base_type" type="String"> </argument> <description> </description> </method> <method name="set_basic_type"> - <argument index="0" name="basic_type" type="int"> + <return type="void"> + </return> + <argument index="0" name="basic_type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> <method name="set_call_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptPropertySet.CallMode"> </argument> <description> </description> </method> <method name="set_index"> + <return type="void"> + </return> <argument index="0" name="index" type="String"> </argument> <description> </description> </method> <method name="set_property"> + <return type="void"> + </return> <argument index="0" name="property" type="String"> </argument> <description> @@ -53231,13 +59110,13 @@ </method> </methods> <members> - <member name="assign_op" type="int" setter="set_assign_op" getter="get_assign_op" brief=""> + <member name="assign_op" type="int" setter="set_assign_op" getter="get_assign_op" brief="" enum="VisualScriptPropertySet.AssignOp"> </member> <member name="base_script" type="String" setter="set_base_script" getter="get_base_script" brief=""> </member> <member name="base_type" type="String" setter="set_base_type" getter="get_base_type" brief=""> </member> - <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief=""> + <member name="basic_type" type="int" setter="set_basic_type" getter="get_basic_type" brief="" enum="Variant.Type"> </member> <member name="index" type="String" setter="set_index" getter="get_index" brief=""> </member> @@ -53245,9 +59124,9 @@ </member> <member name="property" type="String" setter="set_property" getter="get_property" brief=""> </member> - <member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief=""> + <member name="set_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief="" enum="VisualScriptPropertySet.CallMode"> </member> - <member name="type_cache" type="int" setter="_set_type_cache" getter="_get_type_cache" brief=""> + <member name="type_cache" type="Dictionary" setter="_set_type_cache" getter="_get_type_cache" brief=""> </member> </members> <constants> @@ -53272,6 +59151,8 @@ </description> </method> <method name="set_resource_path"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> @@ -53292,7 +59173,7 @@ </description> <methods> <method name="get_return_type" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> @@ -53304,13 +59185,17 @@ </description> </method> <method name="set_enable_return_value"> + <return type="void"> + </return> <argument index="0" name="enable" type="bool"> </argument> <description> </description> </method> <method name="set_return_type"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> @@ -53319,7 +59204,7 @@ <members> <member name="return_enabled" type="bool" setter="set_enable_return_value" getter="is_return_value_enabled" brief=""> </member> - <member name="return_type" type="int" setter="set_return_type" getter="get_return_type" brief=""> + <member name="return_type" type="int" setter="set_return_type" getter="get_return_type" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -53338,6 +59223,8 @@ </description> </method> <method name="set_node_path"> + <return type="void"> + </return> <argument index="0" name="path" type="NodePath"> </argument> <description> @@ -53368,20 +59255,22 @@ </description> <methods> <method name="get_typed" qualifiers="const"> - <return type="int"> + <return type="int" enum="Variant.Type"> </return> <description> </description> </method> <method name="set_typed"> - <argument index="0" name="type" type="int"> + <return type="void"> + </return> + <argument index="0" name="type" type="int" enum="Variant.Type"> </argument> <description> </description> </method> </methods> <members> - <member name="type" type="int" setter="set_typed" getter="get_typed" brief=""> + <member name="type" type="int" setter="set_typed" getter="get_typed" brief="" enum="Variant.Type"> </member> </members> <constants> @@ -53410,6 +59299,8 @@ </description> </method> <method name="set_steps"> + <return type="void"> + </return> <argument index="0" name="steps" type="int"> </argument> <description> @@ -53430,6 +59321,8 @@ </description> <methods> <method name="_subcall" qualifiers="virtual"> + <return type="Variant"> + </return> <argument index="0" name="arguments" type="Variant"> </argument> <description> @@ -53468,12 +59361,16 @@ </description> </method> <method name="set_base_script"> + <return type="void"> + </return> <argument index="0" name="path" type="String"> </argument> <description> </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="type" type="String"> </argument> <description> @@ -53502,6 +59399,8 @@ </description> </method> <method name="set_variable"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -53528,6 +59427,8 @@ </description> </method> <method name="set_variable"> + <return type="void"> + </return> <argument index="0" name="name" type="String"> </argument> <description> @@ -53564,26 +59465,30 @@ </description> </method> <method name="get_yield_mode"> - <return type="int"> + <return type="int" enum="VisualScriptYield.YieldMode"> </return> <description> </description> </method> <method name="set_wait_time"> + <return type="void"> + </return> <argument index="0" name="sec" type="float"> </argument> <description> </description> </method> <method name="set_yield_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptYield.YieldMode"> </argument> <description> </description> </method> </methods> <members> - <member name="mode" type="int" setter="set_yield_mode" getter="get_yield_mode" brief=""> + <member name="mode" type="int" setter="set_yield_mode" getter="get_yield_mode" brief="" enum="VisualScriptYield.YieldMode"> </member> <member name="wait_time" type="float" setter="set_wait_time" getter="get_wait_time" brief=""> </member> @@ -53616,7 +59521,7 @@ </description> </method> <method name="get_call_mode" qualifiers="const"> - <return type="int"> + <return type="int" enum="VisualScriptYieldSignal.CallMode"> </return> <description> </description> @@ -53628,24 +59533,32 @@ </description> </method> <method name="set_base_path"> + <return type="void"> + </return> <argument index="0" name="base_path" type="NodePath"> </argument> <description> </description> </method> <method name="set_base_type"> + <return type="void"> + </return> <argument index="0" name="base_type" type="String"> </argument> <description> </description> </method> <method name="set_call_mode"> - <argument index="0" name="mode" type="int"> + <return type="void"> + </return> + <argument index="0" name="mode" type="int" enum="VisualScriptYieldSignal.CallMode"> </argument> <description> </description> </method> <method name="set_signal"> + <return type="void"> + </return> <argument index="0" name="signal" type="String"> </argument> <description> @@ -53655,7 +59568,7 @@ <members> <member name="base_type" type="String" setter="set_base_type" getter="get_base_type" brief=""> </member> - <member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief=""> + <member name="call_mode" type="int" setter="set_call_mode" getter="get_call_mode" brief="" enum="VisualScriptYieldSignal.CallMode"> </member> <member name="node_path" type="NodePath" setter="set_base_path" getter="get_base_path" brief=""> </member> @@ -53680,6 +59593,12 @@ The visual server is completely opaque, the internals are entirely implementation specific and cannot be accessed. </description> <methods> + <method name="force_draw"> + <return type="void"> + </return> + <description> + </description> + </method> <method name="texture_create"> <return type="RID"> </return> @@ -53689,9 +59608,9 @@ <method name="texture_create_from_image"> <return type="RID"> </return> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="image" type="Image"> </argument> - <argument index="1" name="arg1" type="int" default="7"> + <argument index="1" name="flags" type="int" default="7"> </argument> <description> </description> @@ -53699,7 +59618,7 @@ <method name="texture_get_flags" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="texture" type="RID"> </argument> <description> </description> @@ -53707,7 +59626,7 @@ <method name="texture_get_height" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="texture" type="RID"> </argument> <description> </description> @@ -53715,20 +59634,24 @@ <method name="texture_get_width" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="texture" type="RID"> </argument> <description> </description> </method> <method name="texture_set_flags"> - <argument index="0" name="arg0" type="RID"> + <return type="void"> + </return> + <argument index="0" name="texture" type="RID"> </argument> - <argument index="1" name="arg1" type="int"> + <argument index="1" name="flags" type="int"> </argument> <description> </description> </method> <method name="texture_set_shrink_all_x2_on_set_data"> + <return type="void"> + </return> <argument index="0" name="shrink" type="bool"> </argument> <description> @@ -53747,7 +59670,7 @@ </description> <methods> <method name="get_ref" qualifiers="const"> - <return type="Object"> + <return type="Variant"> </return> <description> Returns the [Object] this weakref is referring to. @@ -53786,12 +59709,16 @@ </description> </method> <method name="set_resizable"> + <return type="void"> + </return> <argument index="0" name="resizable" type="bool"> </argument> <description> </description> </method> <method name="set_title"> + <return type="void"> + </return> <argument index="0" name="title" type="String"> </argument> <description> @@ -53867,12 +59794,16 @@ </description> </method> <method name="set_environment"> + <return type="void"> + </return> <argument index="0" name="env" type="Environment"> </argument> <description> </description> </method> <method name="set_fallback_environment"> + <return type="void"> + </return> <argument index="0" name="env" type="Environment"> </argument> <description> @@ -53937,6 +59868,8 @@ </description> </method> <method name="set_environment"> + <return type="void"> + </return> <argument index="0" name="env" type="Environment"> </argument> <description> @@ -54031,7 +59964,7 @@ </description> </method> <method name="get_node_type"> - <return type="int"> + <return type="int" enum="XMLParser.NodeType"> </return> <description> Get the type of the current node. Compare with [code]NODE_*[/code] constants. @@ -54054,7 +59987,7 @@ </description> </method> <method name="open"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="file" type="String"> </argument> @@ -54063,7 +59996,7 @@ </description> </method> <method name="open_buffer"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="buffer" type="PoolByteArray"> </argument> @@ -54072,14 +60005,14 @@ </description> </method> <method name="read"> - <return type="int"> + <return type="int" enum="Error"> </return> <description> Read the next node of the file. This returns an error code. </description> </method> <method name="seek"> - <return type="int"> + <return type="int" enum="Error"> </return> <argument index="0" name="pos" type="int"> </argument> @@ -54088,6 +60021,8 @@ </description> </method> <method name="skip_section"> + <return type="void"> + </return> <description> Skips the current section. If the node contains other elements, they will be ignored and the cursor will go to the closing of the current element. </description> @@ -54133,6 +60068,8 @@ </description> </method> <method name="set_sort_enabled"> + <return type="void"> + </return> <argument index="0" name="enabled" type="bool"> </argument> <description> diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index 40c66b0bc5..216100bac6 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -31,6 +31,7 @@ #ifdef ALSA_ENABLED +#include "os/os.h" #include "project_settings.h" #include <errno.h> @@ -44,7 +45,7 @@ Error AudioDriverALSA::init() { samples_in = NULL; samples_out = NULL; - mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); + mix_rate = GLOBAL_DEF("audio/mix_rate", DEFAULT_MIX_RATE); speaker_mode = SPEAKER_MODE_STEREO; channels = 2; @@ -86,19 +87,25 @@ Error AudioDriverALSA::init() { status = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &mix_rate, NULL); CHECK_FAIL(status < 0); - int latency = GLOBAL_DEF("audio/output_latency", 25); - buffer_size = closest_power_of_2(latency * mix_rate / 1000); + // In ALSA the period size seems to be the one that will determine the actual latency + // Ref: https://www.alsa-project.org/main/index.php/FramesPeriods + unsigned int periods = 2; + int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + buffer_frames = closest_power_of_2(latency * mix_rate / 1000); + buffer_size = buffer_frames * periods; + period_size = buffer_frames; // set buffer size from project settings status = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size); CHECK_FAIL(status < 0); - // make period size 1/8 - period_size = buffer_size >> 3; status = snd_pcm_hw_params_set_period_size_near(pcm_handle, hwparams, &period_size, NULL); CHECK_FAIL(status < 0); - unsigned int periods = 2; + if (OS::get_singleton()->is_stdout_verbose()) { + print_line("audio buffer frames: " + itos(period_size) + " calculated latency: " + itos(period_size * 1000 / mix_rate) + "ms"); + } + status = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, &periods, NULL); CHECK_FAIL(status < 0); diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index 83601be41b..c76ec0da61 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -51,6 +51,7 @@ class AudioDriverALSA : public AudioDriver { unsigned int mix_rate; SpeakerMode speaker_mode; + snd_pcm_uframes_t buffer_frames; snd_pcm_uframes_t buffer_size; snd_pcm_uframes_t period_size; int channels; diff --git a/drivers/convex_decomp/b2d_decompose.cpp b/drivers/convex_decomp/b2d_decompose.cpp index 14ab4d1072..97d312983f 100644 --- a/drivers/convex_decomp/b2d_decompose.cpp +++ b/drivers/convex_decomp/b2d_decompose.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* b2d_decompose.cpp */ +/* b2d_decompose.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 09f35f097a..ff0741f425 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -1284,6 +1284,7 @@ void RasterizerCanvasGLES3::canvas_render_items(Item *p_item_list, int p_z, cons case VS::CANVAS_LIGHT_FILTER_NONE: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_NEAREST, true); break; case VS::CANVAS_LIGHT_FILTER_PCF3: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF3, true); break; case VS::CANVAS_LIGHT_FILTER_PCF5: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF5, true); break; + case VS::CANVAS_LIGHT_FILTER_PCF7: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF7, true); break; case VS::CANVAS_LIGHT_FILTER_PCF9: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF9, true); break; case VS::CANVAS_LIGHT_FILTER_PCF13: state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF13, true); break; } @@ -1334,6 +1335,7 @@ void RasterizerCanvasGLES3::canvas_render_items(Item *p_item_list, int p_z, cons state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_NEAREST, false); state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF3, false); state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF5, false); + state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF7, false); state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF9, false); state.canvas_shader.set_conditional(CanvasShaderGLES3::SHADOW_FILTER_PCF13, false); diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index a492629dae..6bef039dd1 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* rasterizer_storage_gles3.cpp */ +/* rasterizer_scene_gles3.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -247,7 +247,7 @@ bool RasterizerSceneGLES3::_shadow_atlas_find_shadow(ShadowAtlas *shadow_atlas, int qidx = p_in_quadrants[i]; - if (shadow_atlas->quadrants[qidx].subdivision == p_current_subdiv) { + if (shadow_atlas->quadrants[qidx].subdivision == (uint32_t)p_current_subdiv) { return false; } @@ -257,7 +257,7 @@ bool RasterizerSceneGLES3::_shadow_atlas_find_shadow(ShadowAtlas *shadow_atlas, int found_free_idx = -1; //found a free one int found_used_idx = -1; //found existing one, must steal it - uint64_t min_pass; // pass of the existing one, try to use the least recently used one (LRU fashion) + uint64_t min_pass = 0; // pass of the existing one, try to use the least recently used one (LRU fashion) for (int j = 0; j < sc; j++) { if (!sarr[j].owner.is_valid()) { @@ -349,7 +349,7 @@ bool RasterizerSceneGLES3::shadow_atlas_update_light(RID p_atlas, RID p_light_in uint32_t q = (key >> ShadowAtlas::QUADRANT_SHIFT) & 0x3; uint32_t s = key & ShadowAtlas::SHADOW_INDEX_MASK; - bool should_realloc = shadow_atlas->quadrants[q].subdivision != best_subdiv && (shadow_atlas->quadrants[q].shadows[s].alloc_tick - tick > shadow_atlas_realloc_tolerance_msec); + bool should_realloc = shadow_atlas->quadrants[q].subdivision != (uint32_t)best_subdiv && (shadow_atlas->quadrants[q].shadows[s].alloc_tick - tick > shadow_atlas_realloc_tolerance_msec); bool should_redraw = shadow_atlas->quadrants[q].shadows[s].version != p_light_version; if (!should_realloc) { @@ -554,7 +554,7 @@ void RasterizerSceneGLES3::reflection_atlas_set_subdivision(RID p_ref_atlas, int ReflectionAtlas *reflection_atlas = reflection_atlas_owner.getornull(p_ref_atlas); ERR_FAIL_COND(!reflection_atlas); - uint32_t subdiv = next_power_of_2(p_subdiv); + int subdiv = next_power_of_2(p_subdiv); if (subdiv & 0xaaaaaaaa) { //sqrt(subdiv) must be integer subdiv <<= 1; } @@ -1100,15 +1100,15 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m state.current_line_width = p_material->line_width; } - if (state.current_depth_test != (!p_material->shader->spatial.ontop)) { - if (p_material->shader->spatial.ontop) { + if (state.current_depth_test != (!p_material->shader->spatial.no_depth_test)) { + if (p_material->shader->spatial.no_depth_test) { glDisable(GL_DEPTH_TEST); } else { glEnable(GL_DEPTH_TEST); } - state.current_depth_test = !p_material->shader->spatial.ontop; + state.current_depth_test = !p_material->shader->spatial.no_depth_test; } if (state.current_depth_draw != p_material->shader->spatial.depth_draw_mode) { @@ -2195,7 +2195,7 @@ void RasterizerSceneGLES3::_add_geometry(RasterizerStorageGLES3::Geometry *p_geo void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, RasterizerStorageGLES3::Material *p_material, bool p_shadow) { bool has_base_alpha = (p_material->shader->spatial.uses_alpha && !p_material->shader->spatial.uses_alpha_scissor) || p_material->shader->spatial.uses_screen_texture; - bool has_blend_alpha = p_material->shader->spatial.blend_mode != RasterizerStorageGLES3::Shader::Spatial::BLEND_MODE_MIX || p_material->shader->spatial.ontop; + bool has_blend_alpha = p_material->shader->spatial.blend_mode != RasterizerStorageGLES3::Shader::Spatial::BLEND_MODE_MIX; bool has_alpha = has_base_alpha || has_blend_alpha; bool shadow = false; @@ -2267,7 +2267,7 @@ void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::G } e->sort_key |= uint64_t(e->material->index) << RenderList::SORT_KEY_MATERIAL_INDEX_SHIFT; - e->sort_key |= uint64_t(e->instance->depth_layer) << RenderList::SORT_KEY_DEPTH_LAYER_SHIFT; + e->sort_key |= uint64_t(e->instance->depth_layer) << RenderList::SORT_KEY_OPAQUE_DEPTH_LAYER_SHIFT; if (!has_blend_alpha && has_alpha && p_material->shader->spatial.depth_draw_mode == RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS) { @@ -2283,6 +2283,8 @@ void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::G if (e->instance->gi_probe_instances.size()) { e->sort_key |= SORT_KEY_GI_PROBES_FLAG; } + + e->sort_key |= uint64_t(p_material->render_priority + 128) << RenderList::SORT_KEY_PRIORITY_SHIFT; } /* @@ -2700,7 +2702,7 @@ void RasterizerSceneGLES3::_setup_lights(RID *p_light_cull_result, int p_light_c uint32_t quadrant = (key >> ShadowAtlas::QUADRANT_SHIFT) & 0x3; uint32_t shadow = key & ShadowAtlas::SHADOW_INDEX_MASK; - ERR_CONTINUE(shadow >= shadow_atlas->quadrants[quadrant].shadows.size()); + ERR_CONTINUE(shadow >= (uint32_t)shadow_atlas->quadrants[quadrant].shadows.size()); uint32_t atlas_size = shadow_atlas->size; uint32_t quadrant_size = atlas_size >> 1; @@ -2787,7 +2789,7 @@ void RasterizerSceneGLES3::_setup_lights(RID *p_light_cull_result, int p_light_c uint32_t quadrant = (key >> ShadowAtlas::QUADRANT_SHIFT) & 0x3; uint32_t shadow = key & ShadowAtlas::SHADOW_INDEX_MASK; - ERR_CONTINUE(shadow >= shadow_atlas->quadrants[quadrant].shadows.size()); + ERR_CONTINUE(shadow >= (uint32_t)shadow_atlas->quadrants[quadrant].shadows.size()); uint32_t atlas_size = shadow_atlas->size; uint32_t quadrant_size = atlas_size >> 1; @@ -4282,7 +4284,7 @@ void RasterizerSceneGLES3::render_scene(const Transform &p_cam_transform, const glEnable(GL_DEPTH_TEST); glDisable(GL_SCISSOR_TEST); - render_list.sort_by_reverse_depth(true); + render_list.sort_by_reverse_depth_and_priority(true); if (state.directional_light_count == 0) { directional_light = NULL; @@ -4467,7 +4469,7 @@ void RasterizerSceneGLES3::render_shadow(RID p_light, RID p_shadow_atlas, int p_ uint32_t quadrant = (key >> ShadowAtlas::QUADRANT_SHIFT) & 0x3; uint32_t shadow = key & ShadowAtlas::SHADOW_INDEX_MASK; - ERR_FAIL_INDEX(shadow, shadow_atlas->quadrants[quadrant].shadows.size()); + ERR_FAIL_INDEX((int)shadow, shadow_atlas->quadrants[quadrant].shadows.size()); uint32_t quadrant_size = shadow_atlas->size >> 1; diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 659408b455..5503dba5c4 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -244,7 +244,7 @@ public: GLuint fbo_id[6]; GLuint cubemap; - int size; + uint32_t size; }; Vector<ShadowCubeMap> shadow_cubemaps; @@ -531,7 +531,7 @@ public: virtual void environment_set_fog(RID p_env, bool p_enable, float p_begin, float p_end, RID p_gradient_texture); virtual void environment_set_ssr(RID p_env, bool p_enable, int p_max_steps, float p_fade_in, float p_fade_out, float p_depth_tolerance, bool p_roughness); - virtual void environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_radius2, float p_intensity2, float p_intensity, float p_bias, float p_light_affect, const Color &p_color, bool p_blur); + virtual void environment_set_ssao(RID p_env, bool p_enable, float p_radius, float p_intensity, float p_radius2, float p_intensity2, float p_bias, float p_light_affect, const Color &p_color, bool p_blur); virtual void environment_set_tonemap(RID p_env, VS::EnvironmentToneMapper p_tone_mapper, float p_exposure, float p_white, bool p_auto_exposure, float p_min_luminance, float p_max_luminance, float p_auto_exp_speed, float p_auto_exp_scale); @@ -645,17 +645,25 @@ public: MAX_LIGHTS = 4096, MAX_REFLECTIONS = 1024, - SORT_KEY_DEPTH_LAYER_SHIFT = 60, + SORT_KEY_PRIORITY_SHIFT = 56, + SORT_KEY_PRIORITY_MASK = 0xFF, + //depth layer for opaque (56-52) + SORT_KEY_OPAQUE_DEPTH_LAYER_SHIFT = 52, + SORT_KEY_OPAQUE_DEPTH_LAYER_MASK = 0xF, //64 bits unsupported in MSVC -#define SORT_KEY_UNSHADED_FLAG (uint64_t(1) << 59) -#define SORT_KEY_NO_DIRECTIONAL_FLAG (uint64_t(1) << 58) -#define SORT_KEY_GI_PROBES_FLAG (uint64_t(1) << 57) -#define SORT_KEY_VERTEX_LIT_FLAG (uint64_t(1) << 56) - SORT_KEY_SHADING_SHIFT = 56, +#define SORT_KEY_UNSHADED_FLAG (uint64_t(1) << 51) +#define SORT_KEY_NO_DIRECTIONAL_FLAG (uint64_t(1) << 50) +#define SORT_KEY_GI_PROBES_FLAG (uint64_t(1) << 49) +#define SORT_KEY_VERTEX_LIT_FLAG (uint64_t(1) << 48) + SORT_KEY_SHADING_SHIFT = 48, SORT_KEY_SHADING_MASK = 15, - SORT_KEY_MATERIAL_INDEX_SHIFT = 40, - SORT_KEY_GEOMETRY_INDEX_SHIFT = 20, - SORT_KEY_GEOMETRY_TYPE_SHIFT = 15, + //48-32 material index + SORT_KEY_MATERIAL_INDEX_SHIFT = 32, + //32-12 geometry index + SORT_KEY_GEOMETRY_INDEX_SHIFT = 12, + //bits 12-8 geometry type + SORT_KEY_GEOMETRY_TYPE_SHIFT = 8, + //bits 0-7 for flags SORT_KEY_CULL_DISABLED_FLAG = 4, SORT_KEY_SKELETON_FLAG = 2, SORT_KEY_MIRROR_FLAG = 1 @@ -721,16 +729,22 @@ public: } } - struct SortByReverseDepth { + struct SortByReverseDepthAndPriority { _FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const { - return A->instance->depth > B->instance->depth; + uint32_t layer_A = uint32_t(A->sort_key >> SORT_KEY_PRIORITY_SHIFT); + uint32_t layer_B = uint32_t(B->sort_key >> SORT_KEY_PRIORITY_SHIFT); + if (layer_A == layer_B) { + return A->instance->depth > B->instance->depth; + } else { + return layer_A < layer_B; + } } }; - void sort_by_reverse_depth(bool p_alpha) { //used for alpha + void sort_by_reverse_depth_and_priority(bool p_alpha) { //used for alpha - SortArray<Element *, SortByReverseDepth> sorter; + SortArray<Element *, SortByReverseDepthAndPriority> sorter; if (p_alpha) { sorter.sort(&elements[max_elements - alpha_element_count], alpha_element_count); } else { diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index a66a3d020b..91ba3aa702 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -1599,7 +1599,7 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const { p_shader->spatial.uses_alpha_scissor = false; p_shader->spatial.uses_discard = false; p_shader->spatial.unshaded = false; - p_shader->spatial.ontop = false; + p_shader->spatial.no_depth_test = false; p_shader->spatial.uses_sss = false; p_shader->spatial.uses_vertex_lighting = false; p_shader->spatial.uses_screen_texture = false; @@ -1621,7 +1621,7 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const { shaders.actions_scene.render_mode_values["cull_disabled"] = Pair<int *, int>(&p_shader->spatial.cull_mode, Shader::Spatial::CULL_MODE_DISABLED); shaders.actions_scene.render_mode_flags["unshaded"] = &p_shader->spatial.unshaded; - shaders.actions_scene.render_mode_flags["ontop"] = &p_shader->spatial.ontop; + shaders.actions_scene.render_mode_flags["depth_test_disable"] = &p_shader->spatial.no_depth_test; shaders.actions_scene.render_mode_flags["vertex_lighting"] = &p_shader->spatial.uses_vertex_lighting; @@ -1948,6 +1948,17 @@ void RasterizerStorageGLES3::material_remove_instance_owner(RID p_material, Rast } } +void RasterizerStorageGLES3::material_set_render_priority(RID p_material, int priority) { + + ERR_FAIL_COND(priority < VS::MATERIAL_RENDER_PRIORITY_MIN); + ERR_FAIL_COND(priority > VS::MATERIAL_RENDER_PRIORITY_MAX); + + Material *material = material_owner.get(p_material); + ERR_FAIL_COND(!material); + + material->render_priority = priority; +} + _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataType type, const Variant &value, uint8_t *data, bool p_linear_color) { switch (type) { case ShaderLanguage::TYPE_BOOL: { diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index c74b127b23..f75b77aabe 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -444,7 +444,7 @@ public: bool uses_alpha; bool uses_alpha_scissor; bool unshaded; - bool ontop; + bool no_depth_test; bool uses_vertex; bool uses_discard; bool uses_sss; @@ -502,6 +502,7 @@ public: SelfList<Material> dirty_list; Vector<RID> textures; float line_width; + int render_priority; RID next_pass; @@ -523,6 +524,7 @@ public: ubo_id = 0; ubo_size = 0; last_pass = 0; + render_priority = 0; } }; @@ -550,6 +552,8 @@ public: virtual void material_add_instance_owner(RID p_material, RasterizerScene::InstanceBase *p_instance); virtual void material_remove_instance_owner(RID p_material, RasterizerScene::InstanceBase *p_instance); + virtual void material_set_render_priority(RID p_material, int priority); + void _update_material(Material *material); void update_dirty_materials(); diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index c308e9eddb..bdd54543d2 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -751,8 +751,9 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_SPATIAL].renames["CLEARCOAT_GLOSS"] = "clearcoat_gloss"; actions[VS::SHADER_SPATIAL].renames["ANISOTROPY"] = "anisotropy"; actions[VS::SHADER_SPATIAL].renames["ANISOTROPY_FLOW"] = "anisotropy_flow"; - actions[VS::SHADER_SPATIAL].renames["SSS_SPREAD"] = "sss_spread"; + //actions[VS::SHADER_SPATIAL].renames["SSS_SPREAD"] = "sss_spread"; actions[VS::SHADER_SPATIAL].renames["SSS_STRENGTH"] = "sss_strength"; + actions[VS::SHADER_SPATIAL].renames["TRANSMISSION"] = "transmission"; actions[VS::SHADER_SPATIAL].renames["AO"] = "ao"; actions[VS::SHADER_SPATIAL].renames["EMISSION"] = "emission"; //actions[VS::SHADER_SPATIAL].renames["SCREEN_UV"]=ShaderLanguage::TYPE_VEC2; @@ -782,6 +783,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_SPATIAL].usage_defines["ALPHA_SCISSOR"] = "#define ALPHA_SCISSOR_USED\n"; actions[VS::SHADER_SPATIAL].usage_defines["SSS_STRENGTH"] = "#define ENABLE_SSS\n"; + actions[VS::SHADER_SPATIAL].usage_defines["TRANSMISSION"] = "#define TRANSMISSION_USED\n"; actions[VS::SHADER_SPATIAL].usage_defines["SCREEN_TEXTURE"] = "#define SCREEN_TEXTURE_USED\n"; actions[VS::SHADER_SPATIAL].usage_defines["SCREEN_UV"] = "#define SCREEN_UV_USED\n"; @@ -792,7 +794,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_SPATIAL].render_mode_defines["diffuse_burley"] = "#define DIFFUSE_BURLEY\n"; actions[VS::SHADER_SPATIAL].render_mode_defines["diffuse_oren_nayar"] = "#define DIFFUSE_OREN_NAYAR\n"; - actions[VS::SHADER_SPATIAL].render_mode_defines["diffuse_half_lambert"] = "#define DIFFUSE_HALF_LAMBERT\n"; + actions[VS::SHADER_SPATIAL].render_mode_defines["diffuse_lambert_wrap"] = "#define DIFFUSE_LAMBERT_WRAP\n"; actions[VS::SHADER_SPATIAL].render_mode_defines["diffuse_toon"] = "#define DIFFUSE_TOON\n"; actions[VS::SHADER_SPATIAL].render_mode_defines["specular_blinn"] = "#define SPECULAR_BLINN\n"; diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 37187a86cc..3bcfd24383 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -585,6 +585,20 @@ FRAGMENT_SHADER_CODE #endif +#ifdef SHADOW_FILTER_PCF7 + + SHADOW_TEST(su+shadowpixel_size*3.0); + SHADOW_TEST(su+shadowpixel_size*2.0); + SHADOW_TEST(su+shadowpixel_size); + SHADOW_TEST(su); + SHADOW_TEST(su-shadowpixel_size); + SHADOW_TEST(su-shadowpixel_size*2.0); + SHADOW_TEST(su-shadowpixel_size*3.0); + shadow_attenuation/=7.0; + +#endif + + #ifdef SHADOW_FILTER_PCF9 SHADOW_TEST(su+shadowpixel_size*4.0); diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index ef4925895c..7c60a8ee97 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -887,7 +887,7 @@ float GTR1(float NdotH, float a) -void light_compute(vec3 N, vec3 L,vec3 V,vec3 B, vec3 T,vec3 light_color,vec3 diffuse_color, float specular_blob_intensity, float roughness, float rim,float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,inout vec3 diffuse, inout vec3 specular) { +void light_compute(vec3 N, vec3 L,vec3 V,vec3 B, vec3 T,vec3 light_color,vec3 diffuse_color, vec3 transmission, float specular_blob_intensity, float roughness, float rim,float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,inout vec3 diffuse, inout vec3 specular) { #if defined(USE_LIGHT_SHADER_CODE) //light is written by the light shader @@ -900,10 +900,16 @@ LIGHT_SHADER_CODE float dotNL = max(dot(N,L), 0.0 ); -#if defined(DIFFUSE_HALF_LAMBERT) +#if defined(DIFFUSE_OREN_NAYAR) + vec3 light_amount; +#else + float light_amount; +#endif + - float hl = dot(N,L) * 0.5 + 0.5; - diffuse += hl * light_color * diffuse_color; +#if defined(DIFFUSE_LAMBERT_WRAP) + //energy conserving lambert wrap shader + light_amount = max(0.0,(dot(N,L) + roughness) / ((1.0 + roughness) * (1.0 + roughness))); #elif defined(DIFFUSE_OREN_NAYAR) @@ -919,12 +925,12 @@ LIGHT_SHADER_CODE vec3 A = 1.0 + sigma2 * (diffuse_color / (sigma2 + 0.13) + 0.5 / (sigma2 + 0.33)); float B = 0.45 * sigma2 / (sigma2 + 0.09); - diffuse += diffuse_color * max(0.0, NdotL) * (A + vec3(B) * s / t) / M_PI; + light_amount = max(0.0, NdotL) * (A + vec3(B) * s / t) / M_PI; } #elif defined(DIFFUSE_TOON) - diffuse += smoothstep(-roughness,max(roughness,0.01),dot(N,L)) * light_color * diffuse_color; + light_amount = smoothstep(-roughness,max(roughness,0.01),dot(N,L)); #elif defined(DIFFUSE_BURLEY) @@ -939,11 +945,17 @@ LIGHT_SHADER_CODE float lightScatter = f0 + (fd90 - f0) * pow(1.0 - NdotL, 5.0); float viewScatter = f0 + (fd90 - f0) * pow(1.0 - NdotV, 5.0); - diffuse+= light_color * diffuse_color * lightScatter * viewScatter * energyFactor; + light_amount = lightScatter * viewScatter * energyFactor; } #else //lambert - diffuse += dotNL * light_color * diffuse_color; + light_amount = dotNL; +#endif + +#if defined(TRANSMISSION_USED) + diffuse += light_color * diffuse_color * mix(vec3(light_amount),vec3(1.0),transmission); +#else + diffuse += light_color * diffuse_color * light_amount; #endif @@ -1116,7 +1128,7 @@ vec3 light_transmittance(float translucency,vec3 light_vec, vec3 normal, vec3 po } #endif -void light_process_omni(int idx, vec3 vertex, vec3 eye_vec,vec3 normal,vec3 binormal, vec3 tangent, vec3 albedo, float roughness, float rim, float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,float p_blob_intensity,inout vec3 diffuse_light, inout vec3 specular_light) { +void light_process_omni(int idx, vec3 vertex, vec3 eye_vec,vec3 normal,vec3 binormal, vec3 tangent, vec3 albedo, vec3 transmission, float roughness, float rim, float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,float p_blob_intensity,inout vec3 diffuse_light, inout vec3 specular_light) { vec3 light_rel_vec = omni_lights[idx].light_pos_inv_radius.xyz-vertex; float light_length = length( light_rel_vec ); @@ -1170,11 +1182,11 @@ void light_process_omni(int idx, vec3 vertex, vec3 eye_vec,vec3 normal,vec3 bino light_attenuation*=mix(omni_lights[idx].shadow_color_contact.rgb,vec3(1.0),shadow); } - light_compute(normal,normalize(light_rel_vec),eye_vec,binormal,tangent,omni_lights[idx].light_color_energy.rgb*light_attenuation,albedo,omni_lights[idx].light_params.z*p_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); + light_compute(normal,normalize(light_rel_vec),eye_vec,binormal,tangent,omni_lights[idx].light_color_energy.rgb*light_attenuation,albedo,transmission,omni_lights[idx].light_params.z*p_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); } -void light_process_spot(int idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 binormal, vec3 tangent,vec3 albedo, float roughness, float rim,float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,float p_blob_intensity, inout vec3 diffuse_light, inout vec3 specular_light) { +void light_process_spot(int idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 binormal, vec3 tangent,vec3 albedo, vec3 transmission,float roughness, float rim,float rim_tint, float clearcoat, float clearcoat_gloss,float anisotropy,float p_blob_intensity, inout vec3 diffuse_light, inout vec3 specular_light) { vec3 light_rel_vec = spot_lights[idx].light_pos_inv_radius.xyz-vertex; float light_length = length( light_rel_vec ); @@ -1204,7 +1216,7 @@ void light_process_spot(int idx, vec3 vertex, vec3 eye_vec, vec3 normal, vec3 bi light_attenuation*=mix(spot_lights[idx].shadow_color_contact.rgb,vec3(1.0),shadow); } - light_compute(normal,normalize(light_rel_vec),eye_vec,binormal,tangent,spot_lights[idx].light_color_energy.rgb*light_attenuation,albedo,spot_lights[idx].light_params.z*p_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); + light_compute(normal,normalize(light_rel_vec),eye_vec,binormal,tangent,spot_lights[idx].light_color_energy.rgb*light_attenuation,albedo,transmission,spot_lights[idx].light_params.z*p_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); } @@ -1499,6 +1511,7 @@ void main() { //lay out everything, whathever is unused is optimized away anyway highp vec3 vertex = vertex_interp; vec3 albedo = vec3(0.8,0.8,0.8); + vec3 transmission = vec3(0.0); float metallic = 0.0; float specular = 0.5; vec3 emission = vec3(0.0,0.0,0.0); @@ -1822,7 +1835,7 @@ FRAGMENT_SHADER_CODE specular_light*=mix(vec3(1.0),light_attenuation,specular_light_interp.a); #else - light_compute(normal,-light_direction_attenuation.xyz,eye_vec,binormal,tangent,light_color_energy.rgb*light_attenuation,albedo,light_params.z*specular_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); + light_compute(normal,-light_direction_attenuation.xyz,eye_vec,binormal,tangent,light_color_energy.rgb*light_attenuation,albedo,transmission,light_params.z*specular_blob_intensity,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,diffuse_light,specular_light); #endif @@ -1860,11 +1873,11 @@ FRAGMENT_SHADER_CODE #else for(int i=0;i<omni_light_count;i++) { - light_process_omni(omni_light_indices[i],vertex,eye_vec,normal,binormal,tangent,albedo,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,specular_blob_intensity,diffuse_light,specular_light); + light_process_omni(omni_light_indices[i],vertex,eye_vec,normal,binormal,tangent,albedo,transmission,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,specular_blob_intensity,diffuse_light,specular_light); } for(int i=0;i<spot_light_count;i++) { - light_process_spot(spot_light_indices[i],vertex,eye_vec,normal,binormal,tangent,albedo,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,specular_blob_intensity,diffuse_light,specular_light); + light_process_spot(spot_light_indices[i],vertex,eye_vec,normal,binormal,tangent,albedo,transmission,roughness,rim,rim_tint,clearcoat,clearcoat_gloss,anisotropy,specular_blob_intensity,diffuse_light,specular_light); } #endif //USE_VERTEX_LIGHTING diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 46c9442ffc..246d4d7650 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -216,8 +216,8 @@ void ImageLoaderPNG::get_recognized_extensions(List<String> *p_extensions) const struct PNGReadStatus { - int offset; - int size; + uint32_t offset; + uint32_t size; const unsigned char *image; }; diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 356b1ad958..1798c84d85 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -33,6 +33,7 @@ #include <pulse/error.h> +#include "os/os.h" #include "project_settings.h" Error AudioDriverPulseAudio::init() { @@ -44,7 +45,7 @@ Error AudioDriverPulseAudio::init() { samples_in = NULL; samples_out = NULL; - mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); + mix_rate = GLOBAL_DEF("audio/mix_rate", DEFAULT_MIX_RATE); speaker_mode = SPEAKER_MODE_STEREO; channels = 2; @@ -53,12 +54,17 @@ Error AudioDriverPulseAudio::init() { spec.channels = channels; spec.rate = mix_rate; - int latency = GLOBAL_DEF("audio/output_latency", 25); - buffer_size = closest_power_of_2(latency * mix_rate / 1000); + int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + buffer_frames = closest_power_of_2(latency * mix_rate / 1000); + buffer_size = buffer_frames * channels; + + if (OS::get_singleton()->is_stdout_verbose()) { + print_line("audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); + } pa_buffer_attr attr; - // set to appropriate buffer size from global settings - attr.tlength = buffer_size; + // set to appropriate buffer length (in bytes) from global settings + attr.tlength = buffer_size * sizeof(int16_t); // set them to be automatically chosen attr.prebuf = (uint32_t)-1; attr.maxlength = (uint32_t)-1; @@ -80,8 +86,8 @@ Error AudioDriverPulseAudio::init() { ERR_FAIL_COND_V(pulse == NULL, ERR_CANT_OPEN); } - samples_in = memnew_arr(int32_t, buffer_size * channels); - samples_out = memnew_arr(int16_t, buffer_size * channels); + samples_in = memnew_arr(int32_t, buffer_size); + samples_out = memnew_arr(int16_t, buffer_size); mutex = Mutex::create(); thread = Thread::create(AudioDriverPulseAudio::thread_func, this); @@ -106,18 +112,18 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) { while (!ad->exit_thread) { if (!ad->active) { - for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) { + for (unsigned int i = 0; i < ad->buffer_size; i++) { ad->samples_out[i] = 0; } } else { ad->lock(); - ad->audio_server_process(ad->buffer_size, ad->samples_in); + ad->audio_server_process(ad->buffer_frames, ad->samples_in); ad->unlock(); - for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) { + for (unsigned int i = 0; i < ad->buffer_size; i++) { ad->samples_out[i] = ad->samples_in[i] >> 16; } } @@ -125,7 +131,7 @@ void AudioDriverPulseAudio::thread_func(void *p_udata) { // pa_simple_write always consumes the entire buffer int error_code; - int byte_size = ad->buffer_size * sizeof(int16_t) * ad->channels; + int byte_size = ad->buffer_size * sizeof(int16_t); if (pa_simple_write(ad->pulse, ad->samples_out, byte_size, &error_code) < 0) { // can't recover here fprintf(stderr, "PulseAudio failed and can't recover: %s\n", pa_strerror(error_code)); @@ -175,13 +181,20 @@ void AudioDriverPulseAudio::finish() { exit_thread = true; Thread::wait_to_finish(thread); - if (pulse) + if (pulse) { pa_simple_free(pulse); + pulse = NULL; + } if (samples_in) { memdelete_arr(samples_in); + samples_in = NULL; + } + + if (samples_out) { memdelete_arr(samples_out); - }; + samples_out = NULL; + } memdelete(thread); if (mutex) { @@ -194,10 +207,15 @@ void AudioDriverPulseAudio::finish() { AudioDriverPulseAudio::AudioDriverPulseAudio() { + samples_in = NULL; + samples_out = NULL; mutex = NULL; thread = NULL; pulse = NULL; latency = 0; + buffer_frames = 0; + buffer_size = 0; + channels = 0; } AudioDriverPulseAudio::~AudioDriverPulseAudio() { diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h index 2f56726617..9ae0b7e50c 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.h +++ b/drivers/pulseaudio/audio_driver_pulseaudio.h @@ -51,6 +51,7 @@ class AudioDriverPulseAudio : public AudioDriver { unsigned int mix_rate; SpeakerMode speaker_mode; + unsigned int buffer_frames; unsigned int buffer_size; int channels; diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp index 7de3ff192e..ae5fdd28b6 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.cpp +++ b/drivers/rtaudio/audio_driver_rtaudio.cpp @@ -107,14 +107,13 @@ Error AudioDriverRtAudio::init() { options.numberOfBuffers = 4; parameters.firstChannel = 0; - mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); + mix_rate = GLOBAL_DEF("audio/mix_rate", DEFAULT_MIX_RATE); - int latency = GLOBAL_DEF("audio/output_latency", 25); - // calculate desired buffer_size - unsigned int buffer_size = closest_power_of_2(latency * mix_rate / 1000); + int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + unsigned int buffer_frames = closest_power_of_2(latency * mix_rate / 1000); if (OS::get_singleton()->is_stdout_verbose()) { - print_line("audio buffer size: " + itos(buffer_size)); + print_line("audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); } short int tries = 2; @@ -127,7 +126,7 @@ Error AudioDriverRtAudio::init() { }; try { - dac->openStream(¶meters, NULL, RTAUDIO_SINT32, mix_rate, &buffer_size, &callback, this, &options); + dac->openStream(¶meters, NULL, RTAUDIO_SINT32, mix_rate, &buffer_frames, &callback, this, &options); active = true; break; @@ -199,7 +198,7 @@ AudioDriverRtAudio::AudioDriverRtAudio() { active = false; mutex = NULL; dac = NULL; - mix_rate = 44100; + mix_rate = DEFAULT_MIX_RATE; speaker_mode = SPEAKER_MODE_STEREO; } diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index ddc3b2ed33..a4e4c79dbf 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -211,36 +211,38 @@ Error DirAccessUnix::make_dir(String p_dir) { Error DirAccessUnix::change_dir(String p_dir) { GLOBAL_LOCK_FUNCTION - p_dir = fix_path(p_dir); - char real_current_dir_name[2048]; - getcwd(real_current_dir_name, 2048); - String prev_dir; - if (prev_dir.parse_utf8(real_current_dir_name)) - prev_dir = real_current_dir_name; //no utf8, maybe latin? + // make sure current_dir is valid absolute path + if (current_dir == "." || current_dir == "") { + char real_current_dir_name[2048]; + getcwd(real_current_dir_name, 2048); + current_dir.parse_utf8(real_current_dir_name); + } - chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants - bool worked = (chdir(p_dir.utf8().get_data()) == 0); // we can only give this utf8 + if (p_dir == ".") { + return OK; + } - String base = _get_root_path(); - if (base != "") { + p_dir = fix_path(p_dir); - getcwd(real_current_dir_name, 2048); - String new_dir; - new_dir.parse_utf8(real_current_dir_name); - if (!new_dir.begins_with(base)) - worked = false; - } + String prev_dir = current_dir; - if (worked) { + if (p_dir.is_rel_path()) { + String next_dir = current_dir + "/" + p_dir; + next_dir = next_dir.simplify_path(); + current_dir = next_dir; + } else { + current_dir = p_dir; + } - getcwd(real_current_dir_name, 2048); - if (current_dir.parse_utf8(real_current_dir_name)) - current_dir = real_current_dir_name; //no utf8, maybe latin? + bool worked = (chdir(current_dir.utf8().get_data()) == 0); // we can only give this utf8 + if (!worked) { + current_dir = prev_dir; + return ERR_INVALID_PARAMETER; } chdir(prev_dir.utf8().get_data()); - return worked ? OK : ERR_INVALID_PARAMETER; + return OK; } String DirAccessUnix::get_current_dir() { diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index b743990b92..61d2737555 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -73,8 +73,8 @@ Error PacketPeerUDPPosix::get_packet(const uint8_t **r_buffer, int &r_buffer_siz if (queue_count == 0) return ERR_UNAVAILABLE; - uint32_t size; - uint8_t type; + uint32_t size = 0; + uint8_t type = IP::TYPE_NONE; rb.read(&type, 1, true); if (type == IP::TYPE_IPV4) { uint8_t ip[4]; diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp index f3f9ab82f1..5062a74b63 100644 --- a/drivers/unix/tcp_server_posix.cpp +++ b/drivers/unix/tcp_server_posix.cpp @@ -165,7 +165,7 @@ Ref<StreamPeerTCP> TCPServerPosix::take_connection() { Ref<StreamPeerTCPPosix> conn = memnew(StreamPeerTCPPosix); IP_Address ip; - int port; + int port = 0; _set_ip_addr_port(ip, port, &their_addr); conn->set_socket(fd, ip, port, sock_type); diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index 6e01b5f524..29d1e5deed 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_driver_wasapi.cpp */ +/* audio_driver_wasapi.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -65,6 +65,18 @@ Error AudioDriverWASAPI::init_device() { format_tag = pwfex->wFormatTag; bits_per_sample = pwfex->wBitsPerSample; + switch (channels) { + case 2: // Stereo + case 6: // Surround 5.1 + case 8: // Surround 7.1 + break; + + default: + ERR_PRINT("WASAPI: Unsupported number of channels"); + ERR_FAIL_V(ERR_CANT_OPEN); + break; + } + if (format_tag == WAVE_FORMAT_EXTENSIBLE) { WAVEFORMATEXTENSIBLE *wfex = (WAVEFORMATEXTENSIBLE *)pwfex; @@ -83,13 +95,6 @@ Error AudioDriverWASAPI::init_device() { } } - int latency = GLOBAL_DEF("audio/output_latency", 25); - buffer_size = closest_power_of_2(latency * mix_rate / 1000); - - if (OS::get_singleton()->is_stdout_verbose()) { - print_line("audio buffer size: " + itos(buffer_size)); - } - hr = audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, 0, 0, pwfex, NULL); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); @@ -102,11 +107,20 @@ Error AudioDriverWASAPI::init_device() { hr = audio_client->GetService(IID_IAudioRenderClient, (void **)&render_client); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); + UINT32 max_frames; hr = audio_client->GetBufferSize(&max_frames); ERR_FAIL_COND_V(hr != S_OK, ERR_CANT_OPEN); + // Due to WASAPI Shared Mode we have no control of the buffer size + buffer_frames = max_frames; + + // Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels) + buffer_size = buffer_frames * channels; samples_in.resize(buffer_size); - buffer_frames = buffer_size / channels; + + if (OS::get_singleton()->is_stdout_verbose()) { + print_line("audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); + } return OK; } @@ -200,7 +214,7 @@ void AudioDriverWASAPI::thread_func(void *p_udata) { HRESULT hr = ad->audio_client->GetCurrentPadding(&cur_frames); if (hr == S_OK) { // Check how much frames are available on the WASAPI buffer - UINT32 avail_frames = ad->max_frames - cur_frames; + UINT32 avail_frames = ad->buffer_frames - cur_frames; UINT32 write_frames = avail_frames > left_frames ? left_frames : avail_frames; BYTE *buffer = NULL; @@ -332,7 +346,6 @@ AudioDriverWASAPI::AudioDriverWASAPI() { mutex = NULL; thread = NULL; - max_frames = 0; format_tag = 0; bits_per_sample = 0; diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index b91751f87e..fab8ab3250 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_driver_wasapi.h */ +/* audio_driver_wasapi.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -48,7 +48,6 @@ class AudioDriverWASAPI : public AudioDriver { Mutex *mutex; Thread *thread; - UINT32 max_frames; WORD format_tag; WORD bits_per_sample; diff --git a/editor/SCsub b/editor/SCsub index 172447147c..0e690cf465 100644 --- a/editor/SCsub +++ b/editor/SCsub @@ -155,31 +155,71 @@ def make_authors_header(target, source, env): g.write("#define _EDITOR_AUTHORS_H\n") current_section = "" - name_count = -1 + reading = False def close_section(): g.write("\t0\n") g.write("};\n") - g.write("#define " + current_section.upper() + "_COUNT " + str(name_count) + "\n") for line in f: - if name_count >= 0: + if reading: if line.startswith(" "): g.write("\t\"" + line.strip() + "\",\n") - name_count += 1 continue if line.startswith("## "): - if name_count >= 0: + if reading: close_section() - name_count = -1 + reading = False for i in range(len(sections)): if line.strip().endswith(sections[i]): current_section = sections_id[i] - name_count = 0 + reading = True g.write("static const char *" + current_section + "[] = {\n") break - if name_count >= 0: + if reading: + close_section() + + g.write("#endif\n") + +def make_donors_header(target, source, env): + + sections = ["Platinum sponsors", "Gold sponsors", "Mini sponsors", "Gold donors", "Silver donors", "Bronze donors"] + sections_id = ["donor_s_plat", "donor_s_gold", "donor_s_mini", "donor_gold", "donor_silver", "donor_bronze"] + + src = source[0].srcnode().abspath + dst = target[0].srcnode().abspath + f = open_utf8(src, "r") + g = open_utf8(dst, "w") + + g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") + g.write("#ifndef _EDITOR_DONORS_H\n") + g.write("#define _EDITOR_DONORS_H\n") + + current_section = "" + reading = False + + def close_section(): + g.write("\t0\n") + g.write("};\n") + + for line in f: + if reading >= 0: + if line.startswith(" "): + g.write("\t\"" + line.strip() + "\",\n") + continue + if line.startswith("## "): + if reading: + close_section() + reading = False + for i in range(len(sections)): + if line.strip().endswith(sections[i]): + current_section = sections_id[i] + reading = True + g.write("static const char *" + current_section + "[] = {\n") + break + + if reading: close_section() g.write("#endif\n") @@ -393,6 +433,10 @@ if (env["tools"] == "yes"): env.Depends('#editor/authors.gen.h', "../AUTHORS.md") env.Command('#editor/authors.gen.h', "../AUTHORS.md", make_authors_header) + # Donors + env.Depends('#editor/donors.gen.h', "../DONORS.md") + env.Command('#editor/donors.gen.h', "../DONORS.md", make_donors_header) + # License env.Depends('#editor/license.gen.h', ["../COPYRIGHT.txt", "../LICENSE.txt"]) env.Command('#editor/license.gen.h', ["../COPYRIGHT.txt", "../LICENSE.txt"], make_license_header) diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 5975e54356..6848c43b68 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -634,6 +634,9 @@ static Error _parse_methods(Ref<XMLParser> &parser, Vector<DocData::MethodDoc> & ERR_FAIL_COND_V(!parser->has_attribute("type"), ERR_FILE_CORRUPT); method.return_type = parser->get_attribute_value("type"); + if (parser->has_attribute("enum")) { + method.return_enum = parser->get_attribute_value("enum"); + } } else if (name == "argument") { DocData::ArgumentDoc argument; @@ -916,7 +919,11 @@ Error DocData::save(const String &p_path) { if (m.return_type != "") { - _write_string(f, 3, "<return type=\"" + m.return_type + "\">"); + String enum_text; + if (m.return_enum != String()) { + enum_text = " enum=\"" + m.return_enum + "\""; + } + _write_string(f, 3, "<return type=\"" + m.return_type + "\"" + enum_text + ">"); _write_string(f, 3, "</return>"); } diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 8bd7bfb4bd..a48e6c9057 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -30,6 +30,7 @@ #include "editor_about.h" #include "authors.gen.h" +#include "donors.gen.h" #include "license.gen.h" #include "version.h" #include "version_hash.gen.h" @@ -51,6 +52,47 @@ TextureRect *EditorAbout::get_logo() const { return _logo; } +ScrollContainer *EditorAbout::_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[]) { + + ScrollContainer *sc = memnew(ScrollContainer); + sc->set_name(p_name); + sc->set_v_size_flags(Control::SIZE_EXPAND); + + VBoxContainer *vbc = memnew(VBoxContainer); + vbc->set_h_size_flags(Control::SIZE_EXPAND_FILL); + sc->add_child(vbc); + + for (int i = 0; i < p_sections.size(); i++) { + + const char **names_ptr = p_src[i]; + if (*names_ptr) { + + Label *lbl = memnew(Label); + lbl->set_text(p_sections[i]); + vbc->add_child(lbl); + + ItemList *il = memnew(ItemList); + il->set_max_columns(16); + il->set_h_size_flags(Control::SIZE_EXPAND_FILL); + il->set_same_column_width(true); + il->set_auto_height(true); + while (*names_ptr) { + il->add_item(String::utf8(*names_ptr++), NULL, false); + } + vbc->add_child(il); + if (il->get_item_count() == 2) { + il->set_fixed_column_width(200 * EDSCALE); + } + + HSeparator *hs = memnew(HSeparator); + hs->set_modulate(Color(0, 0, 0, 0)); + vbc->add_child(hs); + } + } + + return sc; +} + EditorAbout::EditorAbout() { set_title(TTR("Thanks from the Godot community!")); @@ -84,43 +126,29 @@ EditorAbout::EditorAbout() { tc->set_v_size_flags(Control::SIZE_EXPAND_FILL); vbc->add_child(tc); - ScrollContainer *dev_base = memnew(ScrollContainer); - dev_base->set_name(TTR("Authors")); - dev_base->set_v_size_flags(Control::SIZE_EXPAND); - tc->add_child(dev_base); - - VBoxContainer *dev_vbc = memnew(VBoxContainer); - dev_vbc->set_h_size_flags(Control::SIZE_EXPAND_FILL); - dev_base->add_child(dev_vbc); + // Authors List<String> dev_sections; dev_sections.push_back(TTR("Project Founders")); dev_sections.push_back(TTR("Lead Developer")); dev_sections.push_back(TTR("Project Manager")); dev_sections.push_back(TTR("Developers")); - const char **dev_src[] = { dev_founders, dev_lead, dev_manager, dev_names }; + tc->add_child(_populate_list(TTR("Authors"), dev_sections, dev_src)); - for (int i = 0; i < dev_sections.size(); i++) { - - Label *lbl = memnew(Label); - lbl->set_text(dev_sections[i]); - dev_vbc->add_child(lbl); - - ItemList *il = memnew(ItemList); - il->set_max_columns(16); - il->set_h_size_flags(Control::SIZE_EXPAND_FILL); - il->set_fixed_column_width(230 * EDSCALE); - il->set_auto_height(true); - const char **dev_names_ptr = dev_src[i]; - while (*dev_names_ptr) - il->add_item(String::utf8(*dev_names_ptr++), NULL, false); - dev_vbc->add_child(il); - - HSeparator *hs = memnew(HSeparator); - hs->set_modulate(Color(0, 0, 0, 0)); - dev_vbc->add_child(hs); - } + // Donors + + List<String> donor_sections; + donor_sections.push_back(TTR("Platinum Sponsors")); + donor_sections.push_back(TTR("Gold Sponsors")); + donor_sections.push_back(TTR("Mini Sponsors")); + donor_sections.push_back(TTR("Gold Donors")); + donor_sections.push_back(TTR("Silver Donors")); + donor_sections.push_back(TTR("Bronze Donors")); + const char **donor_src[] = { donor_s_plat, donor_s_gold, donor_s_mini, donor_gold, donor_silver, donor_bronze }; + tc->add_child(_populate_list(TTR("Donors"), donor_sections, donor_src)); + + // License TextEdit *license = memnew(TextEdit); license->set_name(TTR("License")); @@ -131,6 +159,8 @@ EditorAbout::EditorAbout() { license->set_text(String::utf8(about_license)); tc->add_child(license); + // Thirdparty License + VBoxContainer *license_thirdparty = memnew(VBoxContainer); license_thirdparty->set_name(TTR("Thirdparty License")); license_thirdparty->set_h_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/editor/editor_about.h b/editor/editor_about.h index d7047c03a3..d455b1f074 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -52,6 +52,7 @@ class EditorAbout : public AcceptDialog { private: void _license_tree_selected(); + ScrollContainer *_populate_list(const String &p_name, const List<String> &p_sections, const char **p_src[]); Tree *_tpl_tree; TextEdit *_tpl_text; diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index b3eb3e23a9..6937f74316 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -70,11 +70,14 @@ void EditorAudioBus::_notification(int p_what) { float real_peak[2] = { -100, -100 }; bool activity_found = false; - int cc; + int cc = 0; switch (AudioServer::get_singleton()->get_speaker_mode()) { case AudioServer::SPEAKER_MODE_STEREO: cc = 1; break; case AudioServer::SPEAKER_SURROUND_51: cc = 4; break; case AudioServer::SPEAKER_SURROUND_71: cc = 5; break; + default: + ERR_PRINT("Unknown speaker_mode"); + break; } for (int i = 0; i < cc; i++) { diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index cb74a7b852..2cb5340b8b 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -141,7 +141,7 @@ ObjectID EditorHistory::get_history_obj(int p_obj) const { return history[p_obj].path[history[p_obj].level].object; } -bool EditorHistory::is_at_begining() const { +bool EditorHistory::is_at_beginning() const { return current <= 0; } bool EditorHistory::is_at_end() const { diff --git a/editor/editor_data.h b/editor/editor_data.h index cbba4d60ad..33a4091a65 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -74,7 +74,7 @@ class EditorHistory { void _add_object(ObjectID p_object, const String &p_property, int p_level_change); public: - bool is_at_begining() const; + bool is_at_beginning() const; bool is_at_end() const; void add_object(ObjectID p_object); diff --git a/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp index 1b213501aa..cfb3abfd1d 100644 --- a/editor/editor_dir_dialog.cpp +++ b/editor/editor_dir_dialog.cpp @@ -31,50 +31,40 @@ #include "editor/editor_file_system.h" #include "editor/editor_settings.h" +#include "editor_scale.h" #include "os/keyboard.h" #include "os/os.h" - -void EditorDirDialog::_update_dir(TreeItem *p_item) { +void EditorDirDialog::_update_dir(TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path) { updating = true; - p_item->clear_children(); - DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES); - String cdir = p_item->get_metadata(0); - - da->change_dir(cdir); - da->list_dir_begin(); - String p = da->get_next(); - List<String> dirs; - bool ishidden; - bool show_hidden = EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files"); + String path = p_dir->get_path(); - while (p != "") { + p_item->set_metadata(0, p_dir->get_path()); + p_item->set_icon(0, get_icon("Folder", "EditorIcons")); - ishidden = da->current_is_hidden(); + if (!p_item->get_parent()) { + p_item->set_text(0, "res://"); + } else { - if (show_hidden || !ishidden) { - if (da->current_is_dir() && !p.begins_with(".")) { - dirs.push_back(p); - } + if (!opened_paths.has(path) && (p_select_path == String() || !p_select_path.begins_with(path))) { + p_item->set_collapsed(true); } - p = da->get_next(); + + p_item->set_text(0, p_dir->get_name()); } - dirs.sort(); + //this should be handled by EditorFileSystem already + //bool show_hidden = EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files"); + updating = false; + for (int i = 0; i < p_dir->get_subdir_count(); i++) { - for (List<String>::Element *E = dirs.front(); E; E = E->next()) { TreeItem *ti = tree->create_item(p_item); - ti->set_text(0, E->get()); - ti->set_icon(0, get_icon("Folder", "EditorIcons")); - ti->set_collapsed(true); + _update_dir(ti, p_dir->get_subdir(i)); } - - memdelete(da); - updating = false; } -void EditorDirDialog::reload() { +void EditorDirDialog::reload(const String &p_with_path) { if (!is_visible_in_tree()) { must_reload = true; @@ -83,10 +73,7 @@ void EditorDirDialog::reload() { tree->clear(); TreeItem *root = tree->create_item(); - root->set_metadata(0, "res://"); - root->set_icon(0, get_icon("Folder", "EditorIcons")); - root->set_text(0, "/"); - _update_dir(root); + _update_dir(root, EditorFileSystem::get_singleton()->get_filesystem(), p_with_path); _item_collapsed(root); must_reload = false; } @@ -94,6 +81,7 @@ void EditorDirDialog::reload() { void EditorDirDialog::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_TREE) { + EditorFileSystem::get_singleton()->connect("filesystem_changed", this, "reload"); reload(); if (!tree->is_connected("item_collapsed", this, "_item_collapsed")) { @@ -105,6 +93,10 @@ void EditorDirDialog::_notification(int p_what) { } } + if (p_what == NOTIFICATION_EXIT_TREE) { + EditorFileSystem::get_singleton()->disconnect("filesystem_changed", this, "reload"); + } + if (p_what == NOTIFICATION_VISIBILITY_CHANGED) { if (must_reload && is_visible_in_tree()) { reload(); @@ -116,57 +108,13 @@ void EditorDirDialog::_item_collapsed(Object *p_item) { TreeItem *item = Object::cast_to<TreeItem>(p_item); - if (updating || item->is_collapsed()) + if (updating) return; - TreeItem *ci = item->get_children(); - while (ci) { - - String p = ci->get_metadata(0); - if (p == "") { - String pp = item->get_metadata(0); - ci->set_metadata(0, pp.plus_file(ci->get_text(0))); - _update_dir(ci); - } - ci = ci->get_next(); - } -} - -void EditorDirDialog::set_current_path(const String &p_path) { - - reload(); - String p = p_path; - if (p.begins_with("res://")) - p = p.replace_first("res://", ""); - - Vector<String> dirs = p.split("/", false); - - TreeItem *r = tree->get_root(); - for (int i = 0; i < dirs.size(); i++) { - - String d = dirs[i]; - TreeItem *p = r->get_children(); - while (p) { - - if (p->get_text(0) == d) - break; - p = p->get_next(); - } - - ERR_FAIL_COND(!p); - String pp = p->get_metadata(0); - if (pp == "") { - p->set_metadata(0, String(r->get_metadata(0)).plus_file(d)); - _update_dir(p); - } - updating = true; - p->set_collapsed(false); - updating = false; - _item_collapsed(p); - r = p; - } - - r->select(0); + if (item->is_collapsed()) + opened_paths.erase(item->get_metadata(0)); + else + opened_paths.insert(item->get_metadata(0)); } void EditorDirDialog::ok_pressed() { @@ -201,14 +149,16 @@ void EditorDirDialog::_make_dir_confirm() { String dir = ti->get_metadata(0); - DirAccess *d = DirAccess::open(dir); + DirAccessRef d = DirAccess::open(dir); ERR_FAIL_COND(!d); Error err = d->make_dir(makedirname->get_text()); if (err != OK) { - mkdirerr->popup_centered_minsize(Size2(250, 80)); + mkdirerr->popup_centered_minsize(Size2(250, 80) * EDSCALE); } else { - set_current_path(dir.plus_file(makedirname->get_text())); + opened_paths.insert(dir); + //reload(dir.plus_file(makedirname->get_text())); + EditorFileSystem::get_singleton()->scan_changes(); //we created a dir, so rescan changes } makedirname->set_text(""); // reset label } @@ -218,7 +168,7 @@ void EditorDirDialog::_bind_methods() { ClassDB::bind_method(D_METHOD("_item_collapsed"), &EditorDirDialog::_item_collapsed); ClassDB::bind_method(D_METHOD("_make_dir"), &EditorDirDialog::_make_dir); ClassDB::bind_method(D_METHOD("_make_dir_confirm"), &EditorDirDialog::_make_dir_confirm); - ClassDB::bind_method(D_METHOD("reload"), &EditorDirDialog::reload); + ClassDB::bind_method(D_METHOD("reload"), &EditorDirDialog::reload, DEFVAL("")); ADD_SIGNAL(MethodInfo("dir_selected", PropertyInfo(Variant::STRING, "dir"))); } diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h index b8347f75fb..8aa685947b 100644 --- a/editor/editor_dir_dialog.h +++ b/editor/editor_dir_dialog.h @@ -30,6 +30,7 @@ #ifndef EDITOR_DIR_DIALOG_H #define EDITOR_DIR_DIALOG_H +#include "editor/editor_file_system.h" #include "os/dir_access.h" #include "scene/gui/dialogs.h" #include "scene/gui/tree.h" @@ -42,12 +43,13 @@ class EditorDirDialog : public ConfirmationDialog { AcceptDialog *mkdirerr; Button *makedir; + Set<String> opened_paths; Tree *tree; bool updating; void _item_collapsed(Object *p_item); - void _update_dir(TreeItem *p_item); + void _update_dir(TreeItem *p_item, EditorFileSystemDirectory *p_dir, const String &p_select_path = String()); void _make_dir(); void _make_dir_confirm(); @@ -61,8 +63,7 @@ protected: static void _bind_methods(); public: - void set_current_path(const String &p_path); - void reload(); + void reload(const String &p_path = ""); EditorDirDialog(); }; diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index e761dce8ab..915fb7e5db 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* editor_import_export.cpp */ +/* editor_export.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/editor_export.h b/editor/editor_export.h index feff9678af..3b99c68c85 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* editor_import_export.h */ +/* editor_export.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index 22a9c84d21..3ab3f05906 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -72,11 +72,14 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p m_name->add_fallback(FontJapanese); \ m_name->add_fallback(FontFallback); -#define MAKE_DEFAULT_FONT(m_name, m_size) \ - Ref<DynamicFont> m_name; \ - m_name.instance(); \ - m_name->set_size(m_size); \ - m_name->set_font_data(DefaultFont); \ +// the custom spacings might only work with Noto Sans +#define MAKE_DEFAULT_FONT(m_name, m_size) \ + Ref<DynamicFont> m_name; \ + m_name.instance(); \ + m_name->set_size(m_size); \ + m_name->set_font_data(DefaultFont); \ + m_name->set_spacing(DynamicFont::SPACING_TOP, -1); \ + m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -1); \ MAKE_FALLBACKS(m_name); void editor_register_fonts(Ref<Theme> p_theme) { diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 0e22f0d386..7fa2c53275 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -1712,9 +1712,8 @@ void EditorHelp::_notification(int p_what) { } break; case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { - Ref<StyleBoxFlat> style(memnew(StyleBoxFlat)); - style->set_bg_color(EditorSettings::get_singleton()->get("text_editor/highlighting/background_color")); - background_panel->add_style_override("panel", style); + + class_desc->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1))); } break; default: break; @@ -1786,14 +1785,12 @@ EditorHelp::EditorHelp() { { background_panel = memnew(Panel); - Ref<StyleBoxFlat> style(memnew(StyleBoxFlat)); - style->set_bg_color(EditorSettings::get_singleton()->get("text_editor/highlighting/background_color")); background_panel->set_v_size_flags(SIZE_EXPAND_FILL); - background_panel->add_style_override("panel", style); //get_stylebox("normal","TextEdit")); vbc->add_child(background_panel); class_desc = memnew(RichTextLabel); background_panel->add_child(class_desc); - class_desc->set_area_as_parent_rect(8); + class_desc->set_area_as_parent_rect(); + class_desc->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1))); class_desc->connect("meta_clicked", this, "_class_desc_select"); class_desc->connect("gui_input", this, "_class_desc_input"); } @@ -1882,8 +1879,13 @@ void EditorHelpBit::_bind_methods() { void EditorHelpBit::_notification(int p_what) { - if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { - add_style_override("panel", get_stylebox("ScriptPanel", "EditorStyles")); + switch (p_what) { + case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { + + rich_text->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1))); + } break; + + default: break; } } @@ -1897,8 +1899,8 @@ EditorHelpBit::EditorHelpBit() { rich_text = memnew(RichTextLabel); add_child(rich_text); - rich_text->set_area_as_parent_rect(8 * EDSCALE); + rich_text->set_area_as_parent_rect(); rich_text->connect("meta_clicked", this, "_meta_clicked"); + rich_text->add_color_override("selection_color", EDITOR_DEF("text_editor/highlighting/selection_color", Color(0.2, 0.2, 1))); set_custom_minimum_size(Size2(0, 70 * EDSCALE)); - add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("ScriptPanel", "EditorStyles")); } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8575cd164f..91d2ddcd19 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -283,13 +283,22 @@ void EditorNode::_notification(int p_what) { scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("interface/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY)); property_editor->set_enable_capitalize_paths(bool(EDITOR_DEF("interface/capitalize_properties", true))); Ref<Theme> theme = create_editor_theme(theme_base->get_theme()); + theme_base->set_theme(theme); + gui_base->add_style_override("panel", gui_base->get_stylebox("Background", "EditorStyles")); play_button_panel->add_style_override("panel", gui_base->get_stylebox("PlayButtonPanel", "EditorStyles")); scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); bottom_panel->add_style_override("panel", gui_base->get_stylebox("panel", "TabContainer")); scene_tabs->add_style_override("tab_fg", gui_base->get_stylebox("SceneTabFG", "EditorStyles")); scene_tabs->add_style_override("tab_bg", gui_base->get_stylebox("SceneTabBG", "EditorStyles")); + + file_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + project_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + debug_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + settings_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + help_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + if (bool(EDITOR_DEF("interface/scene_tabs/resize_if_many_tabs", true))) { scene_tabs->set_min_width(int(EDITOR_DEF("interface/scene_tabs/minimum_width", 50)) * EDSCALE); } else { @@ -1368,12 +1377,22 @@ void EditorNode::_set_editing_top_editors(Object *p_current_object) { editor_plugins_over->edit(p_current_object); } +static bool overrides_external_editor(Object *p_object) { + + Script *script = Object::cast_to<Script>(p_object); + + if (!script) + return false; + + return script->get_language()->overrides_external_editor(); +} + void EditorNode::_edit_current() { uint32_t current = editor_history.get_current(); Object *current_obj = current > 0 ? ObjectDB::get_instance(current) : NULL; - property_back->set_disabled(editor_history.is_at_begining()); + property_back->set_disabled(editor_history.is_at_beginning()); property_forward->set_disabled(editor_history.is_at_end()); this->current = current_obj; @@ -1434,7 +1453,7 @@ void EditorNode::_edit_current() { if (main_plugin) { // special case if use of external editor is true - if (main_plugin->get_name() == "Script" && bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor"))) { + if (main_plugin->get_name() == "Script" && (bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor")) || overrides_external_editor(current_obj))) { main_plugin->edit(current_obj); } @@ -1442,6 +1461,7 @@ void EditorNode::_edit_current() { // update screen main_plugin if (!changing_scene) { + if (editor_plugin_screen) editor_plugin_screen->make_visible(false); editor_plugin_screen = main_plugin; @@ -2721,6 +2741,14 @@ Dictionary EditorNode::_get_main_scene_state() { state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value(); state["saved_version"] = saved_version; state["node_filter"] = scene_tree_dock->get_filter(); + int current = -1; + for (int i = 0; i < editor_table.size(); i++) { + if (editor_plugin_screen == editor_table[i]) { + current = i; + break; + } + } + state["editor_index"] = current; return state; } @@ -2731,8 +2759,9 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) { changing_scene = false; - if (get_edited_scene()) { + if (p_state.has("editor_index")) { + int index = p_state["editor_index"]; int current = -1; for (int i = 0; i < editor_table.size(); i++) { if (editor_plugin_screen == editor_table[i]) { @@ -2741,15 +2770,18 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) { } } - if (current < 2) { - //use heuristic instead - - int n2d = 0, n3d = 0; - _find_node_types(get_edited_scene(), n2d, n3d); - if (n2d > n3d) { - _editor_select(EDITOR_2D); - } else if (n3d > n2d) { - _editor_select(EDITOR_3D); + if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there + if (index < 2 || !get_edited_scene()) { + _editor_select(index); + } else { + //use heuristic instead + int n2d = 0, n3d = 0; + _find_node_types(get_edited_scene(), n2d, n3d); + if (n2d > n3d) { + _editor_select(EDITOR_2D); + } else if (n3d > n2d) { + _editor_select(EDITOR_3D); + } } } } @@ -4818,9 +4850,10 @@ EditorNode::EditorNode() { } file_menu = memnew(MenuButton); + file_menu->set_flat(false); file_menu->set_text(TTR("Scene")); - left_menu_hb->add_child(file_menu); file_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + left_menu_hb->add_child(file_menu); prev_scene = memnew(ToolButton); prev_scene->set_icon(gui_base->get_icon("PrevScene", "EditorIcons")); @@ -4889,7 +4922,6 @@ EditorNode::EditorNode() { pm_export->set_name("Export"); p->add_child(pm_export); p->add_submenu_item(TTR("Convert To.."), "Export"); - pm_export->add_separator(); pm_export->add_shortcut(ED_SHORTCUT("editor/convert_to_MeshLibrary", TTR("MeshLibrary..")), FILE_EXPORT_MESH_LIBRARY); pm_export->add_shortcut(ED_SHORTCUT("editor/convert_to_TileSet", TTR("TileSet..")), FILE_EXPORT_TILESET); pm_export->connect("id_pressed", this, "_menu_option"); @@ -4909,6 +4941,7 @@ EditorNode::EditorNode() { p->add_item(TTR("Quit"), FILE_QUIT, KEY_MASK_CMD + KEY_Q); project_menu = memnew(MenuButton); + project_menu->set_flat(false); project_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools.")); project_menu->set_text(TTR("Project")); project_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); @@ -4942,9 +4975,11 @@ EditorNode::EditorNode() { menu_hb->add_child(editor_region); debug_menu = memnew(MenuButton); + debug_menu->set_flat(false); debug_menu->set_text(TTR("Debug")); debug_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); left_menu_hb->add_child(debug_menu); + p = debug_menu->get_popup(); p->set_hide_on_item_selection(false); p->add_check_item(TTR("Deploy with Remote Debug"), RUN_DEPLOY_REMOTE_DEBUG); @@ -4966,9 +5001,10 @@ EditorNode::EditorNode() { menu_hb->add_spacer(); settings_menu = memnew(MenuButton); - left_menu_hb->add_child(settings_menu); + settings_menu->set_flat(false); settings_menu->set_text(TTR("Editor")); settings_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + left_menu_hb->add_child(settings_menu); p = settings_menu->get_popup(); p->add_item(TTR("Editor Settings"), SETTINGS_PREFERENCES); @@ -4983,10 +5019,12 @@ EditorNode::EditorNode() { p->add_item(TTR("Manage Export Templates"), SETTINGS_MANAGE_EXPORT_TEMPLATES); // Help Menu - MenuButton *help_menu = memnew(MenuButton); - left_menu_hb->add_child(help_menu); + help_menu = memnew(MenuButton); + help_menu->set_flat(false); help_menu->set_text(TTR("Help")); help_menu->add_style_override("hover", gui_base->get_stylebox("MenuHover", "EditorStyles")); + left_menu_hb->add_child(help_menu); + p = help_menu->get_popup(); p->connect("id_pressed", this, "_menu_option"); p->add_icon_item(gui_base->get_icon("ClassList", "EditorIcons"), TTR("Classes"), HELP_CLASSES); diff --git a/editor/editor_node.h b/editor/editor_node.h index c3ceee350a..ea74bcbd9d 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -236,11 +236,12 @@ private: MenuButton *file_menu; MenuButton *project_menu; MenuButton *debug_menu; + MenuButton *settings_menu; + MenuButton *help_menu; PopupMenu *tool_menu; ToolButton *export_button; ToolButton *prev_scene; MenuButton *object_menu; - MenuButton *settings_menu; ToolButton *play_button; MenuButton *native_play_button; ToolButton *pause_button; diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 9c9eef848a..db76a27f5f 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -603,7 +603,6 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { hints["text_editor/theme/color_theme"] = PropertyInfo(Variant::STRING, "text_editor/theme/color_theme", PROPERTY_HINT_ENUM, "Default"); set("text_editor/theme/line_spacing", 4); - set("text_editor/theme/adapted_code_editor_background_color", true); _load_default_text_editor_theme(); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 8943d5f0dc..1a7ee0e970 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -198,6 +198,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false); int border_size = EDITOR_DEF("interface/theme/border_size", 1); + Color script_bg_color = EDITOR_DEF("text_editor/highlighting/background_color", Color(0, 0, 0, 0)); + switch (preset) { case 0: { // Default highlight_color = Color::html("#699ce8"); @@ -235,8 +237,8 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { Color dark_color_2 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 1.5); Color dark_color_3 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 2); - Color contrast_color_1 = base_color.linear_interpolate((dark_theme ? Color(1, 1, 1, 1) : Color(0, 0, 0, 1)), 0.3); - Color contrast_color_2 = base_color.linear_interpolate((dark_theme ? Color(1, 1, 1, 1) : Color(0, 0, 0, 1)), 0.5); + Color contrast_color_1 = base_color.linear_interpolate((dark_theme ? Color(1, 1, 1, 1) : Color(0, 0, 0, 1)), MAX(contrast, default_contrast)); + Color contrast_color_2 = base_color.linear_interpolate((dark_theme ? Color(1, 1, 1, 1) : Color(0, 0, 0, 1)), MAX(contrast * 1.5, default_contrast * 1.5)); Color font_color = dark_theme ? Color(1, 1, 1) : Color(0, 0, 0); Color font_color_disabled = dark_theme ? Color(0.6, 0.6, 0.6) : Color(0.45, 0.45, 0.45); @@ -279,8 +281,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { editor_register_fonts(theme); // Editor background - Ref<StyleBoxFlat> style_panel = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); - theme->set_stylebox("Background", "EditorStyles", style_panel); + theme->set_stylebox("Background", "EditorStyles", make_flat_stylebox(dark_color_2, 4, 4, 4, 4)); // Focus Ref<StyleBoxFlat> focus_sbt = make_flat_stylebox(contrast_color_1, 4, 4, 4, 4); @@ -302,12 +303,11 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { Ref<StyleBoxFlat> style_menu_hover_bg = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); style_menu_hover_border->set_draw_center(false); - style_menu_hover_border->set_border_width(MARGIN_BOTTOM, border_width); + style_menu_hover_border->set_border_width(MARGIN_BOTTOM, 2 * EDSCALE); style_menu_hover_border->set_border_color_all(highlight_color); - style_menu_hover_border->set_expand_margin_size(MARGIN_BOTTOM, border_width); theme->set_stylebox("normal", "MenuButton", style_menu); - theme->set_stylebox("hover", "MenuButton", style_menu_hover_border); + theme->set_stylebox("hover", "MenuButton", style_menu); theme->set_stylebox("pressed", "MenuButton", style_menu); theme->set_stylebox("focus", "MenuButton", style_menu); theme->set_stylebox("disabled", "MenuButton", style_menu); @@ -333,10 +333,10 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border); // Content of each tab - Ref<StyleBoxFlat> style_content_panel = make_flat_stylebox(base_color, 4, 5, 4, 4); + Ref<StyleBoxFlat> style_content_panel = make_flat_stylebox(base_color, 4, 4, 4, 4); style_content_panel->set_border_color_all(base_color); style_content_panel->set_border_width_all(border_width); - Ref<StyleBoxFlat> style_content_panel_vp = make_flat_stylebox(base_color, border_width, 5, border_width, border_width); + Ref<StyleBoxFlat> style_content_panel_vp = make_flat_stylebox(base_color, border_width, 4, border_width, border_width); style_content_panel_vp->set_border_color_all(base_color); style_content_panel_vp->set_border_width_all(border_width); theme->set_stylebox("panel", "TabContainer", style_content_panel); @@ -357,6 +357,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("pressed", "Button", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("focus", "Button", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("disabled", "Button", style_button_type_disabled); + theme->set_color("font_color", "Button", button_font_color); theme->set_color("font_color_hover", "Button", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "Button", highlight_color); @@ -366,13 +367,12 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_color("icon_color_pressed", "Button", Color(highlight_color.r * 1.15, highlight_color.g * 1.15, highlight_color.b * 1.15, highlight_color.a)); // OptionButton - Ref<StyleBoxFlat> style_option_button = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); - style_option_button->set_border_width_all(border_width); + theme->set_stylebox("normal", "OptionButton", style_button_type); theme->set_stylebox("hover", "OptionButton", change_border_color(style_button_type, contrast_color_1)); theme->set_stylebox("pressed", "OptionButton", change_border_color(style_button_type, HIGHLIGHT_COLOR_FONT)); theme->set_stylebox("focus", "OptionButton", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("disabled", "OptionButton", style_button_type_disabled); - theme->set_stylebox("normal", "OptionButton", style_button_type); + theme->set_color("font_color", "OptionButton", button_font_color); theme->set_color("font_color_hover", "OptionButton", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "OptionButton", highlight_color); @@ -385,6 +385,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { // CheckButton theme->set_icon("on", "CheckButton", theme->get_icon("GuiToggleOn", "EditorIcons")); theme->set_icon("off", "CheckButton", theme->get_icon("GuiToggleOff", "EditorIcons")); + theme->set_color("font_color", "CheckButton", button_font_color); theme->set_color("font_color_hover", "CheckButton", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "CheckButton", highlight_color); @@ -424,12 +425,6 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { style_tree_bg->set_border_color_all(dark_color_3); theme->set_stylebox("bg", "Tree", style_tree_bg); - // Script background - Ref<StyleBoxFlat> style_script_bg = make_flat_stylebox(dark_color_1, 0, 0, 0, 0); - style_script_bg->set_border_width_all(border_width); - style_script_bg->set_border_color_all(dark_color_3); - theme->set_stylebox("ScriptPanel", "EditorStyles", style_script_bg); - // Tree theme->set_icon("checked", "Tree", theme->get_icon("GuiChecked", "EditorIcons")); theme->set_icon("unchecked", "Tree", theme->get_icon("GuiUnchecked", "EditorIcons")); @@ -441,7 +436,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("custom_button_pressed", "Tree", make_empty_stylebox()); theme->set_stylebox("custom_button_hover", "Tree", style_button_type); theme->set_color("custom_button_font_highlight", "Tree", HIGHLIGHT_COLOR_FONT); - theme->set_color("font_color", "Tree", font_color_disabled); + theme->set_color("font_color", "Tree", font_color); theme->set_color("font_color_selected", "Tree", font_color); Ref<StyleBox> style_tree_btn = make_flat_stylebox(contrast_color_1, 2, 4, 2, 4); @@ -531,6 +526,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { // LineEdit Ref<StyleBoxFlat> style_line_edit = make_flat_stylebox(dark_color_1, 6, 4, 6, 4); + style_line_edit->set_border_width_all(border_width); style_line_edit = change_border_color(style_line_edit, contrast_color_1); Ref<StyleBoxFlat> style_line_edit_disabled = change_border_color(style_line_edit, dark_color_1); style_line_edit_disabled->set_bg_color(Color(0, 0, 0, .1)); @@ -614,11 +610,14 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_icon("grabber_highlight", "VSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons")); //RichTextLabel - theme->set_color("font_color", "RichTextLabel", font_color); + Color rtl_combined_bg_color = dark_color_1.linear_interpolate(script_bg_color, script_bg_color.a); + Color rtl_font_color = (rtl_combined_bg_color.r + rtl_combined_bg_color.g + rtl_combined_bg_color.b > 0.5 * 3) ? Color(0, 0, 0) : Color(1, 1, 1); + theme->set_color("default_color", "RichTextLabel", rtl_font_color); theme->set_stylebox("focus", "RichTextLabel", make_empty_stylebox()); + theme->set_stylebox("normal", "RichTextLabel", make_flat_stylebox(script_bg_color, 6, 6, 6, 6)); // Panel - theme->set_stylebox("panel", "Panel", style_panel); + theme->set_stylebox("panel", "Panel", make_flat_stylebox(dark_color_1, 6, 4, 6, 4)); // Label theme->set_color("font_color", "Label", font_color); diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index ce6d8024ae..c77f85688f 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* export_template_manager.cpp */ +/* export_template_manager.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 0ad7b25e4a..a66d1724a1 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -828,7 +828,12 @@ void FileSystemDock::_move_operation(const String &p_to_path) { //make list of remaps Map<String, String> renames; String repfrom = path == "res://" ? path : String(path + "/"); - String repto = p_to_path == "res://" ? p_to_path : String(p_to_path + "/"); + String repto = p_to_path; + if (!repto.ends_with("/")) { + repto += "/"; + } + + print_line("reprfrom: " + repfrom + " repto " + repto); for (int i = 0; i < move_files.size(); i++) { renames[move_files[i]] = move_files[i].replace_first(repfrom, repto); @@ -868,6 +873,13 @@ void FileSystemDock::_move_operation(const String &p_to_path) { if (err != OK) { EditorNode::get_singleton()->add_io_error(TTR("Error moving file:\n") + move_files[i] + "\n"); } + if (FileAccess::exists(move_files[i] + ".import")) { //move imported files too + //@todo should remove the files in .import folder + err = da->rename(move_files[i] + ".import", to + ".import"); + if (err != OK) { + EditorNode::get_singleton()->add_io_error(TTR("Error moving file:\n") + move_files[i] + ".import\n"); + } + } } for (int i = 0; i < move_dirs.size(); i++) { @@ -1827,7 +1839,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { path = "res://"; - add_constant_override("separation", 3); + add_constant_override("separation", 4); } FileSystemDock::~FileSystemDock() { diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 2f03e72851..21cf08f524 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -474,7 +474,7 @@ Error EditorSceneImporterGLTF::_decode_buffer_view(GLTFState &state, int p_buffe int buffer_end = (stride * (count - 1)) + element_size; ERR_FAIL_COND_V(buffer_end > bv.byte_length, ERR_PARSE_ERROR); - ERR_FAIL_COND_V((offset + buffer_end) > buffer.size(), ERR_PARSE_ERROR); + ERR_FAIL_COND_V((int)(offset + buffer_end) > buffer.size(), ERR_PARSE_ERROR); //fill everything as doubles @@ -1434,6 +1434,8 @@ Error EditorSceneImporterGLTF::_parse_cameras(GLTFState &state) { } print_line("total cameras: " + itos(state.cameras.size())); + + return OK; } Error EditorSceneImporterGLTF::_parse_animations(GLTFState &state) { diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index 25185149b1..e2bacd70e4 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -129,7 +129,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s int format_freq = 0; int loop_begin = 0; int loop_end = 0; - int frames; + int frames = 0; Vector<float> data; diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 4f3472bf03..df4598793c 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -409,7 +409,7 @@ bool CanvasItemEditor::_is_part_of_subscene(CanvasItem *p_item) { return item_owner && item_owner != scene_node && p_item != scene_node && item_owner->get_filename() != ""; } -void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, unsigned int limit) { +void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, int limit) { if (!p_node) return; if (Object::cast_to<Viewport>(p_node)) @@ -1019,6 +1019,51 @@ void CanvasItemEditor::_list_select(const Ref<InputEventMouseButton> &b) { } } +void CanvasItemEditor::_update_cursor() { + + CursorShape c = CURSOR_ARROW; + switch (drag) { + case DRAG_NONE: + if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_MIDDLE) || Input::get_singleton()->is_key_pressed(KEY_SPACE)) { + c = CURSOR_DRAG; + } else { + switch (tool) { + case TOOL_MOVE: + c = CURSOR_MOVE; + break; + case TOOL_EDIT_PIVOT: + c = CURSOR_CROSS; + break; + case TOOL_PAN: + c = CURSOR_DRAG; + break; + } + } + break; + case DRAG_LEFT: + case DRAG_RIGHT: + c = CURSOR_HSIZE; + break; + case DRAG_TOP: + case DRAG_BOTTOM: + c = CURSOR_VSIZE; + break; + case DRAG_TOP_LEFT: + case DRAG_BOTTOM_RIGHT: + c = CURSOR_FDIAGSIZE; + break; + case DRAG_TOP_RIGHT: + case DRAG_BOTTOM_LEFT: + c = CURSOR_BDIAGSIZE; + break; + case DRAG_ALL: + case DRAG_NODE_2D: + c = CURSOR_MOVE; + break; + } + viewport->set_default_cursor_shape(c); +} + void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) { { @@ -1457,6 +1502,7 @@ void CanvasItemEditor::_viewport_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseMotion> m = p_event; if (m.is_valid()) { // Mouse motion event + _update_cursor(); if (!viewport->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field())) viewport->call_deferred("grab_focus"); @@ -1881,7 +1927,7 @@ void CanvasItemEditor::_viewport_draw() { if (snap_show_grid) { //Draw the grid Size2 s = viewport->get_size(); - int last_cell; + int last_cell = 0; Transform2D xform = transform.affine_inverse(); Vector2 grid_offset; @@ -2257,17 +2303,17 @@ void CanvasItemEditor::_notification(int p_what) { anchors[MARGIN_RIGHT] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_RIGHT); anchors[MARGIN_TOP] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_TOP); anchors[MARGIN_BOTTOM] = Object::cast_to<Control>(canvas_item)->get_anchor(MARGIN_BOTTOM); - } - if (r != se->prev_rect || xform != se->prev_xform || pivot != se->prev_pivot || anchors[MARGIN_LEFT] != se->prev_anchors[MARGIN_LEFT] || anchors[MARGIN_RIGHT] != se->prev_anchors[MARGIN_RIGHT] || anchors[MARGIN_TOP] != se->prev_anchors[MARGIN_TOP] || anchors[MARGIN_BOTTOM] != se->prev_anchors[MARGIN_BOTTOM]) { - viewport->update(); - se->prev_rect = r; - se->prev_xform = xform; - se->prev_pivot = pivot; - se->prev_anchors[MARGIN_LEFT] = anchors[MARGIN_LEFT]; - se->prev_anchors[MARGIN_RIGHT] = anchors[MARGIN_RIGHT]; - se->prev_anchors[MARGIN_TOP] = anchors[MARGIN_TOP]; - se->prev_anchors[MARGIN_BOTTOM] = anchors[MARGIN_BOTTOM]; + if (r != se->prev_rect || xform != se->prev_xform || pivot != se->prev_pivot || anchors[MARGIN_LEFT] != se->prev_anchors[MARGIN_LEFT] || anchors[MARGIN_RIGHT] != se->prev_anchors[MARGIN_RIGHT] || anchors[MARGIN_TOP] != se->prev_anchors[MARGIN_TOP] || anchors[MARGIN_BOTTOM] != se->prev_anchors[MARGIN_BOTTOM]) { + viewport->update(); + se->prev_rect = r; + se->prev_xform = xform; + se->prev_pivot = pivot; + se->prev_anchors[MARGIN_LEFT] = anchors[MARGIN_LEFT]; + se->prev_anchors[MARGIN_RIGHT] = anchors[MARGIN_RIGHT]; + se->prev_anchors[MARGIN_TOP] = anchors[MARGIN_TOP]; + se->prev_anchors[MARGIN_BOTTOM] = anchors[MARGIN_BOTTOM]; + } } } @@ -3562,29 +3608,31 @@ void CanvasItemEditorViewport::_create_preview(const Vector<String> &files) cons Sprite *sprite = memnew(Sprite); sprite->set_texture(texture); sprite->set_modulate(Color(1, 1, 1, 0.7f)); - preview->add_child(sprite); + preview_node->add_child(sprite); label->show(); label_desc->show(); } else { if (scene.is_valid()) { Node *instance = scene->instance(); if (instance) { - preview->add_child(instance); + preview_node->add_child(instance); } } } - editor->get_scene_root()->add_child(preview); + editor->get_scene_root()->add_child(preview_node); } } } void CanvasItemEditorViewport::_remove_preview() { - if (preview->get_parent()) { - editor->get_scene_root()->remove_child(preview); - for (int i = preview->get_child_count() - 1; i >= 0; i--) { - Node *node = preview->get_child(i); - memdelete(node); + if (preview_node->get_parent()) { + for (int i = preview_node->get_child_count() - 1; i >= 0; i--) { + Node *node = preview_node->get_child(i); + node->queue_delete(); + preview_node->remove_child(node); } + editor->get_scene_root()->remove_child(preview_node); + label->hide(); label_desc->hide(); } @@ -3794,11 +3842,11 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian break; } if (can_instance) { - if (!preview->get_parent()) { // create preview only once + if (!preview_node->get_parent()) { // create preview only once _create_preview(files); } Transform2D trans = canvas->get_canvas_transform(); - preview->set_position((p_point - trans.get_origin()) / trans.get_scale().x); + preview_node->set_position((p_point - trans.get_origin()) / trans.get_scale().x); label->set_text(vformat(TTR("Adding %s..."), default_type)); } return can_instance; @@ -3820,11 +3868,16 @@ void CanvasItemEditorViewport::drop_data(const Point2 &p_point, const Variant &p List<Node *> list = editor->get_editor_selection()->get_selected_node_list(); if (list.size() == 0) { - accept->get_ok()->set_text(TTR("OK :(")); - accept->set_text(TTR("No parent to instance a child at.")); - accept->popup_centered_minsize(); - _remove_preview(); - return; + Node *root_node = editor->get_edited_scene(); + if (root_node) { + list.push_back(root_node); + } else { + accept->get_ok()->set_text(TTR("OK :(")); + accept->set_text(TTR("No parent to instance a child at.")); + accept->popup_centered_minsize(); + _remove_preview(); + return; + } } if (list.size() != 1) { accept->get_ok()->set_text(TTR("I see..")); @@ -3891,7 +3944,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte editor = p_node; editor_data = editor->get_scene_tree_dock()->get_editor_data(); canvas = p_canvas; - preview = memnew(Node2D); + preview_node = memnew(Node2D); accept = memnew(AcceptDialog); editor->get_gui_base()->add_child(accept); @@ -3945,5 +3998,5 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte } CanvasItemEditorViewport::~CanvasItemEditorViewport() { - memdelete(preview); + memdelete(preview_node); } diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 8f67d641f5..52b4a37a88 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -291,7 +291,7 @@ class CanvasItemEditor : public VBoxContainer { int handle_len; bool _is_part_of_subscene(CanvasItem *p_item); - void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, unsigned int limit = 0); + void _find_canvas_items_at_pos(const Point2 &p_pos, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, Vector<_SelectResult> &r_items, int limit = 0); void _find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_node, const Transform2D &p_parent_xform, const Transform2D &p_canvas_xform, List<CanvasItem *> *r_items); void _select_click_on_empty_area(Point2 p_click_pos, bool p_append, bool p_box_selection); @@ -324,6 +324,7 @@ class CanvasItemEditor : public VBoxContainer { bool updating_scroll; void _update_scroll(float); void _update_scrollbars(); + void _update_cursor(); void incbeg(float &beg, float &end, float inc, float minsize, bool p_symmetric); void incend(float &beg, float &end, float inc, float minsize, bool p_symmetric); @@ -459,7 +460,7 @@ class CanvasItemEditorViewport : public Control { EditorNode *editor; EditorData *editor_data; CanvasItemEditor *canvas; - Node2D *preview; + Node2D *preview_node; AcceptDialog *accept; WindowDialog *selector; Label *selector_label; diff --git a/editor/plugins/cube_grid_theme_editor_plugin.cpp b/editor/plugins/cube_grid_theme_editor_plugin.cpp index 08b38c2ca2..1c17daf425 100644 --- a/editor/plugins/cube_grid_theme_editor_plugin.cpp +++ b/editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -88,7 +88,7 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, if (mesh.is_null()) continue; - int id = p_library->find_item_name(mi->get_name()); + int id = p_library->find_item_by_name(mi->get_name()); if (id < 0) { id = p_library->get_last_unused_item_id(); @@ -111,7 +111,8 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, sb->get_shape_owners(&shapes); for (List<uint32_t>::Element *E = shapes.front(); E; E = E->next()) { - if (sb->is_shape_owner_disabled(E->get())) continue; + if (sb->is_shape_owner_disabled(E->get())) + continue; //Transform shape_transform = sb->shape_owner_get_transform(E->get()); @@ -120,7 +121,7 @@ void MeshLibraryEditor::_import_scene(Node *p_scene, Ref<MeshLibrary> p_library, for (int k = 0; k < sb->shape_owner_get_shape_count(E->get()); k++) { Ref<Shape> collision = sb->shape_owner_get_shape(E->get(), k); - if (collision.is_valid()) + if (!collision.is_valid()) continue; MeshLibrary::ShapeData shape_data; shape_data.shape = collision; diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index abd2559d1f..51f00e5751 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* color_ramp_editor_plugin.cpp */ +/* gradient_editor_plugin.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index c169fa0947..ff7bf858c7 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* color_ramp_editor_plugin.h */ +/* gradient_editor_plugin.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp index a5f854e1b1..84620a75a5 100644 --- a/editor/plugins/line_2d_editor_plugin.cpp +++ b/editor/plugins/line_2d_editor_plugin.cpp @@ -211,7 +211,7 @@ void Line2DEditor::_bind_methods() { } void Line2DEditor::_mode_selected(int p_mode) { - for (unsigned int i = 0; i < _MODE_COUNT; ++i) { + for (int i = 0; i < _MODE_COUNT; ++i) { toolbar_buttons[i]->set_pressed(i == p_mode); } mode = Mode(p_mode); diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index a3195c05d6..f7008298f0 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -659,7 +659,7 @@ void Polygon2DEditor::_uv_draw() { if (snap_show_grid) { Size2 s = uv_edit_draw->get_size(); - int last_cell; + int last_cell = 0; if (snap_step.x != 0) { for (int i = 0; i < s.width; i++) { diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index a529f152dc..04be1ba4ab 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -972,6 +972,14 @@ void ScriptEditor::_menu_option(int p_option) { EditorNode::get_singleton()->show_warning("Can't obtain the script for running"); break; } + + current->apply_code(); + Error err = scr->reload(false); //hard reload script before running always + + if (err != OK) { + EditorNode::get_singleton()->show_warning("Script failed reloading, check console for errors."); + return; + } if (!scr->is_tool()) { EditorNode::get_singleton()->show_warning("Script is not in tool mode, will not be able to run"); @@ -1149,8 +1157,6 @@ void ScriptEditor::_notification(int p_what) { case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: { - tab_container->add_style_override("panel", editor->get_gui_base()->get_stylebox("ScriptPanel", "EditorStyles")); - help_search->set_icon(get_icon("HelpSearch", "EditorIcons")); site_search->set_icon(get_icon("Instance", "EditorIcons")); class_search->set_icon(get_icon("ClassList", "EditorIcons")); @@ -1417,7 +1423,7 @@ void ScriptEditor::_update_script_colors() { int non_zero_hist_size = (hist_size == 0) ? 1 : hist_size; float v = Math::ease((edit_pass - pass) / float(non_zero_hist_size), 0.4); - script_list->set_item_custom_bg_color(i, hot_color.linear_interpolate(cold_color, v)); + script_list->set_item_custom_fg_color(i, hot_color.linear_interpolate(cold_color, v)); } } } @@ -1539,8 +1545,14 @@ bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool bool open_dominant = EditorSettings::get_singleton()->get("text_editor/files/open_dominant_script_on_scene_change"); + if (p_script->get_language()->overrides_external_editor()) { + Error err = p_script->get_language()->open_in_external_editor(p_script, p_line >= 0 ? p_line : 0, p_col); + if (err != OK) + ERR_PRINT("Couldn't open script in the overridden external text editor"); + return false; + } + if ((debugger->get_dump_stack_script() != p_script || debugger->get_debug_with_external_editor()) && - p_script->get_language()->open_in_external_editor(p_script, p_line >= 0 ? p_line : 0, p_col) == OK && p_script->get_path().is_resource_file() && bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor"))) { @@ -2210,7 +2222,6 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { members_overview->set_v_size_flags(SIZE_EXPAND_FILL); tab_container = memnew(TabContainer); - tab_container->add_style_override("panel", p_editor->get_gui_base()->get_stylebox("ScriptPanel", "EditorStyles")); tab_container->set_tabs_visible(false); script_split->add_child(tab_container); @@ -2506,9 +2517,9 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) { EDITOR_DEF("text_editor/open_scripts/script_temperature_enabled", true); EDITOR_DEF("text_editor/open_scripts/highlight_current_script", true); EDITOR_DEF("text_editor/open_scripts/script_temperature_history_size", 15); - EDITOR_DEF("text_editor/open_scripts/script_temperature_hot_color", Color(1, 0, 0, 0.3)); - EDITOR_DEF("text_editor/open_scripts/script_temperature_cold_color", Color(0, 0, 1, 0.3)); - EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(0.81, 0.81, 0.14, 0.63)); + EDITOR_DEF("text_editor/open_scripts/script_temperature_hot_color", Color::html("ed5e5e")); + EDITOR_DEF("text_editor/open_scripts/script_temperature_cold_color", Color(1, 1, 1, 0.3)); + EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(1, 1, 1, 0.5)); EDITOR_DEF("text_editor/open_scripts/group_help_pages", true); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/open_scripts/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path")); EDITOR_DEF("text_editor/open_scripts/sort_scripts_by", 0); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 33890d890d..fae57eb5d2 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -75,14 +75,9 @@ void ScriptTextEditor::_load_theme_settings() { text_edit->clear_colors(); - /* color from color_theme or from editor color */ - - Color background_color = EDITOR_DEF("text_editor/highlighting/background_color", Color(0, 0, 0, 0)); - if (EDITOR_DEF("text_editor/theme/adapted_code_editor_background_color", false)) - background_color = get_color("dark_color_1", "Editor"); - /* keyword color */ - text_edit->add_color_override("background_color", background_color); + + text_edit->add_color_override("background_color", EDITOR_DEF("text_editor/highlighting/background_color", Color(0, 0, 0, 0))); text_edit->add_color_override("completion_background_color", EDITOR_DEF("text_editor/highlighting/completion_background_color", Color(0, 0, 0, 0))); text_edit->add_color_override("completion_selected_color", EDITOR_DEF("text_editor/highlighting/completion_selected_color", Color::html("434244"))); text_edit->add_color_override("completion_existing_color", EDITOR_DEF("text_editor/highlighting/completion_existing_color", Color::html("21dfdfdf"))); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 13b0391a87..b02016c273 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -289,6 +289,8 @@ void ShaderEditor::_editor_settings_changed() { shader_editor->get_text_edit()->cursor_set_blink_speed(EditorSettings::get_singleton()->get("text_editor/cursor/caret_blink_speed")); shader_editor->get_text_edit()->add_constant_override("line_spacing", EditorSettings::get_singleton()->get("text_editor/theme/line_spacing")); shader_editor->get_text_edit()->cursor_set_block_mode(EditorSettings::get_singleton()->get("text_editor/cursor/block_caret")); + shader_editor->get_text_edit()->set_smooth_scroll_enabled(EditorSettings::get_singleton()->get("text_editor/open_scripts/smooth_scrolling")); + shader_editor->get_text_edit()->set_v_scroll_speed(EditorSettings::get_singleton()->get("text_editor/open_scripts/v_scroll_speed")); } void ShaderEditor::_bind_methods() { diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index bc5c700959..a5f55835f0 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -35,12 +35,15 @@ #include "editor/editor_node.h" #include "editor/editor_settings.h" #include "editor/plugins/animation_player_editor_plugin.h" +#include "editor/plugins/script_editor_plugin.h" +#include "editor/script_editor_debugger.h" #include "editor/spatial_editor_gizmos.h" #include "os/keyboard.h" #include "print_string.h" #include "project_settings.h" #include "scene/3d/camera.h" #include "scene/3d/visual_instance.h" +#include "scene/resources/packed_scene.h" #include "scene/resources/surface_tool.h" #include "sort.h" @@ -228,7 +231,7 @@ Vector3 SpatialEditorViewport::_get_camera_normal() const { return -_get_camera_transform().basis.get_axis(2); } -Vector3 SpatialEditorViewport::_get_ray(const Vector2 &p_pos) { +Vector3 SpatialEditorViewport::_get_ray(const Vector2 &p_pos) const { return camera->project_ray_normal(p_pos); } @@ -700,6 +703,11 @@ void SpatialEditorViewport::_smouseenter() { surface->grab_focus(); } +void SpatialEditorViewport::_smouseexit() { + + _remove_preview(); +} + void SpatialEditorViewport::_list_select(Ref<InputEventMouseButton> b) { _find_items_at_pos(b->get_position(), clicked_includes_current, selection_results, b->get_shift()); @@ -1895,6 +1903,7 @@ void SpatialEditorViewport::_notification(int p_what) { surface->connect("draw", this, "_draw"); surface->connect("gui_input", this, "_sinput"); surface->connect("mouse_entered", this, "_smouseenter"); + surface->connect("mouse_exited", this, "_smouseexit"); info->add_style_override("panel", get_stylebox("panel", "Panel")); preview_camera->set_icon(get_icon("Camera", "EditorIcons")); _init_gizmo_instance(index); @@ -2425,6 +2434,7 @@ void SpatialEditorViewport::_bind_methods() { ClassDB::bind_method(D_METHOD("_draw"), &SpatialEditorViewport::_draw); ClassDB::bind_method(D_METHOD("_smouseenter"), &SpatialEditorViewport::_smouseenter); + ClassDB::bind_method(D_METHOD("_smouseexit"), &SpatialEditorViewport::_smouseexit); ClassDB::bind_method(D_METHOD("_sinput"), &SpatialEditorViewport::_sinput); ClassDB::bind_method(D_METHOD("_menu_option"), &SpatialEditorViewport::_menu_option); ClassDB::bind_method(D_METHOD("_toggle_camera_preview"), &SpatialEditorViewport::_toggle_camera_preview); @@ -2432,6 +2442,8 @@ void SpatialEditorViewport::_bind_methods() { ClassDB::bind_method(D_METHOD("update_transform_gizmo_view"), &SpatialEditorViewport::update_transform_gizmo_view); ClassDB::bind_method(D_METHOD("_selection_result_pressed"), &SpatialEditorViewport::_selection_result_pressed); ClassDB::bind_method(D_METHOD("_selection_menu_hide"), &SpatialEditorViewport::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &SpatialEditorViewport::can_drop_data_fw); + ClassDB::bind_method(D_METHOD("drop_data_fw"), &SpatialEditorViewport::drop_data_fw); ADD_SIGNAL(MethodInfo("toggle_maximize_view", PropertyInfo(Variant::OBJECT, "viewport"))); } @@ -2481,6 +2493,293 @@ void SpatialEditorViewport::focus_selection() { cursor.pos = center; } +void SpatialEditorViewport::assign_pending_data_pointers(Spatial *p_preview_node, Rect3 *p_preview_bounds, AcceptDialog *p_accept) { + preview_node = p_preview_node; + preview_bounds = p_preview_bounds; + accept = p_accept; +} + +Vector3 SpatialEditorViewport::_get_instance_position(const Point2 &p_pos) const { + const float MAX_DISTANCE = 10; + + Vector3 world_ray = _get_ray(p_pos); + Vector3 world_pos = _get_ray_pos(p_pos); + + Vector<ObjectID> instances = VisualServer::get_singleton()->instances_cull_ray(world_pos, world_ray, get_tree()->get_root()->get_world()->get_scenario()); + Set<Ref<SpatialEditorGizmo> > found_gizmos; + + float closest_dist = MAX_DISTANCE; + + Vector3 point = world_pos + world_ray * MAX_DISTANCE; + Vector3 normal = Vector3(0.0, 0.0, 0.0); + + for (int i = 0; i < instances.size(); i++) { + + MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(ObjectDB::get_instance(instances[i])); + + if (!mesh_instance) + continue; + + Ref<SpatialEditorGizmo> seg = mesh_instance->get_gizmo(); + + if ((!seg.is_valid()) || found_gizmos.has(seg)) { + continue; + } + + found_gizmos.insert(seg); + + int handle = -1; + Vector3 hit_point; + Vector3 hit_normal; + bool inters = seg->intersect_ray(camera, p_pos, hit_point, hit_normal, NULL, false); + + if (!inters) + continue; + + float dist = world_pos.distance_to(hit_point); + + if (dist < 0) + continue; + + if (dist < closest_dist) { + closest_dist = dist; + point = hit_point; + normal = hit_normal; + } + } + Vector3 center = preview_bounds->get_size() * 0.5; + return point + (center * normal); +} + +Rect3 SpatialEditorViewport::_calculate_spatial_bounds(const Spatial *p_parent, const Rect3 p_bounds) { + Rect3 bounds = p_bounds; + for (int i = 0; i < p_parent->get_child_count(); i++) { + Spatial *child = Object::cast_to<Spatial>(p_parent->get_child(i)); + if (child) { + MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(child); + if (mesh_instance) { + Rect3 mesh_instance_bounds = mesh_instance->get_aabb(); + mesh_instance_bounds.position += mesh_instance->get_global_transform().origin - p_parent->get_global_transform().origin; + bounds.merge_with(mesh_instance_bounds); + } + bounds = _calculate_spatial_bounds(child, bounds); + } + } + return bounds; +} + +void SpatialEditorViewport::_create_preview(const Vector<String> &files) const { + for (int i = 0; i < files.size(); i++) { + String path = files[i]; + RES res = ResourceLoader::load(path); + Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res)); + if (scene != NULL) { + if (scene.is_valid()) { + Node *instance = scene->instance(); + if (instance) { + preview_node->add_child(instance); + } + } + editor->get_scene_root()->add_child(preview_node); + } + } + *preview_bounds = _calculate_spatial_bounds(preview_node, Rect3()); +} + +void SpatialEditorViewport::_remove_preview() { + if (preview_node->get_parent()) { + for (int i = preview_node->get_child_count() - 1; i >= 0; i--) { + Node *node = preview_node->get_child(i); + node->queue_delete(); + preview_node->remove_child(node); + } + editor->get_scene_root()->remove_child(preview_node); + } +} + +bool SpatialEditorViewport::_cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node) { + if (p_desired_node->get_filename() == p_target_scene_path) { + return true; + } + + int childCount = p_desired_node->get_child_count(); + for (int i = 0; i < childCount; i++) { + Node *child = p_desired_node->get_child(i); + if (_cyclical_dependency_exists(p_target_scene_path, child)) { + return true; + } + } + return false; +} + +bool SpatialEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) { + Ref<PackedScene> sdata = ResourceLoader::load(path); + if (!sdata.is_valid()) { // invalid scene + return false; + } + + Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); + if (!instanced_scene) { // error on instancing + return false; + } + + if (editor->get_edited_scene()->get_filename() != "") { // cyclical instancing + if (_cyclical_dependency_exists(editor->get_edited_scene()->get_filename(), instanced_scene)) { + memdelete(instanced_scene); + return false; + } + } + + instanced_scene->set_filename(ProjectSettings::get_singleton()->localize_path(path)); + + editor_data->get_undo_redo().add_do_method(parent, "add_child", instanced_scene); + editor_data->get_undo_redo().add_do_method(instanced_scene, "set_owner", editor->get_edited_scene()); + editor_data->get_undo_redo().add_do_reference(instanced_scene); + editor_data->get_undo_redo().add_undo_method(parent, "remove_child", instanced_scene); + + String new_name = parent->validate_child_name(instanced_scene); + ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger(); + editor_data->get_undo_redo().add_do_method(sed, "live_debug_instance_node", editor->get_edited_scene()->get_path_to(parent), path, new_name); + editor_data->get_undo_redo().add_undo_method(sed, "live_debug_remove_node", NodePath(String(editor->get_edited_scene()->get_path_to(parent)) + "/" + new_name)); + + Transform global_transform; + Spatial *parent_spatial = Object::cast_to<Spatial>(parent); + if (parent_spatial) + global_transform = parent_spatial->get_global_transform(); + + global_transform.origin = _get_instance_position(p_point); + + editor_data->get_undo_redo().add_do_method(instanced_scene, "set_global_transform", global_transform); + + return true; +} + +void SpatialEditorViewport::_perform_drop_data() { + _remove_preview(); + + Vector<String> error_files; + + editor_data->get_undo_redo().create_action(TTR("Create Node")); + + for (int i = 0; i < selected_files.size(); i++) { + String path = selected_files[i]; + RES res = ResourceLoader::load(path); + if (res.is_null()) { + continue; + } + Ref<PackedScene> scene = Ref<PackedScene>(Object::cast_to<PackedScene>(*res)); + if (scene != NULL) { + bool success = _create_instance(target_node, path, drop_pos); + if (!success) { + error_files.push_back(path); + } + } + } + + editor_data->get_undo_redo().commit_action(); + + if (error_files.size() > 0) { + String files_str; + for (int i = 0; i < error_files.size(); i++) { + files_str += error_files[i].get_file().get_basename() + ","; + } + files_str = files_str.substr(0, files_str.length() - 1); + accept->get_ok()->set_text(TTR("Ugh")); + accept->set_text(vformat(TTR("Error instancing scene from %s"), files_str.c_str())); + accept->popup_centered_minsize(); + } +} + +bool SpatialEditorViewport::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const { + + bool can_instance = false; + + if (!preview_node->is_inside_tree()) { + Dictionary d = p_data; + if (d.has("type") && (String(d["type"]) == "files")) { + Vector<String> files = d["files"]; + + List<String> scene_extensions; + ResourceLoader::get_recognized_extensions_for_type("PackedScene", &scene_extensions); + + for (int i = 0; i < files.size(); i++) { + if (scene_extensions.find(files[i].get_extension())) { + RES res = ResourceLoader::load(files[i]); + if (res.is_null()) { + continue; + } + + String type = res->get_class(); + if (type == "PackedScene") { + Ref<PackedScene> sdata = ResourceLoader::load(files[i]); + Node *instanced_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); + if (!instanced_scene) { + continue; + } + memdelete(instanced_scene); + } + can_instance = true; + break; + } + } + if (can_instance) { + _create_preview(files); + } + } + } else { + can_instance = true; + } + + if (can_instance) { + Transform global_transform = Transform(Basis(), _get_instance_position(p_point)); + preview_node->set_global_transform(global_transform); + } + + return can_instance; +} + +void SpatialEditorViewport::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { + if (!can_drop_data_fw(p_point, p_data, p_from)) + return; + + bool is_shift = Input::get_singleton()->is_key_pressed(KEY_SHIFT); + + selected_files.clear(); + Dictionary d = p_data; + if (d.has("type") && String(d["type"]) == "files") { + selected_files = d["files"]; + } + + List<Node *> list = editor->get_editor_selection()->get_selected_node_list(); + if (list.size() == 0) { + Node *root_node = editor->get_edited_scene(); + if (root_node) { + list.push_back(root_node); + } else { + accept->get_ok()->set_text(TTR("OK :(")); + accept->set_text(TTR("No parent to instance a child at.")); + accept->popup_centered_minsize(); + _remove_preview(); + return; + } + } + if (list.size() != 1) { + accept->get_ok()->set_text(TTR("I see..")); + accept->set_text(TTR("This operation requires a single selected node.")); + accept->popup_centered_minsize(); + _remove_preview(); + return; + } + + target_node = list[0]; + if (is_shift && target_node != editor->get_edited_scene()) { + target_node = target_node->get_parent(); + } + drop_pos = p_point; + + _perform_drop_data(); +} + SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index) { _edit.mode = TRANSFORM_NONE; @@ -2491,6 +2790,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed index = p_index; editor = p_editor; + editor_data = editor->get_scene_tree_dock()->get_editor_data(); editor_selection = editor->get_editor_selection(); undo_redo = editor->get_undo_redo(); clicked = 0; @@ -2509,6 +2809,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed c->add_child(viewport); surface = memnew(Control); + surface->set_drag_forwarding(this); add_child(surface); surface->set_area_as_parent_rect(); surface->set_clip_contents(true); @@ -2573,9 +2874,10 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed preview_camera->hide(); preview_camera->connect("toggled", this, "_toggle_camera_preview"); previewing = NULL; - preview = NULL; gizmo_scale = 1.0; + preview_node = NULL; + info = memnew(PanelContainer); info->set_self_modulate(Color(1, 1, 1, 0.4)); surface->add_child(info); @@ -2583,6 +2885,8 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed info->add_child(info_label); info->hide(); + accept = NULL; + freelook_active = false; selection_menu = memnew(PopupMenu); @@ -2958,7 +3262,7 @@ void SpatialEditor::update_transform_gizmo() { gizmo.transform.origin = pcenter; gizmo.transform.basis = gizmo_basis; - for (int i = 0; i < VIEWPORTS_COUNT; i++) { + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { viewports[i]->update_transform_gizmo_view(); } } @@ -3108,7 +3412,7 @@ void SpatialEditor::set_state(const Dictionary &p_state) { Array vp = d["viewports"]; ERR_FAIL_COND(vp.size() > 4); - for (int i = 0; i < VIEWPORTS_COUNT; i++) { + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { viewports[i]->set_state(vp[i]); } } @@ -3505,7 +3809,7 @@ void SpatialEditor::_init_indicators() { gizmo_hl = Ref<SpatialMaterial>(memnew(SpatialMaterial)); gizmo_hl->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - gizmo_hl->set_flag(SpatialMaterial::FLAG_ONTOP, true); + gizmo_hl->set_on_top_of_alpha(); gizmo_hl->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); gizmo_hl->set_albedo(Color(1, 1, 1, gizmo_alph + 0.2f)); gizmo_hl->set_cull_mode(SpatialMaterial::CULL_DISABLED); @@ -3518,7 +3822,7 @@ void SpatialEditor::_init_indicators() { Ref<SpatialMaterial> mat = memnew(SpatialMaterial); mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - mat->set_flag(SpatialMaterial::FLAG_ONTOP, true); + mat->set_on_top_of_alpha(); mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); Color col; col[i] = 1.0; @@ -3613,7 +3917,7 @@ void SpatialEditor::_init_indicators() { Ref<SpatialMaterial> plane_mat = memnew(SpatialMaterial); plane_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - plane_mat->set_flag(SpatialMaterial::FLAG_ONTOP, true); + plane_mat->set_on_top_of_alpha(); plane_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); plane_mat->set_cull_mode(SpatialMaterial::CULL_DISABLED); Color col; @@ -3852,15 +4156,15 @@ void SpatialEditor::_toggle_maximize_view(Object *p_viewport) { if (!maximized) { - for (int i = 0; i < VIEWPORTS_COUNT; i++) { - if (i == index) + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { + if (i == (uint32_t)index) viewports[i]->set_area_as_parent_rect(); else viewports[i]->hide(); } } else { - for (int i = 0; i < VIEWPORTS_COUNT; i++) + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) viewports[i]->show(); if (view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT))) @@ -3904,7 +4208,7 @@ void SpatialEditor::clear() { settings_znear->set_value(EDITOR_DEF("editors/3d/default_z_near", 0.1)); settings_zfar->set_value(EDITOR_DEF("editors/3d/default_z_far", 1500.0)); - for (int i = 0; i < VIEWPORTS_COUNT; i++) { + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { viewports[i]->reset(); } @@ -3917,7 +4221,7 @@ void SpatialEditor::clear() { } } - for (int i = 0; i < VIEWPORTS_COUNT; i++) { + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { viewports[i]->view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(SpatialEditorViewport::VIEW_AUDIO_LISTENER), i == 0); viewports[i]->viewport->set_as_audio_listener(i == 0); @@ -4000,6 +4304,10 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { vs = memnew(VSeparator); hbc_menu->add_child(vs); + // Drag and drop support; + preview_node = memnew(Spatial); + preview_bounds = Rect3(); + ED_SHORTCUT("spatial_editor/bottom_view", TTR("Bottom View"), KEY_MASK_ALT + KEY_KP_7); ED_SHORTCUT("spatial_editor/top_view", TTR("Top View"), KEY_KP_7); ED_SHORTCUT("spatial_editor/rear_view", TTR("Rear View"), KEY_MASK_ALT + KEY_KP_1); @@ -4044,6 +4352,9 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { p = view_menu->get_popup(); + accept = memnew(AcceptDialog); + editor->get_gui_base()->add_child(accept); + p->add_check_shortcut(ED_SHORTCUT("spatial_editor/1_viewport", TTR("1 Viewport"), KEY_MASK_CMD + KEY_1), MENU_VIEW_USE_1_VIEWPORT); p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports", TTR("2 Viewports"), KEY_MASK_CMD + KEY_2), MENU_VIEW_USE_2_VIEWPORTS); p->add_check_shortcut(ED_SHORTCUT("spatial_editor/2_viewports_alt", TTR("2 Viewports (Alt)"), KEY_MASK_ALT + KEY_MASK_CMD + KEY_2), MENU_VIEW_USE_2_VIEWPORTS_ALT); @@ -4074,10 +4385,11 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { viewport_base = memnew(SpatialEditorViewportContainer); shader_split->add_child(viewport_base); viewport_base->set_v_size_flags(SIZE_EXPAND_FILL); - for (int i = 0; i < VIEWPORTS_COUNT; i++) { + for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) { viewports[i] = memnew(SpatialEditorViewport(this, editor, i)); viewports[i]->connect("toggle_maximize_view", this, "_toggle_maximize_view"); + viewports[i]->assign_pending_data_pointers(preview_node, &preview_bounds, accept); viewport_base->add_child(viewports[i]); } //vbc->add_child(viewport_base); @@ -4212,6 +4524,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { } SpatialEditor::~SpatialEditor() { + memdelete(preview_node); } void SpatialEditorPlugin::make_visible(bool p_visible) { diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 374861b5e7..db5abe2b53 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -106,7 +106,16 @@ private: void _menu_option(int p_option); Size2 prev_size; + Spatial *preview_node; + Rect3 *preview_bounds; + Vector<String> selected_files; + AcceptDialog *accept; + + Node *target_node; + Point2 drop_pos; + EditorNode *editor; + EditorData *editor_data; EditorSelection *editor_selection; UndoRedo *undo_redo; @@ -143,7 +152,7 @@ private: ObjectID _select_ray(const Point2 &p_pos, bool p_append, bool &r_includes_current, int *r_gizmo_handle = NULL, bool p_alt_select = false); void _find_items_at_pos(const Point2 &p_pos, bool &r_includes_current, Vector<_RayResult> &results, bool p_alt_select = false); Vector3 _get_ray_pos(const Vector2 &p_pos) const; - Vector3 _get_ray(const Vector2 &p_pos); + Vector3 _get_ray(const Vector2 &p_pos) const; Point2 _point_to_screen(const Vector3 &p_point); Transform _get_camera_transform() const; int get_selected_count() const; @@ -250,6 +259,7 @@ private: void _draw(); void _smouseenter(); + void _smouseexit(); void _sinput(const Ref<InputEvent> &p_event); void _update_freelook(real_t delta); SpatialEditor *spatial_editor; @@ -266,6 +276,17 @@ private: void _list_select(Ref<InputEventMouseButton> b); Point2i _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const; + Vector3 _get_instance_position(const Point2 &p_pos) const; + static Rect3 _calculate_spatial_bounds(const Spatial *p_parent, const Rect3 p_bounds); + void _create_preview(const Vector<String> &files) const; + void _remove_preview(); + bool _cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node); + bool _create_instance(Node *parent, String &path, const Point2 &p_point); + void _perform_drop_data(); + + bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; + void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); + protected: void _notification(int p_what); static void _bind_methods(); @@ -281,6 +302,11 @@ public: void focus_selection(); + void assign_pending_data_pointers( + Spatial *p_preview_node, + Rect3 *p_preview_bounds, + AcceptDialog *p_accept); + Viewport *get_viewport_node() { return viewport; } SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index); @@ -396,6 +422,10 @@ private: Ref<SpatialMaterial> indicator_mat; Ref<SpatialMaterial> cursor_material; + // Scene drag and drop support + Spatial *preview_node; + Rect3 preview_bounds; + /* struct Selected { AABB aabb; @@ -442,6 +472,8 @@ private: MenuButton *transform_menu; MenuButton *view_menu; + AcceptDialog *accept; + ConfirmationDialog *snap_dialog; ConfirmationDialog *xform_dialog; ConfirmationDialog *settings_dialog; @@ -559,6 +591,7 @@ public: Camera *get_camera() { return NULL; } void edit(Spatial *p_spatial); void clear(); + SpatialEditor(EditorNode *p_editor); ~SpatialEditor(); }; diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index c2c26bfe6c..7b40f69082 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -244,8 +244,22 @@ void SpriteFramesEditor::_down_pressed() { void SpriteFramesEditor::_delete_pressed() { + ERR_FAIL_COND(!frames->has_animation(edited_anim)); + if (tree->get_current() < 0) return; + + int to_delete = tree->get_current(); + if (to_delete < 0 || to_delete >= frames->get_frame_count(edited_anim)) { + return; + } + + undo_redo->create_action(TTR("Delete Resource")); + undo_redo->add_do_method(frames, "remove_frame", edited_anim, to_delete); + undo_redo->add_undo_method(frames, "add_frame", edited_anim, frames->get_frame(edited_anim, to_delete), to_delete); + undo_redo->add_do_method(this, "_update_library"); + undo_redo->add_undo_method(this, "_update_library"); + undo_redo->commit_action(); } void SpriteFramesEditor::_animation_select() { diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 82b507bd49..38d1350b07 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -67,7 +67,7 @@ void TextureRegionEditor::_region_draw() { if (snap_mode == SNAP_GRID) { Size2 s = edit_draw->get_size(); - int last_cell; + int last_cell = 0; if (snap_step.x != 0) { if (snap_separation.x == 0) @@ -406,7 +406,7 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) { } else if (drag) { if (edited_margin >= 0) { - float new_margin; + float new_margin = 0; if (edited_margin == 0) new_margin = prev_margin + (mm->get_position().y - drag_from.y) / draw_zoom; else if (edited_margin == 1) @@ -415,6 +415,9 @@ void TextureRegionEditor::_region_input(const Ref<InputEvent> &p_input) { new_margin = prev_margin + (mm->get_position().x - drag_from.x) / draw_zoom; else if (edited_margin == 3) new_margin = prev_margin - (mm->get_position().x - drag_from.x) / draw_zoom; + else + ERR_PRINT("Unexpected edited_margin"); + if (new_margin < 0) new_margin = 0; static Margin m[4] = { MARGIN_TOP, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT }; diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 94fce45733..49687a504f 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* project_settings.cpp */ +/* project_settings_editor.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -700,6 +700,8 @@ void ProjectSettingsEditor::_update_actions() { action->set_meta("__input", ie); } } + + _action_check(action_name->get_text()); } void ProjectSettingsEditor::popup_project_settings() { @@ -809,28 +811,41 @@ void ProjectSettingsEditor::_item_del() { undo_redo->commit_action(); } -void ProjectSettingsEditor::_action_adds(String) { +void ProjectSettingsEditor::_action_check(String p_action) { - _action_add(); -} + if (p_action == "") { -void ProjectSettingsEditor::_action_add() { + action_add->set_disabled(true); + } else { - String action = action_name->get_text(); - if (action.find("/") != -1 || action.find(":") != -1 || action == "") { - message->set_text(TTR("Invalid action (anything goes but '/' or ':').")); - message->popup_centered(Size2(300, 100) * EDSCALE); - return; + if (p_action.find("/") != -1 || p_action.find(":") != -1) { + action_add->set_text(TTR("Can't contain '/' or ':'")); + action_add->set_disabled(true); + return; + } + if (ProjectSettings::get_singleton()->has("input/" + p_action)) { + action_add->set_text(TTR("Already existing")); + action_add->set_disabled(true); + return; + } + + action_add->set_disabled(false); } - if (ProjectSettings::get_singleton()->has("input/" + action)) { - message->set_text(vformat(TTR("Action '%s' already exists!"), action)); - message->popup_centered(Size2(300, 100) * EDSCALE); - return; + action_add->set_text(TTR("Add")); +} + +void ProjectSettingsEditor::_action_adds(String) { + + if (!action_add->is_disabled()) { + _action_add(); } +} + +void ProjectSettingsEditor::_action_add() { Array va; - String name = "input/" + action; + String name = "input/" + action_name->get_text(); undo_redo->create_action(TTR("Add Input Action Event")); undo_redo->add_do_method(ProjectSettings::get_singleton(), "set", name, va); undo_redo->add_undo_method(ProjectSettings::get_singleton(), "clear", name); @@ -854,6 +869,7 @@ void ProjectSettingsEditor::_action_add() { return; r->select(0); input_editor->ensure_cursor_is_visible(); + action_add->set_text(TTR("Add")); } void ProjectSettingsEditor::_item_checked(const String &p_item, bool p_check) { @@ -929,7 +945,7 @@ void ProjectSettingsEditor::_copy_to_platform(int p_which) { String path = globals_editor->get_property_editor()->get_selected_path(); if (path == String()) { - EditorNode::get_singleton()->show_warning(TTR("Select an setting item first!")); + EditorNode::get_singleton()->show_warning(TTR("Select a setting item first!")); return; } @@ -1321,6 +1337,11 @@ void ProjectSettingsEditor::set_plugins_page() { tab_container->set_current_tab(plugin_settings->get_index()); } +TabContainer *ProjectSettingsEditor::get_tabs() { + + return tab_container; +} + void ProjectSettingsEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_item_selected"), &ProjectSettingsEditor::_item_selected); @@ -1331,6 +1352,7 @@ void ProjectSettingsEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_save"), &ProjectSettingsEditor::_save); ClassDB::bind_method(D_METHOD("_action_add"), &ProjectSettingsEditor::_action_add); ClassDB::bind_method(D_METHOD("_action_adds"), &ProjectSettingsEditor::_action_adds); + ClassDB::bind_method(D_METHOD("_action_check"), &ProjectSettingsEditor::_action_check); ClassDB::bind_method(D_METHOD("_action_selected"), &ProjectSettingsEditor::_action_selected); ClassDB::bind_method(D_METHOD("_action_edited"), &ProjectSettingsEditor::_action_edited); ClassDB::bind_method(D_METHOD("_action_activated"), &ProjectSettingsEditor::_action_activated); @@ -1361,6 +1383,8 @@ void ProjectSettingsEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_toggle_search_bar"), &ProjectSettingsEditor::_toggle_search_bar); ClassDB::bind_method(D_METHOD("_copy_to_platform_about_to_show"), &ProjectSettingsEditor::_copy_to_platform_about_to_show); + + ClassDB::bind_method(D_METHOD("get_tabs"), &ProjectSettingsEditor::get_tabs); } ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { @@ -1475,9 +1499,8 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { get_ok()->set_text(TTR("Close")); set_hide_on_ok(true); - message = memnew(ConfirmationDialog); + message = memnew(AcceptDialog); add_child(message); - message->set_hide_on_ok(true); Control *input_base = memnew(Control); input_base->set_name(TTR("Input Map")); @@ -1493,7 +1516,6 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { l = memnew(Label); vbc->add_child(l); - l->set_position(Point2(6, 5) * EDSCALE); l->set_text(TTR("Action:")); hbc = memnew(HBoxContainer); @@ -1503,12 +1525,15 @@ ProjectSettingsEditor::ProjectSettingsEditor(EditorData *p_data) { action_name->set_h_size_flags(SIZE_EXPAND_FILL); hbc->add_child(action_name); action_name->connect("text_entered", this, "_action_adds"); + action_name->connect("text_changed", this, "_action_check"); add = memnew(Button); hbc->add_child(add); add->set_custom_minimum_size(Size2(150, 0) * EDSCALE); add->set_text(TTR("Add")); + add->set_disabled(true); add->connect("pressed", this, "_action_add"); + action_add = add; input_editor = memnew(Tree); vbc->add_child(input_editor); diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index e4e2345692..7f9b18a968 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* project_settings.h */ +/* project_settings_editor.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -66,7 +66,7 @@ class ProjectSettingsEditor : public AcceptDialog { ToolButton *clear_button; HBoxContainer *add_prop_bar; - ConfirmationDialog *message; + AcceptDialog *message; LineEdit *category; LineEdit *property; OptionButton *type; @@ -80,6 +80,7 @@ class ProjectSettingsEditor : public AcceptDialog { MenuButton *popup_copy_to_feature; LineEdit *action_name; + Button *action_add; Tree *input_editor; bool setting; bool updating_translations; @@ -108,6 +109,7 @@ class ProjectSettingsEditor : public AcceptDialog { void _add_item(int p_item, Ref<InputEvent> p_exiting_event = NULL); void _edit_item(Ref<InputEvent> p_exiting_event); + void _action_check(String p_action); void _action_adds(String); void _action_add(); void _device_input_add(); @@ -159,6 +161,8 @@ public: void popup_project_settings(); void set_plugins_page(); + TabContainer *get_tabs(); + void queue_save(); ProjectSettingsEditor(EditorData *p_data); diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index c71cc5af3f..b92ebed167 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -171,33 +171,50 @@ void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd, Vector<Pair<Str Pair<String, Ref<Texture> > pair; pair.first = file; pair.second = get_icon((has_icon(efsd->get_file_type(i), ei) ? efsd->get_file_type(i) : ot), ei); + list.push_back(pair); + } + } + + if (add_directories) { + for (int i = 0; i < efsd->get_subdir_count(); i++) { - if (search_text != String() && list.size() > 0) { + _parse_fs(efsd->get_subdir(i), list); + } + } +} - float this_sim = _path_cmp(search_text, file); - float other_sim = _path_cmp(list[0].first, file); - int pos = 1; +Vector<Pair<String, Ref<Texture> > > EditorQuickOpen::_sort_fs(Vector<Pair<String, Ref<Texture> > > &list) { - while (pos < list.size() && this_sim <= other_sim) { - other_sim = _path_cmp(list[pos++].first, file); - } + String search_text = search_box->get_text(); + Vector<Pair<String, Ref<Texture> > > sorted_list; - pos = this_sim >= other_sim ? pos - 1 : pos; - list.insert(pos, pair); + if (search_text == String() || list.size() == 0) + return sorted_list; - } else { + Vector<float> scores; + scores.resize(list.size()); + for (int i = 0; i < list.size(); i++) + scores[i] = _path_cmp(search_text, list[i].first); - list.push_back(pair); - } - } - } + while (list.size() > 0) { - if (add_directories) { - for (int i = 0; i < efsd->get_subdir_count(); i++) { + float best_score = 0.0f; + int best_idx = 0; - _parse_fs(efsd->get_subdir(i), list); + for (int i = 0; i < list.size(); i++) { + float current_score = scores[i]; + if (current_score > best_score) { + best_score = current_score; + best_idx = i; + } } + + sorted_list.push_back(list[best_idx]); + list.remove(best_idx); + scores.remove(best_idx); } + + return sorted_list; } void EditorQuickOpen::_update_search() { @@ -208,6 +225,7 @@ void EditorQuickOpen::_update_search() { Vector<Pair<String, Ref<Texture> > > list; _parse_fs(efsd, list); + list = _sort_fs(list); for (int i = 0; i < list.size(); i++) { TreeItem *ti = search_options->create_item(root); diff --git a/editor/quick_open.h b/editor/quick_open.h index 3f64dd8cf0..5b91965920 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -49,6 +49,7 @@ class EditorQuickOpen : public ConfirmationDialog { void _sbox_input(const Ref<InputEvent> &p_ie); void _parse_fs(EditorFileSystemDirectory *efsd, Vector<Pair<String, Ref<Texture> > > &list); + Vector<Pair<String, Ref<Texture> > > _sort_fs(Vector<Pair<String, Ref<Texture> > > &list); float _path_cmp(String search, String path) const; void _confirmed(); diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index d0e2e0c240..089c054b59 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -352,9 +352,16 @@ void ScriptCreateDialog::_path_changed(const String &p_path) { /* Does file already exist */ DirAccess *f = DirAccess::create(DirAccess::ACCESS_RESOURCES); - if (f->file_exists(p) && !(f->current_is_dir())) { + if (f->dir_exists(p)) { + is_new_script_created = false; + is_path_valid = false; + _msg_path_valid(false, TTR("Directory of the same name exists")); + } else if (f->file_exists(p)) { is_new_script_created = false; is_path_valid = true; + _msg_path_valid(true, TTR("File exists, will be reused")); + } else { + path_error_label->set_text(""); } memdelete(f); _update_dialog(); diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 623e458aca..05e3feedb5 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -165,7 +165,7 @@ void EditorSettingsDialog::_update_shortcuts() { section->set_custom_bg_color(1, get_color("prop_subsection", "Editor")); } - if (shortcut_filter.is_subsequence_ofi(sc->get_name())) { + if (shortcut_filter.is_subsequence_ofi(sc->get_name()) || shortcut_filter.is_subsequence_ofi(sc->get_as_text())) { TreeItem *item = shortcuts->create_item(section); item->set_text(0, sc->get_name()); diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index c127b9a2f1..9c7ea506aa 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -580,7 +580,7 @@ Ref<SpatialMaterial> EditorSpatialGizmo::create_material(const String &p_name, c } if (p_on_top && is_selected()) { - line_material->set_flag(SpatialMaterial::FLAG_ONTOP, true); + line_material->set_on_top_of_alpha(); } line_material->set_albedo(color); @@ -624,7 +624,7 @@ Ref<SpatialMaterial> EditorSpatialGizmo::create_icon_material(const String &p_na icon->set_billboard_mode(SpatialMaterial::BILLBOARD_ENABLED); if (p_on_top && is_selected()) { - icon->set_flag(SpatialMaterial::FLAG_ONTOP, true); + icon->set_on_top_of_alpha(); } SpatialEditorGizmos::singleton->material_cache[name] = icon; @@ -3411,7 +3411,7 @@ SpatialEditorGizmos::SpatialEditorGizmos() { handle_material = Ref<SpatialMaterial>(memnew(SpatialMaterial)); handle_material->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - handle_material->set_flag(SpatialMaterial::FLAG_ONTOP, true); + handle_material->set_on_top_of_alpha(); handle_material->set_albedo(Color(0.8, 0.8, 0.8)); handle_material_billboard = handle_material->duplicate(); handle_material_billboard->set_billboard_mode(SpatialMaterial::BILLBOARD_ENABLED); @@ -3426,11 +3426,11 @@ SpatialEditorGizmos::SpatialEditorGizmos() { handle2_material->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); handle2_material->set_flag(SpatialMaterial::FLAG_ALBEDO_FROM_VERTEX_COLOR, true); handle2_material->set_flag(SpatialMaterial::FLAG_SRGB_VERTEX_COLOR, true); - handle2_material->set_flag(SpatialMaterial::FLAG_ONTOP, true); + handle2_material->set_on_top_of_alpha(); handle2_material_billboard = handle2_material->duplicate(); handle2_material_billboard->set_billboard_mode(SpatialMaterial::BILLBOARD_ENABLED); handle2_material_billboard->set_billboard_mode(SpatialMaterial::BILLBOARD_ENABLED); - handle2_material_billboard->set_flag(SpatialMaterial::FLAG_ONTOP, true); + handle2_material_billboard->set_on_top_of_alpha(); EDITOR_DEF("editors/3d_gizmos/gizmo_colors/light", Color(1, 1, 0.2)); EDITOR_DEF("editors/3d_gizmos/gizmo_colors/stream_player_3d", Color(0.4, 0.8, 1)); @@ -3490,7 +3490,7 @@ SpatialEditorGizmos::SpatialEditorGizmos() { skeleton_material = create_line_material(Color(0.6, 1.0, 0.3)); skeleton_material->set_cull_mode(SpatialMaterial::CULL_DISABLED); skeleton_material->set_flag(SpatialMaterial::FLAG_UNSHADED, true); - skeleton_material->set_flag(SpatialMaterial::FLAG_ONTOP, true); + skeleton_material->set_on_top_of_alpha(); skeleton_material->set_depth_draw_mode(SpatialMaterial::DEPTH_DRAW_DISABLED); //position 3D Shared mesh diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index 0971ebe23a..d2d65a7428 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -1,6 +1,6 @@ #!/bin/bash -# git pre-commit hook that runs an clang-format stylecheck. +# git pre-commit hook that runs a clang-format stylecheck. # Features: # - abort commit when commit does not comply with the style guidelines # - create a patch of the proposed style changes @@ -97,7 +97,7 @@ do # The sed call is necessary to transform the patch from # --- $file timestamp # +++ - timestamp - # to both lines working on the same file and having a a/ and b/ prefix. + # to both lines working on the same file and having a/ and b/ prefix. # Else it can not be applied with 'git apply'. "$CLANG_FORMAT" -style=file "$file" | \ diff -u "$file" - | \ diff --git a/modules/etc/SCsub b/modules/etc/SCsub index f0c1ee64b9..9c3e703f11 100644 --- a/modules/etc/SCsub +++ b/modules/etc/SCsub @@ -34,7 +34,7 @@ env_etc.Append(CPPPATH=[thirdparty_dir]) env_etc.add_source_files(env.modules_sources, "*.cpp") # upstream uses c++11 -env_etc.Append(CXXFLAGS="-std=gnu++11") +env_etc.Append(CCFLAGS="-std=gnu++11") # -ffast-math seems to be incompatible with ec2comp on recent versions of # GCC and Clang if '-ffast-math' in env_etc['CCFLAGS']: diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index 9a15beb6eb..e86fd06d81 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -117,7 +117,7 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f return; } - int imgw = p_img->get_width(), imgh = p_img->get_height(); + uint32_t imgw = p_img->get_width(), imgh = p_img->get_height(); ERR_FAIL_COND(next_power_of_2(imgw) != imgw || next_power_of_2(imgh) != imgh); Image::Format etc_format = force_etc1_format ? Image::FORMAT_ETC : _get_etc2_mode(detected_channels); diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 65970d48c1..f386f2b542 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -2,12 +2,16 @@ Import('env') -env.add_source_files(env.modules_sources, "*.cpp") -env.add_source_files(env.modules_sources, "godot/*.cpp") +gdn_env = env.Clone() -env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) -env.Append(CPPPATH=['#modules/gdnative/']) +gdn_env.add_source_files(env.modules_sources, "*.cpp") +gdn_env.add_source_files(env.modules_sources, "gdnative/*.cpp") +gdn_env.add_source_files(env.modules_sources, "nativescript/*.cpp") + +gdn_env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) +gdn_env.Append(CPPPATH=['#modules/gdnative/include/']) if "platform" in env and env["platform"] == "x11": # there has to be a better solution? env.Append(LINKFLAGS=["-rdynamic"]) + env.use_ptrcall = True diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index ded987557c..6da538844a 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -100,6 +100,11 @@ GDNativeLibrary::~GDNativeLibrary() { void GDNativeLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("set_library_path", "platform", "path"), &GDNativeLibrary::set_library_path); ClassDB::bind_method(D_METHOD("get_library_path", "platform"), &GDNativeLibrary::get_library_path); + + ClassDB::bind_method(D_METHOD("is_singleton_gdnative"), &GDNativeLibrary::is_singleton_gdnative); + ClassDB::bind_method(D_METHOD("set_singleton_gdnative", "singleton"), &GDNativeLibrary::set_singleton_gdnative); + + ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "singleton_gdnative"), "set_singleton_gdnative", "is_singleton_gdnative"); } bool GDNativeLibrary::_set(const StringName &p_name, const Variant &p_value) { @@ -175,7 +180,6 @@ GDNative::GDNative() { } GDNative::~GDNative() { - // TODO(karroffel): implement ALL the things! } extern "C" void _api_anchor(); diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index dc1c3507ec..4753c7efe5 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -35,7 +35,7 @@ #include "os/thread_safe.h" #include "resource.h" -#include <godot/gdnative.h> +#include "gdnative/gdnative.h" class GDNativeLibrary : public Resource { GDCLASS(GDNativeLibrary, Resource) @@ -77,6 +77,8 @@ class GDNativeLibrary : public Resource { String library_paths[NUM_PLATFORMS]; + bool singleton_gdnative = false; + protected: bool _set(const StringName &p_name, const Variant &p_value); bool _get(const StringName &p_name, Variant &r_ret) const; @@ -92,6 +94,9 @@ public: String get_library_path(StringName p_platform) const; String get_active_library_path() const; + + _FORCE_INLINE_ bool is_singleton_gdnative() const { return singleton_gdnative; } + _FORCE_INLINE_ void set_singleton_gdnative(bool p_singleton) { singleton_gdnative = p_singleton; } }; typedef godot_variant (*native_call_cb)(void *, godot_string *, godot_array *); diff --git a/modules/gdnative/godot/array.cpp b/modules/gdnative/gdnative/array.cpp index c15ba30ca2..51c023981f 100644 --- a/modules/gdnative/godot/array.cpp +++ b/modules/gdnative/gdnative/array.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/array.h> +#include "gdnative/array.h" #include "core/array.h" #include "core/os/memory.h" @@ -61,7 +61,7 @@ void GDAPI godot_array_new_pool_color_array(godot_array *r_dest, const godot_poo memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -73,7 +73,7 @@ void GDAPI godot_array_new_pool_vector3_array(godot_array *r_dest, const godot_p memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -85,7 +85,7 @@ void GDAPI godot_array_new_pool_vector2_array(godot_array *r_dest, const godot_p memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -97,7 +97,7 @@ void GDAPI godot_array_new_pool_string_array(godot_array *r_dest, const godot_po memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -109,7 +109,7 @@ void GDAPI godot_array_new_pool_real_array(godot_array *r_dest, const godot_pool memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -121,7 +121,7 @@ void GDAPI godot_array_new_pool_int_array(godot_array *r_dest, const godot_pool_ memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } @@ -133,7 +133,7 @@ void GDAPI godot_array_new_pool_byte_array(godot_array *r_dest, const godot_pool memnew_placement(dest, Array); dest->resize(pca->size()); - for (size_t i = 0; i < dest->size(); i++) { + for (int i = 0; i < dest->size(); i++) { Variant v = pca->operator[](i); dest->operator[](i) = v; } diff --git a/modules/gdnative/godot/basis.cpp b/modules/gdnative/gdnative/basis.cpp index 1d7aa18a70..b1327cdaef 100644 --- a/modules/gdnative/godot/basis.cpp +++ b/modules/gdnative/gdnative/basis.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/basis.h> +#include "gdnative/basis.h" #include "core/math/matrix3.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/color.cpp b/modules/gdnative/gdnative/color.cpp index 3677fdc265..3f8912d896 100644 --- a/modules/gdnative/godot/color.cpp +++ b/modules/gdnative/gdnative/color.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/color.h> +#include "gdnative/color.h" #include "core/color.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/dictionary.cpp b/modules/gdnative/gdnative/dictionary.cpp index 2996cc78a3..ed98cdbb00 100644 --- a/modules/gdnative/godot/dictionary.cpp +++ b/modules/gdnative/gdnative/dictionary.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/dictionary.h> +#include "gdnative/dictionary.h" #include "core/variant.h" // core/variant.h before to avoid compile errors with MSVC diff --git a/modules/gdnative/godot/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp index 7cd52da34d..cf1f6a4f16 100644 --- a/modules/gdnative/godot/gdnative.cpp +++ b/modules/gdnative/gdnative/gdnative.cpp @@ -27,11 +27,10 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/gdnative.h> +#include "gdnative/gdnative.h" #include "class_db.h" #include "error_macros.h" -#include "gdnative.h" #include "global_constants.h" #include "os/os.h" #include "project_settings.h" diff --git a/modules/gdnative/godot/node_path.cpp b/modules/gdnative/gdnative/node_path.cpp index 2309588a81..50fade5b94 100644 --- a/modules/gdnative/godot/node_path.cpp +++ b/modules/gdnative/gdnative/node_path.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/node_path.h> +#include "gdnative/node_path.h" #include "core/node_path.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/plane.cpp b/modules/gdnative/gdnative/plane.cpp index f3d4b6971e..a5e05ffa6b 100644 --- a/modules/gdnative/godot/plane.cpp +++ b/modules/gdnative/gdnative/plane.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/plane.h> +#include "gdnative/plane.h" #include "core/math/plane.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/pool_arrays.cpp b/modules/gdnative/gdnative/pool_arrays.cpp index 2e533077f6..1393374da2 100644 --- a/modules/gdnative/godot/pool_arrays.cpp +++ b/modules/gdnative/gdnative/pool_arrays.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/pool_arrays.h> +#include "gdnative/pool_arrays.h" #include "array.h" #include "core/variant.h" @@ -65,7 +65,7 @@ void GDAPI godot_pool_byte_array_new_with_array(godot_pool_byte_array *r_dest, c memnew_placement(dest, PoolVector<uint8_t>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -144,7 +144,7 @@ void GDAPI godot_pool_int_array_new_with_array(godot_pool_int_array *r_dest, con memnew_placement(dest, PoolVector<godot_int>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -223,7 +223,7 @@ void GDAPI godot_pool_real_array_new_with_array(godot_pool_real_array *r_dest, c memnew_placement(dest, PoolVector<godot_real>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -302,7 +302,7 @@ void GDAPI godot_pool_string_array_new_with_array(godot_pool_string_array *r_des memnew_placement(dest, PoolVector<String>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -389,7 +389,7 @@ void GDAPI godot_pool_vector2_array_new_with_array(godot_pool_vector2_array *r_d memnew_placement(dest, PoolVector<Vector2>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -475,7 +475,7 @@ void GDAPI godot_pool_vector3_array_new_with_array(godot_pool_vector3_array *r_d memnew_placement(dest, PoolVector<Vector3>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } @@ -561,7 +561,7 @@ void GDAPI godot_pool_color_array_new_with_array(godot_pool_color_array *r_dest, memnew_placement(dest, PoolVector<Color>); dest->resize(a->size()); - for (size_t i = 0; i < a->size(); i++) { + for (int i = 0; i < a->size(); i++) { dest->set(i, (*a)[i]); } } diff --git a/modules/gdnative/godot/quat.cpp b/modules/gdnative/gdnative/quat.cpp index e6bea78b60..7db7847da1 100644 --- a/modules/gdnative/godot/quat.cpp +++ b/modules/gdnative/gdnative/quat.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/quat.h> +#include "gdnative/quat.h" #include "core/math/quat.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/rect2.cpp b/modules/gdnative/gdnative/rect2.cpp index 98e7855dc9..ecd8cce9ca 100644 --- a/modules/gdnative/godot/rect2.cpp +++ b/modules/gdnative/gdnative/rect2.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/rect2.h> +#include "gdnative/rect2.h" #include "core/math/math_2d.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/rect3.cpp b/modules/gdnative/gdnative/rect3.cpp index 88952ab49c..d34d964db9 100644 --- a/modules/gdnative/godot/rect3.cpp +++ b/modules/gdnative/gdnative/rect3.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/rect3.h> +#include "gdnative/rect3.h" #include "core/math/rect3.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/rid.cpp b/modules/gdnative/gdnative/rid.cpp index 51c8aaa1b3..f05c39906c 100644 --- a/modules/gdnative/godot/rid.cpp +++ b/modules/gdnative/gdnative/rid.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/rid.h> +#include "gdnative/rid.h" #include "core/resource.h" #include "core/rid.h" diff --git a/modules/gdnative/godot/string.cpp b/modules/gdnative/gdnative/string.cpp index 1282cf95e5..9b715ce36a 100644 --- a/modules/gdnative/godot/string.cpp +++ b/modules/gdnative/gdnative/string.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/string.h> +#include "gdnative/string.h" #include "core/variant.h" #include "string_db.h" diff --git a/modules/gdnative/godot/transform.cpp b/modules/gdnative/gdnative/transform.cpp index a965067b77..d7a3e78d3f 100644 --- a/modules/gdnative/godot/transform.cpp +++ b/modules/gdnative/gdnative/transform.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/transform.h> +#include "gdnative/transform.h" #include "core/math/transform.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/transform2d.cpp b/modules/gdnative/gdnative/transform2d.cpp index 9fc44ecdfa..dcb54f7a53 100644 --- a/modules/gdnative/godot/transform2d.cpp +++ b/modules/gdnative/gdnative/transform2d.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/transform2d.h> +#include "gdnative/transform2d.h" #include "core/math/math_2d.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/variant.cpp b/modules/gdnative/gdnative/variant.cpp index 582544b3a0..b61f80b1f9 100644 --- a/modules/gdnative/godot/variant.cpp +++ b/modules/gdnative/gdnative/variant.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/variant.h> +#include "gdnative/variant.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/vector2.cpp b/modules/gdnative/gdnative/vector2.cpp index 78ed5f06a9..67f858997f 100644 --- a/modules/gdnative/godot/vector2.cpp +++ b/modules/gdnative/gdnative/vector2.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/vector2.h> +#include "gdnative/vector2.h" #include "core/math/math_2d.h" #include "core/variant.h" diff --git a/modules/gdnative/godot/vector3.cpp b/modules/gdnative/gdnative/vector3.cpp index 5faeac2864..c85a3f1c08 100644 --- a/modules/gdnative/godot/vector3.cpp +++ b/modules/gdnative/gdnative/vector3.cpp @@ -27,7 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include <godot/vector3.h> +#include "gdnative/vector3.h" #include "core/variant.h" #include "core/vector.h" diff --git a/modules/gdnative/godot/icon.png.import b/modules/gdnative/godot/icon.png.import deleted file mode 100644 index 27920124f9..0000000000 --- a/modules/gdnative/godot/icon.png.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/icon.png-aa47d037a37fb38b3b7e7828e4eec407.stex" - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -stream=false -size_limit=0 -detect_3d=true diff --git a/modules/gdnative/godot/array.h b/modules/gdnative/include/gdnative/array.h index 08f73c8785..edab028cba 100644 --- a/modules/gdnative/godot/array.h +++ b/modules/gdnative/include/gdnative/array.h @@ -46,10 +46,10 @@ typedef struct { } godot_array; #endif -#include <godot/pool_arrays.h> -#include <godot/variant.h> +#include <gdnative/pool_arrays.h> +#include <gdnative/variant.h> -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> void GDAPI godot_array_new(godot_array *r_dest); void GDAPI godot_array_new_copy(godot_array *r_dest, const godot_array *p_src); diff --git a/modules/gdnative/godot/basis.h b/modules/gdnative/include/gdnative/basis.h index f36d2199de..8ff6a6f541 100644 --- a/modules/gdnative/godot/basis.h +++ b/modules/gdnative/include/gdnative/basis.h @@ -45,9 +45,9 @@ typedef struct { } godot_basis; #endif -#include <godot/gdnative.h> -#include <godot/quat.h> -#include <godot/vector3.h> +#include <gdnative/gdnative.h> +#include <gdnative/quat.h> +#include <gdnative/vector3.h> void GDAPI godot_basis_new_with_rows(godot_basis *r_dest, const godot_vector3 *p_x_axis, const godot_vector3 *p_y_axis, const godot_vector3 *p_z_axis); void GDAPI godot_basis_new_with_axis_and_angle(godot_basis *r_dest, const godot_vector3 *p_axis, const godot_real p_phi); diff --git a/modules/gdnative/godot/color.h b/modules/gdnative/include/gdnative/color.h index 5d550e40b3..90dccf75aa 100644 --- a/modules/gdnative/godot/color.h +++ b/modules/gdnative/include/gdnative/color.h @@ -45,8 +45,8 @@ typedef struct { } godot_color; #endif -#include <godot/gdnative.h> -#include <godot/string.h> +#include <gdnative/gdnative.h> +#include <gdnative/string.h> void GDAPI godot_color_new_rgba(godot_color *r_dest, const godot_real p_r, const godot_real p_g, const godot_real p_b, const godot_real p_a); void GDAPI godot_color_new_rgb(godot_color *r_dest, const godot_real p_r, const godot_real p_g, const godot_real p_b); diff --git a/modules/gdnative/godot/dictionary.h b/modules/gdnative/include/gdnative/dictionary.h index 10d580af08..c85c3f3830 100644 --- a/modules/gdnative/godot/dictionary.h +++ b/modules/gdnative/include/gdnative/dictionary.h @@ -45,9 +45,9 @@ typedef struct { } godot_dictionary; #endif -#include <godot/array.h> -#include <godot/gdnative.h> -#include <godot/variant.h> +#include <gdnative/array.h> +#include <gdnative/gdnative.h> +#include <gdnative/variant.h> void GDAPI godot_dictionary_new(godot_dictionary *r_dest); void GDAPI godot_dictionary_new_copy(godot_dictionary *r_dest, const godot_dictionary *p_src); diff --git a/modules/gdnative/godot/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index c71a7ae1ef..c574c56d5a 100644 --- a/modules/gdnative/godot/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -146,100 +146,74 @@ typedef float godot_real; /////// Object (forward declared) typedef void godot_object; -/////// Brute force forward declarations for the rest -/* -typedef struct godot_variant godot_variant; -typedef struct godot_string godot_string; -typedef struct godot_vector2 godot_vector2; -typedef struct godot_rect2 godot_rect2; -typedef struct godot_vector3 godot_vector3; -typedef struct godot_transform2d godot_transform2d; -typedef struct godot_plane godot_plane; -typedef struct godot_quat godot_quat; -typedef struct godot_rect3 godot_rect3; -typedef struct godot_basis godot_basis; -typedef struct godot_transform godot_transform; -typedef struct godot_color godot_color; -typedef struct godot_node_path godot_node_path; -typedef struct godot_rid godot_rid; -typedef struct godot_dictionary godot_dictionary; -typedef struct godot_array godot_array; -typedef struct godot_pool_byte_array godot_pool_byte_array; -typedef struct godot_pool_int_array godot_pool_int_array; -typedef struct godot_pool_real_array godot_pool_real_array; -typedef struct godot_pool_string_array godot_pool_string_array; -typedef struct godot_pool_vector2_array godot_pool_vector2_array; -typedef struct godot_pool_vector3_array godot_pool_vector3_array; -typedef struct godot_pool_color_array godot_pool_color_array; -*/ /////// String -#include <godot/string.h> +#include <gdnative/string.h> ////// Vector2 -#include <godot/vector2.h> +#include <gdnative/vector2.h> ////// Rect2 -#include <godot/rect2.h> +#include <gdnative/rect2.h> ////// Vector3 -#include <godot/vector3.h> +#include <gdnative/vector3.h> ////// Transform2D -#include <godot/transform2d.h> +#include <gdnative/transform2d.h> /////// Plane -#include <godot/plane.h> +#include <gdnative/plane.h> /////// Quat -#include <godot/quat.h> +#include <gdnative/quat.h> /////// Rect3 -#include <godot/rect3.h> +#include <gdnative/rect3.h> /////// Basis -#include <godot/basis.h> +#include <gdnative/basis.h> /////// Transform -#include <godot/transform.h> +#include <gdnative/transform.h> /////// Color -#include <godot/color.h> +#include <gdnative/color.h> /////// NodePath -#include <godot/node_path.h> +#include <gdnative/node_path.h> /////// RID -#include <godot/rid.h> +#include <gdnative/rid.h> /////// Dictionary -#include <godot/dictionary.h> +#include <gdnative/dictionary.h> /////// Array -#include <godot/array.h> +#include <gdnative/array.h> // single API file for Pool*Array -#include <godot/pool_arrays.h> +#include <gdnative/pool_arrays.h> void GDAPI godot_object_destroy(godot_object *p_o); ////// Variant -#include <godot/variant.h> +#include <gdnative/variant.h> ////// Singleton API diff --git a/modules/gdnative/godot/node_path.h b/modules/gdnative/include/gdnative/node_path.h index 2f71ddd59d..0cfdbc1127 100644 --- a/modules/gdnative/godot/node_path.h +++ b/modules/gdnative/include/gdnative/node_path.h @@ -45,8 +45,8 @@ typedef struct { } godot_node_path; #endif -#include <godot/gdnative.h> -#include <godot/string.h> +#include <gdnative/gdnative.h> +#include <gdnative/string.h> void GDAPI godot_node_path_new(godot_node_path *r_dest, const godot_string *p_from); void GDAPI godot_node_path_new_copy(godot_node_path *r_dest, const godot_node_path *p_src); diff --git a/modules/gdnative/godot/plane.h b/modules/gdnative/include/gdnative/plane.h index 27548c8b0c..6a8915e08b 100644 --- a/modules/gdnative/godot/plane.h +++ b/modules/gdnative/include/gdnative/plane.h @@ -45,8 +45,8 @@ typedef struct { } godot_plane; #endif -#include <godot/gdnative.h> -#include <godot/vector3.h> +#include <gdnative/gdnative.h> +#include <gdnative/vector3.h> void GDAPI godot_plane_new_with_reals(godot_plane *r_dest, const godot_real p_a, const godot_real p_b, const godot_real p_c, const godot_real p_d); void GDAPI godot_plane_new_with_vectors(godot_plane *r_dest, const godot_vector3 *p_v1, const godot_vector3 *p_v2, const godot_vector3 *p_v3); diff --git a/modules/gdnative/godot/pool_arrays.h b/modules/gdnative/include/gdnative/pool_arrays.h index 1b51dca38c..cb1095ee8c 100644 --- a/modules/gdnative/godot/pool_arrays.h +++ b/modules/gdnative/include/gdnative/pool_arrays.h @@ -113,12 +113,12 @@ typedef struct { } godot_pool_color_array; #endif -#include <godot/array.h> -#include <godot/color.h> -#include <godot/vector2.h> -#include <godot/vector3.h> +#include <gdnative/array.h> +#include <gdnative/color.h> +#include <gdnative/vector2.h> +#include <gdnative/vector3.h> -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> // byte diff --git a/modules/gdnative/godot/quat.h b/modules/gdnative/include/gdnative/quat.h index 9a3238a337..4ffb96eb26 100644 --- a/modules/gdnative/godot/quat.h +++ b/modules/gdnative/include/gdnative/quat.h @@ -45,8 +45,8 @@ typedef struct { } godot_quat; #endif -#include <godot/gdnative.h> -#include <godot/vector3.h> +#include <gdnative/gdnative.h> +#include <gdnative/vector3.h> void GDAPI godot_quat_new(godot_quat *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z, const godot_real p_w); void GDAPI godot_quat_new_with_axis_angle(godot_quat *r_dest, const godot_vector3 *p_axis, const godot_real p_angle); diff --git a/modules/gdnative/godot/rect2.h b/modules/gdnative/include/gdnative/rect2.h index 8ceeddf1b4..9e6cf60342 100644 --- a/modules/gdnative/godot/rect2.h +++ b/modules/gdnative/include/gdnative/rect2.h @@ -43,8 +43,8 @@ typedef struct godot_rect2 { } godot_rect2; #endif -#include <godot/gdnative.h> -#include <godot/vector2.h> +#include <gdnative/gdnative.h> +#include <gdnative/vector2.h> void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const godot_vector2 *p_pos, const godot_vector2 *p_size); void GDAPI godot_rect2_new(godot_rect2 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_width, const godot_real p_height); diff --git a/modules/gdnative/godot/rect3.h b/modules/gdnative/include/gdnative/rect3.h index ca96aadd5c..f94b6fea25 100644 --- a/modules/gdnative/godot/rect3.h +++ b/modules/gdnative/include/gdnative/rect3.h @@ -45,9 +45,9 @@ typedef struct { } godot_rect3; #endif -#include <godot/gdnative.h> -#include <godot/plane.h> -#include <godot/vector3.h> +#include <gdnative/gdnative.h> +#include <gdnative/plane.h> +#include <gdnative/vector3.h> void GDAPI godot_rect3_new(godot_rect3 *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size); diff --git a/modules/gdnative/godot/rid.h b/modules/gdnative/include/gdnative/rid.h index c56ff38735..d9b5336fc9 100644 --- a/modules/gdnative/godot/rid.h +++ b/modules/gdnative/include/gdnative/rid.h @@ -45,7 +45,7 @@ typedef struct { } godot_rid; #endif -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> void GDAPI godot_rid_new(godot_rid *r_dest); diff --git a/modules/gdnative/godot/string.h b/modules/gdnative/include/gdnative/string.h index 128448e64e..aca23a81d8 100644 --- a/modules/gdnative/godot/string.h +++ b/modules/gdnative/include/gdnative/string.h @@ -46,8 +46,8 @@ typedef struct { } godot_string; #endif -#include <godot/gdnative.h> -#include <godot/variant.h> +#include <gdnative/gdnative.h> +#include <gdnative/variant.h> void GDAPI godot_string_new(godot_string *r_dest); void GDAPI godot_string_new_copy(godot_string *r_dest, const godot_string *p_src); diff --git a/modules/gdnative/godot/transform.h b/modules/gdnative/include/gdnative/transform.h index 60788e3d57..656afae129 100644 --- a/modules/gdnative/godot/transform.h +++ b/modules/gdnative/include/gdnative/transform.h @@ -45,10 +45,10 @@ typedef struct { } godot_transform; #endif -#include <godot/basis.h> -#include <godot/gdnative.h> -#include <godot/variant.h> -#include <godot/vector3.h> +#include <gdnative/basis.h> +#include <gdnative/gdnative.h> +#include <gdnative/variant.h> +#include <gdnative/vector3.h> void GDAPI godot_transform_new_with_axis_origin(godot_transform *r_dest, const godot_vector3 *p_x_axis, const godot_vector3 *p_y_axis, const godot_vector3 *p_z_axis, const godot_vector3 *p_origin); void GDAPI godot_transform_new(godot_transform *r_dest, const godot_basis *p_basis, const godot_vector3 *p_origin); diff --git a/modules/gdnative/godot/transform2d.h b/modules/gdnative/include/gdnative/transform2d.h index c0f5725eed..a945868b17 100644 --- a/modules/gdnative/godot/transform2d.h +++ b/modules/gdnative/include/gdnative/transform2d.h @@ -45,9 +45,9 @@ typedef struct { } godot_transform2d; #endif -#include <godot/gdnative.h> -#include <godot/variant.h> -#include <godot/vector2.h> +#include <gdnative/gdnative.h> +#include <gdnative/variant.h> +#include <gdnative/vector2.h> void GDAPI godot_transform2d_new(godot_transform2d *r_dest, const godot_real p_rot, const godot_vector2 *p_pos); void GDAPI godot_transform2d_new_axis_origin(godot_transform2d *r_dest, const godot_vector2 *p_x_axis, const godot_vector2 *p_y_axis, const godot_vector2 *p_origin); diff --git a/modules/gdnative/godot/variant.h b/modules/gdnative/include/gdnative/variant.h index 849ba8bda6..969506585d 100644 --- a/modules/gdnative/godot/variant.h +++ b/modules/gdnative/include/gdnative/variant.h @@ -99,25 +99,25 @@ typedef struct godot_variant_call_error { godot_variant_type expected; } godot_variant_call_error; -#include <godot/array.h> -#include <godot/basis.h> -#include <godot/color.h> -#include <godot/dictionary.h> -#include <godot/node_path.h> -#include <godot/plane.h> -#include <godot/pool_arrays.h> -#include <godot/quat.h> -#include <godot/rect2.h> -#include <godot/rect3.h> -#include <godot/rid.h> -#include <godot/string.h> -#include <godot/transform.h> -#include <godot/transform2d.h> -#include <godot/variant.h> -#include <godot/vector2.h> -#include <godot/vector3.h> - -#include <godot/gdnative.h> +#include <gdnative/array.h> +#include <gdnative/basis.h> +#include <gdnative/color.h> +#include <gdnative/dictionary.h> +#include <gdnative/node_path.h> +#include <gdnative/plane.h> +#include <gdnative/pool_arrays.h> +#include <gdnative/quat.h> +#include <gdnative/rect2.h> +#include <gdnative/rect3.h> +#include <gdnative/rid.h> +#include <gdnative/string.h> +#include <gdnative/transform.h> +#include <gdnative/transform2d.h> +#include <gdnative/variant.h> +#include <gdnative/vector2.h> +#include <gdnative/vector3.h> + +#include <gdnative/gdnative.h> godot_variant_type GDAPI godot_variant_get_type(const godot_variant *p_v); diff --git a/modules/gdnative/godot/vector2.h b/modules/gdnative/include/gdnative/vector2.h index 98e9700e32..0af4abae27 100644 --- a/modules/gdnative/godot/vector2.h +++ b/modules/gdnative/include/gdnative/vector2.h @@ -45,7 +45,7 @@ typedef struct { } godot_vector2; #endif -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y); diff --git a/modules/gdnative/godot/vector3.h b/modules/gdnative/include/gdnative/vector3.h index b76ca11a9c..a27d516ec5 100644 --- a/modules/gdnative/godot/vector3.h +++ b/modules/gdnative/include/gdnative/vector3.h @@ -45,8 +45,8 @@ typedef struct { } godot_vector3; #endif -#include <godot/basis.h> -#include <godot/gdnative.h> +#include <gdnative/basis.h> +#include <gdnative/gdnative.h> typedef enum { GODOT_VECTOR3_AXIS_X, diff --git a/modules/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index d263c61464..96f213ead7 100644 --- a/modules/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* godot.h */ +/* godot_nativescript.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -30,7 +30,7 @@ #ifndef GODOT_NATIVESCRIPT_H #define GODOT_NATIVESCRIPT_H -#include <godot/gdnative.h> +#include <gdnative/gdnative.h> #ifdef __cplusplus extern "C" { diff --git a/modules/nativescript/SCsub b/modules/gdnative/nativescript/SCsub index e980e40e8e..e980e40e8e 100644 --- a/modules/nativescript/SCsub +++ b/modules/gdnative/nativescript/SCsub diff --git a/modules/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp index fdd5a2ea19..fdd5a2ea19 100644 --- a/modules/nativescript/api_generator.cpp +++ b/modules/gdnative/nativescript/api_generator.cpp diff --git a/modules/nativescript/api_generator.h b/modules/gdnative/nativescript/api_generator.h index 56c2d786e6..56c2d786e6 100644 --- a/modules/nativescript/api_generator.h +++ b/modules/gdnative/nativescript/api_generator.h diff --git a/modules/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp index 926b3261b2..61ac13b796 100644 --- a/modules/nativescript/godot_nativescript.cpp +++ b/modules/gdnative/nativescript/godot_nativescript.cpp @@ -27,17 +27,17 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "godot_nativescript.h" - -#include "nativescript.h" +#include "nativescript/godot_nativescript.h" #include "class_db.h" #include "error_macros.h" -#include "gdnative.h" +#include "gdnative/gdnative.h" #include "global_constants.h" #include "project_settings.h" #include "variant.h" +#include "nativescript.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/modules/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index e141080687..724b8390da 100644 --- a/modules/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "nativescript.h" -#include "modules/gdnative/godot/gdnative.h" +#include "gdnative/gdnative.h" #include "global_constants.h" #include "io/file_access_encrypted.h" diff --git a/modules/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h index 571a3c9cc7..6c55e3e327 100644 --- a/modules/nativescript/nativescript.h +++ b/modules/gdnative/nativescript/nativescript.h @@ -38,8 +38,8 @@ #include "script_language.h" #include "self_list.h" -#include "godot_nativescript.h" #include "modules/gdnative/gdnative.h" +#include <nativescript/godot_nativescript.h> #ifndef NO_THREADS #include "os/mutex.h" diff --git a/modules/nativescript/register_types.cpp b/modules/gdnative/nativescript/register_types.cpp index b846710ab8..b846710ab8 100644 --- a/modules/nativescript/register_types.cpp +++ b/modules/gdnative/nativescript/register_types.cpp diff --git a/modules/nativescript/register_types.h b/modules/gdnative/nativescript/register_types.h index 7ac558f68f..7ac558f68f 100644 --- a/modules/nativescript/register_types.h +++ b/modules/gdnative/nativescript/register_types.h diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index 9ad05b7194..d809109987 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -28,12 +28,99 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "register_types.h" +#include "gdnative/gdnative.h" + #include "gdnative.h" #include "io/resource_loader.h" #include "io/resource_saver.h" +#include "nativescript/register_types.h" + +#include "core/engine.h" #include "core/os/os.h" +#include "core/project_settings.h" + +#ifdef TOOLS_ENABLED +#include "editor/editor_node.h" + +// Class used to discover singleton gdnative files + +void actual_discoverer_handler(); + +class GDNativeSingletonDiscover : public Object { + // GDCLASS(GDNativeSingletonDiscover, Object) + + virtual String get_class() const { + // okay, this is a really dirty hack. + // We're overriding get_class so we can connect it to a signal + // This works because get_class is a virtual method, so we don't + // need to register a new class to ClassDB just for this one + // little signal. + + actual_discoverer_handler(); + + return "Object"; + } +}; + +Set<String> get_gdnative_singletons(EditorFileSystemDirectory *p_dir) { + + Set<String> file_paths; + + // check children + + for (int i = 0; i < p_dir->get_file_count(); i++) { + String file_name = p_dir->get_file(i); + String file_type = p_dir->get_file_type(i); + + if (file_type != "GDNativeLibrary") { + continue; + } + + Ref<GDNativeLibrary> lib = ResourceLoader::load(p_dir->get_file_path(i)); + if (lib.is_valid() && lib->is_singleton_gdnative()) { + file_paths.insert(p_dir->get_file_path(i)); + } + } + + // check subdirectories + for (int i = 0; i < p_dir->get_subdir_count(); i++) { + Set<String> paths = get_gdnative_singletons(p_dir->get_subdir(i)); + + for (Set<String>::Element *E = paths.front(); E; E = E->next()) { + file_paths.insert(E->get()); + } + } + + return file_paths; +} + +void actual_discoverer_handler() { + EditorFileSystemDirectory *dir = EditorFileSystem::get_singleton()->get_filesystem(); + + Set<String> file_paths = get_gdnative_singletons(dir); + + Array files; + files.resize(file_paths.size()); + int i = 0; + for (Set<String>::Element *E = file_paths.front(); E; i++, E = E->next()) { + files.set(i, E->get()); + } + + ProjectSettings::get_singleton()->set("gdnative/singletons", files); + + ProjectSettings::get_singleton()->save(); +} + +GDNativeSingletonDiscover *discoverer = NULL; + +void discoverer_callback() { + discoverer = memnew(GDNativeSingletonDiscover); + EditorFileSystem::get_singleton()->connect("filesystem_changed", discoverer, "get_class"); +} + +#endif godot_variant cb_standard_varcall(void *handle, godot_string *p_procedure, godot_array *p_args) { if (handle == NULL) { @@ -62,21 +149,110 @@ godot_variant cb_standard_varcall(void *handle, godot_string *p_procedure, godot return proc(NULL, p_args); } +void cb_singleton_call( + void *p_handle, + godot_string *p_proc_name, + void *p_data, + int p_num_args, + void **p_args, + void *r_return) { + if (p_handle == NULL) { + ERR_PRINT("No valid library handle, can't call singleton procedure"); + return; + } + + void *singleton_proc; + Error err = OS::get_singleton()->get_dynamic_library_symbol_handle( + p_handle, + *(String *)p_proc_name, + singleton_proc); + + if (err != OK) { + return; + } + + void (*singleton_procedure_ptr)() = (void (*)())singleton_proc; + singleton_procedure_ptr(); +} + GDNativeCallRegistry *GDNativeCallRegistry::singleton; +Vector<Ref<GDNative> > singleton_gdnatives; + void register_gdnative_types() { +#ifdef TOOLS_ENABLED + + if (Engine::get_singleton()->is_editor_hint()) { + EditorNode::add_init_callback(discoverer_callback); + } +#endif + ClassDB::register_class<GDNativeLibrary>(); ClassDB::register_class<GDNative>(); GDNativeCallRegistry::singleton = memnew(GDNativeCallRegistry); GDNativeCallRegistry::singleton->register_native_call_type("standard_varcall", cb_standard_varcall); + + GDNativeCallRegistry::singleton->register_native_raw_call_type("gdnative_singleton_call", cb_singleton_call); + + register_nativescript_types(); + + // run singletons + + Array singletons = ProjectSettings::get_singleton()->get("gdnative/singletons"); + + singleton_gdnatives.resize(singletons.size()); + + for (int i = 0; i < singletons.size(); i++) { + String path = singletons[i]; + + Ref<GDNativeLibrary> lib = ResourceLoader::load(path); + + singleton_gdnatives[i].instance(); + singleton_gdnatives[i]->set_library(lib); + + if (!singleton_gdnatives[i]->initialize()) { + // Can't initialize. Don't make a native_call then + continue; + } + + singleton_gdnatives[i]->call_native_raw( + "gdnative_singleton_call", + "godot_gdnative_singleton", + NULL, + 0, + NULL, + NULL); + } } void unregister_gdnative_types() { + + for (int i = 0; i < singleton_gdnatives.size(); i++) { + + if (singleton_gdnatives[i].is_null()) { + continue; + } + + if (!singleton_gdnatives[i]->is_initialized()) { + continue; + } + + singleton_gdnatives[i]->terminate(); + } + + unregister_nativescript_types(); + memdelete(GDNativeCallRegistry::singleton); +#ifdef TOOLS_ENABLED + if (Engine::get_singleton()->is_editor_hint()) { + memdelete(discoverer); + } +#endif + // This is for printing out the sizes of the core types /* diff --git a/modules/gdscript/gd_function.cpp b/modules/gdscript/gd_function.cpp index e6f65fe0c2..ddee7b2521 100644 --- a/modules/gdscript/gd_function.cpp +++ b/modules/gdscript/gd_function.cpp @@ -290,8 +290,8 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a #ifdef DEBUG_ENABLED - uint64_t function_start_time; - uint64_t function_call_time; + uint64_t function_start_time = 0; + uint64_t function_call_time = 0; if (GDScriptLanguage::get_singleton()->profiling) { function_start_time = OS::get_singleton()->get_ticks_usec(); @@ -691,7 +691,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a } #ifdef DEBUG_ENABLED - uint64_t call_time; + uint64_t call_time = 0; if (GDScriptLanguage::get_singleton()->profiling) { call_time = OS::get_singleton()->get_ticks_usec(); @@ -1026,7 +1026,7 @@ Variant GDFunction::call(GDInstance *p_instance, const Variant **p_args, int p_a } case OPCODE_ITERATE_BEGIN: { - CHECK_SPACE(8); //space for this an regular iterate + CHECK_SPACE(8); //space for this a regular iterate GET_VARIANT_PTR(counter, 1); GET_VARIANT_PTR(container, 2); diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp index 072937a521..72c3f9612a 100644 --- a/modules/gdscript/gd_parser.cpp +++ b/modules/gdscript/gd_parser.cpp @@ -1284,7 +1284,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators after ternary if."); @@ -1294,7 +1294,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 3].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators after ternary else."); @@ -1331,7 +1331,7 @@ GDParser::Node *GDParser::_parse_expression(Node *p_parent, bool p_static, bool if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators."); @@ -1857,7 +1857,7 @@ GDParser::PatternNode *GDParser::_parse_pattern(bool p_static) { tokenizer->advance(1); break; } else { - _set_error("'..' pattern only allowed at the end of an dictionary pattern"); + _set_error("'..' pattern only allowed at the end of a dictionary pattern"); return NULL; } } diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index 6f05a4770b..5e1a8b19ac 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -389,7 +389,6 @@ public: virtual bool can_inherit_from_file() { return true; } virtual int find_function(const String &p_function, const String &p_code) const; virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const; - virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return OK; } virtual Error complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, bool &r_forced, String &r_call_hint); #ifdef TOOLS_ENABLED virtual Error lookup_code(const String &p_code, const String &p_symbol, const String &p_base_path, Object *p_owner, LookupResult &r_result); diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 1b932f040e..ced1c3ca12 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -396,8 +396,6 @@ bool GridMap::_octant_update(const OctantKey &p_key) { Map<int, List<Pair<Transform, IndexKey> > > multimesh_items; - print_line("updating octant " + itos(p_key.x) + ", " + itos(p_key.y) + ", " + itos(p_key.z) + " cells: " + itos(g.cells.size())); - for (Set<IndexKey>::Element *E = g.cells.front(); E; E = E->next()) { ERR_CONTINUE(!cell_map.has(E->get())); @@ -464,7 +462,6 @@ bool GridMap::_octant_update(const OctantKey &p_key) { //update multimeshes for (Map<int, List<Pair<Transform, IndexKey> > >::Element *E = multimesh_items.front(); E; E = E->next()) { - print_line("multimesh item " + itos(E->key()) + " transforms " + itos(E->get().size())); Octant::MultimeshInstance mmi; RID mm = VS::get_singleton()->multimesh_create(); diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 6f0a13e07f..f6a76ad2a1 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -1159,14 +1159,14 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { outer_mat.instance(); outer_mat->set_albedo(Color(0.7, 0.7, 1.0, 0.8)); - outer_mat->set_flag(SpatialMaterial::FLAG_ONTOP, true); + outer_mat->set_on_top_of_alpha(); outer_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); outer_mat->set_line_width(3.0); outer_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); selection_floor_mat.instance(); selection_floor_mat->set_albedo(Color(0.80, 0.80, 1.0, 1)); - selection_floor_mat->set_flag(SpatialMaterial::FLAG_ONTOP, true); + selection_floor_mat->set_on_top_of_alpha(); selection_floor_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); selection_floor_mat->set_line_width(3.0); //selection_floor_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); diff --git a/modules/hdr/image_loader_hdr.cpp b/modules/hdr/image_loader_hdr.cpp index d883b0f280..92d88207b3 100644 --- a/modules/hdr/image_loader_hdr.cpp +++ b/modules/hdr/image_loader_hdr.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.cpp */ +/* image_loader_hdr.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/hdr/image_loader_hdr.h b/modules/hdr/image_loader_hdr.h index e6703dc142..569978d28d 100644 --- a/modules/hdr/image_loader_hdr.h +++ b/modules/hdr/image_loader_hdr.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.h */ +/* image_loader_hdr.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/nativescript/config.py b/modules/nativescript/config.py deleted file mode 100644 index 9f57b9bb74..0000000000 --- a/modules/nativescript/config.py +++ /dev/null @@ -1,8 +0,0 @@ - - -def can_build(platform): - return True - - -def configure(env): - env.use_ptrcall = True diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index add7d4dcfc..eb3c0e64d8 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -655,7 +655,7 @@ if (env['builtin_openssl'] != 'no'): env_openssl.add_source_files(env.modules_sources, thirdparty_sources) - # FIXME: Clone the environment to make a env_openssl and not pollute the modules env + # FIXME: Clone the environment to make env_openssl and not pollute the modules env thirdparty_include_paths = [ "", "crypto", diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index 8afd01e20b..00e8ce0f54 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -309,7 +309,7 @@ Ref<RegExMatch> RegEx::search(const String &p_subject, int p_offset, int p_end) _pattern_info(PCRE2_INFO_NAMETABLE, &table); _pattern_info(PCRE2_INFO_NAMEENTRYSIZE, &entry_size); - for (int i = 0; i < count; i++) { + for (uint32_t i = 0; i < count; i++) { CharType id = table[i * entry_size]; if (result->data[id].start == -1) @@ -338,7 +338,7 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a PCRE2_SIZE olength = output.length(); PCRE2_SIZE length = p_subject.length(); - if (p_end >= 0 && p_end < length) + if (p_end >= 0 && (uint32_t)p_end < length) length = p_end; if (sizeof(CharType) == 2) { @@ -430,7 +430,7 @@ Array RegEx::get_names() const { _pattern_info(PCRE2_INFO_NAMETABLE, &table); _pattern_info(PCRE2_INFO_NAMEENTRYSIZE, &entry_size); - for (int i = 0; i < count; i++) { + for (uint32_t i = 0; i < count; i++) { String name = &table[i * entry_size + 1]; if (result.find(name) < 0) { diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index 29073a8499..072f18b990 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -91,7 +91,7 @@ void image_compress_squish(Image *p_image, Image::CompressSource p_source) { if (p_image->get_format() <= Image::FORMAT_RGBA8) { int squish_comp = squish::kColourRangeFit; - Image::Format target_format; + Image::Format target_format = Image::FORMAT_RGBA8; Image::DetectChannels dc = p_image->get_detected_channels(); @@ -140,6 +140,10 @@ void image_compress_squish(Image *p_image, Image::CompressSource p_source) { squish_comp |= squish::kDxt5; } break; + default: { + ERR_PRINT("Unknown image format, defaulting to RGBA8"); + break; + } } PoolVector<uint8_t> data; diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp index 49d959203c..df427907f8 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp @@ -31,7 +31,10 @@ #include "os/file_access.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #include "thirdparty/misc/stb_vorbis.c" +#pragma GCC diagnostic pop void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) { @@ -112,8 +115,8 @@ float AudioStreamPlaybackOGGVorbis::get_length() const { AudioStreamPlaybackOGGVorbis::~AudioStreamPlaybackOGGVorbis() { if (ogg_alloc.alloc_buffer) { - AudioServer::get_singleton()->audio_data_free(ogg_alloc.alloc_buffer); stb_vorbis_close(ogg_stream); + AudioServer::get_singleton()->audio_data_free(ogg_alloc.alloc_buffer); } } diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h index a459e6f31d..bcd829a56a 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h @@ -34,7 +34,10 @@ #include "servers/audio/audio_stream.h" #define STB_VORBIS_HEADER_ONLY +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #include "thirdparty/misc/stb_vorbis.c" +#pragma GCC diagnostic pop #undef STB_VORBIS_HEADER_ONLY class AudioStreamOGGVorbis; diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp index 379c894550..7c7cf5bcbe 100644 --- a/modules/tga/image_loader_tga.cpp +++ b/modules/tga/image_loader_tga.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.cpp */ +/* image_loader_tga.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -53,19 +53,19 @@ Error ImageLoaderTGA::decode_tga_rle(const uint8_t *p_compressed_buffer, size_t count = (c & 0x7f) + 1; if (c & 0x80) { - for (int i = 0; i < p_pixel_size; i++) { + for (size_t i = 0; i < p_pixel_size; i++) { pixels_w.ptr()[i] = p_compressed_buffer[compressed_pos]; compressed_pos += 1; } - for (int i = 0; i < count; i++) { - for (int j = 0; j < p_pixel_size; j++) { + for (size_t i = 0; i < count; i++) { + for (size_t j = 0; j < p_pixel_size; j++) { p_uncompressed_buffer[output_pos + j] = pixels_w.ptr()[j]; } output_pos += p_pixel_size; } } else { count *= p_pixel_size; - for (int i = 0; i < count; i++) { + for (size_t i = 0; i < count; i++) { p_uncompressed_buffer[output_pos] = p_compressed_buffer[compressed_pos]; compressed_pos += 1; output_pos += 1; @@ -208,7 +208,7 @@ Error ImageLoaderTGA::load_image(Ref<Image> p_image, FileAccess *f, bool p_force PoolVector<uint8_t> src_image; int src_image_len = f->get_len(); ERR_FAIL_COND_V(src_image_len == 0, ERR_FILE_CORRUPT); - ERR_FAIL_COND_V(src_image_len < sizeof(tga_header_s), ERR_FILE_CORRUPT); + ERR_FAIL_COND_V(src_image_len < (int)sizeof(tga_header_s), ERR_FILE_CORRUPT); src_image.resize(src_image_len); Error err = OK; diff --git a/modules/tga/image_loader_tga.h b/modules/tga/image_loader_tga.h index 8689a1773b..7905ab37a7 100644 --- a/modules/tga/image_loader_tga.h +++ b/modules/tga/image_loader_tga.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.h */ +/* image_loader_tga.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index 57826d69fb..49a4db237a 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.cpp */ +/* image_loader_tinyexr.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/tinyexr/image_loader_tinyexr.h b/modules/tinyexr/image_loader_tinyexr.h index adecba5d9d..53a81597af 100644 --- a/modules/tinyexr/image_loader_tinyexr.h +++ b/modules/tinyexr/image_loader_tinyexr.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* image_loader_jpegd.h */ +/* image_loader_tinyexr.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index b2e7a6aa27..297e9e510f 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -571,7 +571,6 @@ public: virtual bool has_named_classes() const; virtual int find_function(const String &p_function, const String &p_code) const; virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const; - virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return ERR_UNAVAILABLE; } virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const; virtual void add_global_constant(const StringName &p_variable, const Variant &p_value); diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index 05ceb7a38f..37bd730d08 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_script_editor.h */ +/* visual_script_editor.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -523,7 +523,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) { if (Object::cast_to<VisualScriptExpression>(*node)) { Ref<VisualScriptComment> vsc = node; gnode->set_comment(true); - gnode->set_resizeable(true); + gnode->set_resizable(true); gnode->set_custom_minimum_size(vsc->get_size() * EDSCALE); gnode->connect("resize_request", this, "_comment_node_resized", varray(E->get())); } diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 6bd052fe26..d0e9b5bb86 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -1179,7 +1179,7 @@ VisualScriptExpression::ENode *VisualScriptExpression::_parse_expression() { if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Unexpected two consecutive operators."); diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h index 694fb96cfa..421409b265 100644 --- a/modules/visual_script/visual_script_nodes.h +++ b/modules/visual_script/visual_script_nodes.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* visual_script_nodes.h */ +/* visual_script_nodes.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/visual_script/visual_script_yield_nodes.cpp b/modules/visual_script/visual_script_yield_nodes.cpp index 4b8e17421b..b6d4021ca3 100644 --- a/modules/visual_script/visual_script_yield_nodes.cpp +++ b/modules/visual_script/visual_script_yield_nodes.cpp @@ -516,7 +516,7 @@ public: } else { //yield - Object *object; + Object *object = NULL; switch (call_mode) { diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp index 26344877de..0178ebab84 100644 --- a/modules/webm/video_stream_webm.cpp +++ b/modules/webm/video_stream_webm.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* av_stream_webm.cpp.cpp */ +/* video_stream_webm.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/webm/video_stream_webm.h b/modules/webm/video_stream_webm.h index a48a6c6b9a..9a331849be 100644 --- a/modules/webm/video_stream_webm.h +++ b/modules/webm/video_stream_webm.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* av_stream_webm.cpp.cpp */ +/* video_stream_webm.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/android/audio_driver_opensl.cpp b/platform/android/audio_driver_opensl.cpp index e774f5bb7d..9ebed84ace 100644 --- a/platform/android/audio_driver_opensl.cpp +++ b/platform/android/audio_driver_opensl.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* audio_driver_opensl.cpp */ +/* audio_driver_opensl.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 3c5c0fda23..d691bd7629 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -540,14 +540,14 @@ class EditorExportAndroid : public EditorExportPlatform { //print_line("FILESIZE: "+itos(filesize)+" ACTUAL: "+itos(p_manifest.size())); - uint32_t string_count; - uint32_t styles_count; - uint32_t string_flags; - uint32_t string_data_offset; - - uint32_t styles_offset; - uint32_t string_table_begins; - uint32_t string_table_ends; + uint32_t string_count = 0; + uint32_t styles_count = 0; + uint32_t string_flags = 0; + uint32_t string_data_offset = 0; + + uint32_t styles_offset = 0; + uint32_t string_table_begins = 0; + uint32_t string_table_ends = 0; Vector<uint8_t> stable_extra; String version_name = p_preset->get("version/name"); diff --git a/platform/iphone/icloud.h b/platform/iphone/icloud.h index 7ab3e04bb8..6944ee6749 100644 --- a/platform/iphone/icloud.h +++ b/platform/iphone/icloud.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* icloud.h */ +/* icloud.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm index 84458ed79f..097018f296 100644 --- a/platform/iphone/icloud.mm +++ b/platform/iphone/icloud.mm @@ -1,5 +1,5 @@ /*************************************************************************/ -/* icloud.mm */ +/* icloud.mm */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index a0e5610591..ac8d367366 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -521,21 +521,6 @@ void OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, i #undef SET_EM_CALLBACK #undef EM_CHECK - /* clang-format off */ - EM_ASM_ARGS({ - const send_notification = Module.cwrap('send_notification', null, ['number']); - const notifs = arguments; - (['mouseover', 'mouseleave', 'focus', 'blur']).forEach(function(event, i) { - Module.canvas.addEventListener(event, send_notification.bind(this, notifs[i])); - }); - }, - MainLoop::NOTIFICATION_WM_MOUSE_ENTER, - MainLoop::NOTIFICATION_WM_MOUSE_EXIT, - MainLoop::NOTIFICATION_WM_FOCUS_IN, - MainLoop::NOTIFICATION_WM_FOCUS_OUT - ); -/* clang-format on */ - #ifdef JAVASCRIPT_EVAL_ENABLED javascript_eval = memnew(JavaScript); ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaScript", javascript_eval)); @@ -818,7 +803,23 @@ void OS_JavaScript::main_loop_begin() { if (main_loop) main_loop->init(); + + /* clang-format off */ + EM_ASM_ARGS({ + const send_notification = Module.cwrap('send_notification', null, ['number']); + const notifs = arguments; + (['mouseover', 'mouseleave', 'focus', 'blur']).forEach(function(event, i) { + Module.canvas.addEventListener(event, send_notification.bind(null, notifs[i])); + }); + }, + MainLoop::NOTIFICATION_WM_MOUSE_ENTER, + MainLoop::NOTIFICATION_WM_MOUSE_EXIT, + MainLoop::NOTIFICATION_WM_FOCUS_IN, + MainLoop::NOTIFICATION_WM_FOCUS_OUT + ); + /* clang-format on */ } + bool OS_JavaScript::main_loop_iterate() { if (!main_loop) diff --git a/platform/osx/audio_driver_osx.cpp b/platform/osx/audio_driver_osx.cpp index 8c5a734f76..78c52af201 100644 --- a/platform/osx/audio_driver_osx.cpp +++ b/platform/osx/audio_driver_osx.cpp @@ -77,7 +77,7 @@ Error AudioDriverOSX::initDevice() { break; }*/ - mix_rate = GLOBAL_DEF("audio/mix_rate", 44100); + mix_rate = GLOBAL_DEF("audio/mix_rate", DEFAULT_MIX_RATE); zeromem(&strdesc, sizeof(strdesc)); strdesc.mFormatID = kAudioFormatLinearPCM; @@ -92,15 +92,19 @@ Error AudioDriverOSX::initDevice() { result = AudioUnitSetProperty(audio_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, kOutputBus, &strdesc, sizeof(strdesc)); ERR_FAIL_COND_V(result != noErr, FAILED); - int latency = GLOBAL_DEF("audio/output_latency", 25); - unsigned int buffer_size = closest_power_of_2(latency * mix_rate / 1000); + int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + // Sample rate is independent of channels (ref: https://stackoverflow.com/questions/11048825/audio-sample-frequency-rely-on-channels) + buffer_frames = closest_power_of_2(latency * mix_rate / 1000); - if (OS::get_singleton()->is_stdout_verbose()) { - print_line("audio buffer size: " + itos(buffer_size) + " calculated latency: " + itos(buffer_size * 1000 / mix_rate)); - } + result = AudioUnitSetProperty(audio_unit, kAudioDevicePropertyBufferFrameSize, kAudioUnitScope_Global, kOutputBus, &buffer_frames, sizeof(UInt32)); + ERR_FAIL_COND_V(result != noErr, FAILED); + buffer_size = buffer_frames * channels; samples_in.resize(buffer_size); - buffer_frames = buffer_size / channels; + + if (OS::get_singleton()->is_stdout_verbose()) { + print_line("audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms"); + } AURenderCallbackStruct callback; zeromem(&callback, sizeof(AURenderCallbackStruct)); @@ -234,7 +238,7 @@ void AudioDriverOSX::start() { }; int AudioDriverOSX::get_mix_rate() const { - return 44100; + return mix_rate; }; AudioDriver::SpeakerMode AudioDriverOSX::get_speaker_mode() const { @@ -282,8 +286,12 @@ AudioDriverOSX::AudioDriverOSX() { active = false; mutex = NULL; - mix_rate = 44100; + mix_rate = 0; channels = 2; + + buffer_size = 0; + buffer_frames = 0; + samples_in.clear(); }; diff --git a/platform/osx/audio_driver_osx.h b/platform/osx/audio_driver_osx.h index ac178b89f3..a7e68c8141 100644 --- a/platform/osx/audio_driver_osx.h +++ b/platform/osx/audio_driver_osx.h @@ -45,8 +45,9 @@ class AudioDriverOSX : public AudioDriver { Mutex *mutex; int mix_rate; - int channels; - int buffer_frames; + unsigned int channels; + unsigned int buffer_frames; + unsigned int buffer_size; Vector<int32_t> samples_in; diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index e271f4b947..4bdef8eb83 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad_osx.h */ +/* joypad_osx.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/osx/power_osx.cpp b/platform/osx/power_osx.cpp index 24591e48b1..5f3938cb91 100644 --- a/platform/osx/power_osx.cpp +++ b/platform/osx/power_osx.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* power_osx.cpp */ +/* power_osx.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index c129743507..a2be126c58 100644 --- a/platform/uwp/export/export.cpp +++ b/platform/uwp/export/export.cpp @@ -501,7 +501,7 @@ void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t size_t block_size = (p_len - step) > BLOCK_SIZE ? BLOCK_SIZE : (p_len - step); - for (int i = 0; i < block_size; i++) { + for (uint32_t i = 0; i < block_size; i++) { strm_in[i] = p_buffer[step + i]; } @@ -523,14 +523,14 @@ void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t //package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before); int start = file_buffer.size(); file_buffer.resize(file_buffer.size() + bh.compressed_size); - for (int i = 0; i < bh.compressed_size; i++) + for (uint32_t i = 0; i < bh.compressed_size; i++) file_buffer[start + i] = strm_out[i]; } else { bh.compressed_size = block_size; //package->store_buffer(strm_in.ptr(), block_size); int start = file_buffer.size(); file_buffer.resize(file_buffer.size() + block_size); - for (int i = 0; i < bh.compressed_size; i++) + for (uint32_t i = 0; i < bh.compressed_size; i++) file_buffer[start + i] = strm_in[i]; } @@ -553,7 +553,7 @@ void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t //package->store_buffer(strm_out.ptr(), strm.total_out - total_out_before); int start = file_buffer.size(); file_buffer.resize(file_buffer.size() + (strm.total_out - total_out_before)); - for (int i = 0; i < (strm.total_out - total_out_before); i++) + for (uint32_t i = 0; i < (strm.total_out - total_out_before); i++) file_buffer[start + i] = strm_out[i]; deflateEnd(&strm); @@ -866,7 +866,7 @@ class EditorExportUWP : public EditorExportPlatform { Vector<uint8_t> _get_image_data(const Ref<EditorExportPreset> &p_preset, const String &p_path) { Vector<uint8_t> data; - StreamTexture *image; + StreamTexture *image = NULL; if (p_path.find("StoreLogo") != -1) { image = p_preset->get("images/store_logo").is_zero() ? NULL : Object::cast_to<StreamTexture>(((Object *)p_preset->get("images/store_logo"))); @@ -882,6 +882,8 @@ class EditorExportUWP : public EditorExportPlatform { image = p_preset->get("images/wide310x150_logo").is_zero() ? NULL : Object::cast_to<StreamTexture>(((Object *)p_preset->get("images/wide310x150_logo"))); } else if (p_path.find("SplashScreen") != -1) { image = p_preset->get("images/splash_screen").is_zero() ? NULL : Object::cast_to<StreamTexture>(((Object *)p_preset->get("images/splash_screen"))); + } else { + ERR_PRINT("Unable to load logo"); } if (!image) return data; diff --git a/platform/windows/joypad.cpp b/platform/windows/joypad.cpp index cde72c98c9..00cfa812de 100644 --- a/platform/windows/joypad.cpp +++ b/platform/windows/joypad.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad.cpp */ +/* joypad.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/windows/joypad.h b/platform/windows/joypad.h index 059c577bb6..a76caf6fac 100644 --- a/platform/windows/joypad.h +++ b/platform/windows/joypad.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* joypad.h */ +/* joypad.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 2d33d25773..f96343c92c 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1237,7 +1237,7 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) { unsigned int keycode = KeyMappingX11::get_keycode(keysym_keycode); - /* Phase 3, obtain an unicode character from the keysym */ + /* Phase 3, obtain a unicode character from the keysym */ // KeyMappingX11 also translates keysym to unicode. // It does a binary search on a table to translate diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index eb186a8e1f..39d3f2d6bf 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -246,12 +246,14 @@ void AudioStreamPlayer2D::set_stream(Ref<AudioStream> p_stream) { stream = p_stream; stream_playback = p_stream->instance_playback(); + AudioServer::get_singleton()->unlock(); + if (stream_playback.is_null()) { stream.unref(); ERR_FAIL_COND(stream_playback.is_null()); } - AudioServer::get_singleton()->unlock(); + } Ref<AudioStream> AudioStreamPlayer2D::get_stream() const { diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index ab8277ecf3..1bca2c6f37 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -435,7 +435,7 @@ void Light2D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::COLOR, "shadow_color"), "set_shadow_color", "get_shadow_color"); ADD_PROPERTY(PropertyInfo(Variant::INT, "shadow_buffer_size", PROPERTY_HINT_RANGE, "32,16384,1"), "set_shadow_buffer_size", "get_shadow_buffer_size"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "shadow_gradient_length", PROPERTY_HINT_RANGE, "0,4096,0.1"), "set_shadow_gradient_length", "get_shadow_gradient_length"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "shadow_filter", PROPERTY_HINT_ENUM, "None,PCF3,PCF5,PCF9,PCF13"), "set_shadow_filter", "get_shadow_filter"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "shadow_filter", PROPERTY_HINT_ENUM, "None,PCF3,PCF5,PCF7,PCF9,PCF13"), "set_shadow_filter", "get_shadow_filter"); 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"); diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h index 66b0aa2299..f6bc943adb 100644 --- a/scene/2d/light_2d.h +++ b/scene/2d/light_2d.h @@ -48,6 +48,7 @@ public: SHADOW_FILTER_NONE, SHADOW_FILTER_PCF3, SHADOW_FILTER_PCF5, + SHADOW_FILTER_PCF7, SHADOW_FILTER_PCF9, SHADOW_FILTER_PCF13, }; diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index 9eea5191b9..1235013af4 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -139,7 +139,7 @@ void LineBuilder::build() { float current_distance0 = 0.f; float current_distance1 = 0.f; - float total_distance; + float total_distance = 0.f; _interpolate_color = gradient != NULL; bool distance_required = _interpolate_color || texture_mode == LINE_TEXTURE_TILE; if (distance_required) diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 6efdf25f0d..a69bec2fc8 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -183,7 +183,7 @@ void AudioStreamPlayer3D::_mix_audio() { float AudioStreamPlayer3D::_get_attenuation_db(float p_distance) const { - float att; + float att = 0; switch (attenuation_model) { case ATTENUATION_INVERSE_DISTANCE: { att = Math::linear2db(1.0 / ((p_distance / unit_size) + 000001)); @@ -196,6 +196,10 @@ float AudioStreamPlayer3D::_get_attenuation_db(float p_distance) const { case ATTENUATION_LOGARITHMIC: { att = -20 * Math::log(p_distance / unit_size + 000001); } break; + default: { + ERR_PRINT("Unknown attenuation type"); + break; + } } att += unit_db; @@ -555,12 +559,12 @@ void AudioStreamPlayer3D::set_stream(Ref<AudioStream> p_stream) { stream = p_stream; stream_playback = p_stream->instance_playback(); + AudioServer::get_singleton()->unlock(); + if (stream_playback.is_null()) { stream.unref(); ERR_FAIL_COND(stream_playback.is_null()); } - - AudioServer::get_singleton()->unlock(); } Ref<AudioStream> AudioStreamPlayer3D::get_stream() const { diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index 4d4ed30d03..5f1151f8e9 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* body_shape.cpp */ +/* collision_shape.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h index 6d849f42af..94621177cb 100644 --- a/scene/3d/collision_shape.h +++ b/scene/3d/collision_shape.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* body_shape.h */ +/* collision_shape.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index 0232ce7653..bb54a43028 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -548,8 +548,8 @@ void GIProbe::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, cons //plot the face by guessing it's albedo and emission value //find best axis to map to, for scanning values - int closest_axis; - float closest_dot; + int closest_axis = 0; + float closest_dot = 0; Plane plane = Plane(p_vtx[0], p_vtx[1], p_vtx[2]); Vector3 normal = plane.normal; diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h index b2bcb5af1a..6db825bf54 100644 --- a/scene/3d/immediate_geometry.h +++ b/scene/3d/immediate_geometry.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* immediate_geometry.h */ +/* immediate_geometry.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 9590394211..6a8226c0e1 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -912,35 +912,24 @@ RigidBody::~RigidBody() { ////////////////////////////////////////////////////// ////////////////////////// -Dictionary KinematicBody::_move(const Vector3 &p_motion) { +Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion) { Collision col; - if (move(p_motion, col)) { - Dictionary d; - d["position"] = col.collision; - d["normal"] = col.normal; - d["local_shape"] = col.local_shape; - d["travel"] = col.travel; - d["remainder"] = col.remainder; - d["collider_id"] = col.collider; - if (col.collider) { - d["collider"] = ObjectDB::get_instance(col.collider); - } else { - d["collider"] = Variant(); + if (move_and_collide(p_motion, col)) { + if (motion_cache.is_null()) { + motion_cache.instance(); + motion_cache->owner = this; } - d["collider_velocity"] = col.collider_vel; - d["collider_shape_index"] = col.collider_shape; - d["collider_metadata"] = col.collider_metadata; - - return d; + motion_cache->collision = col; - } else { - return Dictionary(); + return motion_cache; } + + return Ref<KinematicCollision>(); } -bool KinematicBody::move(const Vector3 &p_motion, Collision &r_collision) { +bool KinematicBody::move_and_collide(const Vector3 &p_motion, Collision &r_collision) { Transform gt = get_global_transform(); PhysicsServer::MotionResult result; @@ -964,7 +953,7 @@ bool KinematicBody::move(const Vector3 &p_motion, Collision &r_collision) { return colliding; } -Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction, float p_slope_stop_min_velocity, int p_max_bounces, float p_floor_max_angle) { +Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction, float p_slope_stop_min_velocity, int p_max_slides, float p_floor_max_angle) { Vector3 motion = (floor_velocity + p_linear_velocity) * get_fixed_process_delta_time(); Vector3 lv = p_linear_velocity; @@ -975,11 +964,11 @@ Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Ve colliders.clear(); floor_velocity = Vector3(); - while (p_max_bounces) { + while (p_max_slides) { Collision collision; - bool collided = move(motion, collision); + bool collided = move_and_collide(motion, collision); if (collided) { @@ -1017,7 +1006,7 @@ Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Ve break; } - p_max_bounces--; + p_max_slides--; if (motion == Vector3()) break; } @@ -1059,79 +1048,36 @@ float KinematicBody::get_safe_margin() const { return margin; } - -int KinematicBody::get_collision_count() const { +int KinematicBody::get_slide_count() const { return colliders.size(); } -Vector3 KinematicBody::get_collision_position(int p_collision) const { - - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Vector3()); - return colliders[p_collision].collision; -} -Vector3 KinematicBody::get_collision_normal(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Vector3()); - return colliders[p_collision].normal; +KinematicBody::Collision KinematicBody::get_slide_collision(int p_bounce) const { + ERR_FAIL_INDEX_V(p_bounce, colliders.size(), Collision()); + return colliders[p_bounce]; } -Vector3 KinematicBody::get_collision_travel(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Vector3()); - return colliders[p_collision].travel; -} -Vector3 KinematicBody::get_collision_remainder(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Vector3()); - return colliders[p_collision].remainder; -} -Object *KinematicBody::get_collision_local_shape(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), NULL); - uint32_t owner = shape_find_owner(colliders[p_collision].local_shape); - return shape_owner_get_owner(owner); -} -Object *KinematicBody::get_collision_collider(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), NULL); +Ref<KinematicCollision> KinematicBody::_get_slide_collision(int p_bounce) { - if (colliders[p_collision].collider) { - return ObjectDB::get_instance(colliders[p_collision].collider); + ERR_FAIL_INDEX_V(p_bounce, colliders.size(), Ref<KinematicCollision>()); + if (p_bounce > slide_colliders.size()) { + slide_colliders.resize(p_bounce + 1); } - return NULL; -} -ObjectID KinematicBody::get_collision_collider_id(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), 0); - - return colliders[p_collision].collider; -} -Object *KinematicBody::get_collision_collider_shape(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), NULL); - Object *collider = get_collision_collider(p_collision); - if (collider) { - CollisionObject *obj2d = Object::cast_to<CollisionObject>(collider); - if (obj2d) { - uint32_t owner = shape_find_owner(colliders[p_collision].collider_shape); - return obj2d->shape_owner_get_owner(owner); - } + if (slide_colliders[p_bounce].is_null()) { + slide_colliders[p_bounce].instance(); + slide_colliders[p_bounce]->owner = this; } - return NULL; -} -int KinematicBody::get_collision_collider_shape_index(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), -1); - return colliders[p_collision].collider_shape; -} -Vector3 KinematicBody::get_collision_collider_velocity(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Vector3()); - return colliders[p_collision].collider_vel; -} -Variant KinematicBody::get_collision_collider_metadata(int p_collision) const { - ERR_FAIL_INDEX_V(p_collision, colliders.size(), Variant()); - return colliders[p_collision].collider_metadata; + slide_colliders[p_bounce]->collision = colliders[p_bounce]; + return slide_colliders[p_bounce]; } void KinematicBody::_bind_methods() { - ClassDB::bind_method(D_METHOD("move", "rel_vec"), &KinematicBody::_move); - ClassDB::bind_method(D_METHOD("move_and_slide", "linear_velocity", "floor_normal", "slope_stop_min_velocity", "max_bounces", "floor_max_angle"), &KinematicBody::move_and_slide, DEFVAL(Vector3(0, 0, 0)), DEFVAL(0.05), DEFVAL(4), DEFVAL(Math::deg2rad((float)45))); + ClassDB::bind_method(D_METHOD("move_and_collide", "rel_vec"), &KinematicBody::_move); + ClassDB::bind_method(D_METHOD("move_and_slide", "linear_velocity", "floor_normal", "slope_stop_min_velocity", "max_slides", "floor_max_angle"), &KinematicBody::move_and_slide, DEFVAL(Vector3(0, 0, 0)), DEFVAL(0.05), DEFVAL(4), DEFVAL(Math::deg2rad((float)45))); ClassDB::bind_method(D_METHOD("test_move", "from", "rel_vec"), &KinematicBody::test_move); @@ -1143,18 +1089,8 @@ void KinematicBody::_bind_methods() { ClassDB::bind_method(D_METHOD("set_safe_margin", "pixels"), &KinematicBody::set_safe_margin); ClassDB::bind_method(D_METHOD("get_safe_margin"), &KinematicBody::get_safe_margin); - ClassDB::bind_method(D_METHOD("get_collision_count"), &KinematicBody::get_collision_count); - ClassDB::bind_method(D_METHOD("get_collision_position", "collision"), &KinematicBody::get_collision_position); - ClassDB::bind_method(D_METHOD("get_collision_normal", "collision"), &KinematicBody::get_collision_normal); - ClassDB::bind_method(D_METHOD("get_collision_travel", "collision"), &KinematicBody::get_collision_travel); - ClassDB::bind_method(D_METHOD("get_collision_remainder", "collision"), &KinematicBody::get_collision_remainder); - ClassDB::bind_method(D_METHOD("get_collision_local_shape", "collision"), &KinematicBody::get_collision_local_shape); - ClassDB::bind_method(D_METHOD("get_collision_collider", "collision"), &KinematicBody::get_collision_collider); - ClassDB::bind_method(D_METHOD("get_collision_collider_id", "collision"), &KinematicBody::get_collision_collider_id); - ClassDB::bind_method(D_METHOD("get_collision_collider_shape", "collision"), &KinematicBody::get_collision_collider_shape); - ClassDB::bind_method(D_METHOD("get_collision_collider_shape_index", "collision"), &KinematicBody::get_collision_collider_shape_index); - ClassDB::bind_method(D_METHOD("get_collision_collider_velocity", "collision"), &KinematicBody::get_collision_collider_velocity); - ClassDB::bind_method(D_METHOD("get_collision_collider_metadata", "collision"), &KinematicBody::get_collision_collider_metadata); + ClassDB::bind_method(D_METHOD("get_slide_count"), &KinematicBody::get_slide_count); + ClassDB::bind_method(D_METHOD("get_slide_collision", "slide_idx"), &KinematicBody::_get_slide_collision); ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision/safe_margin", PROPERTY_HINT_RANGE, "0.001,256,0.001"), "set_safe_margin", "get_safe_margin"); } @@ -1169,4 +1105,106 @@ KinematicBody::KinematicBody() on_wall = false; } KinematicBody::~KinematicBody() { + + if (motion_cache.is_valid()) { + motion_cache->owner = NULL; + } + + for (int i = 0; i < slide_colliders.size(); i++) { + if (slide_colliders[i].is_valid()) { + slide_colliders[i]->owner = NULL; + } + } +} +/////////////////////////////////////// + +Vector3 KinematicCollision::get_position() const { + + return collision.collision; +} +Vector3 KinematicCollision::get_normal() const { + return collision.normal; +} +Vector3 KinematicCollision::get_travel() const { + return collision.travel; +} +Vector3 KinematicCollision::get_remainder() const { + return collision.remainder; +} +Object *KinematicCollision::get_local_shape() const { + ERR_FAIL_COND_V(!owner, NULL); + uint32_t ownerid = owner->shape_find_owner(collision.local_shape); + return owner->shape_owner_get_owner(ownerid); +} + +Object *KinematicCollision::get_collider() const { + + if (collision.collider) { + return ObjectDB::get_instance(collision.collider); + } + + return NULL; +} +ObjectID KinematicCollision::get_collider_id() const { + + return collision.collider; +} +Object *KinematicCollision::get_collider_shape() const { + + Object *collider = get_collider(); + if (collider) { + CollisionObject *obj2d = Object::cast_to<CollisionObject>(collider); + if (obj2d) { + uint32_t ownerid = obj2d->shape_find_owner(collision.collider_shape); + return obj2d->shape_owner_get_owner(ownerid); + } + } + + return NULL; +} +int KinematicCollision::get_collider_shape_index() const { + + return collision.collider_shape; +} +Vector3 KinematicCollision::get_collider_velocity() const { + + return collision.collider_vel; +} +Variant KinematicCollision::get_collider_metadata() const { + + return Variant(); +} + +void KinematicCollision::_bind_methods() { + + ClassDB::bind_method(D_METHOD("get_position"), &KinematicCollision::get_position); + ClassDB::bind_method(D_METHOD("get_normal"), &KinematicCollision::get_normal); + ClassDB::bind_method(D_METHOD("get_travel"), &KinematicCollision::get_travel); + ClassDB::bind_method(D_METHOD("get_remainder"), &KinematicCollision::get_remainder); + ClassDB::bind_method(D_METHOD("get_local_shape"), &KinematicCollision::get_local_shape); + ClassDB::bind_method(D_METHOD("get_collider"), &KinematicCollision::get_collider); + ClassDB::bind_method(D_METHOD("get_collider_id"), &KinematicCollision::get_collider_id); + ClassDB::bind_method(D_METHOD("get_collider_shape"), &KinematicCollision::get_collider_shape); + ClassDB::bind_method(D_METHOD("get_collider_shape_index"), &KinematicCollision::get_collider_shape_index); + ClassDB::bind_method(D_METHOD("get_collider_velocity"), &KinematicCollision::get_collider_velocity); + ClassDB::bind_method(D_METHOD("get_collider_metadata"), &KinematicCollision::get_collider_metadata); + + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "position"), "", "get_position"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "normal"), "", "get_normal"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "travel"), "", "get_travel"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "remainder"), "", "get_remainder"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "local_shape"), "", "get_local_shape"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "collider"), "", "get_collider"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "collider_id"), "", "get_collider_id"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "collider_shape"), "", "get_collider_shape"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "collider_shape_index"), "", "get_collider_shape_index"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "collider_velocity"), "", "get_collider_velocity"); + ADD_PROPERTY(PropertyInfo(Variant::NIL, "collider_metadata", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT), "", "get_collider_metadata"); +} + +KinematicCollision::KinematicCollision() { + collision.collider = 0; + collision.collider_shape = 0; + collision.local_shape = 0; + owner = NULL; } diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 23d752ad76..f88b3860dc 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -261,6 +261,8 @@ public: VARIANT_ENUM_CAST(RigidBody::Mode); VARIANT_ENUM_CAST(RigidBody::AxisLock); +class KinematicCollision; + class KinematicBody : public PhysicsBody { GDCLASS(KinematicBody, PhysicsBody); @@ -286,42 +288,62 @@ private: bool on_ceiling; bool on_wall; Vector<Collision> colliders; + Vector<Ref<KinematicCollision> > slide_colliders; + Ref<KinematicCollision> motion_cache; _FORCE_INLINE_ bool _ignores_mode(PhysicsServer::BodyMode) const; - Dictionary _move(const Vector3 &p_motion); + Ref<KinematicCollision> _move(const Vector3 &p_motion); + Ref<KinematicCollision> _get_slide_collision(int p_bounce); protected: static void _bind_methods(); public: - bool move(const Vector3 &p_motion, Collision &r_collision); + bool move_and_collide(const Vector3 &p_motion, Collision &r_collision); bool test_move(const Transform &p_from, const Vector3 &p_motion); void set_safe_margin(float p_margin); float get_safe_margin() const; - Vector3 move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction = Vector3(0, 0, 0), float p_slope_stop_min_velocity = 0.05, int p_max_bounces = 4, float p_floor_max_angle = Math::deg2rad((float)45)); + Vector3 move_and_slide(const Vector3 &p_linear_velocity, const Vector3 &p_floor_direction = Vector3(0, 0, 0), float p_slope_stop_min_velocity = 0.05, int p_max_slides = 4, float p_floor_max_angle = Math::deg2rad((float)45)); bool is_on_floor() const; bool is_on_wall() const; bool is_on_ceiling() const; Vector3 get_floor_velocity() const; - int get_collision_count() const; - Vector3 get_collision_position(int p_collision) const; - Vector3 get_collision_normal(int p_collision) const; - Vector3 get_collision_travel(int p_collision) const; - Vector3 get_collision_remainder(int p_collision) const; - Object *get_collision_local_shape(int p_collision) const; - Object *get_collision_collider(int p_collision) const; - ObjectID get_collision_collider_id(int p_collision) const; - Object *get_collision_collider_shape(int p_collision) const; - int get_collision_collider_shape_index(int p_collision) const; - Vector3 get_collision_collider_velocity(int p_collision) const; - Variant get_collision_collider_metadata(int p_collision) const; + int get_slide_count() const; + Collision get_slide_collision(int p_bounce) const; KinematicBody(); ~KinematicBody(); }; +class KinematicCollision : public Reference { + + GDCLASS(KinematicCollision, Reference); + + KinematicBody *owner; + friend class KinematicBody; + KinematicBody::Collision collision; + +protected: + static void _bind_methods(); + +public: + Vector3 get_position() const; + Vector3 get_normal() const; + Vector3 get_travel() const; + Vector3 get_remainder() const; + Object *get_local_shape() const; + Object *get_collider() const; + ObjectID get_collider_id() const; + Object *get_collider_shape() const; + int get_collider_shape_index() const; + Vector3 get_collider_velocity() const; + Variant get_collider_metadata() const; + + KinematicCollision(); +}; + #endif // PHYSICS_BODY__H diff --git a/scene/3d/remote_transform.cpp b/scene/3d/remote_transform.cpp index 3d402fa5af..8faf985b11 100644 --- a/scene/3d/remote_transform.cpp +++ b/scene/3d/remote_transform.cpp @@ -1,6 +1,5 @@ - /*************************************************************************/ -/* remote_transform.cpp */ +/* remote_transform.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h index 71d7277118..609430340b 100644 --- a/scene/animation/animation_tree_player.h +++ b/scene/animation/animation_tree_player.h @@ -347,7 +347,7 @@ public: void animation_node_set_master_animation(const StringName &p_node, const String &p_master_animation); String animation_node_get_master_animation(const StringName &p_node) const; - void animation_node_set_filter_path(const StringName &p_node, const NodePath &p_filter, bool p_enable); + void animation_node_set_filter_path(const StringName &p_node, const NodePath &p_track_path, bool p_filter); void animation_node_set_get_filtered_paths(const StringName &p_node, List<NodePath> *r_paths) const; bool animation_node_is_path_filtered(const StringName &p_node, const NodePath &p_path) const; diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index 5d71f702df..8bd924e7ce 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -139,12 +139,12 @@ void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) { stream = p_stream; stream_playback = p_stream->instance_playback(); + AudioServer::get_singleton()->unlock(); + if (stream_playback.is_null()) { stream.unref(); ERR_FAIL_COND(stream_playback.is_null()); } - - AudioServer::get_singleton()->unlock(); } Ref<AudioStream> AudioStreamPlayer::get_stream() const { diff --git a/scene/gui/check_box.h b/scene/gui/check_box.h index 4a1adb5f2f..4da06be8d1 100644 --- a/scene/gui/check_box.h +++ b/scene/gui/check_box.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* check_box.h */ +/* check_box.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 8730be0c06..bef0808fd0 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -270,7 +270,7 @@ void GraphNode::_notification(int p_what) { } } - if (resizeable) { + if (resizable) { draw_texture(resizer, get_size() - resizer->get_size()); } } @@ -594,7 +594,7 @@ void GraphNode::_gui_input(const Ref<InputEvent> &p_ev) { Ref<Texture> resizer = get_icon("resizer"); - if (resizeable && mpos.x > get_size().x - resizer->get_width() && mpos.y > get_size().y - resizer->get_height()) { + if (resizable && mpos.x > get_size().x - resizer->get_width() && mpos.y > get_size().y - resizer->get_height()) { resizing = true; resizing_from = mpos; @@ -645,15 +645,15 @@ bool GraphNode::is_comment() const { return comment; } -void GraphNode::set_resizeable(bool p_enable) { +void GraphNode::set_resizable(bool p_enable) { - resizeable = p_enable; + resizable = p_enable; update(); } -bool GraphNode::is_resizeable() const { +bool GraphNode::is_resizable() const { - return resizeable; + return resizable; } void GraphNode::_bind_methods() { @@ -678,8 +678,8 @@ void GraphNode::_bind_methods() { ClassDB::bind_method(D_METHOD("set_comment", "comment"), &GraphNode::set_comment); ClassDB::bind_method(D_METHOD("is_comment"), &GraphNode::is_comment); - ClassDB::bind_method(D_METHOD("set_resizeable", "resizeable"), &GraphNode::set_resizeable); - ClassDB::bind_method(D_METHOD("is_resizeable"), &GraphNode::is_resizeable); + ClassDB::bind_method(D_METHOD("set_resizable", "resizable"), &GraphNode::set_resizable); + ClassDB::bind_method(D_METHOD("is_resizable"), &GraphNode::is_resizable); ClassDB::bind_method(D_METHOD("set_selected", "selected"), &GraphNode::set_selected); ClassDB::bind_method(D_METHOD("is_selected"), &GraphNode::is_selected); @@ -702,7 +702,7 @@ void GraphNode::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::STRING, "title"), "set_title", "get_title"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_close"), "set_show_close_button", "is_close_button_visible"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "resizeable"), "set_resizeable", "is_resizeable"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "resizable"), "set_resizable", "is_resizable"); ADD_SIGNAL(MethodInfo("offset_changed")); ADD_SIGNAL(MethodInfo("dragged", PropertyInfo(Variant::VECTOR2, "from"), PropertyInfo(Variant::VECTOR2, "to"))); @@ -722,7 +722,7 @@ GraphNode::GraphNode() { connpos_dirty = true; set_mouse_filter(MOUSE_FILTER_STOP); comment = false; - resizeable = false; + resizable = false; resizing = false; selected = false; } diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h index 416d711aab..a606e47acd 100644 --- a/scene/gui/graph_node.h +++ b/scene/gui/graph_node.h @@ -68,7 +68,7 @@ private: bool show_close; Vector2 offset; bool comment; - bool resizeable; + bool resizable; bool resizing; Vector2 resizing_from; @@ -151,8 +151,8 @@ public: void set_comment(bool p_enable); bool is_comment() const; - void set_resizeable(bool p_enable); - bool is_resizeable() const; + void set_resizable(bool p_enable); + bool is_resizable() const; virtual Size2 get_minimum_size() const; diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index 9bad871ef9..9a605c98f3 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -151,6 +151,20 @@ Color ItemList::get_item_custom_bg_color(int p_idx) const { return items[p_idx].custom_bg; } +void ItemList::set_item_custom_fg_color(int p_idx, const Color &p_custom_fg_color) { + + ERR_FAIL_INDEX(p_idx, items.size()); + + items[p_idx].custom_fg = p_custom_fg_color; +} + +Color ItemList::get_item_custom_fg_color(int p_idx) const { + + ERR_FAIL_INDEX_V(p_idx, items.size(), Color()); + + return items[p_idx].custom_fg; +} + void ItemList::set_item_tag_icon(int p_idx, const Ref<Texture> &p_tag_icon) { ERR_FAIL_INDEX(p_idx, items.size()); @@ -534,7 +548,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) { uint64_t now = OS::get_singleton()->get_ticks_msec(); uint64_t diff = now - search_time_msec; - if (diff < int(ProjectSettings::get_singleton()->get("gui/timers/incremental_search_max_interval_msec")) * 2) { + if (diff < uint64_t(ProjectSettings::get_singleton()->get("gui/timers/incremental_search_max_interval_msec")) * 2) { for (int i = current - 1; i >= 0; i--) { @@ -569,7 +583,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) { uint64_t now = OS::get_singleton()->get_ticks_msec(); uint64_t diff = now - search_time_msec; - if (diff < int(ProjectSettings::get_singleton()->get("gui/timers/incremental_search_max_interval_msec")) * 2) { + if (diff < uint64_t(ProjectSettings::get_singleton()->get("gui/timers/incremental_search_max_interval_msec")) * 2) { for (int i = current + 1; i < items.size(); i++) { @@ -1021,7 +1035,7 @@ void ItemList::_notification(int p_what) { else max_len = size.x; - Color modulate = items[i].selected ? font_color_selected : font_color; + Color modulate = items[i].selected ? font_color_selected : (items[i].custom_fg != Color() ? items[i].custom_fg : font_color); if (items[i].disabled) modulate.a *= 0.5; diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h index 8166975408..673b7d8956 100644 --- a/scene/gui/item_list.h +++ b/scene/gui/item_list.h @@ -61,6 +61,7 @@ private: bool tooltip_enabled; Variant metadata; String tooltip; + Color custom_fg; Color custom_bg; Rect2 rect_cache; @@ -150,6 +151,9 @@ public: void set_item_custom_bg_color(int p_idx, const Color &p_custom_bg_color); Color get_item_custom_bg_color(int p_idx) const; + void set_item_custom_fg_color(int p_idx, const Color &p_custom_fg_color); + Color get_item_custom_fg_color(int p_idx) const; + void select(int p_idx, bool p_single = true); void unselect(int p_idx); bool is_selected(int p_idx) const; diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 5ed5463f65..e1f77594da 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -401,7 +401,7 @@ void Label::regenerate_word_cache() { bool separatable = (current >= 0x2E08 && current <= 0xFAFF) || (current >= 0xFE30 && current <= 0xFE4F); //current>=33 && (current < 65||current >90) && (current<97||current>122) && (current<48||current>57); bool insert_newline = false; - int char_width; + int char_width = 0; if (current < 33) { diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 66b4e6cec1..6a5f56c78c 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -631,7 +631,7 @@ void LineEdit::_notification(int p_what) { if (has_icon("right_icon")) { Ref<Texture> r_icon = Control::get_icon("right_icon"); ofs_max -= r_icon->get_width(); - r_icon->draw(ci, Point2(width - r_icon->get_width() - x_ofs, y_ofs), Color(1, 1, 1, disabled_alpha * .9)); + r_icon->draw(ci, Point2(width - r_icon->get_width() - x_ofs, height / 2 - r_icon->get_height() / 2), Color(1, 1, 1, disabled_alpha * .9)); } int caret_height = font->get_height() > y_area ? y_area : font->get_height(); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index a3f116c883..ab2c2f445f 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -80,6 +80,10 @@ RichTextLabel::Item *RichTextLabel::_get_next_item(Item *p_item, bool p_free) { return NULL; } +Rect2 RichTextLabel::_get_text_rect() { + Ref<StyleBox> style = get_stylebox("normal"); + return Rect2(style->get_offset(), get_size() - style->get_minimum_size()); +} void RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &y, int p_width, int p_line, ProcessMode p_mode, const Ref<Font> &p_base_font, const Color &p_base_color, const Point2i &p_click_pos, Item **r_click_item, int *r_click_char, bool *r_outside, int p_char_count) { RID ci; @@ -583,7 +587,7 @@ void RichTextLabel::_update_scroll() { int total_height = 0; if (main->lines.size()) - total_height = main->lines[main->lines.size() - 1].height_accum_cache; + total_height = main->lines[main->lines.size() - 1].height_accum_cache + get_stylebox("normal")->get_minimum_size().height; bool exceeds = total_height > get_size().height && scroll_active; @@ -641,7 +645,11 @@ void RichTextLabel::_notification(int p_what) { _update_scroll(); RID ci = get_canvas_item(); + Size2 size = get_size(); + Rect2 text_rect = _get_text_rect(); + + draw_style_box(get_stylebox("normal"), Rect2(Point2(), size)); if (has_focus()) { VisualServer::get_singleton()->canvas_item_add_clip_ignore(ci, true); @@ -657,10 +665,10 @@ void RichTextLabel::_notification(int p_what) { int total_chars = 0; while (from_line < main->lines.size()) { - if (main->lines[from_line].height_accum_cache >= ofs) + if (main->lines[from_line].height_accum_cache + _get_text_rect().get_position().y >= ofs) break; - from_line++; total_chars += main->lines[from_line].char_count; + from_line++; } if (from_line >= main->lines.size()) @@ -672,7 +680,7 @@ void RichTextLabel::_notification(int p_what) { while (y < size.height && from_line < main->lines.size()) { - _process_line(main, Point2(), y, size.width - scroll_w, from_line, PROCESS_DRAW, base_font, base_color, Point2i(), NULL, NULL, NULL, total_chars); + _process_line(main, text_rect.get_position(), y, text_rect.get_size().width - scroll_w, from_line, PROCESS_DRAW, base_font, base_color, Point2i(), NULL, NULL, NULL, total_chars); total_chars += main->lines[from_line].char_count; from_line++; } @@ -686,7 +694,7 @@ void RichTextLabel::_find_click(ItemFrame *p_frame, const Point2i &p_click, Item *r_click_item = NULL; Size2 size = get_size(); - + Rect2 text_rect = _get_text_rect(); int ofs = vscroll->get_value(); //todo, change to binary search @@ -706,9 +714,9 @@ void RichTextLabel::_find_click(ItemFrame *p_frame, const Point2i &p_click, Item Ref<Font> base_font = get_font("normal_font"); Color base_color = get_color("default_color"); - while (y < size.height && from_line < p_frame->lines.size()) { + while (y < text_rect.get_size().height && from_line < p_frame->lines.size()) { - _process_line(p_frame, Point2(), y, size.width - scroll_w, from_line, PROCESS_POINTER, base_font, base_color, p_click, r_click_item, r_click_char, r_outside); + _process_line(p_frame, text_rect.get_position(), y, text_rect.get_size().width - scroll_w, from_line, PROCESS_POINTER, base_font, base_color, p_click, r_click_item, r_click_char, r_outside); if (r_click_item && *r_click_item) return; from_line++; @@ -791,7 +799,7 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { Ref<InputEventKey> k = p_event; if (k.is_valid()) { - if (k->is_pressed() && !k->get_alt() && !k->get_shift() && !k->get_metakey()) { + if (k->is_pressed() && !k->get_alt() && !k->get_shift()) { bool handled = true; switch (k->get_scancode()) { case KEY_PAGEUP: { @@ -1015,13 +1023,14 @@ void RichTextLabel::_validate_line_caches(ItemFrame *p_frame) { //validate invalid lines!s Size2 size = get_size(); + Rect2 text_rect = _get_text_rect(); Ref<Font> base_font = get_font("normal_font"); for (int i = p_frame->first_invalid_line; i < p_frame->lines.size(); i++) { int y = 0; - _process_line(p_frame, Point2(), y, size.width - scroll_w, i, PROCESS_CACHE, base_font, Color()); + _process_line(p_frame, text_rect.get_position(), y, text_rect.get_size().width - scroll_w, i, PROCESS_CACHE, base_font, Color()); p_frame->lines[i].height_cache = y; p_frame->lines[i].height_accum_cache = y; @@ -1031,7 +1040,7 @@ void RichTextLabel::_validate_line_caches(ItemFrame *p_frame) { int total_height = 0; if (p_frame->lines.size()) - total_height = p_frame->lines[p_frame->lines.size() - 1].height_accum_cache; + total_height = p_frame->lines[p_frame->lines.size() - 1].height_accum_cache + get_stylebox("normal")->get_minimum_size().height; main->first_invalid_line = p_frame->lines.size(); diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index 74bf180b5d..4db2c3a8e9 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -276,6 +276,8 @@ private: void _gui_input(Ref<InputEvent> p_event); Item *_get_next_item(Item *p_item, bool p_free = false); + Rect2 _get_text_rect(); + bool use_bbcode; String bbcode; diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 7b93393851..1738e303aa 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -430,7 +430,7 @@ void TextEdit::_notification(int p_what) { double dist = sqrt(target_y * target_y); double vel = ((target_y / dist) * v_scroll_speed) * get_fixed_process_delta_time(); - if (vel >= dist) { + if (Math::abs(vel) >= dist) { v_scroll->set_value(target_v_scroll); scrolling = false; set_fixed_process(false); @@ -2136,15 +2136,25 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { break; } } - if (auto_indent) { - // indent once again if previous line will end with ':' - // (i.e. colon precedes current cursor position) - if (cursor.column > 0 && text[cursor.line][cursor.column - 1] == ':') { + + bool brace_indent = false; + + // no need to indent if we are going upwards. + if (auto_indent && !(k->get_command() && k->get_shift())) { + // indent once again if previous line will end with ':' or '{' + // (i.e. colon/brace precedes current cursor position) + if (cursor.column > 0 && (text[cursor.line][cursor.column - 1] == ':' || text[cursor.line][cursor.column - 1] == '{')) { if (indent_using_spaces) { ins += space_indent; } else { ins += "\t"; } + + // no need to move the brace below if we are not taking the text with us. + if (text[cursor.line][cursor.column] == '}' && !k->get_command()) { + brace_indent = true; + ins += "\n" + ins.substr(1, ins.length() - 2); + } } } @@ -2168,6 +2178,9 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { if (first_line) { cursor_set_line(0); + } else if (brace_indent) { + cursor_set_line(cursor.line - 1); + cursor_set_column(text[cursor.line].length()); } } break; @@ -4531,7 +4544,7 @@ String TextEdit::get_word_at_pos(const Vector2 &p_pos) const { bool symbol = beg < s.length() && _is_symbol(s[beg]); //not sure if right but most editors behave like this bool inside_quotes = false; - int qbegin, qend; + int qbegin = 0, qend = 0; for (int i = 0; i < s.length(); i++) { if (s[i] == '"') { if (inside_quotes) { diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 5e15bceb7d..de17416d8e 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1116,7 +1116,8 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 cache.selected->draw(ci, r); } if (text_editor->is_visible_in_tree()) { - text_editor->set_position(get_global_position() + r.position); + Vector2 ofs(0, (text_editor->get_size().height - r.size.height) / 2); + text_editor->set_position(get_global_position() + r.position - ofs); } } @@ -2572,7 +2573,8 @@ bool Tree::edit_selected() { } else if (c.mode == TreeItem::CELL_MODE_STRING || c.mode == TreeItem::CELL_MODE_RANGE || c.mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) { - Point2i textedpos = get_global_position() + rect.position; + Vector2 ofs(0, (text_editor->get_size().height - rect.size.height) / 2); + Point2i textedpos = get_global_position() + rect.position - ofs; text_editor->set_position(textedpos); text_editor->set_size(rect.size); text_editor->clear(); diff --git a/scene/gui/tree.h b/scene/gui/tree.h index 1fb1eb2792..06d6d3ad5a 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -54,7 +54,7 @@ public: CELL_MODE_CHECK, ///< string + check CELL_MODE_RANGE, ///< Contains a range CELL_MODE_RANGE_EXPRESSION, ///< Contains a range - CELL_MODE_ICON, ///< Contains a icon, not editable + CELL_MODE_ICON, ///< Contains an icon, not editable CELL_MODE_CUSTOM, ///< Contains a custom value, show a string, and an edit button }; diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 766b7923d3..a71b491bae 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* scene_main_loop.cpp */ +/* scene_tree.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index 594b806cef..c116bec4fc 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* scene_main_loop.h */ +/* scene_tree.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 36dbd14b40..c71a280755 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -491,7 +491,7 @@ void Viewport::_notification(int p_what) { if (physics_object_picking && (to_screen_rect == Rect2() || Input::get_singleton()->get_mouse_mode() != Input::MOUSE_MODE_CAPTURED)) { Vector2 last_pos(1e20, 1e20); - CollisionObject *last_object; + CollisionObject *last_object = NULL; ObjectID last_id = 0; PhysicsDirectSpaceState::RayResult result; Physics2DDirectSpaceState *ss2d = Physics2DServer::get_singleton()->space_get_direct_state(find_world_2d()->get_space()); @@ -604,7 +604,7 @@ void Viewport::_notification(int p_what) { } else if (pos == last_pos) { if (last_id) { - if (ObjectDB::get_instance(last_id)) { + if (ObjectDB::get_instance(last_id) && last_object) { //good, exists last_object->_input_event(camera, ev, result.position, result.normal, result.shape); if (last_object->get_capture_input_on_drag() && mb.is_valid() && mb->get_button_index() == 1 && mb->is_pressed()) { diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index e01f5e3cdf..69c17f4912 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -378,6 +378,7 @@ void register_scene_types() { ClassDB::register_virtual_class<CollisionObject>(); ClassDB::register_class<StaticBody>(); ClassDB::register_class<RigidBody>(); + ClassDB::register_class<KinematicCollision>(); ClassDB::register_class<KinematicBody>(); ClassDB::register_class<VehicleBody>(); diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 1a2c8333ef..eae95d9247 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -970,7 +970,12 @@ int Animation::_find(const Vector<K> &p_keys, float p_time) const { int low = 0; int high = len - 1; - int middle; + int middle = 0; + +#if DEBUG_ENABLED + if (low > high) + ERR_PRINT("low > high, this may be a bug"); +#endif const K *keys = &p_keys[0]; @@ -1289,7 +1294,7 @@ Error Animation::transform_track_interpolate(int p_track, float p_time, Vector3 TransformTrack *tt = static_cast<TransformTrack *>(t); - bool ok; + bool ok = false; TransformKey tk = _interpolate(tt->transforms, p_time, tt->interpolation, tt->loop_wrap, &ok); @@ -1315,7 +1320,7 @@ Variant Animation::value_track_interpolate(int p_track, float p_time) const { ERR_FAIL_COND_V(t->type != TYPE_VALUE, Variant()); ValueTrack *vt = static_cast<ValueTrack *>(t); - bool ok; + bool ok = false; Variant res = _interpolate(vt->values, p_time, vt->update_mode == UPDATE_CONTINUOUS ? vt->interpolation : INTERPOLATION_NEAREST, vt->loop_wrap, &ok); diff --git a/scene/resources/color_ramp.h b/scene/resources/color_ramp.h index 816152d51f..316c188d59 100644 --- a/scene/resources/color_ramp.h +++ b/scene/resources/color_ramp.h @@ -88,7 +88,12 @@ public: //binary search int low = 0; int high = points.size() - 1; - int middle; + int middle = 0; + +#if DEBUG_ENABLED + if (low > high) + ERR_PRINT("low > high, this may be a bug"); +#endif while (low <= high) { middle = (low + high) / 2; diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 4ff635edeb..fdea5960e5 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -794,6 +794,7 @@ void fill_default_theme(Ref<Theme> &theme, const Ref<Font> &default_font, const // RichTextLabel theme->set_stylebox("focus", "RichTextLabel", focus); + theme->set_stylebox("normal", "RichTextLabel", make_stylebox(tree_bg_png, 3, 3, 3, 3)); theme->set_font("normal_font", "RichTextLabel", default_font); theme->set_font("bold_font", "RichTextLabel", default_font); diff --git a/scene/resources/default_theme/default_theme.h b/scene/resources/default_theme/default_theme.h index 9032b71775..f2a4b2616d 100644 --- a/scene/resources/default_theme/default_theme.h +++ b/scene/resources/default_theme/default_theme.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* default_theme.cpp */ +/* default_theme.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index d9ccd31f88..ea75748b3d 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -40,7 +40,7 @@ void Font::draw_halign(RID p_canvas_item, const Point2 &p_pos, HAlign p_align, f return; } - float ofs; + float ofs = 0.f; switch (p_align) { case HALIGN_LEFT: { ofs = 0; @@ -51,6 +51,9 @@ void Font::draw_halign(RID p_canvas_item, const Point2 &p_pos, HAlign p_align, f case HALIGN_RIGHT: { ofs = p_width - length; } break; + default: { + ERR_PRINT("Unknown halignment type"); + } break; } draw(p_canvas_item, p_pos + Point2(ofs, 0), p_text, p_modulate, p_width); } diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 315351d039..3d6a10ffc7 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -48,6 +48,19 @@ Ref<Material> Material::get_next_pass() const { return next_pass; } +void Material::set_render_priority(int p_priority) { + + ERR_FAIL_COND(p_priority < RENDER_PRIORITY_MIN); + ERR_FAIL_COND(p_priority > RENDER_PRIORITY_MAX); + render_priority = p_priority; + VS::get_singleton()->material_set_render_priority(material, p_priority); +} + +int Material::get_render_priority() const { + + return render_priority; +} + RID Material::get_rid() const { return material; @@ -58,12 +71,20 @@ void Material::_bind_methods() { ClassDB::bind_method(D_METHOD("set_next_pass", "next_pass"), &Material::set_next_pass); ClassDB::bind_method(D_METHOD("get_next_pass"), &Material::get_next_pass); + ClassDB::bind_method(D_METHOD("set_render_priority", "priority"), &Material::set_render_priority); + ClassDB::bind_method(D_METHOD("get_render_priority"), &Material::get_render_priority); + + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "render_priority", PROPERTY_HINT_RANGE, itos(RENDER_PRIORITY_MIN) + "," + itos(RENDER_PRIORITY_MAX) + ",1"), "set_render_priority", "get_render_priority"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "next_pass", PROPERTY_HINT_RESOURCE_TYPE, "Material"), "set_next_pass", "get_next_pass"); + + BIND_CONSTANT(RENDER_PRIORITY_MAX); + BIND_CONSTANT(RENDER_PRIORITY_MIN); } Material::Material() { material = VisualServer::get_singleton()->material_create(); + render_priority = 0; } Material::~Material() { @@ -218,6 +239,7 @@ void SpatialMaterial::init_shaders() { shader_names->anisotropy = "anisotropy_ratio"; shader_names->depth_scale = "depth_scale"; shader_names->subsurface_scattering_strength = "subsurface_scattering_strength"; + shader_names->transmission = "transmission"; shader_names->refraction = "refraction"; shader_names->point_size = "point_size"; shader_names->uv1_scale = "uv1_scale"; @@ -255,6 +277,7 @@ void SpatialMaterial::init_shaders() { shader_names->texture_names[TEXTURE_AMBIENT_OCCLUSION] = "texture_ambient_occlusion"; shader_names->texture_names[TEXTURE_DEPTH] = "texture_depth"; shader_names->texture_names[TEXTURE_SUBSURFACE_SCATTERING] = "texture_subsurface_scattering"; + shader_names->texture_names[TEXTURE_TRANSMISSION] = "texture_transmission"; shader_names->texture_names[TEXTURE_REFRACTION] = "texture_refraction"; shader_names->texture_names[TEXTURE_DETAIL_MASK] = "texture_detail_mask"; shader_names->texture_names[TEXTURE_DETAIL_ALBEDO] = "texture_detail_albedo"; @@ -331,7 +354,7 @@ void SpatialMaterial::_update_shader() { } switch (diffuse_mode) { case DIFFUSE_LAMBERT: code += ",diffuse_lambert"; break; - case DIFFUSE_HALF_LAMBERT: code += ",diffuse_half_lambert"; break; + case DIFFUSE_LAMBERT_WRAP: code += ",diffuse_lambert_wrap"; break; case DIFFUSE_OREN_NAYAR: code += ",diffuse_oren_nayar"; break; case DIFFUSE_BURLEY: code += ",diffuse_burley"; break; case DIFFUSE_TOON: code += ",diffuse_toon"; break; @@ -347,14 +370,14 @@ void SpatialMaterial::_update_shader() { if (flags[FLAG_UNSHADED]) { code += ",unshaded"; } - if (flags[FLAG_ONTOP]) { - code += ",ontop"; + if (flags[FLAG_DISABLE_DEPTH_TEST]) { + code += ",depth_test_disable"; } if (flags[FLAG_USE_VERTEX_LIGHTING]) { code += ",vertex_lighting"; } - if (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR]) { + if (flags[FLAG_TRIPLANAR_USE_WORLD] && (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR])) { code += ",world_vertex_coords"; } code += ";\n"; @@ -430,6 +453,12 @@ void SpatialMaterial::_update_shader() { code += "uniform sampler2D texture_subsurface_scattering : hint_white;\n"; } + if (features[FEATURE_TRANSMISSION]) { + + code += "uniform vec4 transmission : hint_color;\n"; + code += "uniform sampler2D texture_transmission : hint_black;\n"; + } + if (features[FEATURE_DEPTH_MAPPING]) { code += "uniform sampler2D texture_depth : hint_black;\n"; code += "uniform float depth_scale;\n"; @@ -437,10 +466,10 @@ void SpatialMaterial::_update_shader() { code += "uniform int depth_max_layers;\n"; } if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "varying vec3 uv1_world_pos;\n"; + code += "varying vec3 uv1_triplanar_pos;\n"; } if (flags[FLAG_UV2_USE_TRIPLANAR]) { - code += "varying vec3 uv2_world_pos;\n"; + code += "varying vec3 uv2_triplanar_pos;\n"; } if (flags[FLAG_UV1_USE_TRIPLANAR]) { code += "uniform float uv1_blend_sharpness;\n"; @@ -549,16 +578,16 @@ void SpatialMaterial::_update_shader() { code += "\tuv1_power_normal=pow(abs(NORMAL),vec3(uv1_blend_sharpness));\n"; code += "\tuv1_power_normal/=dot(uv1_power_normal,vec3(1.0));\n"; - code += "\tuv1_world_pos = VERTEX * uv1_scale + uv1_offset;\n"; - code += "\tuv1_world_pos *= vec3(1.0,-1.0, 1.0);\n"; + code += "\tuv1_triplanar_pos = VERTEX * uv1_scale + uv1_offset;\n"; + code += "\tuv1_triplanar_pos *= vec3(1.0,-1.0, 1.0);\n"; } if (flags[FLAG_UV2_USE_TRIPLANAR]) { code += "\tuv2_power_normal=pow(abs(NORMAL), vec3(uv2_blend_sharpness));\n"; code += "\tuv2_power_normal/=dot(uv2_power_normal,vec3(1.0));\n"; - code += "\tuv2_world_pos = VERTEX * uv2_scale + uv2_offset;\n"; - code += "\tuv2_world_pos *= vec3(1.0,-1.0, 1.0);\n"; + code += "\tuv2_triplanar_pos = VERTEX * uv2_scale + uv2_offset;\n"; + code += "\tuv2_triplanar_pos *= vec3(1.0,-1.0, 1.0);\n"; } if (grow_enabled) { @@ -568,11 +597,11 @@ void SpatialMaterial::_update_shader() { code += "}\n"; code += "\n\n"; if (flags[FLAG_UV1_USE_TRIPLANAR] || flags[FLAG_UV2_USE_TRIPLANAR]) { - code += "vec4 triplanar_texture(sampler2D p_sampler,vec3 p_weights,vec3 p_world_pos) {\n"; + code += "vec4 triplanar_texture(sampler2D p_sampler,vec3 p_weights,vec3 p_triplanar_pos) {\n"; code += "\tvec4 samp=vec4(0.0);\n"; - code += "\tsamp+= texture(p_sampler,p_world_pos.xy) * p_weights.z;\n"; - code += "\tsamp+= texture(p_sampler,p_world_pos.xz) * p_weights.y;\n"; - code += "\tsamp+= texture(p_sampler,p_world_pos.zy * vec2(-1.0,1.0)) * p_weights.x;\n"; + code += "\tsamp+= texture(p_sampler,p_triplanar_pos.xy) * p_weights.z;\n"; + code += "\tsamp+= texture(p_sampler,p_triplanar_pos.xz) * p_weights.y;\n"; + code += "\tsamp+= texture(p_sampler,p_triplanar_pos.zy * vec2(-1.0,1.0)) * p_weights.x;\n"; code += "\treturn samp;\n"; code += "}\n"; } @@ -628,7 +657,7 @@ void SpatialMaterial::_update_shader() { code += "\tvec4 albedo_tex = texture(texture_albedo,POINT_COORD);\n"; } else { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tvec4 albedo_tex = triplanar_texture(texture_albedo,uv1_power_normal,uv1_world_pos);\n"; + code += "\tvec4 albedo_tex = triplanar_texture(texture_albedo,uv1_power_normal,uv1_triplanar_pos);\n"; } else { code += "\tvec4 albedo_tex = texture(texture_albedo,base_uv);\n"; } @@ -640,13 +669,13 @@ void SpatialMaterial::_update_shader() { code += "\tALBEDO = albedo.rgb * albedo_tex.rgb;\n"; if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tfloat metallic_tex = dot(triplanar_texture(texture_metallic,uv1_power_normal,uv1_world_pos),metallic_texture_channel);\n"; + code += "\tfloat metallic_tex = dot(triplanar_texture(texture_metallic,uv1_power_normal,uv1_triplanar_pos),metallic_texture_channel);\n"; } else { code += "\tfloat metallic_tex = dot(texture(texture_metallic,base_uv),metallic_texture_channel);\n"; } code += "\tMETALLIC = metallic_tex * metallic;\n"; if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tfloat roughness_tex = dot(triplanar_texture(texture_roughness,uv1_power_normal,uv1_world_pos),roughness_texture_channel);\n"; + code += "\tfloat roughness_tex = dot(triplanar_texture(texture_roughness,uv1_power_normal,uv1_triplanar_pos),roughness_texture_channel);\n"; } else { code += "\tfloat roughness_tex = dot(texture(texture_roughness,base_uv),roughness_texture_channel);\n"; } @@ -655,7 +684,7 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_NORMAL_MAPPING]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tNORMALMAP = triplanar_texture(texture_normal,uv1_power_normal,uv1_world_pos).rgb;\n"; + code += "\tNORMALMAP = triplanar_texture(texture_normal,uv1_power_normal,uv1_triplanar_pos).rgb;\n"; } else { code += "\tNORMALMAP = texture(texture_normal,base_uv).rgb;\n"; } @@ -664,7 +693,7 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_EMISSION]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tvec3 emission_tex = triplanar_texture(texture_emission,uv1_power_normal,uv1_world_pos).rgb;\n"; + code += "\tvec3 emission_tex = triplanar_texture(texture_emission,uv1_power_normal,uv1_triplanar_pos).rgb;\n"; } else { code += "\tvec3 emission_tex = texture(texture_emission,base_uv).rgb;\n"; } @@ -691,7 +720,7 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_RIM]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tvec2 rim_tex = triplanar_texture(texture_rim,uv1_power_normal,uv1_world_pos).xy;\n"; + code += "\tvec2 rim_tex = triplanar_texture(texture_rim,uv1_power_normal,uv1_triplanar_pos).xy;\n"; } else { code += "\tvec2 rim_tex = texture(texture_rim,base_uv).xy;\n"; } @@ -701,7 +730,7 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_CLEARCOAT]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tvec2 clearcoat_tex = triplanar_texture(texture_clearcoat,uv1_power_normal,uv1_world_pos).xy;\n"; + code += "\tvec2 clearcoat_tex = triplanar_texture(texture_clearcoat,uv1_power_normal,uv1_triplanar_pos).xy;\n"; } else { code += "\tvec2 clearcoat_tex = texture(texture_clearcoat,base_uv).xy;\n"; } @@ -711,7 +740,7 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_ANISOTROPY]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tvec3 anisotropy_tex = triplanar_texture(texture_flowmap,uv1_power_normal,uv1_world_pos).rga;\n"; + code += "\tvec3 anisotropy_tex = triplanar_texture(texture_flowmap,uv1_power_normal,uv1_triplanar_pos).rga;\n"; } else { code += "\tvec3 anisotropy_tex = texture(texture_flowmap,base_uv).rga;\n"; } @@ -722,13 +751,13 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_AMBIENT_OCCLUSION]) { if (flags[FLAG_AO_ON_UV2]) { if (flags[FLAG_UV2_USE_TRIPLANAR]) { - code += "\tAO = dot(triplanar_texture(texture_ambient_occlusion,uv2_power_normal,uv2_world_pos),ao_texture_channel);\n"; + code += "\tAO = dot(triplanar_texture(texture_ambient_occlusion,uv2_power_normal,uv2_triplanar_pos),ao_texture_channel);\n"; } else { code += "\tAO = dot(texture(texture_ambient_occlusion,base_uv2),ao_texture_channel);\n"; } } else { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tAO = dot(triplanar_texture(texture_ambient_occlusion,uv1_power_normal,uv1_world_pos),ao_texture_channel);\n"; + code += "\tAO = dot(triplanar_texture(texture_ambient_occlusion,uv1_power_normal,uv1_triplanar_pos),ao_texture_channel);\n"; } else { code += "\tAO = dot(texture(texture_ambient_occlusion,base_uv),ao_texture_channel);\n"; } @@ -738,21 +767,30 @@ void SpatialMaterial::_update_shader() { if (features[FEATURE_SUBSURACE_SCATTERING]) { if (flags[FLAG_UV1_USE_TRIPLANAR]) { - code += "\tfloat sss_tex = triplanar_texture(texture_subsurface_scattering,uv1_power_normal,uv1_world_pos).r;\n"; + code += "\tfloat sss_tex = triplanar_texture(texture_subsurface_scattering,uv1_power_normal,uv1_triplanar_pos).r;\n"; } else { code += "\tfloat sss_tex = texture(texture_subsurface_scattering,base_uv).r;\n"; } code += "\tSSS_STRENGTH=subsurface_scattering_strength*sss_tex;\n"; } + if (features[FEATURE_TRANSMISSION]) { + if (flags[FLAG_UV1_USE_TRIPLANAR]) { + code += "\tvec3 transmission_tex = triplanar_texture(texture_transmission,uv1_power_normal,uv1_triplanar_pos).rgb;\n"; + } else { + code += "\tvec3 transmission_tex = texture(texture_transmission,base_uv).rgb;\n"; + } + code += "\tTRANSMISSION = (transmission.rgb+transmission_tex);\n"; + } + if (features[FEATURE_DETAIL]) { bool triplanar = (flags[FLAG_UV1_USE_TRIPLANAR] && detail_uv == DETAIL_UV_1) || (flags[FLAG_UV2_USE_TRIPLANAR] && detail_uv == DETAIL_UV_2); if (triplanar) { String tp_uv = detail_uv == DETAIL_UV_1 ? "uv1" : "uv2"; - code += "\tvec4 detail_tex = triplanar_texture(texture_detail_albedo," + tp_uv + "_power_normal," + tp_uv + "_world_pos);\n"; - code += "\tvec4 detail_norm_tex = triplanar_texture(texture_detail_normal," + tp_uv + "_power_normal," + tp_uv + "_world_pos);\n"; + code += "\tvec4 detail_tex = triplanar_texture(texture_detail_albedo," + tp_uv + "_power_normal," + tp_uv + "_triplanar_pos);\n"; + code += "\tvec4 detail_norm_tex = triplanar_texture(texture_detail_normal," + tp_uv + "_power_normal," + tp_uv + "_triplanar_pos);\n"; } else { String det_uv = detail_uv == DETAIL_UV_1 ? "base_uv" : "base_uv2"; @@ -994,6 +1032,17 @@ float SpatialMaterial::get_subsurface_scattering_strength() const { return subsurface_scattering_strength; } +void SpatialMaterial::set_transmission(const Color &p_transmission) { + + transmission = p_transmission; + VS::get_singleton()->material_set_param(_get_material(), shader_names->transmission, transmission); +} + +Color SpatialMaterial::get_transmission() const { + + return transmission; +} + void SpatialMaterial::set_refraction(float p_refraction) { refraction = p_refraction; @@ -1159,6 +1208,7 @@ void SpatialMaterial::_validate_property(PropertyInfo &property) const { _validate_feature("ao", FEATURE_AMBIENT_OCCLUSION, property); _validate_feature("depth", FEATURE_DEPTH_MAPPING, property); _validate_feature("subsurf_scatter", FEATURE_SUBSURACE_SCATTERING, property); + _validate_feature("transmission", FEATURE_TRANSMISSION, property); _validate_feature("refraction", FEATURE_REFRACTION, property); _validate_feature("detail", FEATURE_DETAIL, property); @@ -1459,6 +1509,12 @@ RID SpatialMaterial::get_material_rid_for_2d(bool p_shaded, bool p_transparent, return materials_for_2d[version]->get_rid(); } +void SpatialMaterial::set_on_top_of_alpha() { + set_feature(FEATURE_TRANSPARENT, true); + set_render_priority(RENDER_PRIORITY_MAX); + set_flag(FLAG_DISABLE_DEPTH_TEST, true); +} + void SpatialMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_albedo", "albedo"), &SpatialMaterial::set_albedo); @@ -1503,6 +1559,9 @@ void SpatialMaterial::_bind_methods() { ClassDB::bind_method(D_METHOD("set_subsurface_scattering_strength", "strength"), &SpatialMaterial::set_subsurface_scattering_strength); ClassDB::bind_method(D_METHOD("get_subsurface_scattering_strength"), &SpatialMaterial::get_subsurface_scattering_strength); + ClassDB::bind_method(D_METHOD("set_transmission", "transmission"), &SpatialMaterial::set_transmission); + ClassDB::bind_method(D_METHOD("get_transmission"), &SpatialMaterial::get_transmission); + ClassDB::bind_method(D_METHOD("set_refraction", "refraction"), &SpatialMaterial::set_refraction); ClassDB::bind_method(D_METHOD("get_refraction"), &SpatialMaterial::get_refraction); @@ -1606,8 +1665,9 @@ void SpatialMaterial::_bind_methods() { ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_transparent"), "set_feature", "get_feature", FEATURE_TRANSPARENT); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_unshaded"), "set_flag", "get_flag", FLAG_UNSHADED); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_vertex_lighting"), "set_flag", "get_flag", FLAG_USE_VERTEX_LIGHTING); - ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_on_top"), "set_flag", "get_flag", FLAG_ONTOP); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_no_depth_test"), "set_flag", "get_flag", FLAG_DISABLE_DEPTH_TEST); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_use_point_size"), "set_flag", "get_flag", FLAG_USE_POINT_SIZE); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_world_triplanar"), "set_flag", "get_flag", FLAG_TRIPLANAR_USE_WORLD); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "flags_fixed_size"), "set_flag", "get_flag", FLAG_FIXED_SIZE); ADD_GROUP("Vertex Color", "vertex_color"); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "vertex_color_use_as_albedo"), "set_flag", "get_flag", FLAG_ALBEDO_FROM_VERTEX_COLOR); @@ -1693,6 +1753,11 @@ void SpatialMaterial::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL, "subsurf_scatter_strength", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_subsurface_scattering_strength", "get_subsurface_scattering_strength"); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "subsurf_scatter_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TEXTURE_SUBSURFACE_SCATTERING); + ADD_GROUP("Transmission", "transmission_"); + ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "transmission_enabled"), "set_feature", "get_feature", FEATURE_TRANSMISSION); + ADD_PROPERTY(PropertyInfo(Variant::COLOR, "transmission", PROPERTY_HINT_COLOR_NO_ALPHA), "set_transmission", "get_transmission"); + ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "transmission_texture", PROPERTY_HINT_RESOURCE_TYPE, "Texture"), "set_texture", "get_texture", TEXTURE_TRANSMISSION); + ADD_GROUP("Refraction", "refraction_"); ADD_PROPERTYI(PropertyInfo(Variant::BOOL, "refraction_enabled"), "set_feature", "get_feature", FEATURE_REFRACTION); ADD_PROPERTY(PropertyInfo(Variant::REAL, "refraction_scale", PROPERTY_HINT_RANGE, "-1,1,0.01"), "set_refraction", "get_refraction"); @@ -1730,6 +1795,7 @@ void SpatialMaterial::_bind_methods() { BIND_ENUM_CONSTANT(TEXTURE_AMBIENT_OCCLUSION); BIND_ENUM_CONSTANT(TEXTURE_DEPTH); BIND_ENUM_CONSTANT(TEXTURE_SUBSURFACE_SCATTERING); + BIND_ENUM_CONSTANT(TEXTURE_TRANSMISSION); BIND_ENUM_CONSTANT(TEXTURE_REFRACTION); BIND_ENUM_CONSTANT(TEXTURE_DETAIL_MASK); BIND_ENUM_CONSTANT(TEXTURE_DETAIL_ALBEDO); @@ -1748,6 +1814,7 @@ void SpatialMaterial::_bind_methods() { BIND_ENUM_CONSTANT(FEATURE_AMBIENT_OCCLUSION); BIND_ENUM_CONSTANT(FEATURE_DEPTH_MAPPING); BIND_ENUM_CONSTANT(FEATURE_SUBSURACE_SCATTERING); + BIND_ENUM_CONSTANT(FEATURE_TRANSMISSION); BIND_ENUM_CONSTANT(FEATURE_REFRACTION); BIND_ENUM_CONSTANT(FEATURE_DETAIL); BIND_ENUM_CONSTANT(FEATURE_MAX); @@ -1768,7 +1835,7 @@ void SpatialMaterial::_bind_methods() { BIND_ENUM_CONSTANT(FLAG_UNSHADED); BIND_ENUM_CONSTANT(FLAG_USE_VERTEX_LIGHTING); - BIND_ENUM_CONSTANT(FLAG_ONTOP); + BIND_ENUM_CONSTANT(FLAG_DISABLE_DEPTH_TEST); BIND_ENUM_CONSTANT(FLAG_ALBEDO_FROM_VERTEX_COLOR); BIND_ENUM_CONSTANT(FLAG_SRGB_VERTEX_COLOR); BIND_ENUM_CONSTANT(FLAG_USE_POINT_SIZE); @@ -1777,10 +1844,11 @@ void SpatialMaterial::_bind_methods() { 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_TRIPLANAR_USE_WORLD); BIND_ENUM_CONSTANT(FLAG_MAX); BIND_ENUM_CONSTANT(DIFFUSE_LAMBERT); - BIND_ENUM_CONSTANT(DIFFUSE_HALF_LAMBERT); + BIND_ENUM_CONSTANT(DIFFUSE_LAMBERT_WRAP); BIND_ENUM_CONSTANT(DIFFUSE_OREN_NAYAR); BIND_ENUM_CONSTANT(DIFFUSE_BURLEY); BIND_ENUM_CONSTANT(DIFFUSE_TOON); @@ -1821,6 +1889,7 @@ SpatialMaterial::SpatialMaterial() set_anisotropy(0); set_depth_scale(0.05); set_subsurface_scattering_strength(0); + set_transmission(Color(0, 0, 0)); set_refraction(0.05); set_line_width(1); set_point_size(1); diff --git a/scene/resources/material.h b/scene/resources/material.h index 6a0eead708..4e77ab1ed6 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -48,15 +48,23 @@ class Material : public Resource { RID material; Ref<Material> next_pass; + int render_priority; protected: _FORCE_INLINE_ RID _get_material() const { return material; } static void _bind_methods(); public: + enum { + RENDER_PRIORITY_MAX = VS::MATERIAL_RENDER_PRIORITY_MAX, + RENDER_PRIORITY_MIN = VS::MATERIAL_RENDER_PRIORITY_MIN, + }; void set_next_pass(const Ref<Material> &p_pass); Ref<Material> get_next_pass() const; + void set_render_priority(int p_priority); + int get_render_priority() const; + virtual RID get_rid() const; Material(); virtual ~Material(); @@ -104,6 +112,7 @@ public: TEXTURE_AMBIENT_OCCLUSION, TEXTURE_DEPTH, TEXTURE_SUBSURFACE_SCATTERING, + TEXTURE_TRANSMISSION, TEXTURE_REFRACTION, TEXTURE_DETAIL_MASK, TEXTURE_DETAIL_ALBEDO, @@ -127,6 +136,7 @@ public: FEATURE_AMBIENT_OCCLUSION, FEATURE_DEPTH_MAPPING, FEATURE_SUBSURACE_SCATTERING, + FEATURE_TRANSMISSION, FEATURE_REFRACTION, FEATURE_DETAIL, FEATURE_MAX @@ -156,13 +166,14 @@ public: enum Flags { FLAG_UNSHADED, FLAG_USE_VERTEX_LIGHTING, - FLAG_ONTOP, + FLAG_DISABLE_DEPTH_TEST, FLAG_ALBEDO_FROM_VERTEX_COLOR, FLAG_SRGB_VERTEX_COLOR, FLAG_USE_POINT_SIZE, FLAG_FIXED_SIZE, FLAG_UV1_USE_TRIPLANAR, FLAG_UV2_USE_TRIPLANAR, + FLAG_TRIPLANAR_USE_WORLD, FLAG_AO_ON_UV2, FLAG_USE_ALPHA_SCISSOR, FLAG_MAX @@ -170,7 +181,7 @@ public: enum DiffuseMode { DIFFUSE_LAMBERT, - DIFFUSE_HALF_LAMBERT, + DIFFUSE_LAMBERT_WRAP, DIFFUSE_OREN_NAYAR, DIFFUSE_BURLEY, DIFFUSE_TOON, @@ -203,12 +214,12 @@ private: union MaterialKey { struct { - uint64_t feature_mask : 11; + uint64_t feature_mask : 12; uint64_t detail_uv : 1; uint64_t blend_mode : 2; uint64_t depth_draw_mode : 2; uint64_t cull_mode : 2; - uint64_t flags : 11; + uint64_t flags : 12; uint64_t detail_blend_mode : 2; uint64_t diffuse_mode : 3; uint64_t specular_mode : 2; @@ -277,6 +288,7 @@ private: StringName anisotropy; StringName depth_scale; StringName subsurface_scattering_strength; + StringName transmission; StringName refraction; StringName point_size; StringName uv1_scale; @@ -328,6 +340,7 @@ private: float anisotropy; float depth_scale; float subsurface_scattering_strength; + Color transmission; float refraction; float line_width; float point_size; @@ -434,6 +447,9 @@ public: void set_subsurface_scattering_strength(float p_subsurface_scattering_strength); float get_subsurface_scattering_strength() const; + void set_transmission(const Color &p_transmission); + Color get_transmission() const; + void set_refraction(float p_refraction); float get_refraction() const; @@ -511,6 +527,8 @@ public: void set_alpha_scissor_threshold(float p_treshold); float get_alpha_scissor_threshold() const; + void set_on_top_of_alpha(); + void set_metallic_texture_channel(TextureChannel p_channel); TextureChannel get_metallic_texture_channel() const; void set_roughness_texture_channel(TextureChannel p_channel); diff --git a/scene/resources/mesh_library.cpp b/scene/resources/mesh_library.cpp index 4e1ffd2ab3..e1131e7e3e 100644 --- a/scene/resources/mesh_library.cpp +++ b/scene/resources/mesh_library.cpp @@ -214,7 +214,7 @@ Vector<int> MeshLibrary::get_item_list() const { return ret; } -int MeshLibrary::find_item_name(const String &p_name) const { +int MeshLibrary::find_item_by_name(const String &p_name) const { for (Map<int, Item>::Element *E = item_map.front(); E; E = E->next()) { @@ -275,6 +275,9 @@ void MeshLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("get_item_shapes", "id"), &MeshLibrary::_get_item_shapes); ClassDB::bind_method(D_METHOD("get_item_preview", "id"), &MeshLibrary::get_item_preview); ClassDB::bind_method(D_METHOD("remove_item", "id"), &MeshLibrary::remove_item); + ClassDB::bind_method(D_METHOD("remove_item", "id"), &MeshLibrary::remove_item); + ClassDB::bind_method(D_METHOD("find_item_by_name", "name"), &MeshLibrary::find_item_by_name); + ClassDB::bind_method(D_METHOD("clear"), &MeshLibrary::clear); ClassDB::bind_method(D_METHOD("get_item_list"), &MeshLibrary::get_item_list); ClassDB::bind_method(D_METHOD("get_last_unused_item_id"), &MeshLibrary::get_last_unused_item_id); diff --git a/scene/resources/mesh_library.h b/scene/resources/mesh_library.h index 99b6b48d61..c5d23ce50f 100644 --- a/scene/resources/mesh_library.h +++ b/scene/resources/mesh_library.h @@ -84,7 +84,7 @@ public: void clear(); - int find_item_name(const String &p_name) const; + int find_item_by_name(const String &p_name) const; Vector<int> get_item_list() const; int get_last_unused_item_id() const; diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 19fab5d587..c525ca600a 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -145,7 +145,7 @@ Node *SceneState::instance(GenEditState p_edit_state) const { node = parent->_get_child_by_name(snames[n.name]); #ifdef DEBUG_ENABLED if (!node) { - WARN_PRINT(String("Node '" + String(ret_nodes[0]->get_path_to(parent)) + "/" + String(snames[n.name]) + "' was modified from inside a instance, but it has vanished.").ascii().get_data()); + WARN_PRINT(String("Node '" + String(ret_nodes[0]->get_path_to(parent)) + "/" + String(snames[n.name]) + "' was modified from inside an instance, but it has vanished.").ascii().get_data()); } #endif } diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 9751d6e711..6a9ded9ea3 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -501,9 +501,9 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla Vector<Ref<Image> > mipmap_images; int total_size = 0; - for (int i = 0; i < mipmaps; i++) { + for (uint32_t i = 0; i < mipmaps; i++) { - if (i > 0) { + if (i) { size = f->get_32(); } diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp index 992fece85f..1ae0e7b96b 100644 --- a/servers/audio/audio_driver_dummy.cpp +++ b/servers/audio/audio_driver_dummy.cpp @@ -37,17 +37,16 @@ Error AudioDriverDummy::init() { active = false; thread_exited = false; exit_thread = false; - pcm_open = false; samples_in = NULL; - mix_rate = 44100; + mix_rate = DEFAULT_MIX_RATE; speaker_mode = SPEAKER_MODE_STEREO; channels = 2; - int latency = GLOBAL_DEF("audio/output_latency", 25); - buffer_size = next_power_of_2(latency * mix_rate / 1000); + int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + buffer_frames = closest_power_of_2(latency * mix_rate / 1000); - samples_in = memnew_arr(int32_t, buffer_size * channels); + samples_in = memnew_arr(int32_t, buffer_frames * channels); mutex = Mutex::create(); thread = Thread::create(AudioDriverDummy::thread_func, this); @@ -59,17 +58,15 @@ void AudioDriverDummy::thread_func(void *p_udata) { AudioDriverDummy *ad = (AudioDriverDummy *)p_udata; - uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate)) * 1000000; + uint64_t usdelay = (ad->buffer_frames / float(ad->mix_rate)) * 1000000; while (!ad->exit_thread) { - if (!ad->active) { - - } else { + if (ad->active) { ad->lock(); - ad->audio_server_process(ad->buffer_size, ad->samples_in); + ad->audio_server_process(ad->buffer_frames, ad->samples_in); ad->unlock(); }; diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index b3fea59389..90af1961b7 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -43,8 +43,8 @@ class AudioDriverDummy : public AudioDriver { int32_t *samples_in; static void thread_func(void *p_udata); - int buffer_size; + unsigned int buffer_frames; unsigned int mix_rate; SpeakerMode speaker_mode; @@ -53,7 +53,6 @@ class AudioDriverDummy : public AudioDriver { bool active; bool thread_exited; mutable bool exit_thread; - bool pcm_open; public: const char *get_name() const { diff --git a/servers/audio/audio_rb_resampler.cpp b/servers/audio/audio_rb_resampler.cpp index 2f160fd7cd..113e356612 100644 --- a/servers/audio/audio_rb_resampler.cpp +++ b/servers/audio/audio_rb_resampler.cpp @@ -176,7 +176,7 @@ bool AudioRBResampler::mix(int32_t *p_dest, int p_frames) { { - uint32_t read = 0; + int read = 0; switch (channels) { case 1: read = _resample<1>(p_dest, todo, increment); break; case 2: read = _resample<2>(p_dest, todo, increment); break; @@ -189,7 +189,7 @@ bool AudioRBResampler::mix(int32_t *p_dest, int p_frames) { if (remaining && todo > 0) { //print_line("fadeout"); - for (int c = 0; c < channels; c++) { + for (uint32_t c = 0; c < channels; c++) { for (int i = 0; i < todo; i++) { @@ -202,7 +202,7 @@ bool AudioRBResampler::mix(int32_t *p_dest, int p_frames) { } //zero out what remains there to avoid glitches - for (int i = todo * channels; i < int(p_frames) * channels; i++) { + for (uint32_t i = todo * channels; i < int(p_frames) * channels; i++) { p_dest[i] = 0; } @@ -250,7 +250,7 @@ Error AudioRBResampler::setup(int p_channels, int p_src_mix_rate, int p_target_m rb_write_pos = 0; //avoid maybe strange noises upon load - for (int i = 0; i < (rb_len * channels); i++) { + for (unsigned int i = 0; i < (rb_len * channels); i++) { rb[i] = 0; read_buf[i] = 0; diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp index 4075bc3e63..76dd585ffa 100644 --- a/servers/audio/effects/audio_effect_chorus.cpp +++ b/servers/audio/effects/audio_effect_chorus.cpp @@ -78,7 +78,7 @@ void AudioEffectChorusInstance::_process_chunk(const AudioFrame *p_src_frames, A uint64_t increment = llrint(cycles_to_mix / (double)p_frame_count * (double)(1 << AudioEffectChorus::CYCLES_FRAC)); //check the LFO doesn't read ahead of the write pos - if ((((int)max_depth_frames) + 10) > delay_frames) { //10 as some threshold to avoid precision stuff + if ((((unsigned int)max_depth_frames) + 10) > delay_frames) { //10 as some threshold to avoid precision stuff delay_frames += (int)max_depth_frames - delay_frames; delay_frames += 10; //threshold to avoid precision stuff } diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index c0343399c3..3139c6bb7a 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -155,6 +155,29 @@ void AudioServer::_driver_process(int p_frames, int32_t *p_buffer) { todo -= to_copy; to_mix -= to_copy; } + +#ifdef DEBUG_ENABLED + if (OS::get_singleton() && OS::get_singleton()->is_stdout_verbose()) { + static uint64_t first_ticks = 0; + static uint64_t last_ticks = 0; + static uint64_t ticks = 0; + static int count = 0; + static int total = 0; + + ticks = OS::get_singleton()->get_ticks_msec(); + if ((ticks - first_ticks) > 10 * 1000) { + print_line("Audio Driver " + String(AudioDriver::get_singleton()->get_name()) + " average latency: " + itos(total / count) + "ms (frame=" + itos(p_frames) + ")"); + first_ticks = ticks; + total = 0; + count = 0; + } + + total += ticks - last_ticks; + count++; + + last_ticks = ticks; + } +#endif } void AudioServer::_mix_step() { diff --git a/servers/audio_server.h b/servers/audio_server.h index 05e92ceaf0..13a74856c8 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -54,6 +54,9 @@ public: SPEAKER_SURROUND_71, }; + static const int DEFAULT_MIX_RATE = 44100; + static const int DEFAULT_OUTPUT_LATENCY = 15; + static AudioDriver *get_singleton(); void set_singleton(); diff --git a/servers/physics/collision_object_sw.cpp b/servers/physics/collision_object_sw.cpp index ab716a8f6e..3af8b542fa 100644 --- a/servers/physics/collision_object_sw.cpp +++ b/servers/physics/collision_object_sw.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "collision_object_sw.h" +#include "servers/physics/physics_server_sw.h" #include "space_sw.h" void CollisionObjectSW::add_shape(ShapeSW *p_shape, const Transform &p_transform) { @@ -39,8 +40,12 @@ void CollisionObjectSW::add_shape(ShapeSW *p_shape, const Transform &p_transform s.bpid = 0; //needs update shapes.push_back(s); p_shape->add_owner(this); - _update_shapes(); - _shapes_changed(); + + if (!pending_shape_update_list.in_list()) { + PhysicsServerSW::singleton->pending_shape_update_list.add(&pending_shape_update_list); + } + //_update_shapes(); + //_shapes_changed(); } void CollisionObjectSW::set_shape(int p_index, ShapeSW *p_shape) { @@ -50,8 +55,11 @@ void CollisionObjectSW::set_shape(int p_index, ShapeSW *p_shape) { shapes[p_index].shape = p_shape; p_shape->add_owner(this); - _update_shapes(); - _shapes_changed(); + if (!pending_shape_update_list.in_list()) { + PhysicsServerSW::singleton->pending_shape_update_list.add(&pending_shape_update_list); + } + //_update_shapes(); + //_shapes_changed(); } void CollisionObjectSW::set_shape_transform(int p_index, const Transform &p_transform) { @@ -59,8 +67,11 @@ void CollisionObjectSW::set_shape_transform(int p_index, const Transform &p_tran shapes[p_index].xform = p_transform; shapes[p_index].xform_inv = p_transform.affine_inverse(); - _update_shapes(); - _shapes_changed(); + if (!pending_shape_update_list.in_list()) { + PhysicsServerSW::singleton->pending_shape_update_list.add(&pending_shape_update_list); + } + //_update_shapes(); + //_shapes_changed(); } void CollisionObjectSW::remove_shape(ShapeSW *p_shape) { @@ -90,7 +101,11 @@ void CollisionObjectSW::remove_shape(int p_index) { shapes[p_index].shape->remove_owner(this); shapes.remove(p_index); - _shapes_changed(); + if (!pending_shape_update_list.in_list()) { + PhysicsServerSW::singleton->pending_shape_update_list.add(&pending_shape_update_list); + } + //_update_shapes(); + //_shapes_changed(); } void CollisionObjectSW::_set_static(bool p_static) { @@ -202,7 +217,8 @@ void CollisionObjectSW::_shape_changed() { _shapes_changed(); } -CollisionObjectSW::CollisionObjectSW(Type p_type) { +CollisionObjectSW::CollisionObjectSW(Type p_type) + : pending_shape_update_list(this) { _static = true; type = p_type; diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h index dc988aae86..67a8a44944 100644 --- a/servers/physics/collision_object_sw.h +++ b/servers/physics/collision_object_sw.h @@ -75,6 +75,8 @@ private: Transform inv_transform; bool _static; + SelfList<CollisionObjectSW> pending_shape_update_list; + void _update_shapes(); protected: diff --git a/servers/physics/collision_solver_sw.cpp b/servers/physics/collision_solver_sw.cpp index c7f66cb7fc..7bef208237 100644 --- a/servers/physics/collision_solver_sw.cpp +++ b/servers/physics/collision_solver_sw.cpp @@ -271,7 +271,7 @@ bool CollisionSolverSW::solve_distance_plane(const ShapeSW *p_shape_A, const Tra bool collided = false; Vector3 closest; - real_t closest_d; + real_t closest_d = 0; for (int i = 0; i < support_count; i++) { diff --git a/servers/physics/gjk_epa.cpp b/servers/physics/gjk_epa.cpp index 6cea5b003d..0f03bd917a 100644 --- a/servers/physics/gjk_epa.cpp +++ b/servers/physics/gjk_epa.cpp @@ -410,8 +410,8 @@ struct GJK if(l>GJK_SIMPLEX3_EPS) { real_t mindist=-1; - real_t subw[2]; - U subm; + real_t subw[2] = { 0 , 0}; + U subm = 0; for(U i=0;i<3;++i) { if(vec3_dot(*vt[i],vec3_cross(dl[i],n))>0) @@ -458,7 +458,7 @@ struct GJK { real_t mindist=-1; real_t subw[3]; - U subm; + U subm=0; for(U i=0;i<3;++i) { const U j=imd3[i]; diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index 8d6f7b3fd8..2d46770924 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -763,6 +763,8 @@ void PhysicsServerSW::body_apply_impulse(RID p_body, const Vector3 &p_pos, const BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); + _update_shapes(); + body->apply_impulse(p_pos, p_impulse); body->wakeup(); }; @@ -772,6 +774,8 @@ void PhysicsServerSW::body_apply_torque_impulse(RID p_body, const Vector3 &p_imp BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); + _update_shapes(); + body->apply_torque_impulse(p_impulse); body->wakeup(); }; @@ -781,6 +785,8 @@ void PhysicsServerSW::body_set_axis_velocity(RID p_body, const Vector3 &p_axis_v BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); + _update_shapes(); + Vector3 v = body->get_linear_velocity(); Vector3 axis = p_axis_velocity.normalized(); v -= axis * axis.dot(v); @@ -793,6 +799,7 @@ void PhysicsServerSW::body_set_axis_lock(RID p_body, BodyAxisLock p_lock) { BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); + body->set_axis_lock(p_lock); body->wakeup(); } @@ -902,6 +909,8 @@ bool PhysicsServerSW::body_test_motion(RID p_body, const Transform &p_from, cons ERR_FAIL_COND_V(!body->get_space(), false); ERR_FAIL_COND_V(body->get_space()->is_locked(), false); + _update_shapes(); + return body->get_space()->test_body_motion(body, p_from, p_motion, p_margin, r_result); } @@ -1209,6 +1218,8 @@ bool PhysicsServerSW::generic_6dof_joint_get_flag(RID p_joint, Vector3::Axis p_a void PhysicsServerSW::free(RID p_rid) { + _update_shapes(); //just in case + if (shape_owner.owns(p_rid)) { ShapeSW *shape = shape_owner.get(p_rid); @@ -1312,6 +1323,8 @@ void PhysicsServerSW::step(real_t p_step) { if (!active) return; + _update_shapes(); + doing_sync = false; last_step = p_step; @@ -1409,6 +1422,14 @@ int PhysicsServerSW::get_process_info(ProcessInfo p_info) { return 0; } +void PhysicsServerSW::_update_shapes() { + + while (pending_shape_update_list.first()) { + pending_shape_update_list.first()->self()->_shape_changed(); + pending_shape_update_list.remove(pending_shape_update_list.first()); + } +} + void PhysicsServerSW::_shape_col_cbk(const Vector3 &p_point_A, const Vector3 &p_point_B, void *p_userdata) { CollCbkData *cbk = (CollCbkData *)p_userdata; diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index 2e1fa7065a..99ba302acd 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -62,6 +62,10 @@ class PhysicsServerSW : public PhysicsServer { mutable RID_Owner<JointSW> joint_owner; //void _clear_query(QuerySW *p_query); + friend class CollisionObjectSW; + SelfList<CollisionObjectSW>::List pending_shape_update_list; + void _update_shapes(); + public: static PhysicsServerSW *singleton; diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp index f02ff03fcf..1845188089 100644 --- a/servers/physics/shape_sw.cpp +++ b/servers/physics/shape_sw.cpp @@ -734,7 +734,7 @@ Vector3 ConvexPolygonShapeSW::get_support(const Vector3 &p_normal) const { Vector3 n = p_normal; int vert_support_idx = -1; - real_t support_max; + real_t support_max = 0; int vertex_count = mesh.vertices.size(); if (vertex_count == 0) @@ -767,8 +767,8 @@ void ConvexPolygonShapeSW::get_supports(const Vector3 &p_normal, int p_max, Vect int vc = mesh.vertices.size(); //find vertex first - real_t max; - int vtx; + real_t max = 0; + int vtx = 0; for (int i = 0; i < vc; i++) { @@ -1000,7 +1000,7 @@ void FaceShapeSW::project_range(const Vector3 &p_normal, const Transform &p_tran Vector3 FaceShapeSW::get_support(const Vector3 &p_normal) const { int vert_support_idx = -1; - real_t support_max; + real_t support_max = 0; for (int i = 0; i < 3; i++) { @@ -1154,7 +1154,7 @@ Vector3 ConcavePolygonShapeSW::get_support(const Vector3 &p_normal) const { Vector3 n = p_normal; int vert_support_idx = -1; - real_t support_max; + real_t support_max = 0; for (int i = 0; i < count; i++) { diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.cpp b/servers/physics_2d/broad_phase_2d_hash_grid.cpp index 6c800a4b49..db18995bee 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.cpp +++ b/servers/physics_2d/broad_phase_2d_hash_grid.cpp @@ -640,7 +640,7 @@ BroadPhase2DHashGrid::BroadPhase2DHashGrid() { cell_size = GLOBAL_DEF("physics/2d/cell_size", 128); large_object_min_surface = GLOBAL_DEF("physics/2d/large_object_surface_threshold_in_cells", 512); - for (int i = 0; i < hash_table_size; i++) + for (uint32_t i = 0; i < hash_table_size; i++) hash_table[i] = NULL; pass = 1; @@ -649,7 +649,7 @@ BroadPhase2DHashGrid::BroadPhase2DHashGrid() { BroadPhase2DHashGrid::~BroadPhase2DHashGrid() { - for (int i = 0; i < hash_table_size; i++) { + for (uint32_t i = 0; i < hash_table_size; i++) { while (hash_table[i]) { PosBin *pb = hash_table[i]; hash_table[i] = pb->next; diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 9e4acac25d..187a0b180b 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -213,6 +213,7 @@ public: virtual RID material_create() = 0; + virtual void material_set_render_priority(RID p_material, int priority) = 0; virtual void material_set_shader(RID p_shader_material, RID p_shader) = 0; virtual RID material_get_shader(RID p_shader_material) const = 0; diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index d17cf472b3..0684cb1701 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -2586,7 +2586,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons } bool index_valid = false; - DataType member_type; + DataType member_type = TYPE_VOID; switch (expr->get_datatype()) { case TYPE_BVEC2: @@ -2953,7 +2953,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons if (expression[next_op + 1].is_op) { // this is not invalid and can really appear // but it becomes invalid anyway because no binary op - // can be followed by an unary op in a valid combination, + // can be followed by a unary op in a valid combination, // due to how precedence works, unaries will always disappear first _set_error("Parser bug.."); @@ -3349,7 +3349,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, FunctionInfo> &p_funct Token tk = _get_token(); if (tk.type != TK_SHADER_TYPE) { - _set_error("Expected 'shader_type' at the begining of shader."); + _set_error("Expected 'shader_type' at the beginning of shader."); return ERR_PARSE_ERROR; } diff --git a/servers/visual/shader_types.cpp b/servers/visual/shader_types.cpp index d8d1b1c1b1..91c5d430f5 100644 --- a/servers/visual/shader_types.cpp +++ b/servers/visual/shader_types.cpp @@ -102,6 +102,7 @@ ShaderTypes::ShaderTypes() { shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY"] = ShaderLanguage::TYPE_FLOAT; shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["ANISOTROPY_FLOW"] = ShaderLanguage::TYPE_VEC2; shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["SSS_STRENGTH"] = ShaderLanguage::TYPE_FLOAT; + shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["TRANSMISSION"] = ShaderLanguage::TYPE_VEC3; shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["AO"] = ShaderLanguage::TYPE_FLOAT; shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["EMISSION"] = ShaderLanguage::TYPE_VEC3; shader_modes[VS::SHADER_SPATIAL].functions["fragment"].built_ins["SCREEN_TEXTURE"] = ShaderLanguage::TYPE_SAMPLER2D; @@ -128,15 +129,16 @@ ShaderTypes::ShaderTypes() { shader_modes[VS::SHADER_SPATIAL].modes.insert("depth_draw_never"); shader_modes[VS::SHADER_SPATIAL].modes.insert("depth_draw_alpha_prepass"); + shader_modes[VS::SHADER_SPATIAL].modes.insert("depth_test_disable"); + shader_modes[VS::SHADER_SPATIAL].modes.insert("cull_front"); shader_modes[VS::SHADER_SPATIAL].modes.insert("cull_back"); shader_modes[VS::SHADER_SPATIAL].modes.insert("cull_disabled"); shader_modes[VS::SHADER_SPATIAL].modes.insert("unshaded"); - shader_modes[VS::SHADER_SPATIAL].modes.insert("ontop"); shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_lambert"); - shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_half_lambert"); + shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_lambert_wrap"); shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_oren_nayar"); shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_burley"); shader_modes[VS::SHADER_SPATIAL].modes.insert("diffuse_toon"); diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 774b692a22..3953bc5f48 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -690,6 +690,7 @@ public: BIND3(material_set_param, RID, const StringName &, const Variant &) BIND2RC(Variant, material_get_param, RID, const StringName &) + BIND2(material_set_render_priority, RID, int) BIND2(material_set_line_width, RID, float) BIND2(material_set_next_pass, RID, RID) diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index cd68c14de8..0d70b7fc0e 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -948,13 +948,13 @@ void VisualServerScene::_light_instance_update_shadow(Instance *p_instance, cons Vector3 z_vec = transform.basis.get_axis(Vector3::AXIS_Z).normalized(); //z_vec points agsint the camera, like in default opengl - float x_min, x_max; - float y_min, y_max; - float z_min, z_max; + float x_min = 0.f, x_max = 0.f; + float y_min = 0.f, y_max = 0.f; + float z_min = 0.f, z_max = 0.f; - float x_min_cam, x_max_cam; - float y_min_cam, y_max_cam; - float z_min_cam, z_max_cam; + float x_min_cam = 0.f, x_max_cam = 0.f; + float y_min_cam = 0.f, y_max_cam = 0.f; + float z_min_cam = 0.f, z_max_cam = 0.f; float bias_scale = 1.0; @@ -1434,7 +1434,7 @@ void VisualServerScene::_render_scene(const Transform p_cam_transform, const Cam } ins->depth = near_plane.distance_to(ins->transform.origin); - ins->depth_layer = CLAMP(int(ins->depth * 8 / z_far), 0, 7); + ins->depth_layer = CLAMP(int(ins->depth * 16 / z_far), 0, 15); } if (!keep) { @@ -1503,7 +1503,7 @@ void VisualServerScene::_render_scene(const Transform p_cam_transform, const Cam InstanceLightData *light = static_cast<InstanceLightData *>(ins->base_data); - float coverage; + float coverage = 0.f; { //compute coverage @@ -1687,7 +1687,7 @@ bool VisualServerScene::_render_reflection_probe_step(Instance *p_instance, int void VisualServerScene::_gi_probe_fill_local_data(int p_idx, int p_level, int p_x, int p_y, int p_z, const GIProbeDataCell *p_cell, const GIProbeDataHeader *p_header, InstanceGIProbeData::LocalData *p_local_data, Vector<uint32_t> *prev_cell) { - if (p_level == p_header->cell_subdiv - 1) { + if ((uint32_t)p_level == p_header->cell_subdiv - 1) { Vector3 emission; emission.x = (p_cell[p_idx].emission >> 24) / 255.0; @@ -1798,9 +1798,9 @@ void VisualServerScene::_setup_gi_probe(Instance *p_instance) { } for (int i = 0; i < (int)header->cell_subdiv; i++) { - uint32_t x = header->width >> i; - uint32_t y = header->height >> i; - uint32_t z = header->depth >> i; + int x = header->width >> i; + int y = header->height >> i; + int z = header->depth >> i; //create and clear mipmap PoolVector<uint8_t> mipmap; @@ -1896,7 +1896,7 @@ void VisualServerScene::_setup_gi_probe(Instance *p_instance) { uint8_t alpha_block[4][4] = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, { 0, 0, 0, 0 } }; - for (int j = 0; j < k.source_count; j++) { + for (uint32_t j = 0; j < k.source_count; j++) { int alpha = (cells[k.sources[j]].level_alpha >> 8) & 0xFF; if (alpha < min_alpha) @@ -2389,7 +2389,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { Vector3 colors[16]; - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { colors[j].x = (local_data[b.sources[j]].energy[0] / float(probe_data->dynamic.bake_dynamic_range)) / 1024.0; colors[j].y = (local_data[b.sources[j]].energy[1] / float(probe_data->dynamic.bake_dynamic_range)) / 1024.0; @@ -2403,8 +2403,8 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { if (b.source_count == 16) { //all cells are used so, find minmax between them int further_apart[2] = { 0, 0 }; - for (int j = 0; j < b.source_count; j++) { - for (int k = j + 1; k < b.source_count; k++) { + for (uint32_t j = 0; j < b.source_count; j++) { + for (uint32_t k = j + 1; k < b.source_count; k++) { float d = colors[j].distance_squared_to(colors[k]); if (d > distance) { distance = d; @@ -2424,12 +2424,12 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { //average all colors first Vector3 average; - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { average += colors[j]; } average.normalize(); //find max distance in normal from average - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { float d = average.dot(colors[j]); distance = MAX(d, distance); } @@ -2459,7 +2459,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { Vector3 dir = (to - from).normalized(); - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { float d = (colors[j] - from).dot(dir) / distance; indices[j] = int(d * 3 + 0.5); @@ -2469,7 +2469,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { indices[j] = index_swap[CLAMP(indices[j], 0, 3)]; } } else { - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { indices[j] = 0; } } @@ -2478,7 +2478,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) { uint32_t index_block[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - for (int j = 0; j < b.source_count; j++) { + for (uint32_t j = 0; j < b.source_count; j++) { int x = local_data[b.sources[j]].pos[0] % 4; int y = local_data[b.sources[j]].pos[1] % 4; diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 7143178b04..f24049be92 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -128,6 +128,7 @@ public: FUNC3(material_set_param, RID, const StringName &, const Variant &) FUNC2RC(Variant, material_get_param, RID, const StringName &) + FUNC2(material_set_render_priority, RID, int) FUNC2(material_set_line_width, RID, float) FUNC2(material_set_next_pass, RID, RID) diff --git a/servers/visual_server.h b/servers/visual_server.h index acf5675aa5..d516013ee2 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -166,6 +166,11 @@ public: /* COMMON MATERIAL API */ + enum { + MATERIAL_RENDER_PRIORITY_MIN = -128, + MATERIAL_RENDER_PRIORITY_MAX = 127, + + }; virtual RID material_create() = 0; virtual void material_set_shader(RID p_shader_material, RID p_shader) = 0; @@ -174,6 +179,8 @@ public: virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value) = 0; virtual Variant material_get_param(RID p_material, const StringName &p_param) const = 0; + virtual void material_set_render_priority(RID p_material, int priority) = 0; + virtual void material_set_line_width(RID p_material, float p_width) = 0; virtual void material_set_next_pass(RID p_material, RID p_next_material) = 0; @@ -824,6 +831,7 @@ public: CANVAS_LIGHT_FILTER_NONE, CANVAS_LIGHT_FILTER_PCF3, CANVAS_LIGHT_FILTER_PCF5, + CANVAS_LIGHT_FILTER_PCF7, CANVAS_LIGHT_FILTER_PCF9, CANVAS_LIGHT_FILTER_PCF13, }; |
