mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
b690bf8071
-Remove the option --intpalette to format the palette in the xml as ints. If they are not hex formatted, then they should always be float. This option was pointless. -Cleanup some options text for the command line programs. -Allow for dragging around flames in the library tab. This is useful for setting up the order of an animation. -Make the opening of large files in Fractorium much more efficient when not-appending. -Make the opening of large files in all EmberRender and EmberAnimate more efficient. -Better error reporting when opening files. --Bug fixes -Get rid of leftover artifacts that would appear on preview thumbnails when either switching SP/DP or re-rendering previews. -Filename extension was not being appended on Linux when saving as Xml, thus making it impossible to drag that file back in becase drop is filtered on extension. --Code changes -Move GCC compiler spec to C++14. Building with 5.3 now on linux. -Use inline member data initializers. -Make a #define for static for use in Utils.h to make things a little cleaner. -Make various functions able to take arbitrary collections as their parameters rather than just vectors. -Make library collection a list rather than vector. This alleviates the need to re-sync pointers whenever the collection changes. -Subclass QTreeWidget for the library tree. Two new files added for this. -Remove all usage of #ifdef ROW_ONLY_DE in DEOpenCLKernelCreator, it was never used. -Add move constructor and assignment operator to EmberFile. -Add the ability to use a pointer to outside memory in the renderer for the vector of Ember<T>. -Make a lot more functions const where they should be.
122 lines
4.0 KiB
C++
122 lines
4.0 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)
|
|
{
|
|
}
|
|
|
|
/// <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);
|
|
}
|
|
|
|
/// <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);
|
|
}
|
|
|
|
/// <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;
|
|
};
|