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

Merge pull request #37595 from ExpiredPopsicle/18809_flickering_ortho_fix 

Othographic camera in-editor now uses Z near/far instead of hardcoded value
This commit is contained in:
Rémi Verschelde 2020-04-10 17:16:49 +02:00 committed by GitHub
parent 02ed72c373 26912c15e6
commit 218ae1e7a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/spatial_editor_plugin.cpp
View File

@ -345,7 +345,7 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) {
if (orthogonal) { if (orthogonal) {
float half_fov = Math::deg2rad(get_fov()) / 2.0; float half_fov = Math::deg2rad(get_fov()) / 2.0;
float height = 2.0 * cursor.distance * Math::tan(half_fov); float height = 2.0 * cursor.distance * Math::tan(half_fov);
camera->set_orthogonal(height, 0.1, 8192); camera->set_orthogonal(height, get_znear(), get_zfar());
} else { } else {
camera->set_perspective(get_fov(), get_znear(), get_zfar()); camera->set_perspective(get_fov(), get_znear(), get_zfar());
} }
@ -362,7 +362,7 @@ Transform SpatialEditorViewport::to_camera_transform(const Cursor &p_cursor) con
camera_transform.basis.rotate(Vector3(0, 1, 0), -p_cursor.y_rot); camera_transform.basis.rotate(Vector3(0, 1, 0), -p_cursor.y_rot);
if (orthogonal) if (orthogonal)
camera_transform.translate(0, 0, 4096); camera_transform.translate(0, 0, (get_zfar() - get_znear()) / 2.0);
else else
camera_transform.translate(0, 0, p_cursor.distance); camera_transform.translate(0, 0, p_cursor.distance);