Skip to content

Raw data loading option for engineLoadIFP #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3 commits merged into from
Jul 22, 2018
Merged

Raw data loading option for engineLoadIFP #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
062193e
Modified function: engineLoadIFP
Jul 21, 2018
237cfd1
Merge branch 'master' of https://github.com/samr46/mtasa-blue
samr46 Jul 21, 2018
0cf25a0
Variables rename
samr46 Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Client/mods/deathmatch/logic/CClientIFP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ CClientIFP::CClientIFP(class CClientManager* pManager, ElementID ID) : CClientEn
m_u32Hashkey = 0;
}

bool CClientIFP::LoadIFP(const SString& strFilePath, const SString& strBlockName)
bool CClientIFP::LoadIFP(const SString& strFile, const bool isRawData, const SString& strBlockName)
{
m_strBlockName = strBlockName;
m_pVecAnimations = &m_pIFPAnimations->vecAnimations;

if (LoadIFPFile(strFilePath))
if (LoadIFPFile(strFile, isRawData))
{
m_u32Hashkey = HashString(strBlockName.ToLower());
return true;
}
return false;
}

bool CClientIFP::LoadIFPFile(const SString& strFilePath)
bool CClientIFP::LoadIFPFile(const SString& strFile, const bool isRawData)
{
if (LoadFileToMemory(strFilePath))
if (isRawData ? LoadDataBufferToMemory(strFile) : LoadFileToMemory(strFile))
{
if (ReadIFPByVersion())
{
Expand Down
4 changes: 2 additions & 2 deletions Client/mods/deathmatch/logic/CClientIFP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class CClientIFP : public CClientEntity, CFileReader
void MarkAsUnloading(void) { m_bUnloading = true; }
bool IsUnloading(void) { return m_bUnloading; }

bool LoadIFP(const SString& strFilePath, const SString& strBlockName);
bool LoadIFP(const SString& strFile, const bool isRawData, const SString& strBlockName);

const SString& GetBlockName(void) { return m_strBlockName; }
const unsigned int& GetBlockNameHash(void) { return m_u32Hashkey; }
Expand All @@ -219,7 +219,7 @@ class CClientIFP : public CClientEntity, CFileReader
void SetPosition(const CVector& vecPosition){};

private:
bool LoadIFPFile(const SString& strFilePath);
bool LoadIFPFile(const SString& strFile, const bool isRawData);
bool ReadIFPByVersion(void);
void ReadIFPVersion1(void);
void ReadIFPVersion2(bool bAnp3);
Expand Down
24 changes: 20 additions & 4 deletions Client/mods/deathmatch/logic/CFileReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,31 @@ void CFileReader::SkipBytes(const std::uint32_t u32BytesToSkip)
bool CFileReader::LoadFileToMemory(const SString& strFilePath)
{
std::ifstream fileStream(FromUTF8(strFilePath), std::ios::binary | std::ios::ate);
std::streamsize m_iFileSize = fileStream.tellg();
if (m_iFileSize == eIFSTREAM::SIZE_ERROR)
std::streamsize iFileSize = fileStream.tellg();
if (iFileSize == eIFSTREAM::SIZE_ERROR)
{
return false;
}

fileStream.seekg(0, std::ios::beg);
m_vecFileDataBuffer.reserve(static_cast<size_t>(m_iFileSize));
if (fileStream.read(m_vecFileDataBuffer.data(), m_iFileSize))
m_vecFileDataBuffer.reserve(static_cast<size_t>(iFileSize));
if (fileStream.read(m_vecFileDataBuffer.data(), iFileSize))
{
return true;
}
return false;
}

bool CFileReader::LoadDataBufferToMemory(const SString& buffer)
{
std::streamsize iBufferSize = buffer.size();
if (iBufferSize == eIFSTREAM::SIZE_ERROR)
{
return false;
}

m_vecFileDataBuffer.reserve(static_cast<size_t>(iBufferSize));
if (std::copy(buffer.begin(), buffer.end(), m_vecFileDataBuffer.data()))
{
return true;
}
Expand Down
1 change: 1 addition & 0 deletions Client/mods/deathmatch/logic/CFileReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CFileReader

CFileReader(void);
bool LoadFileToMemory(const SString& strFilePath);
bool LoadDataBufferToMemory(const SString& buffer);
// Do not call any file reader functions after calling this function
void FreeFileReaderMemory(void);

Expand Down
10 changes: 8 additions & 2 deletions Client/mods/deathmatch/logic/CIFPEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <StdInc.h>

std::shared_ptr<CClientIFP> CIFPEngine::EngineLoadIFP(CResource* pResource, CClientManager* pManager, const SString& strPath, const SString& strBlockName)
std::shared_ptr<CClientIFP> CIFPEngine::EngineLoadIFP(CResource* pResource, CClientManager* pManager, const SString& strFile, bool bIsRawData, const SString& strBlockName)
{
// Grab the resource root entity
CClientEntity* pRoot = pResource->GetResourceIFPRoot();
Expand All @@ -23,7 +23,7 @@ std::shared_ptr<CClientIFP> CIFPEngine::EngineLoadIFP(CResource* pResource, CCli
std::shared_ptr<CClientIFP> pIFP(new CClientIFP(pManager, INVALID_ELEMENT_ID));

// Try to load the IFP file
if (pIFP->LoadIFP(strPath, strBlockName))
if (pIFP->LoadIFP(strFile, bIsRawData, strBlockName))
{
// We can use the map to retrieve correct IFP by block name later
g_pClientGame->InsertIFPPointerToMap(u32BlockNameHash, pIFP);
Expand Down Expand Up @@ -99,3 +99,9 @@ bool CIFPEngine::EngineRestoreAnimation(CClientEntity* pEntity, const SString& s
}
return false;
}

// Return true if data looks like IFP file contents
bool CIFPEngine::IsIFPData(const SString& strData)
{
return strData.length() > 32 && memcmp(strData, "\x41\x4E\x50", 3) == 0;
}
3 changes: 2 additions & 1 deletion Client/mods/deathmatch/logic/CIFPEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ class CIFPEngine
ALL
};

static std::shared_ptr<CClientIFP> EngineLoadIFP(CResource* pResource, CClientManager* pManager, const SString& strPath, const SString& strBlockName);
static std::shared_ptr<CClientIFP> EngineLoadIFP(CResource* pResource, CClientManager* pManager, const SString& strFile, bool bIsRawData, const SString& strBlockName);
static bool EngineReplaceAnimation(CClientEntity* pEntity, const SString& strInternalBlockName, const SString& strInternalAnimName,
const SString& strCustomBlockName, const SString& strCustomAnimName);
static bool EngineRestoreAnimation(CClientEntity* pEntity, const SString& strInternalBlockName, const SString& strInternalAnimName,
const eRestoreAnimation& eRestoreType);
static bool IsIFPData(const SString& strData);
};

#endif
9 changes: 5 additions & 4 deletions Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,22 +297,23 @@ int CLuaEngineDefs::EngineLoadIFP(lua_State* luaVM)
CResource* pResource = pLuaMain->GetResource();
if (pResource)
{
bool bIsRawData = CIFPEngine::IsIFPData(strFile);
SString strPath;
// Is this a legal filepath?
if (CResourceManager::ParseResourcePathInput(strFile, pResource, &strPath))
if (bIsRawData || CResourceManager::ParseResourcePathInput(strFile, pResource, &strPath))
{
std::shared_ptr<CClientIFP> pIFP = CIFPEngine::EngineLoadIFP(pResource, m_pManager, strPath, strBlockName);
std::shared_ptr<CClientIFP> pIFP = CIFPEngine::EngineLoadIFP(pResource, m_pManager, bIsRawData ? strFile : strPath, bIsRawData, strBlockName);
if (pIFP != nullptr)
{
// Return the IFP element
lua_pushelement(luaVM, pIFP.get());
return 1;
}
else
argStream.SetCustomError(strFile, "Error loading IFP");
argStream.SetCustomError(bIsRawData ? "raw data" : strFile, "Error loading IFP");
}
else
argStream.SetCustomError(strFile, "Bad file path");
argStream.SetCustomError(bIsRawData ? "raw data" : strFile, "Bad file path");
}
}
}
Expand Down