mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 05:30:06 -05:00
de613404de
--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.
123 lines
3.6 KiB
C++
123 lines
3.6 KiB
C++
#pragma once
|
|
|
|
#include "FractoriumPch.h"
|
|
#include "FractoriumSettings.h"
|
|
|
|
/// <summary>
|
|
/// DoubleSpinBox and VariationTreeDoubleSpinBox classes.
|
|
/// </summary>
|
|
|
|
enum class eSpinToggle : et { NONE = 0, SPIN_DOUBLE_CLICK = 1, SPIN_RIGHT_CLICK = 2 };
|
|
|
|
/// <summary>
|
|
/// A derivation to prevent the spin box from selecting its own text
|
|
/// when editing. Also to prevent multiple spin boxes from all having
|
|
/// selected text at once.
|
|
/// </summary>
|
|
class DoubleSpinBox : public QDoubleSpinBox
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit DoubleSpinBox(QWidget* parent = nullptr, int height = 16, double step = 0.05);
|
|
virtual ~DoubleSpinBox() { }
|
|
void SetValueStealth(double d);
|
|
void DoubleClick(bool b);
|
|
void DoubleClickLowVal(double val);
|
|
void DoubleClickZero(double val);
|
|
void DoubleClickNonZero(double val);
|
|
double Step();
|
|
void Step(double step);
|
|
double SmallStep();
|
|
void SmallStep(double step);
|
|
QLineEdit* lineEdit();
|
|
|
|
public slots:
|
|
void OnSpinBoxValueChanged(double d);
|
|
void OnTimeout();
|
|
|
|
protected:
|
|
virtual bool eventFilter(QObject* o, QEvent* e) override;
|
|
virtual void focusInEvent(QFocusEvent* e);
|
|
virtual void focusOutEvent(QFocusEvent* e);
|
|
virtual void enterEvent(QEvent* e);
|
|
virtual void leaveEvent(QEvent* e);
|
|
|
|
private:
|
|
void StartTimer();
|
|
void StopTimer();
|
|
|
|
bool m_DoubleClick;
|
|
double m_DoubleClickLowVal;
|
|
double m_DoubleClickNonZero;
|
|
double m_DoubleClickZero;
|
|
double m_Step;
|
|
double m_SmallStep;
|
|
QPoint m_MouseDownPoint;
|
|
QPoint m_MouseMovePoint;
|
|
shared_ptr<FractoriumSettings> m_Settings;
|
|
static QTimer s_Timer;
|
|
};
|
|
|
|
/// <summary>
|
|
/// VariationTreeWidgetItem and VariationTreeDoubleSpinBox need each other, but each can't include the other.
|
|
/// So VariationTreeWidgetItem includes this file, and use a forward declaration here.
|
|
/// </summary>
|
|
class VariationTreeWidgetItem;
|
|
|
|
/// <summary>
|
|
/// Derivation for the double spin boxes that are in the
|
|
/// variations tree.
|
|
/// </summary>
|
|
class VariationTreeDoubleSpinBox : public DoubleSpinBox
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit VariationTreeDoubleSpinBox(QWidget* p, VariationTreeWidgetItem* widgetItem, eVariationId id, const string& param, int h = 16, double step = 0.05);
|
|
virtual ~VariationTreeDoubleSpinBox() { }
|
|
bool IsParam() { return !m_Param.empty(); }
|
|
string ParamName() { return m_Param; }
|
|
eVariationId GetVariationId() { return m_Id; }
|
|
VariationTreeWidgetItem* WidgetItem() { return m_WidgetItem; }
|
|
|
|
public slots:
|
|
void PiActionTriggered(bool checked = false);
|
|
void TwoPiActionTriggered(bool checked = false);
|
|
void PiOver2ActionTriggered(bool checked = false);
|
|
void PiOver3ActionTriggered(bool checked = false);
|
|
void PiOver4ActionTriggered(bool checked = false);
|
|
void PiOver6ActionTriggered(bool checked = false);
|
|
void OneOverPiActionTriggered(bool checked = false);
|
|
void TwoOverPiActionTriggered(bool checked = false);
|
|
void ThreeOverPiActionTriggered(bool checked = false);
|
|
void FourOverPiActionTriggered(bool checked = false);
|
|
void SqrtTwoActionTriggered(bool checked = false);
|
|
void SqrtThreeActionTriggered(bool checked = false);
|
|
|
|
private:
|
|
string m_Param;
|
|
eVariationId m_Id;
|
|
VariationTreeWidgetItem* m_WidgetItem;
|
|
};
|
|
|
|
/// <summary>
|
|
/// Derivation for the double spin boxes that are in the
|
|
/// affine controls.
|
|
/// </summary>
|
|
class AffineDoubleSpinBox : public DoubleSpinBox
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit AffineDoubleSpinBox(QWidget* p, int h = 20, double step = 0.01);
|
|
virtual ~AffineDoubleSpinBox() { }
|
|
|
|
public slots:
|
|
void NegOneActionTriggered(bool checked = false);
|
|
void ZeroActionTriggered(bool checked = false);
|
|
void OneActionTriggered(bool checked = false);
|
|
void FortyFiveActionTriggered(bool checked = false);
|
|
void NegFortyFiveActionTriggered(bool checked = false);
|
|
};
|