mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-21 21:20:07 -05:00
330074cfb2
-Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth. -Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted. -When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember. -Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render. -Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply. -Make default temporal samples be 100, whereas before it was 1000 which was overkill. -Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box. -This wasn't otherwise fixable without writing a lot more code. --Bug fixes -EmberGenome was crashing when generating a sequence from a source file with more than 2 embers in it. -EmberGenome was improperly handling the first frame of a merge after the last frame of the loop. -These bugs were due to a previous commit. Revert parts of that commit. -Prevent a zoom value of less than 0 when reading from xml. -Slight optimization of the crescents, and mask variations, if the compiler wasn't doing it already. -Unique file naming was broken because it was looking for _# and the default names ended with -#. -Disallow renaming of an ember in the library tree to an empty string. -Severe bug that prevented some variations from being read correctly from params generated outside this program. -Severe OpenCL randomization bug. The first x coordinates of the first points in the first kernel call of the first ember of a render since the OpenCL renderer object was created were not random and were mostly -1. -Severe bug when populating xform selection distributions that could sometimes cause a crash due to roundoff error. Fix by using double. -Limit the max number of variations in a random ember to MAX_CL_VARS, which is 8. This ensures they'll look the same on CPU and GPU. -Prevent user from saving stylesheet to default.qss, it's a special reserved filename. --Code changes -Generalize using the running sum output point inside of a variation for all cases: pre, reg and post. -Allow for array variables in variations where the address of each element is stored in m_Params. -Qualify all math functions with std:: -No longer use our own Clamp() in OpenCL, instead use the standard clamp(). -Redesign how functions are used in the variations OpenCL code. -Add tests to EmberTester to verify some of the new functionality. -Place more const and override qualifiers on functions where appropriate. -Add a global rand with a lock to be used very sparingly. -Use a map instead of a vector for bad param names in Xml parsing. -Prefix affine interpolation mode defines with "AFFINE_" to make their purpose more clear. -Allow for variations that change state during iteration by sending a separate copy of the ember to each rendering thread. -Implement this same functionality with a local struct in OpenCL. It's members are the total of all variables that need to change state within an ember. -Add Contains() function to Utils.h. -EmberRender: print names of kernels being printed with --dump_kernel option. -Clean up EmberTester to handle some of the recent changes. -Fix various casts. -Replace % 2 with & 1, even though the compiler was likely doing this already. -Add new file Variations06.h to accommodate new variations. -General cleanup.
380 lines
12 KiB
C++
380 lines
12 KiB
C++
#include "FractoriumPch.h"
|
|
#include "Fractorium.h"
|
|
|
|
/// <summary>
|
|
/// Initialize the library tree UI.
|
|
/// </summary>
|
|
void Fractorium::InitLibraryUI()
|
|
{
|
|
connect(ui.LibraryTree, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(OnEmberTreeItemChanged(QTreeWidgetItem*, int)), Qt::QueuedConnection);
|
|
connect(ui.LibraryTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)), this, SLOT(OnEmberTreeItemDoubleClicked(QTreeWidgetItem*, int)), Qt::QueuedConnection);
|
|
connect(ui.LibraryTree, SIGNAL(itemActivated(QTreeWidgetItem*, int)), this, SLOT(OnEmberTreeItemDoubleClicked(QTreeWidgetItem*, int)), Qt::QueuedConnection);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Get the index of the currently selected ember in the library tree.
|
|
/// </summary>
|
|
/// <returns>A pair containing the index of the item clicked and a pointer to the item</param>
|
|
pair<size_t, QTreeWidgetItem*> Fractorium::GetCurrentEmberIndex()
|
|
{
|
|
size_t index = 0;
|
|
QTreeWidgetItem* item = nullptr;
|
|
QTreeWidget* tree = ui.LibraryTree;
|
|
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
for (int i = 0; i < top->childCount(); i++)//Iterate through all of the children, which will represent the open embers.
|
|
{
|
|
item = top->child(index);
|
|
|
|
if (item && !item->isSelected())
|
|
index++;
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
|
|
return pair<size_t, QTreeWidgetItem*>(index, item);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Slot function to be called via QMetaObject::invokeMethod() to update preview images in the preview thread.
|
|
/// </summary>
|
|
/// <param name="item">The item double clicked on</param>
|
|
/// <param name="v">The vector holding the RGBA bitmap</param>
|
|
/// <param name="w">The width of the bitmap</param>
|
|
/// <param name="h">The height of the bitmap</param>
|
|
void Fractorium::SetLibraryTreeItemData(EmberTreeWidgetItemBase* item, vector<byte>& v, uint w, uint h)
|
|
{
|
|
item->SetImage(v, w, h);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Set all libary tree entries to the name of the corresponding ember they represent.
|
|
/// </summary>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::SyncNames()
|
|
{
|
|
EmberTreeWidgetItem<T>* item;
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
|
|
tree->blockSignals(true);
|
|
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
for (int i = 0; i < top->childCount(); i++)//Iterate through all of the children, which will represent the open embers.
|
|
{
|
|
if ((item = dynamic_cast<EmberTreeWidgetItem<T>*>(top->child(i))) && i < m_EmberFile.Size())//Cast the child widget to the EmberTreeWidgetItem type.
|
|
item->setText(0, QString::fromStdString(m_EmberFile.m_Embers[i].m_Name));
|
|
}
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Set all libary tree entries to point to the underlying ember they represent.
|
|
/// </summary>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::SyncPointers()
|
|
{
|
|
EmberTreeWidgetItem<T>* item;
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
|
|
tree->blockSignals(true);
|
|
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
size_t childCount = top->childCount();
|
|
|
|
for (int i = 0; i < childCount; i++)//Iterate through all of the children, which will represent the open embers.
|
|
{
|
|
if ((item = dynamic_cast<EmberTreeWidgetItem<T>*>(top->child(i))) && i < m_EmberFile.Size())//Cast the child widget to the EmberTreeWidgetItem type.
|
|
item->SetEmberPointer(&m_EmberFile.m_Embers[i]);
|
|
}
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fill the library tree with the names of the embers in the
|
|
/// currently opened file.
|
|
/// Start preview render thread.
|
|
/// </summary>
|
|
/// <param name="selectIndex">After the tree is filled, select this index. Pass -1 to omit selecting an index.</param>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::FillLibraryTree(int selectIndex)
|
|
{
|
|
uint i, j, size = 64;
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
vector<byte> v(size * size * 4);
|
|
|
|
StopPreviewRender();
|
|
tree->clear();
|
|
QCoreApplication::flush();
|
|
|
|
tree->blockSignals(true);
|
|
|
|
QTreeWidgetItem* fileItem = new QTreeWidgetItem(tree);
|
|
QFileInfo info(m_EmberFile.m_Filename);
|
|
|
|
fileItem->setText(0, info.fileName());
|
|
fileItem->setToolTip(0, m_EmberFile.m_Filename);
|
|
fileItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable);
|
|
|
|
for (j = 0; j < m_EmberFile.Size(); j++)
|
|
{
|
|
Ember<T>* ember = &m_EmberFile.m_Embers[j];
|
|
EmberTreeWidgetItem<T>* emberItem = new EmberTreeWidgetItem<T>(ember, fileItem);
|
|
|
|
emberItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable);
|
|
|
|
if (ember->m_Name.empty())
|
|
emberItem->setText(0, ToString(j));
|
|
else
|
|
emberItem->setText(0, ember->m_Name.c_str());
|
|
|
|
emberItem->setToolTip(0, emberItem->text(0));
|
|
emberItem->SetImage(v, size, size);
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
|
|
if (selectIndex != -1)
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
if (EmberTreeWidgetItem<T>* emberItem = dynamic_cast<EmberTreeWidgetItem<T>*>(top->child(selectIndex)))
|
|
emberItem->setSelected(true);
|
|
|
|
QCoreApplication::flush();
|
|
RenderPreviews(0, m_EmberFile.Size());
|
|
tree->expandAll();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Update the library tree with the newly added embers (most likely from pasting) and
|
|
/// only render previews for the new ones, without clearing the entire tree.
|
|
/// </summary>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::UpdateLibraryTree()
|
|
{
|
|
uint i, size = 64;
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
vector<byte> v(size * size * 4);
|
|
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
int childCount = top->childCount();
|
|
|
|
tree->blockSignals(true);
|
|
|
|
for (i = childCount; i < m_EmberFile.Size(); i++)
|
|
{
|
|
Ember<T>* ember = &m_EmberFile.m_Embers[i];
|
|
EmberTreeWidgetItem<T>* emberItem = new EmberTreeWidgetItem<T>(ember, top);
|
|
|
|
emberItem->setFlags(Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsSelectable);
|
|
|
|
if (ember->m_Name.empty())
|
|
emberItem->setText(0, ToString(i));
|
|
else
|
|
emberItem->setText(0, ember->m_Name.c_str());
|
|
|
|
emberItem->setToolTip(0, emberItem->text(0));
|
|
emberItem->SetImage(v, size, size);
|
|
}
|
|
|
|
//When adding elements to the vector, they may have been reshuffled which will have invalidated
|
|
//the pointers contained in the EmberTreeWidgetItems. So reassign all pointers here.
|
|
SyncPointers();
|
|
tree->blockSignals(false);
|
|
RenderPreviews(childCount, m_EmberFile.Size());
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Copy the text of the item which was changed to the name of the current ember.
|
|
/// Ensure all names are unique in the opened file.
|
|
/// This seems to be called spuriously, so we do a check inside to make sure
|
|
/// the text was actually changed.
|
|
/// We also have to wrap the dynamic_cast call in a try/catch block because this can
|
|
/// be called on a widget that has already been deleted.
|
|
/// </summary>
|
|
/// <param name="item">The libary tree item changed</param>
|
|
/// <param name="col">The column clicked, ignored.</param>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::EmberTreeItemChanged(QTreeWidgetItem* item, int col)
|
|
{
|
|
try
|
|
{
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
EmberTreeWidgetItem<T>* emberItem = dynamic_cast<EmberTreeWidgetItem<T>*>(item);
|
|
|
|
if (emberItem)
|
|
{
|
|
if (emberItem->text(0).isEmpty())//Prevent empty string.
|
|
{
|
|
emberItem->UpdateEditText();
|
|
return;
|
|
}
|
|
|
|
string oldName = emberItem->GetEmber()->m_Name;//First preserve the previous name.
|
|
|
|
tree->blockSignals(true);
|
|
emberItem->UpdateEmberName();//Copy edit text to the ember's name variable.
|
|
m_EmberFile.MakeNamesUnique();//Ensure all names remain unique.
|
|
SyncNames();//Copy all ember names to the tree items since some might have changed to be made unique.
|
|
string newName = emberItem->GetEmber()->m_Name;//Get the new, final, unique name.
|
|
|
|
if (m_Ember.m_Name == oldName && oldName != newName)//If the ember edited was the current one, and the name was indeed changed, update the name of the current one.
|
|
{
|
|
m_Ember.m_Name = newName;
|
|
m_LastSaveCurrent = "";//Reset will force the dialog to show on the next save current since the user probably wants a different name.
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
}
|
|
else if (auto parentItem = dynamic_cast<QTreeWidgetItem*>(item))
|
|
{
|
|
QString text = parentItem->text(0);
|
|
|
|
if (text != "")
|
|
{
|
|
m_EmberFile.m_Filename = text;
|
|
m_LastSaveAll = "";//Reset will force the dialog to show on the next save all since the user probably wants a different name.
|
|
}
|
|
}
|
|
}
|
|
catch(const std::exception& e)
|
|
{
|
|
qDebug() << "FractoriumEmberController<T>::EmberTreeItemChanged() : Exception thrown: " << e.what();
|
|
}
|
|
}
|
|
|
|
void Fractorium::OnEmberTreeItemChanged(QTreeWidgetItem* item, int col) { m_Controller->EmberTreeItemChanged(item, col); }
|
|
|
|
/// <summary>
|
|
/// Set the current ember to the selected item.
|
|
/// Clears the undo state.
|
|
/// Resets the rendering process.
|
|
/// Called when the user double clicks on a library tree item.
|
|
/// This will get called twice for some reason, and there's no way to prevent it.
|
|
/// Doesn't seem to cause any problems.
|
|
/// </summary>
|
|
/// <param name="item">The item double clicked on</param>
|
|
/// <param name="col">The column clicked, ignored.</param>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::EmberTreeItemDoubleClicked(QTreeWidgetItem* item, int col)
|
|
{
|
|
if (EmberTreeWidgetItem<T>* emberItem = dynamic_cast<EmberTreeWidgetItem<T>*>(item))
|
|
{
|
|
ClearUndo();
|
|
SetEmber(*emberItem->GetEmber());
|
|
}
|
|
}
|
|
|
|
void Fractorium::OnEmberTreeItemDoubleClicked(QTreeWidgetItem* item, int col) { m_Controller->EmberTreeItemDoubleClicked(item, col); }
|
|
|
|
/// <summary>
|
|
/// Delete the currently selected item in the tree.
|
|
/// Note this is not necessarilly the current ember, it's just the item
|
|
/// in the tree that is selected.
|
|
/// </summary>
|
|
/// <param name="p">A pair containing the index of the item clicked and a pointer to the item</param>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::Delete(const pair<size_t, QTreeWidgetItem*>& p)
|
|
{
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
|
|
tree->blockSignals(true);
|
|
|
|
if (m_EmberFile.Delete(p.first))
|
|
{
|
|
delete p.second;
|
|
SyncPointers();
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
|
|
//If there is now only one item left and it wasn't selected, select it.
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
if (top->childCount() == 1)
|
|
if (auto item = dynamic_cast<EmberTreeWidgetItem<T>*>(top->child(0)))
|
|
if (item->GetEmber()->m_Name != m_Ember.m_Name)
|
|
EmberTreeItemDoubleClicked(top->child(0), 0);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Called when the user presses and releases the delete key while the library tree has the focus,
|
|
/// and an item is selected.
|
|
/// </summary>
|
|
/// <param name="p">A pair containing the index of the item clicked and a pointer to the item</param>
|
|
void Fractorium::OnDelete(const pair<size_t, QTreeWidgetItem*>& p)
|
|
{
|
|
m_Controller->Delete(p);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Stop the preview renderer if it's already running.
|
|
/// Clear all of the existing preview images, then start the preview rendering thread.
|
|
/// Optionally only render previews for a subset of all open embers.
|
|
/// </summary>
|
|
/// <param name="start">The 0-based index to start rendering previews for</param>
|
|
/// <param name="end">The 0-based index which is one beyond the last ember to render a preview for</param>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::RenderPreviews(uint start, uint end)
|
|
{
|
|
StopPreviewRender();
|
|
|
|
if (start == UINT_MAX && end == UINT_MAX)
|
|
{
|
|
QTreeWidget* tree = m_Fractorium->ui.LibraryTree;
|
|
|
|
tree->blockSignals(true);
|
|
|
|
if (QTreeWidgetItem* top = tree->topLevelItem(0))
|
|
{
|
|
int childCount = top->childCount();
|
|
vector<byte> emptyPreview(PREVIEW_SIZE * PREVIEW_SIZE * 3);
|
|
|
|
for (int i = 0; i < childCount; i++)
|
|
if (EmberTreeWidgetItem<T>* treeItem = dynamic_cast<EmberTreeWidgetItem<T>*>(top->child(i)))
|
|
treeItem->SetImage(emptyPreview, PREVIEW_SIZE, PREVIEW_SIZE);
|
|
}
|
|
|
|
tree->blockSignals(false);
|
|
m_PreviewResult = QtConcurrent::run(m_PreviewRenderFunc, 0, m_EmberFile.Size());
|
|
}
|
|
else
|
|
m_PreviewResult = QtConcurrent::run(m_PreviewRenderFunc, start, end);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Stop the preview rendering thread.
|
|
/// </summary>
|
|
template <typename T>
|
|
void FractoriumEmberController<T>::StopPreviewRender()
|
|
{
|
|
m_PreviewRun = false;
|
|
|
|
while (m_PreviewRunning)
|
|
QApplication::processEvents();
|
|
|
|
m_PreviewResult.cancel();
|
|
|
|
while (m_PreviewResult.isRunning())
|
|
QApplication::processEvents();
|
|
|
|
QCoreApplication::sendPostedEvents(m_Fractorium->ui.LibraryTree);
|
|
QCoreApplication::flush();
|
|
}
|
|
|
|
template class FractoriumEmberController<float>;
|
|
|
|
#ifdef DO_DOUBLE
|
|
template class FractoriumEmberController<double>;
|
|
#endif
|