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

Fixes to ClippedCamera 

This work has been kindly sponsored by IMVU.

(cherry picked from commit 9e97bac0cf)
This commit is contained in:
JFonS 2019-05-10 10:35:15 +02:00 committed by Rémi Verschelde
parent dc90131d8c
commit 49613428f1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/3d/camera.cpp
View File

@ -684,8 +684,9 @@ void ClippedCamera::set_process_mode(ProcessMode p_mode) {
if (process_mode == p_mode) { if (process_mode == p_mode) {
return; return;
} }
set_process_internal(p_mode == CLIP_PROCESS_IDLE); process_mode = p_mode;
set_physics_process_internal(p_mode == CLIP_PROCESS_PHYSICS); set_process_internal(process_mode == CLIP_PROCESS_IDLE);
set_physics_process_internal(process_mode == CLIP_PROCESS_PHYSICS);
} }
ClippedCamera::ProcessMode ClippedCamera::get_process_mode() const { ClippedCamera::ProcessMode ClippedCamera::get_process_mode() const {
return process_mode; return process_mode;
@ -748,7 +749,7 @@ void ClippedCamera::_notification(int p_what) {
float csafe, cunsafe; float csafe, cunsafe;
if (dspace->cast_motion(pyramid_shape, xf, cam_pos - ray_from, margin, csafe, cunsafe, exclude, collision_mask, clip_to_bodies, clip_to_areas)) { if (dspace->cast_motion(pyramid_shape, xf, cam_pos - ray_from, margin, csafe, cunsafe, exclude, collision_mask, clip_to_bodies, clip_to_areas)) {
clip_offset = cam_pos.distance_to(ray_from + (cam_pos - ray_from).normalized() * csafe); clip_offset = cam_pos.distance_to(ray_from + (cam_pos - ray_from) * csafe);
} }
_update_camera(); _update_camera();