Add more graph colors, add mainloop_dtime graph, make statustext fade away faster

diff --git a/src/game.cpp b/src/game.cpp
index 34fdaf559d1c4d4f2d17528a38eac620e0c40776..e261a9f04d6425822c7948cf24995f5c83d83fdc 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -666,7 +666,9 @@ public:
                static const video::SColor usable_colors[] = {
                        video::SColor(255,255,100,100),
                        video::SColor(255,90,225,90),
                static const video::SColor usable_colors[] = {
                        video::SColor(255,255,100,100),
                        video::SColor(255,90,225,90),

-                       video::SColor(255,100,100,255)
+                       video::SColor(255,100,100,255),
+                       video::SColor(255,255,150,50),
+                       video::SColor(255,220,220,100)

                };
                static const u32 usable_colors_count =
                                sizeof(usable_colors) / sizeof(*usable_colors);
                };
                static const u32 usable_colors_count =
                                sizeof(usable_colors) / sizeof(*usable_colors);


@@ -702,7 +704,7 @@ public:
                        s32 y = y_bottom - meta_i * 50;
                        float show_min = meta.min;
                        float show_max = meta.max;
                        s32 y = y_bottom - meta_i * 50;
                        float show_min = meta.min;
                        float show_max = meta.max;

-                       if(show_min >= 0 && show_max >= 0){
+                       if(show_min >= -0.0001 && show_max >= -0.0001){

                                if(show_min <= show_max * 0.5)
                                        show_min = 0;
                        }
                                if(show_min <= show_max * 0.5)
                                        show_min = 0;
                        }


@@ -1201,6 +1203,8 @@ void the_game(
                        dtime = 0;
                lasttime = time;
 
                        dtime = 0;
                lasttime = time;
 

+               g_profiler->graphAdd("mainloop_dtime", dtime);
+

                /* Run timers */
 
                if(nodig_delay_timer >= 0)
                /* Run timers */
 
                if(nodig_delay_timer >= 0)


@@ -2407,7 +2411,7 @@ void the_game(
                }
 
                {
                }
 
                {

-                       float statustext_time_max = 3.0;
+                       float statustext_time_max = 1.5;

                        if(!statustext.empty())
                        {
                                statustext_time += dtime;
                        if(!statustext.empty())
                        {
                                statustext_time += dtime;


@@ -2441,7 +2445,7 @@ void the_game(
                                        initial_color.getInterpolated_quadratic(
                                                initial_color,
                                                final_color,
                                        initial_color.getInterpolated_quadratic(
                                                initial_color,
                                                final_color,

-                                               statustext_time / (float) statustext_time_max);
+                                               pow(statustext_time / (float)statustext_time_max, 2.0));

                                guitext_status->setOverrideColor(fade_color);
                                guitext_status->enableOverrideColor(true);
                        }
                                guitext_status->setOverrideColor(fade_color);
                                guitext_status->enableOverrideColor(true);
                        }