Improve profiler a bit

src/main_loop.cpp

@@ -45,6 +45,7 @@ m_frame_count(0)
 {
     m_curr_time = 0;
     m_prev_time = 0;
+    m_throttle_fps = true;
 }  // MainLoop
 
 //-----------------------------------------------------------------------------
@@ -78,12 +79,14 @@ float MainLoop::getLimitedDt()
         // When in menus, reduce FPS much, it's not necessary to push to the maximum for plain menus
         const int max_fps = (StateManager::get()->throttleFPS() ? 35 : UserConfigParams::m_max_fps);
         const int current_fps = (int)(1000.0f/dt);
-        if( current_fps > max_fps && !ProfileWorld::isProfileMode())
+        if (m_throttle_fps && current_fps > max_fps && !ProfileWorld::isProfileMode())
         {
             int wait_time = 1000/max_fps - 1000/current_fps;
             if(wait_time < 1) wait_time = 1;
 
+            PROFILER_PUSH_CPU_MARKER("Throttle framerate", 0, 0, 0);
             StkTime::sleep(wait_time);
+            PROFILER_POP_CPU_MARKER();
         }
         else break;
     }
@@ -122,7 +125,9 @@ void MainLoop::run()
 
         if (World::getWorld())  // race is active if world exists
         {
+            PROFILER_PUSH_CPU_MARKER("Update race", 255, 0, 255);
             updateRace(dt);
+            PROFILER_POP_CPU_MARKER();
         }   // if race is active
 
         // We need to check again because update_race may have requested

src/main_loop.hpp

@@ -29,6 +29,7 @@ class MainLoop
 {
 private:
     bool m_abort;
+    bool m_throttle_fps;
 
     int      m_frame_count;
     Uint32   m_curr_time;
@@ -40,6 +41,7 @@ public:
         ~MainLoop();
     void run();
     void abort();
+    void setThrottleFPS(bool throttle) { m_throttle_fps = throttle; }
     // ------------------------------------------------------------------------
     /** Returns true if STK is to be stoppe. */
     bool isAborted() const { return m_abort; }

src/physics/physics.cpp

@@ -36,6 +36,7 @@
 #include "physics/stk_dynamics_world.hpp"
 #include "physics/triangle_mesh.hpp"
 #include "tracks/track.hpp"
+#include "utils/profiler.hpp"
 
 // ----------------------------------------------------------------------------
 /** Initialise physics.
@@ -135,6 +136,8 @@ void Physics::removeKart(const AbstractKart *kart)
  */
 void Physics::update(float dt)
 {
+    PROFILER_PUSH_CPU_MARKER("Physics", 0, 0, 0);
+
     m_physics_loop_active = true;
     // Bullet can report the same collision more than once (up to 4
     // contact points per collision). Additionally, more than one internal
@@ -275,6 +278,8 @@ void Physics::update(float dt)
     for(unsigned int i=0; i<m_karts_to_delete.size(); i++)
         removeKart(m_karts_to_delete[i]);
     m_karts_to_delete.clear();
+
+    PROFILER_POP_CPU_MARKER("Physics", 0, 0, 0);
 }   // update
 
 //-----------------------------------------------------------------------------

src/utils/debug.cpp

@@ -26,6 +26,7 @@
 #include "physics/irr_debug_drawer.hpp"
 #include "physics/physics.hpp"
 #include "race/history.hpp"
+#include "main_loop.hpp"
 #include "replay/replay_recorder.hpp"
 #include "utils/log.hpp"
 #include <IGUIEnvironment.h>
@@ -69,7 +70,8 @@ enum DebugMenuCommand
     DEBUG_POWERUP_SWITCH,
     DEBUG_POWERUP_ZIPPER,
     DEBUG_POWERUP_NITRO,
-    DEBUG_TOGGLE_GUI
+    DEBUG_TOGGLE_GUI,
+    DEBUG_THROTTLE_FPS
 };
 
 // -----------------------------------------------------------------------------
@@ -133,6 +135,7 @@ bool onEvent(const SEvent &event)
             sub->addItem(L"Nitro", DEBUG_POWERUP_NITRO );
             
             mnu->addItem(L"Profiler",DEBUG_PROFILER);
+            mnu->addItem(L"Do not limit FPS", DEBUG_THROTTLE_FPS);
             mnu->addItem(L"FPS",DEBUG_FPS);
             mnu->addItem(L"Save replay", DEBUG_SAVE_REPLAY);
             mnu->addItem(L"Save history", DEBUG_SAVE_HISTORY);
@@ -251,6 +254,10 @@ bool onEvent(const SEvent &event)
                     UserConfigParams::m_profiler_enabled =
                                             !UserConfigParams::m_profiler_enabled;
                 }
+                else if (cmdID == DEBUG_THROTTLE_FPS)
+                {
+                    main_loop->setThrottleFPS(false);
+                }
                 else if (cmdID == DEBUG_FPS)
                 {
                     UserConfigParams::m_display_fps =

src/utils/profiler.cpp

@@ -225,7 +225,8 @@ void Profiler::draw()
         }
     }
 
-    const double factor = profiler_width / (end - start);
+    const double duration = end - start;
+    const double factor = profiler_width / duration;
 
     // Get the mouse pos
     core::vector2di mouse_pos = GUIEngine::EventHandler::get()->getMousePos();
@@ -281,7 +282,10 @@ void Profiler::draw()
         {
             Marker& m = hovered_markers.top();
             std::ostringstream oss;
-            oss << m.name << " [" << (m.end-m.start) << " ms]" << std::endl;
+            oss.precision(4);
+            oss << m.name << " [" << (m.end - m.start) << " ms / ";
+            oss.precision(3);
+            oss << (m.end - m.start)*100.0 / duration << "%]" << std::endl;
             text += oss.str().c_str();
             hovered_markers.pop();
         }