godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15060 from poke1024/camera2d-update

Browse Source 
Update Camera2D scroll using NOTIFICATION_INTERNAL_PROCESS
This commit is contained in:
Rémi Verschelde 2018-01-08 19:31:50 +01:00 committed by GitHub
commit 05297d8b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scene/2d/camera_2d.cpp
View File

@ -143,7 +143,7 @@ Transform2D Camera2D::get_camera_transform() {
if (smoothing_enabled && !Engine::get_singleton()->is_editor_hint()) { if (smoothing_enabled && !Engine::get_singleton()->is_editor_hint()) {
float c = smoothing * get_physics_process_delta_time(); float c = smoothing * get_process_delta_time();
smoothed_camera_pos = ((camera_pos - smoothed_camera_pos) * c) + smoothed_camera_pos; smoothed_camera_pos = ((camera_pos - smoothed_camera_pos) * c) + smoothed_camera_pos;
ret_camera_pos = smoothed_camera_pos; ret_camera_pos = smoothed_camera_pos;
//camera_pos=camera_pos*(1.0-smoothing)+new_camera_pos*smoothing; //camera_pos=camera_pos*(1.0-smoothing)+new_camera_pos*smoothing;
@ -217,14 +217,14 @@ void Camera2D::_notification(int p_what) {
switch (p_what) { switch (p_what) {
case NOTIFICATION_PHYSICS_PROCESS: { case NOTIFICATION_INTERNAL_PROCESS: {
_update_scroll(); _update_scroll();
} break; } break;
case NOTIFICATION_TRANSFORM_CHANGED: { case NOTIFICATION_TRANSFORM_CHANGED: {
if (!is_physics_processing()) if (!is_processing_internal())
_update_scroll(); _update_scroll();
} break; } break;
@ -246,7 +246,7 @@ void Camera2D::_notification(int p_what) {
add_to_group(canvas_group_name); add_to_group(canvas_group_name);
if (Engine::get_singleton()->is_editor_hint()) { if (Engine::get_singleton()->is_editor_hint()) {
set_physics_process(false); set_process_internal(false);
} }
_update_scroll(); _update_scroll();
@ -503,9 +503,9 @@ void Camera2D::set_follow_smoothing(float p_speed) {
smoothing = p_speed; smoothing = p_speed;
if (smoothing > 0 && !(is_inside_tree() && Engine::get_singleton()->is_editor_hint())) if (smoothing > 0 && !(is_inside_tree() && Engine::get_singleton()->is_editor_hint()))
set_physics_process(true); set_process_internal(true);
else else
set_physics_process(false); set_process_internal(false);
} }
float Camera2D::get_follow_smoothing() const { float Camera2D::get_follow_smoothing() const {