aboutsummaryrefslogtreecommitdiff
path: root/scene/2d/camera_2d.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2017-09-20 13:22:47 +0200
committerGitHub2017-09-20 13:22:47 +0200
commit372cdc20705dab7c2227b89d8bc4d425ffd3e8a4 (patch)
treea8811a50265edd940b00e12b9bd522e3e9b4694e /scene/2d/camera_2d.cpp
parentecd226c6a751f8a20766363fd1f2e1e0e2da8fba (diff)
parent5ad9be4c24e9d7dc5672fdc42cea896622fe5685 (diff)
downloadgodot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.gz
godot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.zst
godot-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.zip
Merge pull request #11153 from letheed/rename-pos
Rename pos/rot/loc/scl
Diffstat (limited to '')
-rw-r--r--scene/2d/camera_2d.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp
index e39e6fc6d..0d04967f1 100644
--- a/scene/2d/camera_2d.cpp
+++ b/scene/2d/camera_2d.cpp
@@ -452,7 +452,7 @@ float Camera2D::get_drag_margin(Margin p_margin) const {
return drag_margin[p_margin];
}
-Vector2 Camera2D::get_camera_pos() const {
+Vector2 Camera2D::get_camera_position() const {
return camera_pos;
}
@@ -673,7 +673,7 @@ void Camera2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_drag_margin", "margin", "drag_margin"), &Camera2D::set_drag_margin);
ClassDB::bind_method(D_METHOD("get_drag_margin", "margin"), &Camera2D::get_drag_margin);
- ClassDB::bind_method(D_METHOD("get_camera_pos"), &Camera2D::get_camera_pos);
+ ClassDB::bind_method(D_METHOD("get_camera_position"), &Camera2D::get_camera_position);
ClassDB::bind_method(D_METHOD("get_camera_screen_center"), &Camera2D::get_camera_screen_center);
ClassDB::bind_method(D_METHOD("set_zoom", "zoom"), &Camera2D::set_zoom);