diff options
| author | Poommetee Ketson <poommetee@protonmail.com> | 2017-09-17 08:25:36 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-17 08:25:36 +0700 |
| commit | 5ccaf36c6bbbeffc5b3ffff14205af2f8e9a6848 (patch) | |
| tree | e167a2ec1d22318a71cb12da63c0c90f10848e48 /editor | |
| parent | b13bd3ef5c77526927fa52296cffaf4ce5d53ef2 (diff) | |
| parent | ac9c400adcc6cc94772f4c13e7fc26dbaed1c387 (diff) | |
Merge pull request #11338 from marcelofg55/clang_compilefix
Compile fix for clang error on spatial_editor_plugin.cpp
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/plugins/spatial_editor_plugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 7fa0fcba58..2c42150cee 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -92,11 +92,11 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) { Cursor old_camera_cursor = camera_cursor; camera_cursor = cursor; - camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.0, p_interp_delta * (1 / orbit_inertia))); - camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.0, p_interp_delta * (1 / orbit_inertia))); + camera_cursor.x_rot = Math::lerp(old_camera_cursor.x_rot, cursor.x_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); + camera_cursor.y_rot = Math::lerp(old_camera_cursor.y_rot, cursor.y_rot, MIN(1.f, p_interp_delta * (1 / orbit_inertia))); - camera_cursor.pos = old_camera_cursor.pos.linear_interpolate(cursor.pos, MIN(1.0, p_interp_delta * (1 / translation_inertia))); - camera_cursor.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN(1.0, p_interp_delta * (1 / translation_inertia))); + camera_cursor.pos = old_camera_cursor.pos.linear_interpolate(cursor.pos, MIN(1.f, p_interp_delta * (1 / translation_inertia))); + camera_cursor.distance = Math::lerp(old_camera_cursor.distance, cursor.distance, MIN(1.f, p_interp_delta * (1 / translation_inertia))); if (p_interp_delta == 0 || is_freelook_active()) { camera_cursor = cursor; |