mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-01 05:46:06 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Add missing Mac build files.
 -Convert PaletteList into a Singleton<T>.
This commit is contained in:
Person
2017-02-26 09:34:43 -08:00
parent 00189531fc
commit 29c084a058
25 changed files with 178 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/EmberCommon/EmberCommon.h
View File

@ -122,7 +122,7 @@ static bool ParseEmberFile(XmlToEmber<T>& parser, const string& filename, vector
template <typename T>
static bool InitPaletteList(const string& filename)
{
PaletteList<T> paletteList;//Even though this is local, the members are static so they will remain.
auto paletteList = PaletteList<float>::Instance();
static vector<string> paths =
{
"./"
@ -138,15 +138,15 @@ static bool InitPaletteList(const string& filename)
for (auto& p : paths)
{
if (!added)
added |= paletteList.Add(p + "/" + filename);
added |= paletteList->Add(p + "/" + filename);
else
break;
}
if (!added || !paletteList.Size())
if (!added || !paletteList->Size())
{
cout << "Error parsing palette file " << filename << ". Reason: \n"
<< paletteList.ErrorReportString() << "\nReturning without executing.\n";
<< paletteList->ErrorReportString() << "\nReturning without executing.\n";
return false;
}