mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-22 13:40: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.
129 lines
4.2 KiB
C++
129 lines
4.2 KiB
C++
#pragma once
|
|
|
|
#include "FractoriumPch.h"
|
|
|
|
/// <summary>
|
|
/// EmberTreeWidgetItem
|
|
/// </summary>
|
|
|
|
/// <summary>
|
|
/// A thin derivation of QTreeWidgetItem for a tree of embers in an open file.
|
|
/// The tree is intended to contain one open ember file at a time.
|
|
/// This is a non-templated base for casting purposes.
|
|
/// </summary>
|
|
class EmberTreeWidgetItemBase : public QTreeWidgetItem
|
|
{
|
|
public:
|
|
/// <summary>
|
|
/// Constructor that takes a pointer to a QTreeWidget as a parent widget.
|
|
/// This is meant to be a root level item.
|
|
/// </summary>
|
|
/// <param name="p">The parent widget of this item</param>
|
|
explicit EmberTreeWidgetItemBase(QTreeWidget* p)
|
|
: QTreeWidgetItem(p)
|
|
{
|
|
}
|
|
|
|
/// <summary>
|
|
/// Constructor that takes a pointer to a QTreeWidgetItem as a parent widget.
|
|
/// This is meant to be the child of a root level item.
|
|
/// </summary>
|
|
/// <param name="p">The parent widget of this item</param>
|
|
explicit EmberTreeWidgetItemBase(QTreeWidgetItem* p)
|
|
: QTreeWidgetItem(p)
|
|
{
|
|
}
|
|
|
|
~EmberTreeWidgetItemBase()
|
|
{
|
|
//qDebug() << "~EmberTreeWidgetItemBase()";
|
|
}
|
|
|
|
/// <summary>
|
|
/// Set the preview image for the tree widget item.
|
|
/// </summary>
|
|
/// <param name="v">The vector containing the RGB pixels [0..255] which will make up the preview image</param>
|
|
/// <param name="width">The width of the image in pixels</param>
|
|
/// <param name="height">The height of the image in pixels</param>
|
|
void SetImage(vector<byte>& v, uint width, uint height)
|
|
{
|
|
int size = 64;
|
|
m_Image = QImage(width, height, QImage::Format_RGBA8888);
|
|
memcpy(m_Image.scanLine(0), v.data(), SizeOf(v));//Memcpy the data in.
|
|
m_Pixmap = QPixmap::fromImage(m_Image).scaled(QSize(size, size), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);//Create a QPixmap out of the QImage, scaled to size.
|
|
setData(0, Qt::DecorationRole, m_Pixmap);
|
|
}
|
|
|
|
protected:
|
|
QImage m_Image;
|
|
QPixmap m_Pixmap;
|
|
};
|
|
|
|
/// <summary>
|
|
/// A thin derivation of QTreeWidgetItem for a tree of embers in an open file.
|
|
/// The tree is intended to contain one open ember file at a time.
|
|
/// </summary>
|
|
template <typename T>
|
|
class EmberTreeWidgetItem : public EmberTreeWidgetItemBase
|
|
{
|
|
public:
|
|
/// <summary>
|
|
/// Constructor that takes a pointer to an ember and a QTreeWidget as a parent widget.
|
|
/// This is meant to be a root level item.
|
|
/// </summary>
|
|
/// <param name="ember">A pointer to the ember this item will represent</param>
|
|
/// <param name="p">The parent widget of this item</param>
|
|
explicit EmberTreeWidgetItem(Ember<T>* ember, QTreeWidget* p = nullptr)
|
|
: EmberTreeWidgetItemBase(p),
|
|
m_Ember(ember)
|
|
{
|
|
setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
|
|
setCheckState(0, Qt::Unchecked);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Constructor that takes a pointer to an ember and a QTreeWidgetItem as a parent widget.
|
|
/// This is meant to be the child of a root level item.
|
|
/// </summary>
|
|
/// <param name="ember">A pointer to the ember this item will represent</param>
|
|
/// <param name="p">The parent widget of this item</param>
|
|
explicit EmberTreeWidgetItem(Ember<T>* ember, QTreeWidgetItem* p = nullptr)
|
|
: EmberTreeWidgetItemBase(p),
|
|
m_Ember(ember)
|
|
{
|
|
setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
|
|
setCheckState(0, Qt::Unchecked);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Copy the text of the tree item to the name of the ember.
|
|
/// </summary>
|
|
void UpdateEmberName() { m_Ember->m_Name = text(0).toStdString(); }
|
|
|
|
/// <summary>
|
|
/// Set the text of the tree item.
|
|
/// </summary>
|
|
void UpdateEditText() { setText(0, QString::fromStdString(m_Ember->m_Name)); }
|
|
|
|
/// <summary>
|
|
/// Get a pointer to the ember held by the tree item.
|
|
/// </summary>
|
|
Ember<T>* GetEmber() const { return m_Ember; }
|
|
|
|
/// <summary>
|
|
/// Perform a deep copy from the passed in ember to the dereferenced
|
|
/// ember pointer of the tree item.
|
|
/// </summary>
|
|
/// <param name="ember">The ember to copy</param>
|
|
void SetEmber(Ember<T>& ember) { *m_Ember = ember; }
|
|
|
|
/// <summary>
|
|
/// Set the ember pointer member to point to the passed in ember pointer.
|
|
/// </summary>
|
|
/// <param name="ember">The ember to point to</param>
|
|
void SetEmberPointer(Ember<T>* ember) { m_Ember = ember; }
|
|
|
|
private:
|
|
Ember<T>* m_Ember;
|
|
};
|