Allow the LUA API to set animations to meshes as well as the animation speed. Also...

[minetest.git] / src / client.cpp

diff --git a/src/client.cpp b/src/client.cpp
index 504297a6d87fb5710e6ed970b98e4442b47b3421..7f5421747c75da1c4dc3bc1745440852dc1197de 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -41,6 +41,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "sound.h"
 #include "util/string.h"
 #include "hex.h"
+#include "IMeshCache.h"
 
 static std::string getMediaCacheDir()
 {
@@ -820,8 +821,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
        name = removeStringEnd(filename, image_ext);
        if(name != "")
        {
-               verbosestream<<"Client: Attempting to load image "
-                               <<"file \""<<filename<<"\""<<std::endl;
+               verbosestream<<"Client: Storing image into Irrlicht: "
+                               <<"\""<<filename<<"\""<<std::endl;
 
                io::IFileSystem *irrfs = m_device->getFileSystem();
                video::IVideoDriver *vdrv = m_device->getVideoDriver();
@@ -854,28 +855,31 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
        name = removeStringEnd(filename, sound_ext);
        if(name != "")
        {
-               verbosestream<<"Client: Attempting to load sound "
-                               <<"file \""<<filename<<"\""<<std::endl;
+               verbosestream<<"Client: Storing sound into Irrlicht: "
+                               <<"\""<<filename<<"\""<<std::endl;
                m_sound->loadSoundData(name, data);
                return true;
        }
 
        const char *model_ext[] = {
-               ".b3d", ".md2", ".obj",
+               ".x", ".b3d", ".md2", ".obj",
                NULL
        };
        name = removeStringEnd(filename, model_ext);
        if(name != "")
        {
                verbosestream<<"Client: Storing model into Irrlicht: "
-                               <<"file \""<<filename<<"\""<<std::endl;
+                               <<"\""<<filename<<"\""<<std::endl;
 
                io::IFileSystem *irrfs = m_device->getFileSystem();
-
-               // Create an irrlicht memory file
-               io::IReadFile *rfile = irrfs->createMemoryReadFile(*data_rw, data_rw.getSize(), filename.c_str(), true);
+               io::IReadFile *rfile = irrfs->createMemoryReadFile(
+                               *data_rw, data_rw.getSize(), filename.c_str());
                assert(rfile);
-               //rfile->drop();
+               
+               scene::ISceneManager *smgr = m_device->getSceneManager();
+               scene::IAnimatedMesh *mesh = smgr->getMesh(rfile);
+               smgr->getMeshCache()->addMesh(filename.c_str(), mesh);
+               
                return true;
        }