Home Explore Help
Sign In
Godot
/
godot
mirror of https://github.com/godotengine/godot.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Compile fix for clang error on spatial_editor_plugin.cpp

Marcelo Fernandez 8 years ago
parent
1679baf833
commit
ac9c400adc
1 changed files with 4 additions and 4 deletions
Unified View Show Diff Stats
  1. 4 4
      editor/plugins/spatial_editor_plugin.cpp

+ 4 - 4
editor/plugins/spatial_editor_plugin.cpp
View File 

@@ -92,11 +92,11 @@ void SpatialEditorViewport::_update_camera(float p_interp_delta) {
 
 	Cursor old_camera_cursor = camera_cursor;
 
 	Cursor old_camera_cursor = camera_cursor;
 
 	camera_cursor = 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()) {
 
 	if (p_interp_delta == 0 || is_freelook_active()) {
 
 		camera_cursor = cursor;
 
 		camera_cursor = cursor;