mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -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

7
Source/EmberGenome/EmberGenome.cpp
View File

@ -203,7 +203,7 @@ bool EmberGenome(EmberOptions& opt)
return false;
}
if (!InitPaletteList<T>(opt.PalettePath()))
if (!InitPaletteList<float>(opt.PalettePath()))
return false;
if (!opt.EmberCL())
@ -562,7 +562,7 @@ bool EmberGenome(EmberOptions& opt)
cout << emberToXml.ToString(result1, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
}
tools.Spin(embers[0], pTemplate, result2, frame , blend , opt.CwLoops());
tools.Spin(embers[0], pTemplate, result2, frame, blend, opt.CwLoops());
tools.Spin(embers[0], pTemplate, result3, frame + 1, blend + spread, opt.CwLoops());
cout << emberToXml.ToString(result2, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
cout << emberToXml.ToString(result3, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
@ -581,7 +581,7 @@ bool EmberGenome(EmberOptions& opt)
cout << emberToXml.ToString(result1, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
}
tools.SpinInter(embers.data(), pTemplate, result2, frame , false, blend , opt.InterpLoops(), opt.CwInterpLoops());
tools.SpinInter(embers.data(), pTemplate, result2, frame, false, blend, opt.InterpLoops(), opt.CwInterpLoops());
tools.SpinInter(embers.data(), pTemplate, result3, frame + 1, false, blend + spread, opt.InterpLoops(), opt.CwInterpLoops());
cout << emberToXml.ToString(result2, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
cout << emberToXml.ToString(result3, opt.Extras(), opt.PrintEditDepth(), !opt.NoEdits(), opt.HexPalette());
@ -862,6 +862,7 @@ int _tmain(int argc, _TCHAR* argv[])
if (!opt.Populate(argc, argv, eOptionUse::OPT_USE_GENOME))
{
auto palf = PaletteList<float>::Instance();
#ifdef DO_DOUBLE
if (!opt.Sp())