mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-08-16 12:25:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--User changes

Browse Source 
-The concept of "saving back to file in memory" has been removed. The current ember is saved back to memory whenever the render completes and the thumbnail will be updated each time.
 -Command line programs now default to using double precision.
 -The --bits argument has been removed and replaced with --sp to specify single precision. If omitted, DP is used.
 -Remove the --seed option, it was never used.
 -Remove the --sub_batch_size option, it has been part of the Xml for a long time.
 -Remove --hex_palette argument for EmberRender, it only makes sense in EmberAnimate and EmberGenome.
 -Set enable_jpg_comments and enable_png_comments to false by default. It was a very bad idea to have them be true because it reveals the flame parameters used to render the image which many artists guard closely.

--Bug fixes
 -Continuous update was broken.
 -Undo list was broken with new Library tab design.
 -Force repaint on xform checkbox change to ensure circles are immediately drawn around selected xforms.

--Code changes
 -Remove save to back to file in memory icon, document-hf-insert.png.
This commit is contained in:
mfeemster
2016-04-11 18:15:14 -07:00
parent b690bf8071
commit 7715910362
12 changed files with 92 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Fractorium/Fractorium.h
View File

@ -115,7 +115,6 @@ public slots:
void OnActionSaveCurrentAsXml(bool checked);
void OnActionSaveEntireFileAsXml(bool checked);
void OnActionSaveCurrentScreen(bool checked);
void OnActionSaveCurrentToOpenedFile(bool checked);
void OnActionExit(bool checked);
void OnActionUndo(bool checked);//Edit.

1
Source/Fractorium/Fractorium.qrc
View File

@ -13,7 +13,6 @@
<file>Icons/layers-stack.png</file>
<file>Icons/monitor.png</file>
<file>Icons/016938-3d-transparent-glass-icon-symbols-shapes-shape-square-clear-16.png</file>
<file>Icons/document-hf-insert.png</file>
<file>Icons/010425-3d-transparent-glass-icon-animals-spiderweb2.png</file>
<file>Icons/database-medium.png</file>
<file>Icons/databases.png</file>

25
Source/Fractorium/Fractorium.ui
View File

@ -3473,8 +3473,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>263</width>
<height>700</height>
<width>118</width>
<height>618</height>
</rect>
</property>
<property name="autoFillBackground">
@ -5491,8 +5491,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>259</width>
<height>652</height>
<width>133</width>
<height>52</height>
</rect>
</property>
<property name="sizePolicy">
@ -6517,7 +6517,6 @@
<addaction name="ActionSaveCurrentAsXml"/>
<addaction name="ActionSaveEntireFileAsXml"/>
<addaction name="ActionSaveCurrentScreen"/>
<addaction name="ActionSaveCurrentToOpenedFile"/>
<addaction name="separator"/>
<addaction name="ActionExit"/>
</widget>
@ -6759,7 +6758,6 @@
<addaction name="separator"/>
<addaction name="ActionSaveCurrentAsXml"/>
<addaction name="ActionSaveEntireFileAsXml"/>
<addaction name="ActionSaveCurrentToOpenedFile"/>
<addaction name="ActionSaveCurrentScreen"/>
<addaction name="separator"/>
<addaction name="ActionCopyXml"/>
@ -6820,21 +6818,6 @@
<string>E&amp;xit</string>
</property>
</action>
<action name="ActionSaveCurrentToOpenedFile">
<property name="icon">
<iconset resource="Fractorium.qrc">
<normaloff>:/Fractorium/Icons/document-hf-insert.png</normaloff>:/Fractorium/Icons/document-hf-insert.png</iconset>
</property>
<property name="text">
<string>&amp;Save Current to Opened File</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Save the currently displayed flame back to the opened file in memory.&lt;/p&gt;&lt;p&gt;This overwrites the original flame but does not store the file back to disk.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="shortcut">
<string>Ctrl+B</string>
</property>
</action>
<action name="ActionSaveCurrentAsXml">
<property name="icon">
<iconset resource="Fractorium.qrc">

9
Source/Fractorium/FractoriumMenus.cpp
View File

@ -14,7 +14,6 @@ void Fractorium::InitMenusUI()
connect(ui.ActionOpen, SIGNAL(triggered(bool)), this, SLOT(OnActionOpen(bool)), Qt::QueuedConnection);
connect(ui.ActionSaveCurrentAsXml, SIGNAL(triggered(bool)), this, SLOT(OnActionSaveCurrentAsXml(bool)), Qt::QueuedConnection);
connect(ui.ActionSaveEntireFileAsXml, SIGNAL(triggered(bool)), this, SLOT(OnActionSaveEntireFileAsXml(bool)), Qt::QueuedConnection);
connect(ui.ActionSaveCurrentToOpenedFile, SIGNAL(triggered(bool)), this, SLOT(OnActionSaveCurrentToOpenedFile(bool)), Qt::QueuedConnection);
connect(ui.ActionSaveCurrentScreen, SIGNAL(triggered(bool)), this, SLOT(OnActionSaveCurrentScreen(bool)), Qt::QueuedConnection);
connect(ui.ActionExit, SIGNAL(triggered(bool)), this, SLOT(OnActionExit(bool)), Qt::QueuedConnection);
//Edit menu.
@ -399,8 +398,6 @@ void FractoriumEmberController<T>::SaveCurrentToOpenedFile()
}
}
void Fractorium::OnActionSaveCurrentToOpenedFile(bool checked) { m_Controller->SaveCurrentToOpenedFile(); }
/// <summary>
/// Exit the application.
/// </summary>
@ -422,7 +419,9 @@ void FractoriumEmberController<T>::Undo()
int index = m_Ember.GetTotalXformIndex(CurrentXform());
m_LastEditWasUndoRedo = true;
m_UndoIndex = std::max<size_t>(0u, m_UndoIndex - 1u);
auto temp = m_EmberFilePointer;//m_EmberFilePointer will be set to point to whatever is passed in, which we don't want since it's coming from the undo list...
SetEmber(m_UndoList[m_UndoIndex], true);
m_EmberFilePointer = temp;//...keep it pointing to the original one in the file.
m_EditState = eEditUndoState::UNDO_REDO;
if (index >= 0)
@ -446,7 +445,9 @@ void FractoriumEmberController<T>::Redo()
int index = m_Ember.GetTotalXformIndex(CurrentXform());
m_LastEditWasUndoRedo = true;
m_UndoIndex = std::min<size_t>(m_UndoIndex + 1, m_UndoList.size() - 1);
auto temp = m_EmberFilePointer;
SetEmber(m_UndoList[m_UndoIndex], true);
m_EmberFilePointer = temp;//...keep it pointing to the original one in the file.
m_EditState = eEditUndoState::UNDO_REDO;
if (index >= 0)
@ -813,7 +814,7 @@ void Fractorium::OnActionFinalRender(bool checked)
//First completely stop what the current rendering process is doing.
m_Controller->DeleteRenderer();//Delete the renderer, but not the controller.
m_Controller->StopPreviewRender();
OnActionSaveCurrentToOpenedFile(true);//Save whatever was edited back to the current open file.
m_Controller->SaveCurrentToOpenedFile();//Save whatever was edited back to the current open file.
m_RenderStatusLabel->setText("Renderer stopped.");
m_FinalRenderDialog->show();
}

11
Source/Fractorium/FractoriumRender.cpp
View File

@ -371,7 +371,9 @@ bool FractoriumEmberController<T>::Render()
if (ProcessState() != eProcessState::ACCUM_DONE)
{
//if (m_Renderer->Run(m_FinalImage, 0) == RENDER_OK)//Full, non-incremental render for debugging.
if (m_Renderer->Run(m_FinalImage, 0, m_SubBatchCount, (iterBegin || m_Fractorium->m_Settings->ContinuousUpdate())) == eRenderStatus::RENDER_OK)//Force output on iterBegin or if the settings specify to always do it.
bool update = iterBegin || m_Fractorium->m_Settings->ContinuousUpdate();
if (m_Renderer->Run(m_FinalImage, 0, m_SubBatchCount, update) == eRenderStatus::RENDER_OK)//Force output on iterBegin or if the settings specify to always do it.
{
//The amount to increment sub batch while rendering proceeds is purely empirical.
//Change later if better values can be derived/observed.
@ -445,13 +447,16 @@ bool FractoriumEmberController<T>::Render()
FillSummary();//Only update summary on render completion since it's not the type of thing the user needs real-time updates on.
}
//Update the GL window on start because the output will be forced.
//Update the GL window on start or continuous rendering because the output will be forced.
//Update it on finish because the rendering process is completely done.
if (iterBegin || ProcessState() == eProcessState::ACCUM_DONE)
if (update || ProcessState() == eProcessState::ACCUM_DONE)
{
if (m_FinalImage.size() == m_Renderer->FinalBufferSize())//Make absolutely sure the correct amount of data is passed.
gl->update();
if (ProcessState() == eProcessState::ACCUM_DONE)
SaveCurrentToOpenedFile();
//Uncomment for debugging kernel build and execution errors.
//m_Fractorium->ui.InfoRenderingTextEdit->setText(QString::fromStdString(m_Fractorium->m_Wrapper.DumpInfo()));
//if (rendererCL)

3
Source/Fractorium/FractoriumXforms.cpp
View File

@ -447,6 +447,8 @@ void FractoriumEmberController<T>::FillXforms(int index)
{
auto cb1 = new QCheckBox(MakeXformCaption(i), m_Fractorium);
auto cb2 = new QCheckBox(MakeXformCaption(i + 1), m_Fractorium);
QObject::connect(cb1, &QCheckBox::stateChanged, [&](int state) { m_Fractorium->ui.GLDisplay->update(); });//Ensure circles are drawn immediately after toggle.
QObject::connect(cb2, &QCheckBox::stateChanged, [&](int state) { m_Fractorium->ui.GLDisplay->update(); });
m_Fractorium->m_XformSelections.push_back(cb1);
m_Fractorium->m_XformSelections.push_back(cb2);
m_Fractorium->m_XformsSelectionLayout->addRow(cb1, cb2);
@ -455,6 +457,7 @@ void FractoriumEmberController<T>::FillXforms(int index)
else if (i < count)
{
auto cb = new QCheckBox(MakeXformCaption(i), m_Fractorium);
QObject::connect(cb, &QCheckBox::stateChanged, [&](int state) { m_Fractorium->ui.GLDisplay->update(); });
m_Fractorium->m_XformSelections.push_back(cb);
m_Fractorium->m_XformsSelectionLayout->addRow(cb, new QWidget(m_Fractorium));
i++;

BIN
Source/Fractorium/Icons/document-hf-insert.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 498 B