mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
c91171d392
-Add animation sequence creation to Fractorium. -Add two new options to EmberGenome which are used when generating an animation sequence.: --startcount: Add this number to the filename of each flame. --padding: Override the automatically calculated amount of padding zeroes added to each filename. --Bug fixes -Prevent filenames in command line programs from using scientific notation when rendering a large number of frames. -Fix tab orders to match newer GUI items which were overlooked in previous releases. -Re-render previews if transparency value in the options dialog was changed. Re-rendering was previously only done if early clip or y axis up was changed. -Use transparency when rendering thumbnail previews. --Code changes -Wrap EmberCommon.h in a namespace called EmberCommon. -Move FormatName() from EmberGenome to EmberCommon.h/cpp -Add a prefix parameter to EmberFile::DefaultFilename() to allow for creating a default filename for sequences. -When showing the final render dialog, allow specifying where it came from: the toolbar or the render sequence button. -Refactor all preview rendering code out into its own class hierarchy with overrides for the main window and the final render dialog. -Remove all preview render cancelling functions, they are now built into the new class hierarchy and a new render will not start until the previous one is stopped. -Add two new function ConstrainLow() and ConstrainHigh() which wrap constraining two min/max spinboxes to each others' values. -Add a bool to FractoriumEmberControllerBase::CopyEmberFile() to specify whether to copy the main file or the sequence file. This is somewhat of a hack and was done in a rush. -Add a bool to FractoriumEmberControllerBase::SetEmberFile() to specify whether to move the file rather than copy. This is used in FinalRenderEmberController and improves efficiency. -Add wrapper functions for variations filter dialog settings.
174 lines
6.6 KiB
C++
174 lines
6.6 KiB
C++
#pragma once
|
|
|
|
#include "FractoriumSettings.h"
|
|
#include "FractoriumEmberController.h"
|
|
|
|
/// <summary>
|
|
/// FinalRenderEmberControllerBase and FinalRenderEmberController<T> classes.
|
|
/// </summary>
|
|
|
|
/// <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.
|
|
/// </summary>
|
|
class Fractorium;
|
|
class FractoriumFinalRenderDialog;
|
|
template <typename T> class FinalRenderPreviewRenderer;
|
|
|
|
/// <summary>
|
|
/// Used to hold the options specified in the current state of the Gui for performing the final render.
|
|
/// </summary>
|
|
struct FinalRenderGuiState
|
|
{
|
|
bool m_EarlyClip;
|
|
bool m_YAxisUp;
|
|
bool m_AlphaChannel;
|
|
bool m_Transparency;
|
|
bool m_OpenCL;
|
|
bool m_Double;
|
|
bool m_SaveXml;
|
|
bool m_DoAll;
|
|
bool m_DoSequence;
|
|
bool m_KeepAspect;
|
|
eScaleType m_Scale;
|
|
QString m_Path;
|
|
QString m_Ext;
|
|
QString m_Prefix;
|
|
QString m_Suffix;
|
|
QList<QVariant> m_Devices;
|
|
uint m_ThreadCount;
|
|
int m_ThreadPriority;
|
|
double m_WidthScale;
|
|
double m_HeightScale;
|
|
double m_Quality;
|
|
uint m_TemporalSamples;
|
|
uint m_Supersample;
|
|
size_t m_Strips;
|
|
};
|
|
|
|
/// <summary>
|
|
/// FinalRenderEmberControllerBase serves as a non-templated base class with virtual
|
|
/// functions which will be overridden in a derived class that takes a template parameter.
|
|
/// Although not meant to be used as an interactive renderer, it derives from FractoriumEmberControllerBase
|
|
/// to access a few of its members to avoid having to redefine them here.
|
|
/// </summary>
|
|
class FinalRenderEmberControllerBase : public FractoriumEmberControllerBase
|
|
{
|
|
friend FractoriumFinalRenderDialog;
|
|
|
|
public:
|
|
FinalRenderEmberControllerBase(FractoriumFinalRenderDialog* finalRenderDialog);
|
|
virtual ~FinalRenderEmberControllerBase() { }
|
|
|
|
virtual void SyncCurrentToGui() { }
|
|
virtual void SyncGuiToEmbers(size_t widthOverride = 0, size_t heightOverride = 0) { }
|
|
virtual void SyncCurrentToSizeSpinners(bool scale, bool size) { }
|
|
virtual void ResetProgress(bool total = true) { }
|
|
virtual tuple<size_t, size_t, size_t> SyncAndComputeMemory() { return tuple<size_t, size_t, size_t>(0, 0, 0); }
|
|
virtual double OriginalAspect() { return 1; }
|
|
virtual QString ComposePath(const QString& name) { return ""; }
|
|
virtual void CancelRender() { }
|
|
virtual QString CheckMemory(const tuple<size_t, size_t, size_t>& p) { return ""; }
|
|
|
|
bool CreateRendererFromGUI();
|
|
void Output(const QString& s);
|
|
|
|
protected:
|
|
bool m_Run = false;
|
|
size_t m_ImageCount = 0;
|
|
std::atomic<size_t> m_FinishedImageCount;
|
|
|
|
QFuture<void> m_Result;
|
|
std::function<void (void)> m_FinalRenderFunc;
|
|
|
|
FractoriumSettings* m_Settings;
|
|
FractoriumFinalRenderDialog* m_FinalRenderDialog;
|
|
FinalRenderGuiState m_GuiState;
|
|
std::recursive_mutex m_ProgressCs;
|
|
Timing m_RenderTimer;
|
|
Timing m_TotalTimer;
|
|
};
|
|
|
|
/// <summary>
|
|
/// Templated derived class which implements all interaction functionality between the embers
|
|
/// of a specific template type and the final render dialog.
|
|
/// </summary>
|
|
template<typename T>
|
|
class FinalRenderEmberController : public FinalRenderEmberControllerBase
|
|
{
|
|
friend FinalRenderPreviewRenderer<T>;
|
|
|
|
public:
|
|
FinalRenderEmberController(FractoriumFinalRenderDialog* finalRender);
|
|
virtual ~FinalRenderEmberController() { }
|
|
|
|
//Virtual functions overridden from FractoriumEmberControllerBase.
|
|
virtual void SetEmberFile(const EmberFile<float>& emberFile, bool move) override;
|
|
virtual void CopyEmberFile(EmberFile<float>& emberFile, bool sequence, std::function<void(Ember<float>& ember)> perEmberOperation/* = [&](Ember<float>& ember) { }*/) override;
|
|
#ifdef DO_DOUBLE
|
|
virtual void SetEmberFile(const EmberFile<double>& emberFile, bool move) override;
|
|
virtual void CopyEmberFile(EmberFile<double>& emberFile, bool sequence, std::function<void(Ember<double>& ember)> perEmberOperation/* = [&](Ember<double>& ember) { }*/) override;
|
|
#endif
|
|
virtual void SetEmber(size_t index, bool verbatim) override;
|
|
virtual bool Render() override;
|
|
virtual bool CreateRenderer(eRendererType renderType, const vector<pair<size_t, size_t>>& devices, bool shared = true) override;
|
|
virtual int ProgressFunc(Ember<T>& ember, void* foo, double fraction, int stage, double etaMs) override;
|
|
virtual size_t Index() const override { return m_Ember->m_Index; }
|
|
virtual uint SizeOfT() const override { return sizeof(T); }
|
|
|
|
//Virtual functions overridden from FinalRenderEmberControllerBase.
|
|
virtual void SyncCurrentToGui() override;
|
|
virtual void SyncGuiToEmbers(size_t widthOverride = 0, size_t heightOverride = 0) override;
|
|
virtual void SyncCurrentToSizeSpinners(bool scale, bool size) override;
|
|
virtual void ResetProgress(bool total = true) override;
|
|
virtual tuple<size_t, size_t, size_t> SyncAndComputeMemory() override;
|
|
virtual double OriginalAspect() override { return double(m_Ember->m_OrigFinalRasW) / m_Ember->m_OrigFinalRasH; }
|
|
virtual QString Name() const override { return QString::fromStdString(m_Ember->m_Name); }
|
|
virtual QString ComposePath(const QString& name) override;
|
|
virtual void CancelRender() override;
|
|
virtual QString CheckMemory(const tuple<size_t, size_t, size_t>& p) override;
|
|
|
|
//Non Virtual functions.
|
|
EmberNs::Renderer<T, float>* FirstOrDefaultRenderer();
|
|
|
|
protected:
|
|
void HandleFinishedProgress();
|
|
void SaveCurrentRender(Ember<T>& ember);
|
|
void SaveCurrentRender(Ember<T>& ember, const EmberImageComments& comments, vector<byte>& pixels, size_t width, size_t height, size_t channels, size_t bpc);
|
|
void RenderComplete(Ember<T>& ember);
|
|
void RenderComplete(Ember<T>& ember, const EmberStats& stats, Timing& renderTimer);
|
|
void SyncGuiToEmber(Ember<T>& ember, size_t widthOverride = 0, size_t heightOverride = 0);
|
|
bool SyncGuiToRenderer();
|
|
void SetProgressComplete(int val);
|
|
|
|
Ember<T>* m_Ember;
|
|
EmberFile<T> m_EmberFile;
|
|
EmberToXml<T> m_XmlWriter;
|
|
unique_ptr<FinalRenderPreviewRenderer<T>> m_FinalPreviewRenderer;
|
|
vector<unique_ptr<EmberNs::Renderer<T, float>>> m_Renderers;
|
|
};
|
|
|
|
/// <summary>
|
|
/// Thin derivation to handle preview rendering that is specific to the final render dialog.
|
|
/// This differs from the preview renderers on the main window because they render multiple embers
|
|
/// to a tree, whereas this renders a single preview.
|
|
/// </summary>
|
|
template <typename T>
|
|
class FinalRenderPreviewRenderer : public PreviewRenderer<T>
|
|
{
|
|
public:
|
|
using PreviewRenderer<T>::m_PreviewRun;
|
|
using PreviewRenderer<T>::m_PreviewEmber;
|
|
using PreviewRenderer<T>::m_PreviewRenderer;
|
|
using PreviewRenderer<T>::m_PreviewFinalImage;
|
|
|
|
FinalRenderPreviewRenderer(FinalRenderEmberController<T>* controller) : m_Controller(controller)
|
|
{
|
|
}
|
|
|
|
virtual void PreviewRenderFunc(uint start, uint end) override;
|
|
|
|
private:
|
|
FinalRenderEmberController<T>* m_Controller;
|
|
};
|