gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 23:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17571 from kubecz3k/cam-disable

Browse source 
a way to ensure that camera is disabled
This commit is contained in:
Rémi Verschelde 2018-03-23 11:08:44 +01:00 committed by GitHub
parent 74382dbfbb f78c7353ea
commit 8cfca7726f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/3d/camera.cpp
View file

@ -201,7 +201,7 @@ void Camera::make_current() {
//get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,camera_group,"_camera_make_current",this);
}
void Camera::clear_current() {
void Camera::clear_current(bool p_enable_next) {
current = false;
if (!is_inside_tree())
@ -209,7 +209,10 @@ void Camera::clear_current() {
if (get_viewport()->get_camera() == this) {
get_viewport()->_camera_set(NULL);
get_viewport()->_camera_make_next_current(this);
if (p_enable_next) {
get_viewport()->_camera_make_next_current(this);
}
}
}
@ -439,7 +442,7 @@ void Camera::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_perspective", "fov", "z_near", "z_far"), &Camera::set_perspective);
ClassDB::bind_method(D_METHOD("set_orthogonal", "size", "z_near", "z_far"), &Camera::set_orthogonal);
ClassDB::bind_method(D_METHOD("make_current"), &Camera::make_current);
ClassDB::bind_method(D_METHOD("clear_current"), &Camera::clear_current);
ClassDB::bind_method(D_METHOD("clear_current", "enable_next"), &Camera::clear_current, DEFVAL(true));
ClassDB::bind_method(D_METHOD("set_current"), &Camera::set_current);
ClassDB::bind_method(D_METHOD("is_current"), &Camera::is_current);
ClassDB::bind_method(D_METHOD("get_camera_transform"), &Camera::get_camera_transform);

2
scene/3d/camera.h
View file

@ -113,7 +113,7 @@ public:
void set_projection(Camera::Projection p_mode);
void make_current();
void clear_current();
void clear_current(bool p_enable_next = true);
void set_current(bool p_current);
bool is_current() const;