Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 21:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename pos to position in user facing methods and variables

Browse Source 
Rename user facing methods and variables as well as the corresponding
C++ methods according to the folloming changes:

* pos -> position
* rot -> rotation
* loc -> location

C++ variables are left as is.
This commit is contained in:
letheed 2017-09-10 15:37:49 +02:00
parent ecd226c6a7
commit 5ad9be4c24
247 changed files with 823 additions and 832 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/bind/core_bind.cpp
View File

@ -1033,10 +1033,8 @@ void _OS::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_time", "utc"), &_OS::get_time, DEFVAL(false));
ClassDB::bind_method(D_METHOD("get_time_zone_info"), &_OS::get_time_zone_info);
ClassDB::bind_method(D_METHOD("get_unix_time"), &_OS::get_unix_time);
ClassDB::bind_method(D_METHOD("get_datetime_from_unix_time", "unix_time_val"),
&_OS::get_datetime_from_unix_time);
ClassDB::bind_method(D_METHOD("get_unix_time_from_datetime", "datetime"),
&_OS::get_unix_time_from_datetime);
ClassDB::bind_method(D_METHOD("get_datetime_from_unix_time", "unix_time_val"), &_OS::get_datetime_from_unix_time);
ClassDB::bind_method(D_METHOD("get_unix_time_from_datetime", "datetime"), &_OS::get_unix_time_from_datetime);
ClassDB::bind_method(D_METHOD("get_system_time_secs"), &_OS::get_system_time_secs);
ClassDB::bind_method(D_METHOD("set_icon", "icon"), &_OS::set_icon);
@ -1337,7 +1335,7 @@ void _Geometry::_bind_methods() {
ClassDB::bind_method(D_METHOD("build_box_planes", "extents"), &_Geometry::build_box_planes);
ClassDB::bind_method(D_METHOD("build_cylinder_planes", "radius", "height", "sides", "axis"), &_Geometry::build_cylinder_planes, DEFVAL(Vector3::AXIS_Z));
ClassDB::bind_method(D_METHOD("build_capsule_planes", "radius", "height", "sides", "lats", "axis"), &_Geometry::build_capsule_planes, DEFVAL(Vector3::AXIS_Z));
ClassDB::bind_method(D_METHOD("segment_intersects_circle", "segment_from", "segment_to", "circle_pos", "circle_radius"), &_Geometry::segment_intersects_circle);
ClassDB::bind_method(D_METHOD("segment_intersects_circle", "segment_from", "segment_to", "circle_position", "circle_radius"), &_Geometry::segment_intersects_circle);
ClassDB::bind_method(D_METHOD("segment_intersects_segment_2d", "from_a", "to_a", "from_b", "to_b"), &_Geometry::segment_intersects_segment_2d);
ClassDB::bind_method(D_METHOD("get_closest_points_between_segments_2d", "p1", "q1", "p2", "q2"), &_Geometry::get_closest_points_between_segments_2d);
@ -1353,7 +1351,7 @@ void _Geometry::_bind_methods() {
ClassDB::bind_method(D_METHOD("ray_intersects_triangle", "from", "dir", "a", "b", "c"), &_Geometry::ray_intersects_triangle);
ClassDB::bind_method(D_METHOD("segment_intersects_triangle", "from", "to", "a", "b", "c"), &_Geometry::segment_intersects_triangle);
ClassDB::bind_method(D_METHOD("segment_intersects_sphere", "from", "to", "spos", "sradius"), &_Geometry::segment_intersects_sphere);
ClassDB::bind_method(D_METHOD("segment_intersects_sphere", "from", "to", "sphere_position", "sphere_radius"), &_Geometry::segment_intersects_sphere);
ClassDB::bind_method(D_METHOD("segment_intersects_cylinder", "from", "to", "height", "radius"), &_Geometry::segment_intersects_cylinder);
ClassDB::bind_method(D_METHOD("segment_intersects_convex", "from", "to", "planes"), &_Geometry::segment_intersects_convex);
ClassDB::bind_method(D_METHOD("point_is_inside_triangle", "point", "a", "b", "c"), &_Geometry::point_is_inside_triangle);
@ -1452,10 +1450,10 @@ void _File::seek_end(int64_t p_position) {
ERR_FAIL_COND(!f);
f->seek_end(p_position);
}
int64_t _File::get_pos() const {
int64_t _File::get_position() const {
ERR_FAIL_COND_V(!f, 0);
return f->get_pos();
return f->get_position();
}
int64_t _File::get_len() const {
@ -1534,7 +1532,7 @@ String _File::get_as_text() const {
ERR_FAIL_COND_V(!f, String());
String text;
size_t original_pos = f->get_pos();
size_t original_pos = f->get_position();
f->seek(0);
String l = get_line();
@ -1731,9 +1729,9 @@ void _File::_bind_methods() {
ClassDB::bind_method(D_METHOD("open", "path", "flags"), &_File::open);
ClassDB::bind_method(D_METHOD("close"), &_File::close);
ClassDB::bind_method(D_METHOD("is_open"), &_File::is_open);
ClassDB::bind_method(D_METHOD("seek", "pos"), &_File::seek);
ClassDB::bind_method(D_METHOD("seek_end", "pos"), &_File::seek_end, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_pos"), &_File::get_pos);
ClassDB::bind_method(D_METHOD("seek", "position"), &_File::seek);
ClassDB::bind_method(D_METHOD("seek_end", "position"), &_File::seek_end, DEFVAL(0));
ClassDB::bind_method(D_METHOD("get_position"), &_File::get_position);
ClassDB::bind_method(D_METHOD("get_len"), &_File::get_len);
ClassDB::bind_method(D_METHOD("eof_reached"), &_File::eof_reached);
ClassDB::bind_method(D_METHOD("get_8"), &_File::get_8);

2
core/bind/core_bind.h
View File

@ -399,7 +399,7 @@ public:
void seek(int64_t p_position); ///< seek to a given position
void seek_end(int64_t p_position = 0); ///< seek from the end of file
int64_t get_pos() const; ///< get position in the file
int64_t get_position() const; ///< get position in the file
int64_t get_len() const; ///< get size of the file
bool eof_reached() const; ///< reading passed EOF

2
core/io/file_access_buffered.cpp
View File

@ -76,7 +76,7 @@ void FileAccessBuffered::seek_end(int64_t p_position) {
file.offset = file.size + p_position;
};
size_t FileAccessBuffered::get_pos() const {
size_t FileAccessBuffered::get_position() const {
return file.offset;
};

2
core/io/file_access_buffered.h
View File

@ -72,7 +72,7 @@ protected:
int get_cache_size();
public:
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual void seek(size_t p_position); ///< seek to a given position

4
core/io/file_access_compressed.cpp
View File

@ -62,7 +62,7 @@ Error FileAccessCompressed::open_after_magic(FileAccess *p_base) {
block_size = f->get_32();
read_total = f->get_32();
int bc = (read_total / block_size) + 1;
int acc_ofs = f->get_pos() + bc * 4;
int acc_ofs = f->get_position() + bc * 4;
int max_bs = 0;
for (int i = 0; i < bc; i++) {
@ -232,7 +232,7 @@ void FileAccessCompressed::seek_end(int64_t p_position) {
seek(read_total + p_position);
}
}
size_t FileAccessCompressed::get_pos() const {
size_t FileAccessCompressed::get_position() const {
ERR_FAIL_COND_V(!f, 0);
if (writing) {

2
core/io/file_access_compressed.h
View File

@ -74,7 +74,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

4
core/io/file_access_encrypted.cpp
View File

@ -71,7 +71,7 @@ Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8
unsigned char md5d[16];
p_base->get_buffer(md5d, 16);
length = p_base->get_64();
base = p_base->get_pos();
base = p_base->get_position();
ERR_FAIL_COND_V(p_base->get_len() < base + length, ERR_FILE_CORRUPT);
uint32_t ds = length;
if (ds % 16) {
@ -199,7 +199,7 @@ void FileAccessEncrypted::seek_end(int64_t p_position) {
seek(data.size() + p_position);
}
size_t FileAccessEncrypted::get_pos() const {
size_t FileAccessEncrypted::get_position() const {
return pos;
}

2
core/io/file_access_encrypted.h
View File

@ -61,7 +61,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

2
core/io/file_access_memory.cpp
View File

@ -120,7 +120,7 @@ void FileAccessMemory::seek_end(int64_t p_position) {
pos = length + p_position;
}
size_t FileAccessMemory::get_pos() const {
size_t FileAccessMemory::get_position() const {
ERR_FAIL_COND_V(!data, 0);
return pos;

2
core/io/file_access_memory.h
View File

@ -51,7 +51,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

2
core/io/file_access_network.cpp
View File

@ -350,7 +350,7 @@ void FileAccessNetwork::seek_end(int64_t p_position) {
seek(total_size + p_position);
}
size_t FileAccessNetwork::get_pos() const {
size_t FileAccessNetwork::get_position() const {
ERR_FAIL_COND_V(!opened, 0);
return pos;

2
core/io/file_access_network.h
View File

@ -145,7 +145,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

8
core/io/file_access_pack.cpp
View File

@ -140,17 +140,17 @@ bool PackedSourcePCK::try_open_pack(const String &p_path) {
if (magic != 0x43504447) {
//maybe at he end.... self contained exe
f->seek_end();
f->seek(f->get_pos() - 4);
f->seek(f->get_position() - 4);
magic = f->get_32();
if (magic != 0x43504447) {
memdelete(f);
return false;
}
f->seek(f->get_pos() - 12);
f->seek(f->get_position() - 12);
uint64_t ds = f->get_64();
f->seek(f->get_pos() - ds - 8);
f->seek(f->get_position() - ds - 8);
magic = f->get_32();
if (magic != 0x43504447) {
@ -236,7 +236,7 @@ void FileAccessPack::seek_end(int64_t p_position) {
seek(pf.size + p_position);
}
size_t FileAccessPack::get_pos() const {
size_t FileAccessPack::get_position() const {
return pos;
}

2
core/io/file_access_pack.h
View File

@ -148,7 +148,7 @@ public:
virtual void seek(size_t p_position);
virtual void seek_end(int64_t p_position = 0);
virtual size_t get_pos() const;
virtual size_t get_position() const;
virtual size_t get_len() const;
virtual bool eof_reached() const;

6
core/io/file_access_zip.cpp
View File

@ -65,7 +65,7 @@ static uLong godot_write(voidpf opaque, voidpf stream, const void *buf, uLong si
static long godot_tell(voidpf opaque, voidpf stream) {
FileAccess *f = (FileAccess *)opaque;
return f->get_pos();
return f->get_position();
};
static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
@ -76,7 +76,7 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
switch (origin) {
case ZLIB_FILEFUNC_SEEK_CUR:
pos = f->get_pos() + offset;
pos = f->get_position() + offset;
break;
case ZLIB_FILEFUNC_SEEK_END:
pos = f->get_len() + offset;
@ -301,7 +301,7 @@ void FileAccessZip::seek_end(int64_t p_position) {
unzSeekCurrentFile(zfile, get_len() + p_position);
};
size_t FileAccessZip::get_pos() const {
size_t FileAccessZip::get_position() const {
ERR_FAIL_COND_V(!zfile, 0);
return unztell(zfile);

2
core/io/file_access_zip.h
View File

@ -98,7 +98,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

8
core/io/pck_packer.cpp
View File

@ -119,7 +119,7 @@ Error PCKPacker::flush(bool p_verbose) {
for (int i = 0; i < files.size(); i++) {
file->store_pascal_string(files[i].path);
files[i].offset_offset = file->get_pos();
files[i].offset_offset = file->get_position();
file->store_64(0); // offset
file->store_64(files[i].size); // size
@ -130,10 +130,10 @@ Error PCKPacker::flush(bool p_verbose) {
file->store_32(0);
};
uint64_t ofs = file->get_pos();
uint64_t ofs = file->get_position();
ofs = _align(ofs, alignment);
_pad(file, ofs - file->get_pos());
_pad(file, ofs - file->get_position());
const uint32_t buf_max = 65536;
uint8_t *buf = memnew_arr(uint8_t, buf_max);
@ -150,7 +150,7 @@ Error PCKPacker::flush(bool p_verbose) {
to_write -= read;
};
uint64_t pos = file->get_pos();
uint64_t pos = file->get_position();
file->seek(files[i].offset_offset); // go back to store the file's offset
file->store_64(ofs);
file->seek(pos);

8
core/io/resource_format_binary.cpp
View File

@ -1179,7 +1179,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
save_ustring(fw, get_ustring(f)); //type
size_t md_ofs = f->get_pos();
size_t md_ofs = f->get_position();
size_t importmd_ofs = f->get_64();
fw->store_64(0); //metadata offset
@ -1227,7 +1227,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
save_ustring(fw, path);
}
int64_t size_diff = (int64_t)fw->get_pos() - (int64_t)f->get_pos();
int64_t size_diff = (int64_t)fw->get_position() - (int64_t)f->get_position();
//internal resources
uint32_t int_resources_size = f->get_32();
@ -1880,7 +1880,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
} else {
save_unicode_string(r->get_path()); //actual external
}
ofs_pos.push_back(f->get_pos());
ofs_pos.push_back(f->get_position());
f->store_64(0); //offset in 64 bits
}
@ -1891,7 +1891,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
ResourceData &rd = E->get();
ofs_table.push_back(f->get_pos());
ofs_table.push_back(f->get_position());
save_unicode_string(rd.type);
f->store_32(rd.properties.size());

6
core/io/stream_peer.cpp
View File

@ -405,9 +405,9 @@ void StreamPeer::_bind_methods() {
void StreamPeerBuffer::_bind_methods() {
ClassDB::bind_method(D_METHOD("seek", "pos"), &StreamPeerBuffer::seek);
ClassDB::bind_method(D_METHOD("seek", "position"), &StreamPeerBuffer::seek);
ClassDB::bind_method(D_METHOD("get_size"), &StreamPeerBuffer::get_size);
ClassDB::bind_method(D_METHOD("get_pos"), &StreamPeerBuffer::get_pos);
ClassDB::bind_method(D_METHOD("get_position"), &StreamPeerBuffer::get_position);
ClassDB::bind_method(D_METHOD("resize", "size"), &StreamPeerBuffer::resize);
ClassDB::bind_method(D_METHOD("set_data_array", "data"), &StreamPeerBuffer::set_data_array);
ClassDB::bind_method(D_METHOD("get_data_array"), &StreamPeerBuffer::get_data_array);
@ -484,7 +484,7 @@ int StreamPeerBuffer::get_size() const {
return data.size();
}
int StreamPeerBuffer::get_pos() const {
int StreamPeerBuffer::get_position() const {
return pointer;
}

2
core/io/stream_peer.h
View File

@ -111,7 +111,7 @@ public:
void seek(int p_pos);
int get_size() const;
int get_pos() const;
int get_position() const;
void resize(int p_size);
void set_data_array(const PoolVector<uint8_t> &p_data);

2
core/io/xml_parser.cpp
View File

@ -369,7 +369,7 @@ void XMLParser::_bind_methods() {
ClassDB::bind_method(D_METHOD("is_empty"), &XMLParser::is_empty);
ClassDB::bind_method(D_METHOD("get_current_line"), &XMLParser::get_current_line);
ClassDB::bind_method(D_METHOD("skip_section"), &XMLParser::skip_section);
ClassDB::bind_method(D_METHOD("seek", "pos"), &XMLParser::seek);
ClassDB::bind_method(D_METHOD("seek", "position"), &XMLParser::seek);
ClassDB::bind_method(D_METHOD("open", "file"), &XMLParser::open);
ClassDB::bind_method(D_METHOD("open_buffer", "buffer"), &XMLParser::open_buffer);

4
core/io/zip_io.h
View File

@ -72,7 +72,7 @@ static uLong zipio_write(voidpf opaque, voidpf stream, const void *buf, uLong si
static long zipio_tell(voidpf opaque, voidpf stream) {
FileAccess *f = *(FileAccess **)opaque;
return f->get_pos();
return f->get_position();
};
static long zipio_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
@ -83,7 +83,7 @@ static long zipio_seek(voidpf opaque, voidpf stream, uLong offset, int origin) {
switch (origin) {
case ZLIB_FILEFUNC_SEEK_CUR:
pos = f->get_pos() + offset;
pos = f->get_position() + offset;
break;
case ZLIB_FILEFUNC_SEEK_END:
pos = f->get_len() + offset;

12
core/math/a_star.cpp
View File

@ -58,7 +58,7 @@ void AStar::add_point(int p_id, const Vector3 &p_pos, real_t p_weight_scale) {
}
}
Vector3 AStar::get_point_pos(int p_id) const {
Vector3 AStar::get_point_position(int p_id) const {
ERR_FAIL_COND_V(!points.has(p_id), Vector3());
@ -171,7 +171,7 @@ int AStar::get_closest_point(const Vector3 &p_point) const {
return closest_id;
}
Vector3 AStar::get_closest_pos_in_segment(const Vector3 &p_point) const {
Vector3 AStar::get_closest_position_in_segment(const Vector3 &p_point) const {
real_t closest_dist = 1e20;
bool found = false;
@ -412,8 +412,8 @@ PoolVector<int> AStar::get_id_path(int p_from_id, int p_to_id) {
void AStar::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_available_point_id"), &AStar::get_available_point_id);
ClassDB::bind_method(D_METHOD("add_point", "id", "pos", "weight_scale"), &AStar::add_point, DEFVAL(1.0));
ClassDB::bind_method(D_METHOD("get_point_pos", "id"), &AStar::get_point_pos);
ClassDB::bind_method(D_METHOD("add_point", "id", "position", "weight_scale"), &AStar::add_point, DEFVAL(1.0));
ClassDB::bind_method(D_METHOD("get_point_position", "id"), &AStar::get_point_position);
ClassDB::bind_method(D_METHOD("get_point_weight_scale", "id"), &AStar::get_point_weight_scale);
ClassDB::bind_method(D_METHOD("remove_point", "id"), &AStar::remove_point);
ClassDB::bind_method(D_METHOD("has_point", "id"), &AStar::has_point);
@ -425,8 +425,8 @@ void AStar::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear"), &AStar::clear);
ClassDB::bind_method(D_METHOD("get_closest_point", "to_pos"), &AStar::get_closest_point);
ClassDB::bind_method(D_METHOD("get_closest_pos_in_segment", "to_pos"), &AStar::get_closest_pos_in_segment);
ClassDB::bind_method(D_METHOD("get_closest_point", "to_position"), &AStar::get_closest_point);
ClassDB::bind_method(D_METHOD("get_closest_position_in_segment", "to_position"), &AStar::get_closest_position_in_segment);
ClassDB::bind_method(D_METHOD("get_point_path", "from_id", "to_id"), &AStar::get_point_path);
ClassDB::bind_method(D_METHOD("get_id_path", "from_id", "to_id"), &AStar::get_id_path);

4
core/math/a_star.h
View File

@ -101,7 +101,7 @@ public:
int get_available_point_id() const;
void add_point(int p_id, const Vector3 &p_pos, real_t p_weight_scale = 1);
Vector3 get_point_pos(int p_id) const;
Vector3 get_point_position(int p_id) const;
real_t get_point_weight_scale(int p_id) const;
void remove_point(int p_id);
bool has_point(int p_id) const;
@ -114,7 +114,7 @@ public:
void clear();
int get_closest_point(const Vector3 &p_point) const;
Vector3 get_closest_pos_in_segment(const Vector3 &p_point) const;
Vector3 get_closest_position_in_segment(const Vector3 &p_point) const;
PoolVector<Vector3> get_point_path(int p_from_id, int p_to_id);
PoolVector<int> get_id_path(int p_from_id, int p_to_id);

2
core/os/dir_access.cpp
View File

@ -312,7 +312,7 @@ Error DirAccess::copy(String p_from, String p_to, int chmod_flags) {
}
fsrc->seek_end(0);
int size = fsrc->get_pos();
int size = fsrc->get_position();
fsrc->seek(0);
err = OK;
while (size--) {

2
core/os/file_access.h
View File

@ -90,7 +90,7 @@ public:
virtual void seek(size_t p_position) = 0; ///< seek to a given position
virtual void seek_end(int64_t p_position = 0) = 0; ///< seek from the end of file
virtual size_t get_pos() const = 0; ///< get position in the file
virtual size_t get_position() const = 0; ///< get position in the file
virtual size_t get_len() const = 0; ///< get size of the file
virtual bool eof_reached() const = 0; ///< reading passed EOF

2
core/os/input.cpp
View File

@ -80,7 +80,7 @@ void Input::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_mouse_button_mask"), &Input::get_mouse_button_mask);
ClassDB::bind_method(D_METHOD("set_mouse_mode", "mode"), &Input::set_mouse_mode);
ClassDB::bind_method(D_METHOD("get_mouse_mode"), &Input::get_mouse_mode);
ClassDB::bind_method(D_METHOD("warp_mouse_pos", "to"), &Input::warp_mouse_pos);
ClassDB::bind_method(D_METHOD("warp_mouse_position", "to"), &Input::warp_mouse_position);
ClassDB::bind_method(D_METHOD("action_press", "action"), &Input::action_press);
ClassDB::bind_method(D_METHOD("action_release", "action"), &Input::action_release);
ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(Vector2()));

2
core/os/input.h
View File

@ -81,7 +81,7 @@ public:
virtual Point2 get_last_mouse_speed() const = 0;
virtual int get_mouse_button_mask() const = 0;
virtual void warp_mouse_pos(const Vector2 &p_to) = 0;
virtual void warp_mouse_position(const Vector2 &p_to) = 0;
virtual Point2i warp_mouse_motion(const Ref<InputEventMouseMotion> &p_motion, const Rect2 &p_rect) = 0;
virtual Vector3 get_gravity() const = 0;

2
core/os/input_event.cpp
View File

@ -781,7 +781,7 @@ void InputEventScreenTouch::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_index", "index"), &InputEventScreenTouch::set_index);
ClassDB::bind_method(D_METHOD("get_index"), &InputEventScreenTouch::get_index);
ClassDB::bind_method(D_METHOD("set_position", "pos"), &InputEventScreenTouch::set_position);
ClassDB::bind_method(D_METHOD("set_position", "position"), &InputEventScreenTouch::set_position);
ClassDB::bind_method(D_METHOD("get_position"), &InputEventScreenTouch::get_position);
ClassDB::bind_method(D_METHOD("set_pressed", "pressed"), &InputEventScreenTouch::set_pressed);

2
core/os/os.h
View File

@ -156,7 +156,7 @@ public:
virtual void set_mouse_mode(MouseMode p_mode);
virtual MouseMode get_mouse_mode() const;
virtual void warp_mouse_pos(const Point2 &p_to) {}
virtual void warp_mouse_position(const Point2 &p_to) {}
virtual Point2 get_mouse_position() const = 0;
virtual int get_mouse_button_state() const = 0;
virtual void set_window_title(const String &p_title) = 0;

2
core/project_settings.cpp
View File

@ -910,7 +910,7 @@ Variant ProjectSettings::property_get_revert(const String &p_name) {
void ProjectSettings::_bind_methods() {
ClassDB::bind_method(D_METHOD("has", "name"), &ProjectSettings::has);
ClassDB::bind_method(D_METHOD("set_order", "name", "pos"), &ProjectSettings::set_order);
ClassDB::bind_method(D_METHOD("set_order", "name", "position"), &ProjectSettings::set_order);
ClassDB::bind_method(D_METHOD("get_order", "name"), &ProjectSettings::get_order);
ClassDB::bind_method(D_METHOD("set_initial_value", "name", "value"), &ProjectSettings::set_initial_value);
ClassDB::bind_method(D_METHOD("add_property_info", "hint"), &ProjectSettings::_add_property_info_bind);

20
core/variant_call.cpp
View File

@ -1394,7 +1394,7 @@ void register_variant_methods() {
ADDFUNC2(STRING, STRING, String, format, NIL, "values", STRING, "placeholder", varray("{_}"));
ADDFUNC2(STRING, STRING, String, replace, STRING, "what", STRING, "forwhat", varray());
ADDFUNC2(STRING, STRING, String, replacen, STRING, "what", STRING, "forwhat", varray());
ADDFUNC2(STRING, STRING, String, insert, INT, "pos", STRING, "what", varray());
ADDFUNC2(STRING, STRING, String, insert, INT, "position", STRING, "what", varray());
ADDFUNC0(STRING, STRING, String, capitalize, varray());
ADDFUNC2(STRING, POOL_STRING_ARRAY, String, split, STRING, "divisor", BOOL, "allow_empty", varray(true));
ADDFUNC2(STRING, POOL_REAL_ARRAY, String, split_floats, STRING, "divisor", BOOL, "allow_empty", varray(true));
@ -1402,14 +1402,14 @@ void register_variant_methods() {
ADDFUNC0(STRING, STRING, String, to_upper, varray());
ADDFUNC0(STRING, STRING, String, to_lower, varray());
ADDFUNC1(STRING, STRING, String, left, INT, "pos", varray());
ADDFUNC1(STRING, STRING, String, right, INT, "pos", varray());
ADDFUNC1(STRING, STRING, String, left, INT, "position", varray());
ADDFUNC1(STRING, STRING, String, right, INT, "position", varray());
ADDFUNC2(STRING, STRING, String, strip_edges, BOOL, "left", BOOL, "right", varray(true, true));
ADDFUNC0(STRING, STRING, String, get_extension, varray());
ADDFUNC0(STRING, STRING, String, get_basename, varray());
ADDFUNC1(STRING, STRING, String, plus_file, STRING, "file", varray());
ADDFUNC1(STRING, INT, String, ord_at, INT, "at", varray());
ADDFUNC2(STRING, NIL, String, erase, INT, "pos", INT, "chars", varray());
ADDFUNC2(STRING, NIL, String, erase, INT, "position", INT, "chars", varray());
ADDFUNC0(STRING, INT, String, hash, varray());
ADDFUNC0(STRING, STRING, String, md5_text, varray());
ADDFUNC0(STRING, STRING, String, sha256_text, varray());
@ -1560,9 +1560,9 @@ void register_variant_methods() {
ADDFUNC1(ARRAY, NIL, Array, push_back, NIL, "value", varray());
ADDFUNC1(ARRAY, NIL, Array, push_front, NIL, "value", varray());
ADDFUNC1(ARRAY, NIL, Array, append, NIL, "value", varray());
ADDFUNC1(ARRAY, NIL, Array, resize, INT, "pos", varray());
ADDFUNC2(ARRAY, NIL, Array, insert, INT, "pos", NIL, "value", varray());
ADDFUNC1(ARRAY, NIL, Array, remove, INT, "pos", varray());
ADDFUNC1(ARRAY, NIL, Array, resize, INT, "size", varray());
ADDFUNC2(ARRAY, NIL, Array, insert, INT, "position", NIL, "value", varray());
ADDFUNC1(ARRAY, NIL, Array, remove, INT, "position", varray());
ADDFUNC1(ARRAY, NIL, Array, erase, NIL, "value", varray());
ADDFUNC0(ARRAY, NIL, Array, front, varray());
ADDFUNC0(ARRAY, NIL, Array, back, varray());
@ -1728,10 +1728,10 @@ void register_variant_methods() {
_VariantCall::add_constructor(_VariantCall::Vector2_init1, Variant::VECTOR2, "x", Variant::REAL, "y", Variant::REAL);
_VariantCall::add_constructor(_VariantCall::Rect2_init1, Variant::RECT2, "pos", Variant::VECTOR2, "size", Variant::VECTOR2);
_VariantCall::add_constructor(_VariantCall::Rect2_init1, Variant::RECT2, "position", Variant::VECTOR2, "size", Variant::VECTOR2);
_VariantCall::add_constructor(_VariantCall::Rect2_init2, Variant::RECT2, "x", Variant::REAL, "y", Variant::REAL, "width", Variant::REAL, "height", Variant::REAL);
_VariantCall::add_constructor(_VariantCall::Transform2D_init2, Variant::TRANSFORM2D, "rot", Variant::REAL, "pos", Variant::VECTOR2);
_VariantCall::add_constructor(_VariantCall::Transform2D_init2, Variant::TRANSFORM2D, "rotation", Variant::REAL, "position", Variant::VECTOR2);
_VariantCall::add_constructor(_VariantCall::Transform2D_init3, Variant::TRANSFORM2D, "x_axis", Variant::VECTOR2, "y_axis", Variant::VECTOR2, "origin", Variant::VECTOR2);
_VariantCall::add_constructor(_VariantCall::Vector3_init1, Variant::VECTOR3, "x", Variant::REAL, "y", Variant::REAL, "z", Variant::REAL);
@ -1746,7 +1746,7 @@ void register_variant_methods() {
_VariantCall::add_constructor(_VariantCall::Color_init1, Variant::COLOR, "r", Variant::REAL, "g", Variant::REAL, "b", Variant::REAL, "a", Variant::REAL);
_VariantCall::add_constructor(_VariantCall::Color_init2, Variant::COLOR, "r", Variant::REAL, "g", Variant::REAL, "b", Variant::REAL);
_VariantCall::add_constructor(_VariantCall::Rect3_init1, Variant::RECT3, "pos", Variant::VECTOR3, "size", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Rect3_init1, Variant::RECT3, "position", Variant::VECTOR3, "size", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Basis_init1, Variant::BASIS, "x_axis", Variant::VECTOR3, "y_axis", Variant::VECTOR3, "z_axis", Variant::VECTOR3);
_VariantCall::add_constructor(_VariantCall::Basis_init2, Variant::BASIS, "axis", Variant::VECTOR3, "phi", Variant::REAL);

16
doc/classes/AStar.xml
View File

@ -39,7 +39,7 @@
</return>
<argument index="0" name="id" type="int">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<argument index="2" name="weight_scale" type="float" default="1.0">
</argument>
@ -113,19 +113,19 @@
<method name="get_closest_point" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="to_pos" type="Vector3">
<argument index="0" name="to_position" type="Vector3">
</argument>
<description>
Returns the id of the closest point to [code]to_pos[/code]. Returns -1 if there are no points in the points pool.
Returns the id of the closest point to [code]to_position[/code]. Returns -1 if there are no points in the points pool.
</description>
</method>
<method name="get_closest_pos_in_segment" qualifiers="const">
<method name="get_closest_position_in_segment" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="to_pos" type="Vector3">
<argument index="0" name="to_position" type="Vector3">
</argument>
<description>
Returns the closest position to [code]to_pos[/code] that resides inside a segment between two connected points.
Returns the closest position to [code]to_position[/code] that resides inside a segment between two connected points.
[codeblock]
var as = AStar.new()
@ -134,7 +134,7 @@
as.connect_points(1, 2)
var res = as.get_closest_pos_in_segment(Vector3(3,3,0)) # returns (0, 3, 0)
var res = as.get_closest_position_in_segment(Vector3(3,3,0)) # returns (0, 3, 0)
[/codeblock]
The result is in the segment that goes from [code]y=0[/code] to [code]y=5[/code]. It's the closest position in the segment to the given point.
</description>
@ -178,7 +178,7 @@
Returns an array with the points that are in the path found by AStar between the given points. The array is ordered from the starting point to the ending point of the path.
</description>
</method>
<method name="get_point_pos" qualifiers="const">
<method name="get_point_position" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="id" type="int">

6
doc/classes/Animation.xml
View File

@ -17,7 +17,7 @@
</return>
<argument index="0" name="type" type="int" enum="Animation.TrackType">
</argument>
<argument index="1" name="at_pos" type="int" default="-1">
<argument index="1" name="at_position" type="int" default="-1">
</argument>
<description>
Add a track to the Animation. The track type must be specified as any of the values in the TYPE_* enumeration.
@ -281,12 +281,12 @@
Remove a key by index in a given track.
</description>
</method>
<method name="track_remove_key_at_pos">
<method name="track_remove_key_at_position">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="float">
<argument index="1" name="position" type="float">
</argument>
<description>
Remove a key by position (seconds) in a given track.

6
doc/classes/AnimationPlayer.xml
View File

@ -129,7 +129,7 @@
Get the length (in seconds) of the currently being played animation.
</description>
</method>
<method name="get_current_animation_pos" qualifiers="const">
<method name="get_current_animation_position" qualifiers="const">
<return type="float">
</return>
<description>
@ -143,7 +143,7 @@
Return the default blend time between animations.
</description>
</method>
<method name="get_pos" qualifiers="const">
<method name="get_position" qualifiers="const">
<return type="float">
</return>
<description>
@ -245,7 +245,7 @@
<method name="seek">
<return type="void">
</return>
<argument index="0" name="pos_sec" type="float">
<argument index="0" name="seconds" type="float">
</argument>
<argument index="1" name="update" type="bool" default="false">
</argument>

8
doc/classes/AnimationTreePlayer.xml
View File

@ -271,7 +271,7 @@
Return the input source for a given node input.
</description>
</method>
<method name="node_get_pos" qualifiers="const">
<method name="node_get_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="id" type="String">
@ -300,12 +300,12 @@
Rename a node in the graph.
</description>
</method>
<method name="node_set_pos">
<method name="node_set_position">
<return type="void">
</return>
<argument index="0" name="id" type="String">
</argument>
<argument index="1" name="screen_pos" type="Vector2">
<argument index="1" name="screen_position" type="Vector2">
</argument>
<description>
Sets position of a node in the graph given its name and position.
@ -531,7 +531,7 @@
</return>
<argument index="0" name="id" type="String">
</argument>
<argument index="1" name="pos_sec" type="float">
<argument index="1" name="seconds" type="float">
</argument>
<description>
Sets time seek value of a TimeSeek node given its name and value.

6
doc/classes/Array.xml
View File

@ -168,7 +168,7 @@
</description>
</method>
<method name="insert">
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<argument index="1" name="value" type="var">
</argument>
@ -206,14 +206,14 @@
</description>
</method>
<method name="remove">
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Remove an element from the array by index.
</description>
</method>
<method name="resize">
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Resize the array to contain a different number of elements. If the array size is smaller, elements are cleared, if bigger, new elements are Null.

4
doc/classes/AudioServer.xml
View File

@ -14,7 +14,7 @@
<method name="add_bus">
<return type="void">
</return>
<argument index="0" name="at_pos" type="int" default="-1">
<argument index="0" name="at_position" type="int" default="-1">
</argument>
<description>
</description>
@ -26,7 +26,7 @@
</argument>
<argument index="1" name="effect" type="AudioEffect">
</argument>
<argument index="2" name="at_pos" type="int" default="-1">
<argument index="2" name="at_position" type="int" default="-1">
</argument>
<description>
</description>

8
doc/classes/AudioStreamPlayer.xml
View File

@ -23,7 +23,7 @@
<description>
</description>
</method>
<method name="get_pos">
<method name="get_position">
<return type="float">
</return>
<description>
@ -56,16 +56,16 @@
<method name="play">
<return type="void">
</return>
<argument index="0" name="from_pos" type="float" default="0.0">
<argument index="0" name="from_position" type="float" default="0.0">
</argument>
<description>
Plays the audio from the given position 'from_pos', in seconds.
Plays the audio from the given position 'from_position', in seconds.
</description>
</method>
<method name="seek">
<return type="void">
</return>
<argument index="0" name="to_pos" type="float">
<argument index="0" name="to_position" type="float">
</argument>
<description>
Sets the position from which audio will be played, in seconds.

8
doc/classes/AudioStreamPlayer2D.xml
View File

@ -36,7 +36,7 @@
<description>
</description>
</method>
<method name="get_pos">
<method name="get_position">
<return type="float">
</return>
<description>
@ -69,16 +69,16 @@
<method name="play">
<return type="void">
</return>
<argument index="0" name="from_pos" type="float" default="0.0">
<argument index="0" name="from_position" type="float" default="0.0">
</argument>
<description>
Plays the audio from the given position 'from_pos', in seconds.
Plays the audio from the given position 'from_position', in seconds.
</description>
</method>
<method name="seek">
<return type="void">
</return>
<argument index="0" name="to_pos" type="float">
<argument index="0" name="to_position" type="float">
</argument>
<description>
Sets the position from which audio will be played, in seconds.

8
doc/classes/AudioStreamPlayer3D.xml
View File

@ -78,7 +78,7 @@
<description>
</description>
</method>
<method name="get_pos">
<method name="get_position">
<return type="float">
</return>
<description>
@ -123,16 +123,16 @@
<method name="play">
<return type="void">
</return>
<argument index="0" name="from_pos" type="float" default="0.0">
<argument index="0" name="from_position" type="float" default="0.0">
</argument>
<description>
Plays the audio from the given position 'from_pos', in seconds.
Plays the audio from the given position 'from_position', in seconds.
</description>
</method>
<method name="seek">
<return type="void">
</return>
<argument index="0" name="to_pos" type="float">
<argument index="0" name="to_position" type="float">
</argument>
<description>
Sets the position from which audio will be played, in seconds.

4
doc/classes/BitMap.xml
View File

@ -32,7 +32,7 @@
<method name="get_bit" qualifiers="const">
<return type="bool">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Returns bitmap's value at the specified position.
@ -55,7 +55,7 @@
<method name="set_bit">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="bit" type="bool">
</argument>

2
doc/classes/Camera2D.xml
View File

@ -38,7 +38,7 @@
<description>
</description>
</method>
<method name="get_camera_pos" qualifiers="const">
<method name="get_camera_position" qualifiers="const">
<return type="Vector2">
</return>
<description>

14
doc/classes/CanvasItem.xml
View File

@ -27,7 +27,7 @@
</return>
<argument index="0" name="font" type="Font">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="char" type="String">
</argument>
@ -42,7 +42,7 @@
<method name="draw_circle">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="radius" type="float">
</argument>
@ -170,7 +170,7 @@
<method name="draw_set_transform">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="rot" type="float">
</argument>
@ -193,7 +193,7 @@
</return>
<argument index="0" name="font" type="Font">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="text" type="String">
</argument>
@ -221,7 +221,7 @@
</return>
<argument index="0" name="texture" type="Texture">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )">
</argument>
@ -367,7 +367,7 @@
Get this item's light mask number.
</description>
</method>
<method name="get_local_mouse_pos" qualifiers="const">
<method name="get_local_mouse_position" qualifiers="const">
<return type="Vector2">
</return>
<description>
@ -476,7 +476,7 @@
<description>
</description>
</method>
<method name="make_canvas_pos_local" qualifiers="const">
<method name="make_canvas_position_local" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="screen_point" type="Vector2">

4
doc/classes/CollisionObject.xml
View File

@ -16,7 +16,7 @@
</argument>
<argument index="1" name="event" type="InputEvent">
</argument>
<argument index="2" name="click_pos" type="Vector3">
<argument index="2" name="click_position" type="Vector3">
</argument>
<argument index="3" name="click_normal" type="Vector3">
</argument>
@ -209,7 +209,7 @@
</argument>
<argument index="1" name="event" type="Object">
</argument>
<argument index="2" name="click_pos" type="Vector3">
<argument index="2" name="click_position" type="Vector3">
</argument>
<argument index="3" name="click_normal" type="Vector3">
</argument>

20
doc/classes/Control.xml
View File

@ -106,7 +106,7 @@
<method name="can_drop_data" qualifiers="virtual">
<return type="bool">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="data" type="Variant">
</argument>
@ -116,7 +116,7 @@
<method name="drop_data" qualifiers="virtual">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="data" type="Variant">
</argument>
@ -177,7 +177,7 @@
<method name="get_cursor_shape" qualifiers="const">
<return type="int" enum="Control.CursorShape">
</return>
<argument index="0" name="pos" type="Vector2" default="Vector2( 0, 0 )">
<argument index="0" name="position" type="Vector2" default="Vector2( 0, 0 )">
</argument>
<description>
Return the cursor shape at a certain position in the control.
@ -199,7 +199,7 @@
<method name="get_drag_data" qualifiers="virtual">
<return type="Object">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
</description>
@ -390,7 +390,7 @@
<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="at_position" type="Vector2" default="Vector2( 0, 0 )">
</argument>
<description>
Return the tooltip, which will appear when the cursor is resting over this control.
@ -596,7 +596,7 @@
<method name="set_begin">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Sets MARGIN_LEFT and MARGIN_TOP at the same time. This is a helper (see [method set_margin]).
@ -646,7 +646,7 @@
<method name="set_end">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Sets MARGIN_RIGHT and MARGIN_BOTTOM at the same time. This is a helper (see [method set_margin]).
@ -675,7 +675,7 @@
<method name="set_global_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Move the Control to a new position, relative to the top-left corner of the [i]window[/i] Control, and without changing current anchor mode. (see [method set_margin]).
@ -729,7 +729,7 @@
<method name="set_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Move the Control to a new position, relative to the top-left corner of the parent Control, changing all margins if needed and without changing current anchor mode. This is a helper (see [method set_margin]).
@ -826,7 +826,7 @@
<method name="warp_mouse">
<return type="void">
</return>
<argument index="0" name="to_pos" type="Vector2">
<argument index="0" name="to_position" type="Vector2">
</argument>
<description>
</description>

4
doc/classes/Curve.xml
View File

@ -12,7 +12,7 @@
<method name="add_point">
<return type="int">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="left_tangent" type="float" default="0">
</argument>
@ -77,7 +77,7 @@
<description>
</description>
</method>
<method name="get_point_pos" qualifiers="const">
<method name="get_point_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="index" type="int">

18
doc/classes/Curve2D.xml
View File

@ -15,17 +15,17 @@
<method name="add_point">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="in" type="Vector2" default="Vector2( 0, 0 )">
</argument>
<argument index="2" name="out" type="Vector2" default="Vector2( 0, 0 )">
</argument>
<argument index="3" name="atpos" type="int" default="-1">
<argument index="3" name="at_position" type="int" default="-1">
</argument>
<description>
Adds a point to a curve, at position "pos", with control points "in" and "out".
If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
Adds a point to a curve, at "position", with control points "in" and "out".
If "at_position" is given, the point is inserted before the point number "at_position", moving that point (and every point after) after the inserted point. If "at_position" is not given, or is an illegal value (at_position &lt;0 or at_position &gt;= [method get_point_count]), the point will be appended at the end of the point list.
</description>
</method>
<method name="clear_points">
@ -80,7 +80,7 @@
Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0).
</description>
</method>
<method name="get_point_pos" qualifiers="const">
<method name="get_point_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="idx" type="int">
@ -146,7 +146,7 @@
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<description>
Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
@ -157,18 +157,18 @@
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<description>
Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
</description>
</method>
<method name="set_point_pos">
<method name="set_point_position">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<description>
Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.

18
doc/classes/Curve3D.xml
View File

@ -15,17 +15,17 @@
<method name="add_point">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<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>
<argument index="3" name="atpos" type="int" default="-1">
<argument index="3" name="at_position" type="int" default="-1">
</argument>
<description>
Adds a point to a curve, at position "pos", with control points "in" and "out".
If "atpos" is given, the point is inserted before the point number "atpos", moving that point (and every point after) after the inserted point. If "atpos" is not given, or is an illegal value (atpos &lt;0 or atpos &gt;= [method get_point_count]), the point will be appended at the end of the point list.
Adds a point to a curve, at "position", with control points "in" and "out".
If "at_position" is given, the point is inserted before the point number "at_position", moving that point (and every point after) after the inserted point. If "at_position" is not given, or is an illegal value (at_position &lt;0 or at_position &gt;= [method get_point_count]), the point will be appended at the end of the point list.
</description>
</method>
<method name="clear_points">
@ -87,7 +87,7 @@
Returns the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console, and returns (0, 0, 0).
</description>
</method>
<method name="get_point_pos" qualifiers="const">
<method name="get_point_position" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="idx" type="int">
@ -162,7 +162,7 @@
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<description>
Sets the position of the control point leading to the vertex "idx". If the index is out of bounds, the function sends an error to the console.
@ -173,18 +173,18 @@
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<description>
Sets the position of the control point leading out of the vertex "idx". If the index is out of bounds, the function sends an error to the console.
</description>
</method>
<method name="set_point_pos">
<method name="set_point_position">
<return type="void">
</return>
<argument index="0" name="idx" type="int">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<description>
Sets the position for the vertex "idx". If the index is out of bounds, the function sends an error to the console.

6
doc/classes/File.xml
View File

@ -168,7 +168,7 @@
Get a [String] saved in Pascal format from the file.
</description>
</method>
<method name="get_pos" qualifiers="const">
<method name="get_position" qualifiers="const">
<return type="int">
</return>
<description>
@ -258,7 +258,7 @@
<method name="seek">
<return type="void">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Change the file reading/writing cursor to the specified position (in bytes from the beginning of the file).
@ -267,7 +267,7 @@
<method name="seek_end">
<return type="void">
</return>
<argument index="0" name="pos" type="int" default="0">
<argument index="0" name="position" type="int" default="0">
</argument>
<description>
Change the file reading/writing cursor to the specified position (in bytes from the end of the file). Note that this is an offset, so you should use negative numbers or the cursor will be at the end of the file.

8
doc/classes/Font.xml
View File

@ -16,7 +16,7 @@
</return>
<argument index="0" name="canvas_item" type="RID">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="string" type="String">
</argument>
@ -25,7 +25,7 @@
<argument index="4" name="clip_w" type="int" default="-1">
</argument>
<description>
Draw "string" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally 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.
Draw "string" into a canvas item using the font at a given position, with "modulate" color, and optionally clipping the width. "position" specifies the baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis.
</description>
</method>
<method name="draw_char" qualifiers="const">
@ -33,7 +33,7 @@
</return>
<argument index="0" name="canvas_item" type="RID">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="char" type="int">
</argument>
@ -42,7 +42,7 @@
<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.
Draw character "char" into a canvas item using the font at a given position, with "modulate" color, and optionally kerning if "next" is passed. clipping the width. "position" 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.
</description>
</method>
<method name="get_ascent" qualifiers="const">

6
doc/classes/Geometry.xml
View File

@ -176,7 +176,7 @@
</argument>
<argument index="1" name="segment_to" type="Vector2">
</argument>
<argument index="2" name="circle_pos" type="Vector2">
<argument index="2" name="circle_position" type="Vector2">
</argument>
<argument index="3" name="circle_radius" type="float">
</argument>
@ -230,9 +230,9 @@
</argument>
<argument index="1" name="to" type="Vector3">
</argument>
<argument index="2" name="spos" type="Vector3">
<argument index="2" name="sphere_position" type="Vector3">
</argument>
<argument index="3" name="sradius" type="float">
<argument index="3" name="sphere_radius" type="float">
</argument>
<description>
</description>

4
doc/classes/GraphEdit.xml
View File

@ -177,7 +177,7 @@
</argument>
<argument index="1" name="from_slot" type="int">
</argument>
<argument index="2" name="release_pos" type="Vector2">
<argument index="2" name="release_position" type="Vector2">
</argument>
<description>
</description>
@ -230,7 +230,7 @@
<theme_items>
<theme_item name="bezier_len_neg" type="int">
</theme_item>
<theme_item name="bezier_len_pos" type="int">
<theme_item name="bezier_len_position" type="int">
</theme_item>
<theme_item name="bg" type="StyleBox">
</theme_item>

4
doc/classes/GraphNode.xml
View File

@ -43,7 +43,7 @@
Return the number of enabled input slots (connections) to the GraphNode.
</description>
</method>
<method name="get_connection_input_pos">
<method name="get_connection_input_position">
<return type="Vector2">
</return>
<argument index="0" name="idx" type="int">
@ -77,7 +77,7 @@
Return the number of enabled output slots (connections) of the GraphNode.
</description>
</method>
<method name="get_connection_output_pos">
<method name="get_connection_output_position">
<return type="Vector2">
</return>
<argument index="0" name="idx" type="int">

2
doc/classes/ImmediateGeometry.xml
View File

@ -28,7 +28,7 @@
<method name="add_vertex">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<description>
Add a vertex with the currently set color/uv/etc.

2
doc/classes/Input.xml
View File

@ -298,7 +298,7 @@
Stops the vibration of the joypad.
</description>
</method>
<method name="warp_mouse_pos">
<method name="warp_mouse_position">
<return type="void">
</return>
<argument index="0" name="to" type="Vector2">

2
doc/classes/InputEventScreenTouch.xml
View File

@ -33,7 +33,7 @@
<method name="set_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
</description>

6
doc/classes/ItemList.xml
View File

@ -85,10 +85,10 @@
<description>
</description>
</method>
<method name="get_item_at_pos" qualifiers="const">
<method name="get_item_at_position" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="exact" type="bool" default="false">
</argument>
@ -490,7 +490,7 @@
<signal name="item_rmb_selected">
<argument index="0" name="index" type="int">
</argument>
<argument index="1" name="atpos" type="Vector2">
<argument index="1" name="at_position" type="Vector2">
</argument>
<description>
Fired when specified list item has been selected via right mouse clicking.

8
doc/classes/Line2D.xml
View File

@ -14,7 +14,7 @@
<method name="add_point">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Add a point at the x/y position in the supplied [Vector2]
@ -56,7 +56,7 @@
<description>
</description>
</method>
<method name="get_point_pos" qualifiers="const">
<method name="get_point_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="i" type="int">
@ -149,12 +149,12 @@
<description>
</description>
</method>
<method name="set_point_pos">
<method name="set_point_position">
<return type="void">
</return>
<argument index="0" name="i" type="int">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<description>
</description>

6
doc/classes/LineEdit.xml
View File

@ -66,7 +66,7 @@
Return the align mode of the [LineEdit].
</description>
</method>
<method name="get_cursor_pos" qualifiers="const">
<method name="get_cursor_position" qualifiers="const">
<return type="int">
</return>
<description>
@ -169,10 +169,10 @@
Set text alignment of the [LineEdit].
</description>
</method>
<method name="set_cursor_pos">
<method name="set_cursor_position">
<return type="void">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Set the cursor position inside the [LineEdit], causing it to scroll if needed.

2
doc/classes/Node.xml
View File

@ -441,7 +441,7 @@
</return>
<argument index="0" name="child_node" type="Node">
</argument>
<argument index="1" name="to_pos" type="int">
<argument index="1" name="to_position" type="int">
</argument>
<description>
Move a child node to a different position (order) amongst the other children. Since calls, signals, etc are performed by tree order, changing the order of children nodes may be useful.

4
doc/classes/Node2D.xml
View File

@ -169,7 +169,7 @@
<method name="set_global_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Set the node's global position.
@ -214,7 +214,7 @@
<method name="set_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Set the node's position.

6
doc/classes/Physics2DDirectBodyState.xml
View File

@ -45,7 +45,7 @@
Return the collider object, this depends on how it was created (will return a scene node if such was used to create it).
</description>
</method>
<method name="get_contact_collider_pos" qualifiers="const">
<method name="get_contact_collider_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="contact_idx" type="int">
@ -72,7 +72,7 @@
Return the metadata of the collided shape. This metadata is different from [method Object.get_meta], and is set with [method Physics2DServer.shape_set_data].
</description>
</method>
<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
<method name="get_contact_collider_velocity_at_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="contact_idx" type="int">
@ -97,7 +97,7 @@
Return the local normal (of this body) of the contact point.
</description>
</method>
<method name="get_contact_local_pos" qualifiers="const">
<method name="get_contact_local_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="contact_idx" type="int">

2
doc/classes/Physics2DServer.xml
View File

@ -306,7 +306,7 @@
</return>
<argument index="0" name="body" type="RID">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="impulse" type="Vector2">
</argument>

10
doc/classes/PhysicsDirectBodyState.xml
View File

@ -14,7 +14,7 @@
</return>
<argument index="0" name="force" type="Vector3">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<description>
</description>
@ -22,7 +22,7 @@
<method name="apply_impulse">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<argument index="1" name="j" type="Vector3">
</argument>
@ -73,7 +73,7 @@
<description>
</description>
</method>
<method name="get_contact_collider_pos" qualifiers="const">
<method name="get_contact_collider_position" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="contact_idx" type="int">
@ -89,7 +89,7 @@
<description>
</description>
</method>
<method name="get_contact_collider_velocity_at_pos" qualifiers="const">
<method name="get_contact_collider_velocity_at_position" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="contact_idx" type="int">
@ -111,7 +111,7 @@
<description>
</description>
</method>
<method name="get_contact_local_pos" qualifiers="const">
<method name="get_contact_local_position" qualifiers="const">
<return type="Vector3">
</return>
<argument index="0" name="contact_idx" type="int">

2
doc/classes/PhysicsServer.xml
View File

@ -268,7 +268,7 @@
</return>
<argument index="0" name="body" type="RID">
</argument>
<argument index="1" name="pos" type="Vector3">
<argument index="1" name="position" type="Vector3">
</argument>
<argument index="2" name="impulse" type="Vector3">
</argument>

2
doc/classes/ProjectSettings.xml
View File

@ -147,7 +147,7 @@
</return>
<argument index="0" name="name" type="String">
</argument>
<argument index="1" name="pos" type="int">
<argument index="1" name="position" type="int">
</argument>
<description>
Set the order of a configuration value (influences when saved to the config file).

2
doc/classes/Rect2.xml
View File

@ -14,7 +14,7 @@
<method name="Rect2">
<return type="Rect2">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="size" type="Vector2">
</argument>

2
doc/classes/Rect3.xml
View File

@ -14,7 +14,7 @@
<method name="Rect3">
<return type="Rect3">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<argument index="1" name="size" type="Vector3">
</argument>

2
doc/classes/RigidBody.xml
View File

@ -27,7 +27,7 @@
<method name="apply_impulse">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<argument index="1" name="impulse" type="Vector3">
</argument>

4
doc/classes/Spatial.xml
View File

@ -145,10 +145,10 @@
Rotates itself to point into direction of target position. Operations take place in global space.
</description>
</method>
<method name="look_at_from_pos">
<method name="look_at_from_position">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector3">
<argument index="0" name="position" type="Vector3">
</argument>
<argument index="1" name="target" type="Vector3">
</argument>

2
doc/classes/SpriteFrames.xml
View File

@ -26,7 +26,7 @@
</argument>
<argument index="1" name="frame" type="Texture">
</argument>
<argument index="2" name="atpos" type="int" default="-1">
<argument index="2" name="at_position" type="int" default="-1">
</argument>
<description>
</description>

4
doc/classes/StreamPeerBuffer.xml
View File

@ -27,7 +27,7 @@
<description>
</description>
</method>
<method name="get_pos" qualifiers="const">
<method name="get_position" qualifiers="const">
<return type="int">
</return>
<description>
@ -50,7 +50,7 @@
<method name="seek">
<return type="void">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
</description>

10
doc/classes/String.xml
View File

@ -266,12 +266,12 @@
</description>
</method>
<method name="erase">
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<argument index="1" name="chars" type="int">
</argument>
<description>
Erase [code]chars[/code] characters from the string starting from [code]pos[/code].
Erase [code]chars[/code] characters from the string starting from [code]position[/code].
</description>
</method>
<method name="find">
@ -360,7 +360,7 @@
<method name="insert">
<return type="String">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<argument index="1" name="what" type="String">
</argument>
@ -445,7 +445,7 @@
<method name="left">
<return type="String">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Return an amount of characters from the left of the string.
@ -596,7 +596,7 @@
<method name="right">
<return type="String">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Return the right side of the string from a given position.

2
doc/classes/Texture.xml
View File

@ -16,7 +16,7 @@
</return>
<argument index="0" name="canvas_item" type="RID">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<argument index="2" name="modulate" type="Color" default="Color( 1, 1, 1, 1 )">
</argument>

8
doc/classes/TileMap.xml
View File

@ -39,7 +39,7 @@
<method name="get_cellv" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Return the tile index of the cell referenced by a Vector2.
@ -222,7 +222,7 @@
<method name="map_to_world" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="mappos" type="Vector2">
<argument index="0" name="map_position" type="Vector2">
</argument>
<argument index="1" name="ignore_half_ofs" type="bool" default="false">
</argument>
@ -264,7 +264,7 @@
<method name="set_cellv">
<return type="void">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<argument index="1" name="tile" type="int">
</argument>
@ -442,7 +442,7 @@
<method name="world_to_map" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="worldpos" type="Vector2">
<argument index="0" name="world_position" type="Vector2">
</argument>
<description>
Return the tilemap (grid-based) coordinates corresponding to the absolute world position given as an argument.

2
doc/classes/Transform2D.xml
View File

@ -38,7 +38,7 @@
</return>
<argument index="0" name="rot" type="float">
</argument>
<argument index="1" name="pos" type="Vector2">
<argument index="1" name="position" type="Vector2">
</argument>
<description>
Constructs the [Transform2D] from rotation angle in radians and position [Vector2].

16
doc/classes/Tree.xml
View File

@ -65,10 +65,10 @@
Get whether a right click can select items.
</description>
</method>
<method name="get_column_at_pos" qualifiers="const">
<method name="get_column_at_position" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Get the column index under the given point.
@ -113,10 +113,10 @@
Get the flags of the current drop mode.
</description>
</method>
<method name="get_drop_section_at_pos" qualifiers="const">
<method name="get_drop_section_at_position" qualifiers="const">
<return type="int">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
</description>
@ -146,10 +146,10 @@
Get the rectangle area of the the specified item. If column is specified, only get the position and size of that column, otherwise get the rectangle containing all columns.
</description>
</method>
<method name="get_item_at_pos" qualifiers="const">
<method name="get_item_at_position" qualifiers="const">
<return type="TreeItem">
</return>
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Get the tree item at the specified position (relative to the tree origin position).
@ -342,7 +342,7 @@
</description>
</signal>
<signal name="empty_tree_rmb_selected">
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Emitted when the right mouse button is pressed if RMB selection is active and the tree is empty.
@ -378,7 +378,7 @@
</description>
</signal>
<signal name="item_rmb_selected">
<argument index="0" name="pos" type="Vector2">
<argument index="0" name="position" type="Vector2">
</argument>
<description>
Emitted when an item is selected with right mouse button.

2
doc/classes/Tween.xml
View File

@ -8,7 +8,7 @@
Because it is easy to get it wrong, here is a quick usage example:
[codeblock]
var tween = get_node("Tween")
tween.interpolate_property(get_node("Node2D_to_move"), "transform/pos", Vector2(0,0), Vector2(100,100), 1, Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
tween.interpolate_property(get_node("Node2D_to_move"), "transform/origin", Vector2(0,0), Vector2(100,100), 1, Tween.TRANS_LINEAR, Tween.EASE_IN_OUT)
tween.start()
[/codeblock]
Some of the methods of this class require a property name. You can get the property name by hovering over the property in the inspector of the editor.

2
doc/classes/VideoPlayer.xml
View File

@ -39,7 +39,7 @@
Get the name of the video stream.
</description>
</method>
<method name="get_stream_pos" qualifiers="const">
<method name="get_stream_position" qualifiers="const">
<return type="float">
</return>
<description>

2
doc/classes/Viewport.xml
View File

@ -528,7 +528,7 @@
<method name="warp_mouse">
<return type="void">
</return>
<argument index="0" name="to_pos" type="Vector2">
<argument index="0" name="to_position" type="Vector2">
</argument>
<description>
Warp the mouse to a position, relative to the viewport.

8
doc/classes/VisualScript.xml
View File

@ -34,7 +34,7 @@
</argument>
<argument index="2" name="node" type="VisualScriptNode">
</argument>
<argument index="3" name="pos" type="Vector2" default="Vector2( 0, 0 )">
<argument index="3" name="position" type="Vector2" default="Vector2( 0, 0 )">
</argument>
<description>
</description>
@ -197,7 +197,7 @@
<description>
</description>
</method>
<method name="get_node_pos" qualifiers="const">
<method name="get_node_position" qualifiers="const">
<return type="Vector2">
</return>
<argument index="0" name="func" type="String">
@ -405,14 +405,14 @@
<description>
</description>
</method>
<method name="set_node_pos">
<method name="set_node_position">
<return type="void">
</return>
<argument index="0" name="func" type="String">
</argument>
<argument index="1" name="id" type="int">
</argument>
<argument index="2" name="pos" type="Vector2">
<argument index="2" name="position" type="Vector2">
</argument>
<description>
</description>

2
doc/classes/XMLParser.xml
View File

@ -133,7 +133,7 @@
<method name="seek">
<return type="int" enum="Error">
</return>
<argument index="0" name="pos" type="int">
<argument index="0" name="position" type="int">
</argument>
<description>
Move the buffer cursor to a certain offset (since the beginning) and read the next node there. This returns an error code.

2
drivers/unix/file_access_unix.cpp
View File

@ -168,7 +168,7 @@ void FileAccessUnix::seek_end(int64_t p_position) {
check_errors();
}
size_t FileAccessUnix::get_pos() const {
size_t FileAccessUnix::get_position() const {
ERR_FAIL_COND_V(!f, 0);

2
drivers/unix/file_access_unix.h
View File

@ -62,7 +62,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

6
drivers/windows/file_access_windows.cpp
View File

@ -156,7 +156,7 @@ void FileAccessWindows::seek_end(int64_t p_position) {
if (fseek(f, p_position, SEEK_END))
check_errors();
}
size_t FileAccessWindows::get_pos() const {
size_t FileAccessWindows::get_position() const {
size_t aux_position = 0;
aux_position = ftell(f);
@ -169,9 +169,9 @@ size_t FileAccessWindows::get_len() const {
ERR_FAIL_COND_V(!f, 0);
size_t pos = get_pos();
size_t pos = get_position();
fseek(f, 0, SEEK_END);
int size = get_pos();
int size = get_position();
fseek(f, pos, SEEK_SET);
return size;

2
drivers/windows/file_access_windows.h
View File

@ -54,7 +54,7 @@ public:
virtual void seek(size_t p_position); ///< seek to a given position
virtual void seek_end(int64_t p_position = 0); ///< seek from the end of file
virtual size_t get_pos() const; ///< get position in the file
virtual size_t get_position() const; ///< get position in the file
virtual size_t get_len() const; ///< get size of the file
virtual bool eof_reached() const; ///< reading passed EOF

46
editor/animation_editor.cpp
View File

@ -322,7 +322,7 @@ public:
undo_redo->add_do_method(animation.ptr(), "track_remove_key", track, key);
undo_redo->add_do_method(animation.ptr(), "track_insert_key", track, new_time, val, trans);
undo_redo->add_do_method(this, "_key_ofs_changed", animation, key_ofs, new_time);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", track, new_time);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", track, new_time);
undo_redo->add_undo_method(animation.ptr(), "track_insert_key", track, key_ofs, val, trans);
undo_redo->add_undo_method(this, "_key_ofs_changed", animation, new_time, key_ofs);
@ -563,8 +563,8 @@ public:
case Animation::TYPE_TRANSFORM: {
p_list->push_back(PropertyInfo(Variant::VECTOR3, "loc"));
p_list->push_back(PropertyInfo(Variant::QUAT, "rot"));
p_list->push_back(PropertyInfo(Variant::VECTOR3, "location"));
p_list->push_back(PropertyInfo(Variant::QUAT, "rotation"));
p_list->push_back(PropertyInfo(Variant::VECTOR3, "scale"));
} break;
@ -719,7 +719,7 @@ void AnimationKeyEditor::_anim_duplicate_keys(bool transpose) {
int existing_idx = animation->track_find_key(dst_track, dst_time, true);
undo_redo->add_do_method(animation.ptr(), "track_insert_key", dst_track, dst_time, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key));
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", dst_track, dst_time);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", dst_track, dst_time);
Pair<int, float> p;
p.first = dst_track;
@ -1016,7 +1016,7 @@ float AnimationKeyEditor::_get_zoom_scale() const {
}
}
void AnimationKeyEditor::_track_pos_draw() {
void AnimationKeyEditor::_track_position_draw() {
if (!animation.is_valid()) {
return;
@ -2301,8 +2301,8 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
if (tt == Animation::TYPE_TRANSFORM) {
Dictionary d;
d["loc"] = Vector3();
d["rot"] = Quat();
d["location"] = Vector3();
d["rotation"] = Quat();
d["scale"] = Vector3();
newval = d;
@ -2337,7 +2337,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
undo_redo->create_action(TTR("Anim Add Key"));
undo_redo->add_do_method(animation.ptr(), "track_insert_key", idx, pos, newval, 1);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", idx, pos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", idx, pos);
if (existing != -1) {
Variant v = animation->track_get_key_value(idx, existing);
@ -2506,7 +2506,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
if (selection.has(sk))
continue; //already in selection, don't save
undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_pos", E->key().track, newtime);
undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_position", E->key().track, newtime);
_AnimMoveRestore amr;
amr.key = animation->track_get_key_value(E->key().track, idx);
@ -2536,7 +2536,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
if (newpos<0)
continue; //no remove what no inserted
*/
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", E->key().track, newpos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", E->key().track, newpos);
}
// 5-(undo) reinsert keys
@ -2753,10 +2753,10 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
case Animation::TYPE_TRANSFORM: {
Dictionary d = animation->track_get_key_value(idx, mouse_over.over_key);
if (d.has("loc"))
text += "loc: " + String(d["loc"]) + "\n";
if (d.has("rot"))
text += "rot: " + String(d["rot"]) + "\n";
if (d.has("location"))
text += "location: " + String(d["location"]) + "\n";
if (d.has("rotation"))
text += "rot: " + String(d["rotation"]) + "\n";
if (d.has("scale"))
text += "scale: " + String(d["scale"]) + "\n";
} break;
@ -3359,9 +3359,9 @@ int AnimationKeyEditor::_confirm_insert(InsertData p_id, int p_last_track) {
Transform tr = p_id.value;
Dictionary d;
d["loc"] = tr.origin;
d["location"] = tr.origin;
d["scale"] = tr.basis.get_scale();
d["rot"] = Quat(tr.basis); //.orthonormalized();
d["rotation"] = Quat(tr.basis); //.orthonormalized();
value = d;
} break;
default: {}
@ -3376,7 +3376,7 @@ int AnimationKeyEditor::_confirm_insert(InsertData p_id, int p_last_track) {
p_last_track++;
} else {
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", p_id.track_idx, time);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", p_id.track_idx, time);
int existing = animation->track_find_key(p_id.track_idx, time, true);
if (existing != -1) {
Variant v = animation->track_get_key_value(p_id.track_idx, existing);
@ -3451,7 +3451,7 @@ void AnimationKeyEditor::_create_value_item(int p_type) {
Variant::CallError ce;
Variant v = Variant::construct(Variant::Type(p_type), NULL, 0, ce);
undo_redo->add_do_method(animation.ptr(), "track_insert_key", cvi_track, cvi_pos, v);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", cvi_track, cvi_pos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", cvi_track, cvi_pos);
int existing = animation->track_find_key(cvi_track, cvi_pos, true);
@ -3586,7 +3586,7 @@ void AnimationKeyEditor::_scale() {
if (selection.has(sk))
continue; //already in selection, don't save
undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_pos", E->key().track, newtime);
undo_redo->add_do_method(animation.ptr(), "track_remove_key_at_position", E->key().track, newtime);
_AnimMoveRestore amr;
amr.key = animation->track_get_key_value(E->key().track, idx);
@ -3609,7 +3609,7 @@ void AnimationKeyEditor::_scale() {
for (Map<SelectedKey, KeyInfo>::Element *E = selection.back(); E; E = E->prev()) {
float newpos = _NEW_POS(E->get().pos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_pos", E->key().track, newpos);
undo_redo->add_undo_method(animation.ptr(), "track_remove_key_at_position", E->key().track, newpos);
}
// 5-(undo) reinsert keys
@ -3696,7 +3696,7 @@ void AnimationKeyEditor::_bind_methods() {
ClassDB::bind_method(D_METHOD("_menu_track"), &AnimationKeyEditor::_menu_track);
ClassDB::bind_method(D_METHOD("_clear_selection_for_anim"), &AnimationKeyEditor::_clear_selection_for_anim);
ClassDB::bind_method(D_METHOD("_select_at_anim"), &AnimationKeyEditor::_select_at_anim);
ClassDB::bind_method(D_METHOD("_track_pos_draw"), &AnimationKeyEditor::_track_pos_draw);
ClassDB::bind_method(D_METHOD("_track_position_draw"), &AnimationKeyEditor::_track_position_draw);
ClassDB::bind_method(D_METHOD("_insert_delay"), &AnimationKeyEditor::_insert_delay);
ClassDB::bind_method(D_METHOD("_step_changed"), &AnimationKeyEditor::_step_changed);
@ -3715,7 +3715,7 @@ void AnimationKeyEditor::_bind_methods() {
ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "res"), PropertyInfo(Variant::STRING, "prop")));
ADD_SIGNAL(MethodInfo("keying_changed"));
ADD_SIGNAL(MethodInfo("timeline_changed", PropertyInfo(Variant::REAL, "pos"), PropertyInfo(Variant::BOOL, "drag")));
ADD_SIGNAL(MethodInfo("timeline_changed", PropertyInfo(Variant::REAL, "position"), PropertyInfo(Variant::BOOL, "drag")));
ADD_SIGNAL(MethodInfo("animation_len_changed", PropertyInfo(Variant::REAL, "len")));
ADD_SIGNAL(MethodInfo("animation_step_changed", PropertyInfo(Variant::REAL, "step")));
ADD_SIGNAL(MethodInfo("key_edited", PropertyInfo(Variant::INT, "track"), PropertyInfo(Variant::INT, "key")));
@ -3915,7 +3915,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
track_pos->set_area_as_parent_rect();
track_pos->set_mouse_filter(MOUSE_FILTER_IGNORE);
track_editor->add_child(track_pos);
track_pos->connect("draw", this, "_track_pos_draw");
track_pos->connect("draw", this, "_track_position_draw");
select_anim_warning = memnew(Label);
track_editor->add_child(select_anim_warning);

2
editor/animation_editor.h
View File

@ -273,7 +273,7 @@ class AnimationKeyEditor : public VBoxContainer {
void _track_editor_draw();
void _track_editor_gui_input(const Ref<InputEvent> &p_input);
void _track_pos_draw();
void _track_position_draw();
void _track_name_changed(const String &p_name);
void _track_menu_selected(int p_idx);

2
editor/code_editor.cpp
View File

@ -367,7 +367,7 @@ void FindReplaceBar::_show_search() {
if (!get_search_text().empty()) {
search_text->select_all();
search_text->set_cursor_pos(search_text->get_text().length());
search_text->set_cursor_position(search_text->get_text().length());
search_current();
}
}

6
editor/create_dialog.cpp
View File

@ -513,7 +513,7 @@ void CreateDialog::_favorite_activated() {
Variant CreateDialog::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
TreeItem *ti = favorites->get_item_at_pos(p_point);
TreeItem *ti = favorites->get_item_at_position(p_point);
if (ti) {
Dictionary d;
d["type"] = "create_favorite_drag";
@ -544,12 +544,12 @@ void CreateDialog::drop_data_fw(const Point2 &p_point, const Variant &p_data, Co
Dictionary d = p_data;
TreeItem *ti = favorites->get_item_at_pos(p_point);
TreeItem *ti = favorites->get_item_at_position(p_point);
if (!ti)
return;
String drop_at = ti->get_text(0);
int ds = favorites->get_drop_section_at_pos(p_point);
int ds = favorites->get_drop_section_at_position(p_point);
int drop_idx = favorite_list.find(drop_at);
if (drop_idx < 0)

8
editor/editor_audio_buses.cpp
View File

@ -459,7 +459,7 @@ void EditorAudioBus::drop_data(const Point2 &p_point, const Variant &p_data) {
Variant EditorAudioBus::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
print_line("drag fw");
TreeItem *item = effects->get_item_at_pos(p_point);
TreeItem *item = effects->get_item_at_position(p_point);
if (!item) {
print_line("no item");
return Variant();
@ -489,7 +489,7 @@ bool EditorAudioBus::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
if (!d.has("type") || String(d["type"]) != "audio_bus_effect")
return false;
TreeItem *item = effects->get_item_at_pos(p_point);
TreeItem *item = effects->get_item_at_position(p_point);
if (!item)
return false;
@ -502,10 +502,10 @@ void EditorAudioBus::drop_data_fw(const Point2 &p_point, const Variant &p_data,
Dictionary d = p_data;
TreeItem *item = effects->get_item_at_pos(p_point);
TreeItem *item = effects->get_item_at_position(p_point);
if (!item)
return;
int pos = effects->get_drop_section_at_pos(p_point);
int pos = effects->get_drop_section_at_position(p_point);
Variant md = item->get_metadata(0);
int paste_at;

8
editor/editor_autoload_settings.cpp
View File

@ -419,12 +419,12 @@ bool EditorAutoloadSettings::can_drop_data_fw(const Point2 &p_point, const Varia
return false;
if (drop_data.has("type")) {
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return false;
int section = tree->get_drop_section_at_pos(p_point);
int section = tree->get_drop_section_at_position(p_point);
if (section < -1)
return false;
@ -437,12 +437,12 @@ bool EditorAutoloadSettings::can_drop_data_fw(const Point2 &p_point, const Varia
void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_control) {
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return;
int section = tree->get_drop_section_at_pos(p_point);
int section = tree->get_drop_section_at_position(p_point);
if (section < -1)
return;

4
editor/editor_export.cpp
View File

@ -278,7 +278,7 @@ Error EditorExportPlatform::_save_pack_file(void *p_userdata, const String &p_pa
SavedData sd;
sd.path_utf8 = p_path.utf8();
sd.ofs = pd->f->get_pos();
sd.ofs = pd->f->get_position();
sd.size = p_data.size();
pd->f->store_buffer(p_data.ptr(), p_data.size());
@ -736,7 +736,7 @@ Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, c
f->store_32(pd.file_ofs.size()); //amount of files
size_t header_size = f->get_pos();
size_t header_size = f->get_position();
//precalculate header size

20
editor/filesystem_dock.cpp
View File

@ -1258,11 +1258,11 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
if (drag_data.has("type") && String(drag_data["type"]) == "favorite") {
//moving favorite around
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return false;
int what = tree->get_drop_section_at_pos(p_point);
int what = tree->get_drop_section_at_position(p_point);
if (ti == tree->get_root()->get_children()) {
return (what == 1); //the parent, first fav
@ -1288,7 +1288,7 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
if (p_from == files) {
int at_pos = files->get_item_at_pos(p_point);
int at_pos = files->get_item_at_position(p_point);
if (at_pos != -1) {
String dir = files->get_item_metadata(at_pos);
@ -1299,7 +1299,7 @@ bool FileSystemDock::can_drop_data_fw(const Point2 &p_point, const Variant &p_da
if (p_from == tree) {
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return false;
String path = ti->get_metadata(0);
@ -1323,7 +1323,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (drag_data.has("type") && String(drag_data["type"]) == "favorite") {
//moving favorite around
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return;
@ -1336,7 +1336,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
swap = swap.substr(0, swap.length() - 1);
}
int what = tree->get_drop_section_at_pos(p_point);
int what = tree->get_drop_section_at_position(p_point);
TreeItem *swap_item = NULL;
@ -1391,7 +1391,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (p_from == tree) {
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return;
String path = ti->get_metadata(0);
@ -1406,7 +1406,7 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (p_from == files) {
String save_path = path;
int at_pos = files->get_item_at_pos(p_point);
int at_pos = files->get_item_at_position(p_point);
if (at_pos != -1) {
String to_dir = files->get_item_metadata(at_pos);
if (to_dir.ends_with("/")) {
@ -1429,11 +1429,11 @@ void FileSystemDock::drop_data_fw(const Point2 &p_point, const Variant &p_data,
if (p_from == files) {
int at_pos = files->get_item_at_pos(p_point);
int at_pos = files->get_item_at_position(p_point);
ERR_FAIL_COND(at_pos == -1);
to_dir = files->get_item_metadata(at_pos);
} else {
TreeItem *ti = tree->get_item_at_pos(p_point);
TreeItem *ti = tree->get_item_at_position(p_point);
if (!ti)
return;
to_dir = ti->get_metadata(0);

2
editor/import/resource_importer_wav.cpp
View File

@ -141,7 +141,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s
/* chunk size */
uint32_t chunksize = file->get_32();
uint32_t file_pos = file->get_pos(); //save file pos, so we can skip to next chunk safely
uint32_t file_pos = file->get_position(); //save file pos, so we can skip to next chunk safely
if (file->eof_reached()) {

12
editor/plugins/animation_player_editor_plugin.cpp
View File

@ -76,14 +76,14 @@ void AnimationPlayerEditor::_notification(int p_what) {
}
}
}
frame->set_value(player->get_current_animation_pos());
key_editor->set_anim_pos(player->get_current_animation_pos());
frame->set_value(player->get_current_animation_position());
key_editor->set_anim_pos(player->get_current_animation_position());
EditorNode::get_singleton()->get_property_editor()->refresh();
} else if (last_active) {
//need the last frame after it stopped
frame->set_value(player->get_current_animation_pos());
frame->set_value(player->get_current_animation_position());
}
last_active = player->is_playing();
@ -197,7 +197,7 @@ void AnimationPlayerEditor::_play_from_pressed() {
if (current != "") {
float time = player->get_current_animation_pos();
float time = player->get_current_animation_position();
if (current == player->get_current_animation() && player->is_playing()) {
@ -245,7 +245,7 @@ void AnimationPlayerEditor::_play_bw_from_pressed() {
if (current != "") {
float time = player->get_current_animation_pos();
float time = player->get_current_animation_position();
if (current == player->get_current_animation())
player->stop(); //so it wont blend with itself
@ -944,7 +944,7 @@ void AnimationPlayerEditor::_seek_value_changed(float p_value, bool p_set) {
}
if (player->is_valid() && !p_set) {
float cpos = player->get_current_animation_pos();
float cpos = player->get_current_animation_position();
player->seek_delta(pos, pos - cpos);
} else {

16
editor/plugins/animation_tree_editor_plugin.cpp
View File

@ -63,7 +63,7 @@ Size2 AnimationTreeEditor::_get_maximum_size() {
for (List<StringName>::Element *E = order.front(); E; E = E->next()) {
Point2 pos = anim_tree->node_get_pos(E->get());
Point2 pos = anim_tree->node_get_position(E->get());
if (click_type == CLICK_NODE && click_node == E->get()) {
@ -257,7 +257,7 @@ void AnimationTreeEditor::_popup_edit_dialog() {
filter_button->hide();
edit_check->hide();
Point2 pos = anim_tree->node_get_pos(edited_node) - Point2(h_scroll->get_value(), v_scroll->get_value());
Point2 pos = anim_tree->node_get_position(edited_node) - Point2(h_scroll->get_value(), v_scroll->get_value());
Ref<StyleBox> style = get_stylebox("panel", "PopupMenu");
Size2 size = get_node_size(edited_node);
Point2 popup_pos(pos.x + style->get_margin(MARGIN_LEFT), pos.y + size.y - style->get_margin(MARGIN_BOTTOM));
@ -479,7 +479,7 @@ void AnimationTreeEditor::_draw_node(const StringName &p_node) {
Ref<Texture> slot_icon = get_icon("VisualShaderPort", "EditorIcons");
Size2 size = get_node_size(p_node);
Point2 pos = anim_tree->node_get_pos(p_node);
Point2 pos = anim_tree->node_get_position(p_node);
if (click_type == CLICK_NODE && click_node == p_node) {
pos += click_motion - click_pos;
@ -618,7 +618,7 @@ AnimationTreeEditor::ClickType AnimationTreeEditor::_locate_click(const Point2 &
AnimationTreePlayer::NodeType type = anim_tree->node_get_type(node);
Point2 pos = anim_tree->node_get_pos(node);
Point2 pos = anim_tree->node_get_position(node);
Size2 size = get_node_size(node);
pos -= Point2(h_scroll->get_value(), v_scroll->get_value());
@ -674,7 +674,7 @@ Point2 AnimationTreeEditor::_get_slot_pos(const StringName &p_node_id, bool p_in
Ref<Texture> slot_icon = get_icon("VisualShaderPort", "EditorIcons");
Size2 size = get_node_size(p_node_id);
Point2 pos = anim_tree->node_get_pos(p_node_id);
Point2 pos = anim_tree->node_get_position(p_node_id);
if (click_type == CLICK_NODE && click_node == p_node_id) {
@ -806,12 +806,12 @@ void AnimationTreeEditor::_gui_input(Ref<InputEvent> p_event) {
} break;
case CLICK_NODE: {
Point2 new_pos = anim_tree->node_get_pos(click_node) + (click_motion - click_pos);
Point2 new_pos = anim_tree->node_get_position(click_node) + (click_motion - click_pos);
if (new_pos.x < 5)
new_pos.x = 5;
if (new_pos.y < 5)
new_pos.y = 5;
anim_tree->node_set_pos(click_node, new_pos);
anim_tree->node_set_position(click_node, new_pos);
} break;
default: {}
@ -1081,7 +1081,7 @@ StringName AnimationTreeEditor::_add_node(int p_item) {
}
anim_tree->add_node((AnimationTreePlayer::NodeType)p_item, name);
anim_tree->node_set_pos(name, Point2(last_x, last_y));
anim_tree->node_set_position(name, Point2(last_x, last_y));
order.push_back(name);
last_x += 10;
last_y += 10;

10
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -368,7 +368,7 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
} else if (set_pivot_shortcut.is_valid() && set_pivot_shortcut->is_shortcut(p_ev) && drag == DRAG_NONE && can_move_pivot) {
if (!Input::get_singleton()->is_mouse_button_pressed(0)) {
List<Node *> &selection = editor_selection->get_selected_node_list();
Vector2 mouse_pos = viewport->get_local_mouse_pos();
Vector2 mouse_pos = viewport->get_local_mouse_position();
if (selection.size() && viewport->get_rect().has_point(mouse_pos)) {
//just in case, make it work if over viewport
mouse_pos = transform.affine_inverse().xform(mouse_pos);
@ -4188,13 +4188,13 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String &
pos = parent->call("get_global_position");
}
Transform2D trans = canvas->get_canvas_transform();
Point2 target_pos = (p_point - trans.get_origin()) / trans.get_scale().x - pos;
Point2 target_position = (p_point - trans.get_origin()) / trans.get_scale().x - pos;
if (default_type == "Polygon2D" || default_type == "TouchScreenButton" || default_type == "TextureRect" || default_type == "Patch9Rect") {
target_pos -= texture_size / 2;
target_position -= texture_size / 2;
}
// there's nothing to be used as source position so snapping will work as absolute if enabled
target_pos = canvas->snap_point(target_pos);
editor_data->get_undo_redo().add_do_method(child, "set_position", target_pos);
target_position = canvas->snap_point(target_position);
editor_data->get_undo_redo().add_do_method(child, "set_position", target_position);
}
bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, const Point2 &p_point) {

22
editor/plugins/curve_editor_plugin.cpp
View File

@ -188,7 +188,7 @@ void CurveEditor::on_gui_input(const Ref<InputEvent> &p_event) {
} else {
// Drag tangent
Vector2 point_pos = curve.get_point_pos(_selected_point);
Vector2 point_pos = curve.get_point_position(_selected_point);
Vector2 control_pos = get_world_pos(mpos);
Vector2 dir = (control_pos - point_pos).normalized();
@ -378,7 +378,7 @@ int CurveEditor::get_point_at(Vector2 pos) const {
const float r = _hover_radius * _hover_radius;
for (int i = 0; i < curve.get_point_count(); ++i) {
Vector2 p = get_view_pos(curve.get_point_pos(i));
Vector2 p = get_view_pos(curve.get_point_position(i));
if (p.distance_squared_to(pos) <= r) {
return i;
}
@ -525,8 +525,8 @@ Vector2 CurveEditor::get_tangent_view_pos(int i, TangentIndex tangent) const {
else
dir = Vector2(1, _curve_ref->get_point_right_tangent(i));
Vector2 point_pos = get_view_pos(_curve_ref->get_point_pos(i));
Vector2 control_pos = get_view_pos(_curve_ref->get_point_pos(i) + dir);
Vector2 point_pos = get_view_pos(_curve_ref->get_point_position(i));
Vector2 control_pos = get_view_pos(_curve_ref->get_point_position(i) + dir);
return point_pos + _tangents_length * (control_pos - point_pos).normalized();
}
@ -549,8 +549,8 @@ static void plot_curve_accurate(const Curve &curve, float step, T plot_func) {
plot_func(Vector2(0, y), Vector2(1.f, y), true);
} else {
Vector2 first_point = curve.get_point_pos(0);
Vector2 last_point = curve.get_point_pos(curve.get_point_count() - 1);
Vector2 first_point = curve.get_point_position(0);
Vector2 last_point = curve.get_point_position(curve.get_point_count() - 1);
// Edge lines
plot_func(Vector2(0, first_point.y), first_point, false);
@ -559,8 +559,8 @@ static void plot_curve_accurate(const Curve &curve, float step, T plot_func) {
// Draw section by section, so that we get maximum precision near points.
// It's an accurate representation, but slower than using the baked one.
for (int i = 1; i < curve.get_point_count(); ++i) {
Vector2 a = curve.get_point_pos(i - 1);
Vector2 b = curve.get_point_pos(i);
Vector2 a = curve.get_point_position(i - 1);
Vector2 b = curve.get_point_position(i);
Vector2 pos = a;
Vector2 prev_pos = a;
@ -667,7 +667,7 @@ void CurveEditor::_draw() {
const Color tangent_color(0.5, 0.5, 1, 1);
int i = _selected_point;
Vector2 pos = curve.get_point_pos(i);
Vector2 pos = curve.get_point_position(i);
if (i != 0) {
Vector2 control_pos = get_tangent_view_pos(i, TANGENT_LEFT);
@ -718,7 +718,7 @@ void CurveEditor::_draw() {
const Color selected_point_color(1, 0.5, 0.5);
for (int i = 0; i < curve.get_point_count(); ++i) {
Vector2 pos = curve.get_point_pos(i);
Vector2 pos = curve.get_point_position(i);
draw_rect(Rect2(get_view_pos(pos), Vector2(1, 1)).grow(3), i == _selected_point ? selected_point_color : point_color);
// TODO Circles are prettier. Needs a fix! Or a texture
//draw_circle(pos, 2, point_color);
@ -728,7 +728,7 @@ void CurveEditor::_draw() {
if (_hover_point != -1) {
const Color hover_color = line_color;
Vector2 pos = curve.get_point_pos(_hover_point);
Vector2 pos = curve.get_point_position(_hover_point);
stroke_rect(Rect2(get_view_pos(pos), Vector2(1, 1)).grow(_hover_radius), hover_color);
}

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