mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
6ba16888e3
-Add new variations: crackle, dc_perlin. -Make default palette interp mode be linear instead of step. -Make summary tab the selected one in the Info tab. -Allow for highlight power of up to 10. It was previously limited to 2. --Bug fixes -Direct color calculations were wrong. -Flattening was not applied to final xform. -Fix "pure virtual function call" error on shutdown. --Code changes -Allow for array precalc params in variations by adding a size member to the ParamWithName class. -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length. -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin. -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project. -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern. -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on. -Add missing backslash to CUDA include and library paths for builds on Nvidia systems. -Add missing gl.h include for Windows. -Remove glew include paths from Fractorium, it's not used. -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2. -Fix bad paths on linux build. -General cleanup.
64 lines
1.5 KiB
C++
64 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include "ui_OptionsDialog.h"
|
|
#include "FractoriumSettings.h"
|
|
#include "SpinBox.h"
|
|
|
|
/// <summary>
|
|
/// FractoriumOptionsDialog class.
|
|
/// </summary>
|
|
|
|
class Fractorium;//Forward declaration since Fractorium uses this dialog.
|
|
|
|
/// <summary>
|
|
/// The options dialog allows the user to save various preferences
|
|
/// between program runs.
|
|
/// It has a pointer to a FractoriumSettings object which is assigned
|
|
/// in the constructor. The main window holds the object as a member and the
|
|
/// pointer to it here is just for convenience.
|
|
/// </summary>
|
|
class FractoriumOptionsDialog : public QDialog
|
|
{
|
|
Q_OBJECT
|
|
|
|
friend Fractorium;
|
|
|
|
public:
|
|
FractoriumOptionsDialog(FractoriumSettings* settings, QWidget* p = 0, Qt::WindowFlags f = 0);
|
|
|
|
public slots:
|
|
void OnOpenCLCheckBoxStateChanged(int state);
|
|
void OnDeviceTableCellChanged(int row, int col);
|
|
void OnDeviceTableRadioToggled(bool checked);
|
|
virtual void accept() override;
|
|
virtual void reject() override;
|
|
|
|
protected:
|
|
virtual void showEvent(QShowEvent* e) override;
|
|
|
|
private:
|
|
bool EarlyClip();
|
|
bool YAxisUp();
|
|
bool AlphaChannel();
|
|
bool Transparency();
|
|
bool ContinuousUpdate();
|
|
bool OpenCL();
|
|
bool Double();
|
|
bool ShowAllXforms();
|
|
bool AutoUnique();
|
|
uint ThreadCount();
|
|
uint RandomCount();
|
|
void DataToGui();
|
|
void GuiToData();
|
|
|
|
Ui::OptionsDialog ui;
|
|
shared_ptr<OpenCLInfo> m_Info;
|
|
SpinBox* m_XmlTemporalSamplesSpin;
|
|
SpinBox* m_XmlQualitySpin;
|
|
SpinBox* m_XmlSupersampleSpin;
|
|
QLineEdit* m_IdEdit;
|
|
QLineEdit* m_UrlEdit;
|
|
QLineEdit* m_NickEdit;
|
|
FractoriumSettings* m_Settings;
|
|
};
|