mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
07592c9d78
Add Curves.h, and CurvesGraphicsView.h/cpp to support bezier color curves. Add Curves member to Ember. Add curves capability to EmberCL. Remove some unused variables in the kernel created in RendererCL::CreateFinalAccumKernelString(). Use glm namespace for vec classes if GLM_VERSION >= 96, else use glm::detail. As a result of using glm namespace, all instances of min and max had to be qualified with std:: Split ComputeCamera into that and ComputeQuality(). Reduce the amount of ComputeCamera() and MakeDmap() calls on each incremental iter that doesn't use temporal samples. Fix clamping bug with DE filter widths. Provide functions to return the kernels from RendererCL to assist with diagnostics and debugging. Prevent extra newline in EmberRender when only rendering a single image. Add the ability to delete an ember at a given index in EmberFile. Allow deleting/focusing ember in library tab with delete and enter keys. Reorder some code in Fractorium.h to match the tabs order. Add and call ClearFinalImages() to clear buffers in controller to fix bug where previous CPU render would be shown for a split second when switching from OpenCL back to CPU. Refactor ember library pointer syncing to a function SyncPointers(). Add the ability to save ember Xmls to an unique automatically generated name after the first time the user has specified a name.
57 lines
1.1 KiB
C++
57 lines
1.1 KiB
C++
#define GL_GLEXT_PROTOTYPES 1
|
|
#define XFORM_COLOR_COUNT 14
|
|
|
|
#undef QT_OPENGL_ES_2//Make absolutely sure OpenGL ES is not used.
|
|
#define QT_NO_OPENGL_ES_2
|
|
|
|
#ifndef WIN32
|
|
#include <QtWidgets>
|
|
#endif
|
|
|
|
#include "Renderer.h"
|
|
#include "RendererCL.h"
|
|
#include "VariationList.h"
|
|
#include "OpenCLWrapper.h"
|
|
#include "XmlToEmber.h"
|
|
#include "EmberToXml.h"
|
|
#include "SheepTools.h"
|
|
#include "JpegUtils.h"
|
|
#include "EmberCommon.h"
|
|
|
|
#ifdef WIN32
|
|
#include <QtWidgets>
|
|
#endif
|
|
|
|
#include <deque>
|
|
#include <QLineEdit>
|
|
#include <QSpinBox>
|
|
#include <QDoubleSpinBox>
|
|
#include <QPainterPath>
|
|
#include <QPushButton>
|
|
#include <QComboBox>
|
|
#include <QColorDialog>
|
|
#include <QGraphicsView>
|
|
#include <QTreeWidget>
|
|
#include <QWheelEvent>
|
|
#include <QItemDelegate>
|
|
#include <QApplication>
|
|
#include <QSettings>
|
|
#include <QStandardPaths>
|
|
#include <QOpenGLWidget>
|
|
#include <qopenglfunctions_2_0.h>
|
|
#include <QtWidgets/QMainWindow>
|
|
#include <QFuture>
|
|
#include <QtConcurrentRun>
|
|
|
|
#include "glm/glm.hpp"
|
|
#include "glm/gtc/matrix_transform.hpp"
|
|
#include "glm/gtc/type_ptr.hpp"
|
|
|
|
#ifndef WIN32
|
|
#undef Bool
|
|
#endif
|
|
|
|
using namespace std;
|
|
using namespace EmberNs;
|
|
using namespace EmberCLns;
|