Skip to content

Commit

Permalink
refacto: rendering engine singleton removal step 1 (filesystem)
Browse files Browse the repository at this point in the history 
Make the RenderingEngine filesystem member non accessible from everywhere

This permits also to determine that some lua code has directly a logic to extract zip file. Move this logic inside client, it's not the lua stack role to perform a such complex operation

Found also another irrlicht <1.8 compat code to remove
  • Loading branch information
@nerzhul
nerzhul committed May 3, 2021
1 parent bc1888f commit e34d28a
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 86 deletions.
84 changes: 73 additions & 11 deletions src/client/client.cpp
View file
Expand Up @@ -97,6 +97,7 @@ Client::Client(
NodeDefManager *nodedef,
ISoundManager *sound,
MtEventManager *event,
RenderingEngine *rendering_engine,
bool ipv6,
GameUI *game_ui
):
Expand All @@ -106,6 +107,7 @@ Client::Client(
m_nodedef(nodedef),
m_sound(sound),
m_event(event),
m_rendering_engine(rendering_engine),
m_mesh_update_thread(this),
m_env(
new ClientMap(this, control, 666),
Expand Down Expand Up @@ -660,8 +662,8 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
TRACESTREAM(<< "Client: Attempting to load image "
<< "file \"" << filename << "\"" << std::endl);

io::IFileSystem *irrfs = RenderingEngine::get_filesystem();
video::IVideoDriver *vdrv = RenderingEngine::get_video_driver();
io::IFileSystem *irrfs = m_rendering_engine->get_filesystem();
video::IVideoDriver *vdrv = m_rendering_engine->get_video_driver();

io::IReadFile *rfile = irrfs->createMemoryReadFile(
data.c_str(), data.size(), "_tempreadfile");
Expand Down Expand Up @@ -728,6 +730,72 @@ bool Client::loadMedia(const std::string &data, const std::string &filename,
return false;
}

bool Client::extractZipFile(const char *filename, const std::string &destination)
{
auto fs = m_rendering_engine->get_filesystem();

if (!fs->addFileArchive(filename, false, false, io::EFAT_ZIP)) {
return false;
}

sanity_check(fs->getFileArchiveCount() > 0);

/**********************************************************************/
/* WARNING this is not threadsafe!! */
/**********************************************************************/
io::IFileArchive* opened_zip = fs->getFileArchive(fs->getFileArchiveCount() - 1);

const io::IFileList* files_in_zip = opened_zip->getFileList();

unsigned int number_of_files = files_in_zip->getFileCount();

for (unsigned int i=0; i < number_of_files; i++) {
std::string fullpath = destination;
fullpath += DIR_DELIM;
fullpath += files_in_zip->getFullFileName(i).c_str();
std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);

if (!files_in_zip->isDirectory(i)) {
if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
fs->removeFileArchive(fs->getFileArchiveCount()-1);
return false;
}

io::IReadFile* toread = opened_zip->createAndOpenFile(i);

FILE *targetfile = fopen(fullpath.c_str(),"wb");

if (targetfile == NULL) {
fs->removeFileArchive(fs->getFileArchiveCount()-1);
return false;
}

char read_buffer[1024];
long total_read = 0;

while (total_read < toread->getSize()) {

unsigned int bytes_read =
toread->read(read_buffer,sizeof(read_buffer));
if ((bytes_read == 0 ) ||
(fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
{
fclose(targetfile);
fs->removeFileArchive(fs->getFileArchiveCount() - 1);
return false;
}
total_read += bytes_read;
}

fclose(targetfile);
}

}

fs->removeFileArchive(fs->getFileArchiveCount() - 1);
return true;
}

// Virtual methods from con::PeerHandler
void Client::peerAdded(con::Peer *peer)
{
Expand Down Expand Up @@ -1910,23 +1978,17 @@ scene::IAnimatedMesh* Client::getMesh(const std::string &filename, bool cache)

// Create the mesh, remove it from cache and return it
// This allows unique vertex colors and other properties for each instance
#if IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR > 8
io::IReadFile *rfile = RenderingEngine::get_filesystem()->createMemoryReadFile(
io::IReadFile *rfile = m_rendering_engine->get_filesystem()->createMemoryReadFile(
data.c_str(), data.size(), filename.c_str());
#else
Buffer<char> data_rw(data.c_str(), data.size()); // Const-incorrect Irrlicht
io::IReadFile *rfile = RenderingEngine::get_filesystem()->createMemoryReadFile(
*data_rw, data_rw.getSize(), filename.c_str());
#endif
FATAL_ERROR_IF(!rfile, "Could not create/open RAM file");

scene::IAnimatedMesh *mesh = RenderingEngine::get_scene_manager()->getMesh(rfile);
scene::IAnimatedMesh *mesh = m_rendering_engine->get_scene_manager()->getMesh(rfile);
rfile->drop();
if (!mesh)
return nullptr;
mesh->grab();
if (!cache)
RenderingEngine::get_mesh_cache()->removeMesh(mesh);
m_rendering_engine->get_mesh_cache()->removeMesh(mesh);
return mesh;
}

Expand Down
6 changes: 6 additions & 0 deletions src/client/client.h
View file
Expand Up @@ -45,6 +45,7 @@ struct ClientEvent;
struct MeshMakeData;
struct ChatMessage;
class MapBlockMesh;
class RenderingEngine;
class IWritableTextureSource;
class IWritableShaderSource;
class IWritableItemDefManager;
Expand Down Expand Up @@ -123,6 +124,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
NodeDefManager *nodedef,
ISoundManager *sound,
MtEventManager *event,
RenderingEngine *rendering_engine,
bool ipv6,
GameUI *game_ui
);
Expand Down Expand Up @@ -379,6 +381,9 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
// Insert a media file appropriately into the appropriate manager
bool loadMedia(const std::string &data, const std::string &filename,
bool from_media_push = false);

bool extractZipFile(const char *filename, const std::string &destination);

// Send a request for conventional media transfer
void request_media(const std::vector<std::string> &file_requests);

Expand Down Expand Up @@ -469,6 +474,7 @@ class Client : public con::PeerHandler, public InventoryManager, public IGameDef
NodeDefManager *m_nodedef;
ISoundManager *m_sound;
MtEventManager *m_event;
RenderingEngine *m_rendering_engine;


MeshUpdateThread m_mesh_update_thread;
Expand Down
2 changes: 1 addition & 1 deletion src/client/game.cpp
View file
Expand Up @@ -1465,7 +1465,7 @@ bool Game::connectToServer(const GameStartData &start_data,
start_data.password, start_data.address,
*draw_control, texture_src, shader_src,
itemdef_manager, nodedef_manager, sound, eventmgr,
connect_address.isIPv6(), m_game_ui.get());
RenderingEngine::get_instance(), connect_address.isIPv6(), m_game_ui.get());

client->m_simple_singleplayer_mode = simple_singleplayer_mode;

Expand Down
5 changes: 2 additions & 3 deletions src/client/renderingengine.h
View file
Expand Up @@ -59,10 +59,9 @@ class RenderingEngine

static RenderingEngine *get_instance() { return s_singleton; }

static io::IFileSystem *get_filesystem()
io::IFileSystem *get_filesystem()
{
sanity_check(s_singleton && s_singleton->m_device);
return s_singleton->m_device->getFileSystem();
return m_device->getFileSystem();
}

static video::IVideoDriver *get_video_driver()
Expand Down
73 changes: 2 additions & 71 deletions src/script/lua_api/l_mainmenu.cpp
View file
Expand Up @@ -34,9 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "serverlist.h"
#include "mapgen/mapgen.h"
#include "settings.h"

#include <IFileArchive.h>
#include <IFileSystem.h>
#include "client/client.h"
#include "client/renderingengine.h"
#include "network/networkprotocol.h"

Expand Down Expand Up @@ -630,74 +628,7 @@ int ModApiMainMenu::l_extract_zip(lua_State *L)

if (ModApiMainMenu::mayModifyPath(absolute_destination)) {
fs::CreateAllDirs(absolute_destination);

io::IFileSystem *fs = RenderingEngine::get_filesystem();

if (!fs->addFileArchive(zipfile, false, false, io::EFAT_ZIP)) {
lua_pushboolean(L,false);
return 1;
}

sanity_check(fs->getFileArchiveCount() > 0);

/**********************************************************************/
/* WARNING this is not threadsafe!! */
/**********************************************************************/
io::IFileArchive* opened_zip =
fs->getFileArchive(fs->getFileArchiveCount()-1);

const io::IFileList* files_in_zip = opened_zip->getFileList();

unsigned int number_of_files = files_in_zip->getFileCount();

for (unsigned int i=0; i < number_of_files; i++) {
std::string fullpath = destination;
fullpath += DIR_DELIM;
fullpath += files_in_zip->getFullFileName(i).c_str();
std::string fullpath_dir = fs::RemoveLastPathComponent(fullpath);

if (!files_in_zip->isDirectory(i)) {
if (!fs::PathExists(fullpath_dir) && !fs::CreateAllDirs(fullpath_dir)) {
fs->removeFileArchive(fs->getFileArchiveCount()-1);
lua_pushboolean(L,false);
return 1;
}

io::IReadFile* toread = opened_zip->createAndOpenFile(i);

FILE *targetfile = fopen(fullpath.c_str(),"wb");

if (targetfile == NULL) {
fs->removeFileArchive(fs->getFileArchiveCount()-1);
lua_pushboolean(L,false);
return 1;
}

char read_buffer[1024];
long total_read = 0;

while (total_read < toread->getSize()) {

unsigned int bytes_read =
toread->read(read_buffer,sizeof(read_buffer));
if ((bytes_read == 0 ) ||
(fwrite(read_buffer, 1, bytes_read, targetfile) != bytes_read))
{
fclose(targetfile);
fs->removeFileArchive(fs->getFileArchiveCount()-1);
lua_pushboolean(L,false);
return 1;
}
total_read += bytes_read;
}

fclose(targetfile);
}

}

fs->removeFileArchive(fs->getFileArchiveCount()-1);
lua_pushboolean(L,true);
lua_pushboolean(L, getClient(L)->extractZipFile(zipfile, destination));
return 1;
}

Expand Down

0 comments on commit e34d28a

Please sign in to comment.