birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes for Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-13 16:05:20 -07:00
parent 1d4c53a777
commit 5f7b534afd
66 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/GameResourcesExporter.cpp
+2 -19
View File
@@ -97,7 +97,7 @@ void CGameResourcesExporter::Save(const QString& outputDirectory)
{
// Save this file in target folder.
QString trgFilename = Path::Make(outputDirectory, srcFilename);
int fsize = file.GetLength();
int fsize = static_cast<int>(file.GetLength());
if (fsize > data.GetSize())
{
data.Allocate(fsize + 16);
@@ -123,23 +123,6 @@ void CGameResourcesExporter::Save(const QString& outputDirectory)
m_files.clear();
}
#if defined(WIN64) || defined(APPLE) || defined(AZ_PLATFORM_LINUX)
template <class Container1, class Container2>
void Append(Container1& a, const Container2& b)
{
a.reserve (a.size() + b.size());
for (auto it = b.begin(); it != b.end(); ++it)
{
a.insert(a.end(), *it);
}
}
#else
template <class Container1, class Container2>
void Append(Container1& a, const Container2& b)
{
a.insert (a.end(), b.begin(), b.end());
}
#endif
//////////////////////////////////////////////////////////////////////////
//
// Go through all editor objects and gathers files from thier properties.
@@ -150,5 +133,5 @@ void CGameResourcesExporter::GetFilesFromObjects()
CUsedResources rs;
GetIEditor()->GetObjectManager()->GatherUsedResources(rs);
Append(m_files, rs.files);
AZStd::copy(rs.files.begin(), rs.files.end(), AZStd::back_inserter(m_files));
}