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

18
Source/EmberTester/EmberTester.cpp
View File

@ -88,9 +88,9 @@ void MakeTestAllVarsRegPrePost(vector<Ember<T>>& embers)
uint index = 0;
ostringstream ss;
auto varList = VariationList<T>::Instance();
PaletteList<T> paletteList;
auto paletteList = PaletteList<float>::Instance();
QTIsaac<ISAAC_SIZE, ISAAC_INT> rand;
paletteList.Add("flam3-palettes.xml");
paletteList->Add("flam3-palettes.xml");
Timing t;
Ember<T> emberNoVars;
emberNoVars.m_FinalRasW = 640;
@ -113,7 +113,7 @@ void MakeTestAllVarsRegPrePost(vector<Ember<T>>& embers)
ss << "NoVars";
emberNoVars.m_Name = ss.str();
ss.str("");
emberNoVars.m_Palette = *paletteList.GetPaletteByFilename(paletteList.m_DefaultFilename, 0);
emberNoVars.m_Palette = *paletteList->GetPaletteByFilename(paletteList->m_DefaultFilename, 0);
embers.push_back(emberNoVars);
while (index < varList->RegSize())
@ -176,7 +176,7 @@ void MakeTestAllVarsRegPrePost(vector<Ember<T>>& embers)
ss << index << "_" << regVar->Name();
ember1.m_Name = ss.str();
ss.str("");
ember1.m_Palette = *paletteList.GetRandomPalette();
ember1.m_Palette = *paletteList->GetRandomPalette();
index++;
embers.push_back(ember1);
}
@ -1078,10 +1078,10 @@ void PrintAllVars()
void TestXformsInOutPoints()
{
uint index = 0;
auto varList(VariationList<float>::Instance());
PaletteList<float> paletteList;
auto varList = VariationList<float>::Instance();
auto paletteList = PaletteList<float>::Instance();
QTIsaac<ISAAC_SIZE, ISAAC_INT> rand;
paletteList.Add("flam3-palettes.xml");
paletteList->Add("flam3-palettes.xml");
while (index < varList->RegSize())
{
@ -1975,8 +1975,8 @@ int _tmain(int argc, _TCHAR* argv[])
TestThreadedKernel();
PaletteList<float> palf;
Palette<float>* pal = palf.GetRandomPalette();
auto palf = PaletteList<float>::Instance();
Palette<float>* pal = palf->GetRandomPalette();
cout << pal->Size() << endl;