mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-06 00:06:00 -04:00
Features:
--Add support for Exr files which use 32-bit floats for each RGBA channel. Seems to come out too washed out. --Allow for clearing an individual color curve. --Allow for saving multiple image types in EmberRender and EmberAnimate. All writes are threaded. --Remove --bpc command line argument. Add format png16 as a replacement. --Remove --enable_jpg_comments and --enable_png_comments command line arguments, and replace them with --enable_comments which applies to jpg, png and exr. --Add menu items to variations and affine spinners which allow for easy entry of specific numeric values like pi. --Make final render dialog be wider rather than so tall. Bug fixes: --Fix some OpenCL compile errors on Mac. --Remove ability to save bitmap files on all platforms but Windows. Code changes: --New dependency on OpenEXR. --Allow Curves class to interact with objects of a different template type. --Make m_Curves member of Ember always use float as template type. --Set the length of the curves array to always be 2^17 which should offer enough precision with new 32-bit float pixel types. --Set pixel types to always be 32-bit float. This results in a major reduction of code in the final accumulation part of Renderer.h/cpp. --Remove corresponding code from RendererCL and FinalAccumOpenCLKernelCreator. --Remove Transparency, NumChannels and BytesPerPixel setters from Renderer.h/cpp. --Add new global functions to format final image buffers and place all alpha calculation and scaling code in them. --Blending is no longer needed in OpenGLWidget because of the new pixel type. --Make new class, AffineDoubleSpinBox. --Attempt to make file save dialog code work the same on all OSes. --Remove some unused functions.
This commit is contained in:
@ -339,18 +339,18 @@ public slots:
|
||||
void OnSummaryTreeHeaderSectionClicked(int logicalIndex);
|
||||
|
||||
//Rendering/progress.
|
||||
void StartRenderTimer();
|
||||
void StartRenderTimer(bool updatePreviews);
|
||||
void IdleTimer();
|
||||
bool ControllersOk();
|
||||
void ShowCritical(const QString& title, const QString& text, bool invokeRequired = false);
|
||||
|
||||
//Can't have a template function be a slot.
|
||||
void SetLibraryTreeItemData(EmberTreeWidgetItemBase* item, vector<byte>& v, uint w, uint h);
|
||||
void SetLibraryTreeItemData(EmberTreeWidgetItemBase* item, vv4F& v, uint w, uint h);
|
||||
|
||||
public:
|
||||
//template<typename spinType, typename valType>//See below.
|
||||
//static void SetupSpinner(QTableWidget* table, const QObject* receiver, int& row, int col, spinType*& spinBox, int height, valType min, valType max, valType step, const char* signal, const char* slot, bool incRow = true, valType val = 0, valType doubleClickZero = -999, valType doubleClickNonZero = -999);
|
||||
static void SetupAffineSpinner(QTableWidget* table, const QObject* receiver, int row, int col, DoubleSpinBox*& spinBox, int height, double min, double max, double step, double prec, const char* signal, const char* slot);
|
||||
static void SetupAffineSpinner(QTableWidget* table, const QObject* receiver, int row, int col, AffineDoubleSpinBox*& spinBox, int height, double min, double max, double step, double prec, const char* signal, const char* slot);
|
||||
static void SetupCombo(QTableWidget* table, const QObject* receiver, int& row, int col, StealthComboBox*& comboBox, const vector<string>& vals, const char* signal, const char* slot, Qt::ConnectionType connectionType = Qt::QueuedConnection);
|
||||
static void SetFixedTableHeader(QHeaderView* header, QHeaderView::ResizeMode mode = QHeaderView::Fixed);
|
||||
|
||||
@ -422,8 +422,8 @@ private:
|
||||
void ErrorReportToQTextEdit(const vector<string>& errors, QTextEdit* textEdit, bool clear = true);
|
||||
|
||||
//Rendering/progress.
|
||||
void ShutdownAndRecreateFromOptions();
|
||||
bool CreateRendererFromOptions();
|
||||
void ShutdownAndRecreateFromOptions(bool updatePreviews);
|
||||
bool CreateRendererFromOptions(bool updatePreviews);
|
||||
bool CreateControllerFromOptions();
|
||||
void EnableRenderControls(bool enable);
|
||||
|
||||
@ -489,22 +489,22 @@ private:
|
||||
DoubleSpinBox* m_XformDirectColorSpin;
|
||||
|
||||
//Xforms Affine.
|
||||
DoubleSpinBox* m_PreX1Spin;//Pre.
|
||||
DoubleSpinBox* m_PreX2Spin;
|
||||
DoubleSpinBox* m_PreY1Spin;
|
||||
DoubleSpinBox* m_PreY2Spin;
|
||||
DoubleSpinBox* m_PreO1Spin;
|
||||
DoubleSpinBox* m_PreO2Spin;
|
||||
AffineDoubleSpinBox* m_PreX1Spin;//Pre.
|
||||
AffineDoubleSpinBox* m_PreX2Spin;
|
||||
AffineDoubleSpinBox* m_PreY1Spin;
|
||||
AffineDoubleSpinBox* m_PreY2Spin;
|
||||
AffineDoubleSpinBox* m_PreO1Spin;
|
||||
AffineDoubleSpinBox* m_PreO2Spin;
|
||||
|
||||
DoubleSpinBox* m_PostX1Spin;//Post.
|
||||
DoubleSpinBox* m_PostX2Spin;
|
||||
DoubleSpinBox* m_PostY1Spin;
|
||||
DoubleSpinBox* m_PostY2Spin;
|
||||
DoubleSpinBox* m_PostO1Spin;
|
||||
DoubleSpinBox* m_PostO2Spin;
|
||||
AffineDoubleSpinBox* m_PostX1Spin;//Post.
|
||||
AffineDoubleSpinBox* m_PostX2Spin;
|
||||
AffineDoubleSpinBox* m_PostY1Spin;
|
||||
AffineDoubleSpinBox* m_PostY2Spin;
|
||||
AffineDoubleSpinBox* m_PostO1Spin;
|
||||
AffineDoubleSpinBox* m_PostO2Spin;
|
||||
|
||||
DoubleSpinBox* m_PreSpins[6];
|
||||
DoubleSpinBox* m_PostSpins[6];
|
||||
AffineDoubleSpinBox* m_PreSpins[6];
|
||||
AffineDoubleSpinBox* m_PostSpins[6];
|
||||
|
||||
//Xaos.
|
||||
DoubleSpinBox* m_XaosSpinBox;
|
||||
@ -555,6 +555,7 @@ private:
|
||||
int m_VarSortMode;
|
||||
int m_PaletteSortMode;
|
||||
int m_PreviousPaletteRow;
|
||||
vector<byte> m_PreviewVec;
|
||||
shared_ptr<OpenCLInfo> m_Info;
|
||||
unique_ptr<FractoriumEmberControllerBase> m_Controller;
|
||||
Ui::FractoriumClass ui;
|
||||
|
Reference in New Issue
Block a user