mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-07-11 18:54:53 -04:00
0.4.1.3 Beta 10/14/2014
--User Changes Size is no longer fixed to the window size. Size scaling is done differently in the final render dialog. This fixes several bugs. Remove Xml saving size from settings and options dialog, it no longer applies. Final render can be broken into strips. Set default save path to the desktop if none is found in the settings file. Set default output size to 1920x1080 if none is found in the settings file. --Bug Fixes Better memory size reporting in final render dialog. --Code Changes Migrate to C++11, Qt 5.3.1, and Visual Studio 2013. Change most instances of unsigned int to size_t, and int to intmax_t. Add m_OrigPixPerUnit and m_ScaleType to Ember for scaling purposes. Replace some sprintf_s() calls in XmlToEmber with ostringstream. Move more non-templated members into RendererBase. Add CopyVec() overload that takes a per element function pointer. Add vector Memset(). Replace '&' with '+' instead of "&" in XmlToEmber for much faster parsing. Break strips rendering out into EmberCommon and call from EmberRender and Fractorium. Make AddAndWriteBuffer() just call WriteBuffer(). Make AddAndWriteImage() delete the existing image first before replacing it. Add SetOutputTexture() to RendererCL to support making new textures in response to resize events. Remove multiple return statements in RendererCL, and replace with a bool that tracks results. Add ToDouble(), MakeEnd(), ToString() and Exists() wrappers in Fractorium. Add Size() wrapper in EmberFile. Make QString function arguments const QString&, and string with const string&. Make ShowCritical() wrapper for invoking a message box from another thread. Add combo box to TwoButtonWidget and rename.
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
#include "ui_FinalRenderDialog.h"
|
||||
#include "SpinBox.h"
|
||||
#include "DoubleSpinBox.h"
|
||||
#include "TwoButtonWidget.h"
|
||||
#include "TwoButtonComboWidget.h"
|
||||
#include "FractoriumSettings.h"
|
||||
#include "FinalRenderEmberController.h"
|
||||
|
||||
@ -53,21 +53,24 @@ public:
|
||||
bool DoAll();
|
||||
bool DoSequence();
|
||||
bool KeepAspect();
|
||||
bool ApplyToAll();
|
||||
eScaleType Scale();
|
||||
void Scale(eScaleType scale);
|
||||
QString DoAllExt();
|
||||
QString Ext();
|
||||
QString Path();
|
||||
void Path(QString s);
|
||||
void Path(const QString& s);
|
||||
QString Prefix();
|
||||
QString Suffix();
|
||||
unsigned int Current();
|
||||
unsigned int PlatformIndex();
|
||||
unsigned int DeviceIndex();
|
||||
unsigned int ThreadCount();
|
||||
unsigned int Width();
|
||||
unsigned int Height();
|
||||
double WidthScale();
|
||||
double HeightScale();
|
||||
double Quality();
|
||||
unsigned int TemporalSamples();
|
||||
unsigned int Supersample();
|
||||
unsigned int Strips();
|
||||
FinalRenderGuiState State();
|
||||
|
||||
public Q_SLOTS:
|
||||
@ -77,17 +80,24 @@ public Q_SLOTS:
|
||||
void OnTransparencyCheckBoxStateChanged(int state);
|
||||
void OnOpenCLCheckBoxStateChanged(int state);
|
||||
void OnDoublePrecisionCheckBoxStateChanged(int state);
|
||||
void OnPlatformComboCurrentIndexChanged(int index);
|
||||
void OnDoAllCheckBoxStateChanged(int state);
|
||||
void OnDoSequenceCheckBoxStateChanged(int state);
|
||||
void OnFinalRenderCurrentSpinChanged(int d);
|
||||
void OnPlatformComboCurrentIndexChanged(int index);
|
||||
void OnApplyAllCheckBoxStateChanged(int state);
|
||||
void OnFinalRenderWidthScaleChanged(double d);
|
||||
void OnFinalRenderHeightScaleChanged(double d);
|
||||
void OnKeepAspectCheckBoxStateChanged(int state);
|
||||
void OnScaleRadioButtonChanged(bool checked);
|
||||
void OnWidthChanged(int d);
|
||||
void OnHeightChanged(int d);
|
||||
void OnQualityChanged(double d);
|
||||
void OnTemporalSamplesChanged(int d);
|
||||
void OnSupersampleChanged(int d);
|
||||
void OnStripsChanged(int d);
|
||||
void OnFileButtonClicked(bool checked);
|
||||
void OnShowFolderButtonClicked(bool checked);
|
||||
void OnFinalRenderExtIndexChanged(int d);
|
||||
void OnFinalRenderPrefixChanged(const QString& s);
|
||||
void OnFinalRenderSuffixChanged(const QString& s);
|
||||
void OnRenderClicked(bool checked);
|
||||
void OnCancelRenderClicked(bool checked);
|
||||
|
||||
@ -97,15 +107,19 @@ protected:
|
||||
|
||||
private:
|
||||
bool CreateControllerFromGUI(bool createRenderer);
|
||||
void SetMemory();
|
||||
bool SetMemory();
|
||||
|
||||
int m_MemoryCellIndex;
|
||||
int m_PathCellIndex;
|
||||
OpenCLWrapper m_Wrapper;
|
||||
Timing m_RenderTimer;
|
||||
SpinBox* m_WidthSpin;
|
||||
SpinBox* m_HeightSpin;
|
||||
DoubleSpinBox* m_WidthScaleSpin;
|
||||
DoubleSpinBox* m_HeightScaleSpin;
|
||||
DoubleSpinBox* m_QualitySpin;
|
||||
SpinBox* m_TemporalSamplesSpin;
|
||||
SpinBox* m_SupersampleSpin;
|
||||
SpinBox* m_StripsSpin;
|
||||
TwoButtonComboWidget* m_Tbcw;
|
||||
QLineEdit* m_PrefixEdit;
|
||||
QLineEdit* m_SuffixEdit;
|
||||
FractoriumSettings* m_Settings;
|
||||
|
Reference in New Issue
Block a user