mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-02 22:34:52 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Fix build.
 -Cleanup warnings.
This commit is contained in:
mfeemster
2016-02-13 17:24:51 -08:00
parent 09fd339696
commit 10c12b5250
35 changed files with 472 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Fractorium/FractoriumEmberController.h
View File

@ -199,7 +199,7 @@ public:
virtual void RandomXaos() { }
//Palette.
virtual int InitPaletteList(const string& s) { return 0; }
virtual size_t InitPaletteList(const string& s) { return 0; }
virtual bool FillPaletteTable(const string& s) { return false; }
virtual void ApplyPaletteToEmber() { }
virtual void PaletteAdjust() { }
@ -240,9 +240,9 @@ protected:
bool m_Shared;
bool m_LastEditWasUndoRedo;
vector<pair<size_t, size_t>> m_Devices;
uint m_SubBatchCount;
size_t m_SubBatchCount;
uint m_FailedRenders;
uint m_UndoIndex;
size_t m_UndoIndex;
double m_LockedScale;
eRendererType m_RenderType;
eEditUndoState m_EditState;
@ -443,7 +443,7 @@ public:
virtual void RandomXaos() override;
//Palette.
virtual int InitPaletteList(const string& s) override;
virtual size_t InitPaletteList(const string& s) override;
virtual bool FillPaletteTable(const string& s) override;
virtual void ApplyPaletteToEmber() override;
virtual void PaletteAdjust() override;