Remove preload_item_visuals code

[dragonfireclient.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 2dc537782b0dbac1931a15a5c3366673549b0b3a..f27f031c5325e2dcd9fdbd481011257df50df80c 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -228,6 +228,7 @@ Client::Client(
        m_particle_manager(&m_env),
        m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, ipv6, this),
        m_device(device),
+       m_camera(NULL),
        m_minimap_disabled_by_server(false),
        m_server_ser_ver(SER_FMT_VER_INVALID),
        m_proto_ver(0),
@@ -263,6 +264,9 @@ Client::Client(
 
        m_cache_smooth_lighting = g_settings->getBool("smooth_lighting");
        m_cache_enable_shaders  = g_settings->getBool("enable_shaders");
+       m_cache_use_tangent_vertices = m_cache_enable_shaders && (
+               g_settings->getBool("enable_bumpmapping") || 
+               g_settings->getBool("enable_parallax_occlusion"));
 }
 
 void Client::Stop()
@@ -1582,7 +1586,8 @@ void Client::addUpdateMeshTask(v3s16 p, bool ack_to_server, bool urgent)
                Create a task to update the mesh of the block
        */
 
-       MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders);
+       MeshMakeData *data = new MeshMakeData(this, m_cache_enable_shaders,
+               m_cache_use_tangent_vertices);
 
        {
                //TimeTaker timer("data fill");
@@ -1761,29 +1766,6 @@ void Client::afterContentReceived(IrrlichtDevice *device)
        m_nodedef->updateTextures(this, texture_update_progress, &tu_args);
        delete[] tu_args.text_base;
 
-       // Preload item textures and meshes if configured to
-       if(g_settings->getBool("preload_item_visuals"))
-       {
-               verbosestream<<"Updating item textures and meshes"<<std::endl;
-               text = wgettext("Item textures...");
-               draw_load_screen(text, device, guienv, 0, 0);
-               std::set<std::string> names = m_itemdef->getAll();
-               size_t size = names.size();
-               size_t count = 0;
-               int percent = 0;
-               for(std::set<std::string>::const_iterator
-                               i = names.begin(); i != names.end(); ++i)
-               {
-                       // Asking for these caches the result
-                       m_itemdef->getInventoryTexture(*i, this);
-                       m_itemdef->getWieldMesh(*i, this);
-                       count++;
-                       percent = (count * 100 / size * 0.2) + 80;
-                       draw_load_screen(text, device, guienv, 0, percent);
-               }
-               delete[] text;
-       }
-
        // Start mesh update thread after setting up content definitions
        infostream<<"- Starting mesh update thread"<<std::endl;
        m_mesh_update_thread.start();