godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-23 15:16:17 +00:00
Code Releases Wiki Activity

Color 3D editor FPS label depending on the performance level

Browse Source 
This provides easier visual grepping.

Incindentally, this change will force constant editor redrawing whenever
the View FPS option is enabled in the 3D viewport settings. This is
required to get an accurate FPS display in 3.x.
Otherwise, the FPS counter shot all the way up to 145 FPS
whenever nothing was changing on screen (even if actual
performance was much lower).
This commit is contained in:
Hugo Locurcio
2022-03-02 22:16:13 +01:00
parent cf970aab26
commit 2893090a50
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/plugins/spatial_editor_plugin.cpp
View File

@@ -2686,10 +2686,13 @@ void SpatialEditorViewport::_notification(int p_what) {
fps_label->set_visible(show_fps); fps_label->set_visible(show_fps);
if (show_fps) { if (show_fps) {
String text; const float fps = Engine::get_singleton()->get_frames_per_second();
const float temp_fps = Engine::get_singleton()->get_frames_per_second(); fps_label->set_text(vformat(TTR("FPS: %d (%s ms)"), fps, rtos(1000.0f / fps).pad_decimals(2)));
text += vformat(TTR("FPS: %d (%s ms)"), temp_fps, rtos(1000.0f / temp_fps).pad_decimals(2)); // Middle point is at 60 FPS.
fps_label->set_text(text); fps_label->add_color_override(
"font_color",
frame_time_gradient->get_color_at_offset(
Math::range_lerp(fps, 110, 10, 0, 1)));
} }
bool show_cinema = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW)); bool show_cinema = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_CINEMATIC_PREVIEW));
@@ -2747,6 +2750,10 @@ void SpatialEditorViewport::_notification(int p_what) {
fps_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles")); fps_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles"));
cinema_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles")); cinema_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles"));
locked_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles")); locked_label->add_style_override("normal", editor->get_gui_base()->get_stylebox("Information3dViewport", "EditorStyles"));
frame_time_gradient->set_color(0, get_color("success_color", "Editor"));
frame_time_gradient->set_color(1, get_color("warning_color", "Editor"));
frame_time_gradient->set_color(2, get_color("error_color", "Editor"));
} }
} }
@@ -4186,6 +4193,10 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
rotation_control->set_viewport(this); rotation_control->set_viewport(this);
top_right_vbox->add_child(rotation_control); top_right_vbox->add_child(rotation_control);
frame_time_gradient = memnew(Gradient);
// The color is set when the theme changes.
frame_time_gradient->add_point(0.5, Color());
fps_label = memnew(Label); fps_label = memnew(Label);
fps_label->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -90 * EDSCALE); fps_label->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_END, -90 * EDSCALE);
fps_label->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE); fps_label->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 10 * EDSCALE);
@@ -4220,6 +4231,10 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed
EditorSettings::get_singleton()->connect("settings_changed", this, "update_transform_gizmo_view"); EditorSettings::get_singleton()->connect("settings_changed", this, "update_transform_gizmo_view");
} }
SpatialEditorViewport::~SpatialEditorViewport() {
memdelete(frame_time_gradient);
}
////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////
void SpatialEditorViewportContainer::_gui_input(const Ref<InputEvent> &p_event) { void SpatialEditorViewportContainer::_gui_input(const Ref<InputEvent> &p_event) {

2
editor/plugins/spatial_editor_plugin.h
View File

@@ -285,6 +285,7 @@ private:
VBoxContainer *top_right_vbox; VBoxContainer *top_right_vbox;
ViewportRotationControl *rotation_control; ViewportRotationControl *rotation_control;
Gradient *frame_time_gradient;
Label *fps_label; Label *fps_label;
struct _RayResult { struct _RayResult {
@@ -487,6 +488,7 @@ public:
Camera *get_camera() { return camera; } // return the default camera object. Camera *get_camera() { return camera; } // return the default camera object.
SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index); SpatialEditorViewport(SpatialEditor *p_spatial_editor, EditorNode *p_editor, int p_index);
~SpatialEditorViewport();
}; };
class SpatialEditorSelectedItem : public Object { class SpatialEditorSelectedItem : public Object {