ServerRemotePlayer implements ServerActiveObject

[oweals/minetest.git] / src / game.cpp

diff --git a/src/game.cpp b/src/game.cpp
index e666e084d6d20a8f9b85c696ac71a99a840939be..d666dbcdf3848ecc2d45b54705fa8a8539f34af5 100644 (file)
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -872,7 +872,6 @@ void the_game(
                        L"",
                        core::rect<s32>(5, 5+(text_height+5)*1, 795, (5+text_height)*2),
                        false, false);
-       
        // At the middle of the screen
        // Object infos are shown in this
        gui::IGUIStaticText *guitext_info = guienv->addStaticText(
@@ -889,6 +888,15 @@ void the_game(
        //guitext_chat->setBackgroundColor(video::SColor(96,0,0,0));
        core::list<ChatLine> chat_lines;
        
+       // Profiler text (size is updated when text is updated)
+       gui::IGUIStaticText *guitext_profiler = guienv->addStaticText(
+                       L"<Profiler>",
+                       core::rect<s32>(6, 4+(text_height+5)*2, 400,
+                       (text_height+5)*2 + text_height*35),
+                       false, false);
+       guitext_profiler->setBackgroundColor(video::SColor(80,0,0,0));
+       guitext_profiler->setVisible(false);
+       
        /*GUIQuickInventory *quick_inventory = new GUIQuickInventory
                        (guienv, NULL, v2s32(10, 70), 5, &local_inventory);*/
        /*GUIQuickInventory *quick_inventory = new GUIQuickInventory
@@ -942,6 +950,10 @@ void the_game(
 
        bool respawn_menu_active = false;
 
+       bool show_profiler = false;
+       bool force_fog_off = false;
+       bool disable_camera_update = false;
+
        /*
                Main loop
        */
@@ -1071,6 +1083,7 @@ void the_game(
                object_hit_delay_timer -= dtime;
 
                g_profiler->add("Elapsed time", dtime);
+               g_profiler->avg("FPS", 1./dtime);
 
                /*
                        Log frametime for visualization
@@ -1161,14 +1174,32 @@ void the_game(
                */
                float profiler_print_interval =
                                g_settings->getFloat("profiler_print_interval");
-               if(profiler_print_interval != 0)
+               bool print_to_log = true;
+               if(profiler_print_interval == 0){
+                       print_to_log = false;
+                       profiler_print_interval = 5;
+               }
+               if(m_profiler_interval.step(dtime, profiler_print_interval))
                {
-                       if(m_profiler_interval.step(0.030, profiler_print_interval))
-                       {
+                       if(print_to_log){
                                infostream<<"Profiler:"<<std::endl;
                                g_profiler->print(infostream);
-                               g_profiler->clear();
                        }
+
+                       std::ostringstream os(std::ios_base::binary);
+                       g_profiler->print(os);
+                       std::wstring text = narrow_to_wide(os.str());
+                       guitext_profiler->setText(text.c_str());
+
+                       g_profiler->clear();
+                       
+                       s32 w = font->getDimension(text.c_str()).Width;
+                       if(w < 400)
+                               w = 400;
+                       core::rect<s32> rect(6, 4+(text_height+5)*2, 12+w,
+                                       8+(text_height+5)*2 +
+                                       font->getDimension(text.c_str()).Height);
+                       guitext_profiler->setRelativePosition(rect);
                }
 
                /*
@@ -1298,6 +1329,31 @@ void the_game(
                                image->drop(); 
                        }                        
                }
+               else if(input->wasKeyDown(getKeySetting("keymap_toggle_profiler")))
+               {
+                       show_profiler = !show_profiler;
+                       guitext_profiler->setVisible(show_profiler);
+                       if(show_profiler)
+                               chat_lines.push_back(ChatLine(L"Profiler disabled"));
+                       else
+                               chat_lines.push_back(ChatLine(L"Profiler enabled"));
+               }
+               else if(input->wasKeyDown(getKeySetting("keymap_toggle_force_fog_off")))
+               {
+                       force_fog_off = !force_fog_off;
+                       if(force_fog_off)
+                               chat_lines.push_back(ChatLine(L"Fog disabled"));
+                       else
+                               chat_lines.push_back(ChatLine(L"Fog enabled"));
+               }
+               else if(input->wasKeyDown(getKeySetting("keymap_toggle_update_camera")))
+               {
+                       disable_camera_update = !disable_camera_update;
+                       if(disable_camera_update)
+                               chat_lines.push_back(ChatLine(L"Camera update disabled"));
+                       else
+                               chat_lines.push_back(ChatLine(L"Camera update enabled"));
+               }
 
                // Item selection with mouse wheel
                {
@@ -1542,11 +1598,10 @@ void the_game(
                v3f camera_direction = camera.getDirection();
                f32 camera_fov = camera.getFovMax();
                
-               if(FIELD_OF_VIEW_TEST)
-                       client.updateCamera(v3f(0,0,0), v3f(0,0,1), camera_fov);
-               else
+               if(!disable_camera_update){
                        client.updateCamera(camera_position,
                                camera_direction, camera_fov);
+               }
 
                //timer2.stop();
                //TimeTaker //timer3("//timer3");
@@ -1946,7 +2001,7 @@ void the_game(
                        Fog
                */
                
-               if(g_settings->getBool("enable_fog") == true)
+               if(g_settings->getBool("enable_fog") == true && !force_fog_off)
                {
                        f32 range;
                        if(farmesh)
@@ -1956,10 +2011,11 @@ void the_game(
                        else
                        {
                                range = draw_control.wanted_range*BS + MAP_BLOCKSIZE*BS*1.5;
+                               range *= 0.9;
                                if(draw_control.range_all)
                                        range = 100000*BS;
-                               if(range < 50*BS)
-                                       range = range * 0.5 + 25*BS;
+                               /*if(range < 50*BS)
+                                       range = range * 0.5 + 25*BS;*/
                        }
 
                        driver->setFog(
@@ -2024,14 +2080,15 @@ void the_game(
                                        "(% .1f, % .1f, % .1f)"
                                        " (% .3f < btime_jitter < % .3f"
                                        ", dtime_jitter = % .1f %%"
-                                       ", v_range = %.1f)",
+                                       ", v_range = %.1f, RTT = %.3f)",
                                        player_position.X/BS,
                                        player_position.Y/BS,
                                        player_position.Z/BS,
                                        busytime_jitter1_min_sample,
                                        busytime_jitter1_max_sample,
                                        dtime_jitter1_max_fraction * 100.0,
-                                       draw_control.wanted_range
+                                       draw_control.wanted_range,
+                                       client.getRTT()
                                        );
 
                        guitext2->setText(narrow_to_wide(temptext).c_str());
@@ -2112,7 +2169,8 @@ void the_game(
 
                        guitext_chat->setRelativePosition(rect);
 
-                       if(chat_lines.size() == 0)
+                       // Don't show chat if empty or profiler is enabled
+                       if(chat_lines.size() == 0 || show_profiler)
                                guitext_chat->setVisible(false);
                        else
                                guitext_chat->setVisible(true);