mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-02 22:34:52 -04:00
--User changes
-Remove the option --intpalette to format the palette in the xml as ints. If they are not hex formatted, then they should always be float. This option was pointless. -Cleanup some options text for the command line programs. -Allow for dragging around flames in the library tab. This is useful for setting up the order of an animation. -Make the opening of large files in Fractorium much more efficient when not-appending. -Make the opening of large files in all EmberRender and EmberAnimate more efficient. -Better error reporting when opening files. --Bug fixes -Get rid of leftover artifacts that would appear on preview thumbnails when either switching SP/DP or re-rendering previews. -Filename extension was not being appended on Linux when saving as Xml, thus making it impossible to drag that file back in becase drop is filtered on extension. --Code changes -Move GCC compiler spec to C++14. Building with 5.3 now on linux. -Use inline member data initializers. -Make a #define for static for use in Utils.h to make things a little cleaner. -Make various functions able to take arbitrary collections as their parameters rather than just vectors. -Make library collection a list rather than vector. This alleviates the need to re-sync pointers whenever the collection changes. -Subclass QTreeWidget for the library tree. Two new files added for this. -Remove all usage of #ifdef ROW_ONLY_DE in DEOpenCLKernelCreator, it was never used. -Add move constructor and assignment operator to EmberFile. -Add the ability to use a pointer to outside memory in the renderer for the vector of Ember<T>. -Make a lot more functions const where they should be.
This commit is contained in:
@ -18,6 +18,12 @@ enum class eEditUndoState : et { REGULAR_EDIT, UNDO_REDO, EDIT_UNDO };
|
||||
/// </summary>
|
||||
enum class eXformUpdate : et { UPDATE_CURRENT, UPDATE_SELECTED, UPDATE_CURRENT_AND_SELECTED, UPDATE_SELECTED_EXCEPT_FINAL, UPDATE_ALL, UPDATE_ALL_EXCEPT_FINAL };
|
||||
|
||||
/// <summary>
|
||||
/// An enum representing the type of synchronizing to do between the list of Embers kept in memory
|
||||
/// and the widgets in the library tree.
|
||||
/// </summary>
|
||||
enum eLibraryUpdate { INDEX = 1, NAME = 2, POINTER = 4 };
|
||||
|
||||
/// <summary>
|
||||
/// FractoriumEmberController and Fractorium need each other, but each can't include the other.
|
||||
/// So Fractorium includes this file, and Fractorium is declared as a forward declaration here.
|
||||
@ -42,6 +48,7 @@ class FractoriumEmberControllerBase : public RenderCallback
|
||||
{
|
||||
public:
|
||||
FractoriumEmberControllerBase(Fractorium* fractorium);
|
||||
FractoriumEmberControllerBase(const FractoriumEmberControllerBase& controller) = delete;
|
||||
virtual ~FractoriumEmberControllerBase();
|
||||
|
||||
//Embers.
|
||||
@ -107,14 +114,14 @@ public:
|
||||
//Toolbar.
|
||||
|
||||
//Library.
|
||||
virtual void SyncNames() { }
|
||||
virtual void SyncPointers() { }
|
||||
virtual void SyncLibrary(eLibraryUpdate update) { }
|
||||
virtual void FillLibraryTree(int selectIndex = -1) { }
|
||||
virtual void UpdateLibraryTree() { }
|
||||
virtual void EmberTreeItemChanged(QTreeWidgetItem* item, int col) { }
|
||||
virtual void EmberTreeItemDoubleClicked(QTreeWidgetItem* item, int col) { }
|
||||
virtual void RenderPreviews(uint start = UINT_MAX, uint end = UINT_MAX) { }
|
||||
virtual void StopPreviewRender() { }
|
||||
virtual void MoveLibraryItems(int startRow, int destRow) { }
|
||||
virtual void Delete(const pair<size_t, QTreeWidgetItem*>& p) { }
|
||||
|
||||
//Params.
|
||||
@ -237,17 +244,17 @@ protected:
|
||||
eProcessState ProcessState() { return m_Renderer.get() ? m_Renderer->ProcessState() : eProcessState::NONE; }
|
||||
|
||||
//Non-templated members.
|
||||
bool m_Rendering;
|
||||
bool m_Shared;
|
||||
bool m_Rendering = false;
|
||||
bool m_Shared = true;
|
||||
bool m_LastEditWasUndoRedo;
|
||||
vector<pair<size_t, size_t>> m_Devices;
|
||||
size_t m_SubBatchCount;
|
||||
uint m_FailedRenders;
|
||||
size_t m_UndoIndex;
|
||||
double m_LockedScale;
|
||||
eRendererType m_RenderType;
|
||||
size_t m_SubBatchCount = 1;//Will be ovewritten by the options on first render.
|
||||
uint m_FailedRenders = 0;
|
||||
size_t m_UndoIndex = 0;
|
||||
double m_LockedScale = 1;
|
||||
eRendererType m_RenderType = eRendererType::CPU_RENDERER;
|
||||
eEditUndoState m_EditState;
|
||||
GLuint m_OutputTexID;
|
||||
GLuint m_OutputTexID = 0;
|
||||
Timing m_RenderElapsedTimer;
|
||||
EmberStats m_Stats;
|
||||
QImage m_FinalPaletteImage;
|
||||
@ -265,7 +272,7 @@ protected:
|
||||
Fractorium* m_Fractorium;
|
||||
std::unique_ptr<QTimer> m_RenderTimer;
|
||||
std::unique_ptr<QTimer> m_RenderRestartTimer;
|
||||
shared_ptr<OpenCLInfo> m_Info;
|
||||
shared_ptr<OpenCLInfo> m_Info = OpenCLInfo::Instance();
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
@ -279,6 +286,7 @@ class FractoriumEmberController : public FractoriumEmberControllerBase
|
||||
{
|
||||
public:
|
||||
FractoriumEmberController(Fractorium* fractorium);
|
||||
FractoriumEmberController(const FractoriumEmberController<T>& controller) = delete;
|
||||
virtual ~FractoriumEmberController();
|
||||
|
||||
//Embers.
|
||||
@ -347,10 +355,10 @@ public:
|
||||
//Toolbar.
|
||||
|
||||
//Library.
|
||||
virtual void SyncNames() override;
|
||||
virtual void SyncPointers() override;
|
||||
virtual void SyncLibrary(eLibraryUpdate update) override;
|
||||
virtual void FillLibraryTree(int selectIndex = -1) override;
|
||||
virtual void UpdateLibraryTree() override;
|
||||
virtual void MoveLibraryItems(int startRow, int destRow) override;
|
||||
virtual void Delete(const pair<size_t, QTreeWidgetItem*>& p) override;
|
||||
virtual void EmberTreeItemChanged(QTreeWidgetItem* item, int col) override;
|
||||
virtual void EmberTreeItemDoubleClicked(QTreeWidgetItem* item, int col) override;
|
||||
@ -489,11 +497,12 @@ private:
|
||||
bool SyncSizes();
|
||||
|
||||
//Templated members.
|
||||
bool m_PreviewRun;
|
||||
bool m_PreviewRunning;
|
||||
bool m_PreviewRun = false;
|
||||
bool m_PreviewRunning = false;
|
||||
vector<T> m_TempOpacities;
|
||||
vector<T> m_NormalizedWeights;
|
||||
Ember<T> m_Ember;
|
||||
const void* m_EmberFilePointer = nullptr;
|
||||
EmberFile<T> m_EmberFile;
|
||||
deque<Ember<T>> m_UndoList;
|
||||
vector<Xform<T>> m_CopiedXforms;
|
||||
@ -503,7 +512,7 @@ private:
|
||||
VariationList<T>& m_VariationList;
|
||||
unique_ptr<SheepTools<T, float>> m_SheepTools;
|
||||
unique_ptr<GLEmberController<T>> m_GLController;
|
||||
unique_ptr<EmberNs::Renderer<T, float>> m_PreviewRenderer;
|
||||
unique_ptr<EmberNs::Renderer<T, float>> m_PreviewRenderer = make_unique<EmberNs::Renderer<T, float>>();
|
||||
QFuture<void> m_PreviewResult;
|
||||
std::function<void (uint, uint)> m_PreviewRenderFunc;
|
||||
};
|
||||
|
Reference in New Issue
Block a user