1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Texture cache -> Media cache WIP

This commit is contained in:
Perttu Ahola 2012-03-25 11:50:29 +03:00
parent 4bf5065a9c
commit f801e16b78
8 changed files with 235 additions and 241 deletions

View file

@ -253,21 +253,21 @@ struct PrioritySortedBlockTransfer
u16 peer_id;
};
struct TextureRequest
struct MediaRequest
{
std::string name;
TextureRequest(const std::string &name_=""):
MediaRequest(const std::string &name_=""):
name(name_)
{}
};
struct TextureInformation
struct MediaInfo
{
std::string path;
std::string sha1_digest;
TextureInformation(const std::string path_="",
MediaInfo(const std::string path_="",
const std::string sha1_digest_=""):
path(path_),
sha1_digest(sha1_digest_)
@ -644,11 +644,10 @@ private:
// Sends blocks to clients (locks env and con on its own)
void SendBlocks(float dtime);
void PrepareTextures();
void SendTextureAnnouncement(u16 peer_id);
void SendTexturesRequested(u16 peer_id,core::list<TextureRequest> tosend);
void fillMediaCache();
void sendMediaAnnouncement(u16 peer_id);
void sendRequestedMedia(u16 peer_id,
const core::list<MediaRequest> &tosend);
/*
Something random
@ -832,7 +831,7 @@ private:
friend class EmergeThread;
friend class RemoteClient;
std::map<std::string,TextureInformation> m_Textures;
std::map<std::string,MediaInfo> m_media;
/*
Sounds