优化菜单

content/public/graphics.cc

@@ -725,6 +725,15 @@ void Graphics::DrawSettingsWindowInternal() {
 
 void Graphics::DrawGraphicsSettingsGUI() {
   if (ImGui::CollapsingHeader("Graphics")) {
+    ImGui::TextWrapped("Renderer: %s", renderer::GL.GetString(GL_RENDERER));
+    ImGui::Separator();
+    ImGui::TextWrapped("Vendor: %s", renderer::GL.GetString(GL_VENDOR));
+    ImGui::Separator();
+    ImGui::TextWrapped("Version: %s", renderer::GL.GetString(GL_VERSION));
+    ImGui::Separator();
+    ImGui::Text("Average FPS: %d", share_data_->display_fps);
+    ImGui::Separator();
+
     // V-Sync
     int gl_vsync;
     SDL_GL_GetSwapInterval(&gl_vsync);

content/worker/event_runner.cc

@@ -12,7 +12,7 @@ namespace content {
 
 EventRunner::EventRunner(WorkerShareData* share_data)
     : share_data_(share_data),
-      fps_counter_{false, 0, SDL_GetPerformanceCounter(),
+      fps_counter_{0, SDL_GetPerformanceCounter(),
                    SDL_GetPerformanceFrequency(), 0} {
   share_data_->user_event_id = SDL_RegisterEvents(EVENT_NUMS);
 }
@@ -67,11 +67,11 @@ void EventRunner::EventDispatch(const SDL_Event& event) {
     uint64_t now_ticks = SDL_GetPerformanceCounter();
     uint64_t delta_ticks = now_ticks - fps_counter_.last_counter;
     if (delta_ticks >= fps_counter_.counter_freq) {
-      if (fps_counter_.enable_display) {
-        fps_counter_.average_fps = fps_counter_.frame_count;
-        UpdateFPSDisplay(std::make_optional<int32_t>(fps_counter_.average_fps));
-      }
+      // Set display fps
+      fps_counter_.average_fps = fps_counter_.frame_count;
+      share_data_->display_fps = fps_counter_.average_fps;
 
+      // Update fps
       fps_counter_.last_counter = SDL_GetPerformanceCounter();
       fps_counter_.frame_count = 0;
     }
@@ -85,15 +85,6 @@ void EventRunner::EventDispatch(const SDL_Event& event) {
     if (event.key.keysym.scancode == SDL_SCANCODE_F1) {
       // Settings menu
       share_data_->enable_settings_menu = !share_data_->enable_settings_menu;
-    } else if (event.key.keysym.scancode == SDL_SCANCODE_F2) {
-      // Switch fps display mode
-      fps_counter_.enable_display = !fps_counter_.enable_display;
-
-      std::optional<int32_t> fps = std::nullopt;
-      if (fps_counter_.enable_display)
-        fps = std::make_optional<int32_t>(fps_counter_.average_fps);
-
-      UpdateFPSDisplay(fps);
     } else if (event.key.keysym.scancode == SDL_SCANCODE_F12) {
       // Trigger reset process
       binding_runner_->RequestReset();
@@ -111,14 +102,4 @@ void EventRunner::EventDispatch(const SDL_Event& event) {
   }
 }
 
-void EventRunner::UpdateFPSDisplay(std::optional<int32_t> fps) {
-  base::WeakPtr<ui::Widget> window = share_data_->window;
-  scoped_refptr<CoreConfigure> config = share_data_->config;
-
-  if (fps.has_value())
-    return window->SetTitle(config->game_title() +
-                            " - FPS: " + std::to_string(*fps));
-  return window->SetTitle(config->game_title());
-}
-
 }  // namespace content

content/worker/event_runner.h

@@ -43,15 +43,13 @@ class EventRunner : public base::RefCounted<EventRunner> {
  private:
   static int EventFilter(void* userdata, SDL_Event* event);
   void EventDispatch(const SDL_Event& event);
-  void UpdateFPSDisplay(std::optional<int32_t> fps);
 
   WorkerShareData* share_data_;
   base::WeakPtr<BindingRunner> binding_runner_;
   base::CallbackListSubscription quit_observer_;
   std::unique_ptr<base::RunLoop> loop_runner_;
 
   struct {
-    bool enable_display;
     uint64_t frame_count;
     uint64_t last_counter;
     uint64_t counter_freq;

content/worker/worker_share.h

@@ -43,6 +43,7 @@ struct WorkerShareData {
   } background_sync;
 
   // GUI Event Queue
+  int display_fps = 0;
   bool enable_settings_menu = false;
   bool disable_gui_key_input = false;
   moodycamel::ConcurrentQueue<SDL_Event> event_queue;