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

Affine2D: Remove * operator, it's unused.

Browse Source 
RendererBase: Add ComputeCamera() as a virtual function. Add strips parameter to TotalIterCount().

Renderer: Implement ComputeCamera() as an override.

SpatialFilter: Ensure filters that are too small are made large enough to create.

FinalRenderDialog: Add estimated iters table row and populate on all UI updates.

FractoriumParams: Zoom was not being saved, loaded. Fixed.

GLWidget: Prevent mouse wheel event from being passed to the scroll bars. It should only affect the scale.
This commit is contained in:
mfeemster
2014-10-18 12:56:37 -07:00
parent f5a707ea63
commit 2df1f7a52b
15 changed files with 94 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Fractorium/FinalRenderEmberController.cpp
View File

@ -566,8 +566,10 @@ void FinalRenderEmberController<T>::ResetProgress(bool total)
/// </summary>
/// <returns>If successful, memory required in bytes, else zero.</returns>
template <typename T>
size_t FinalRenderEmberController<T>::SyncAndComputeMemory()
pair<size_t, size_t> FinalRenderEmberController<T>::SyncAndComputeMemory()
{
pair<size_t, size_t> p(0, 0);
if (m_Renderer.get())
{
bool b = false;
@ -579,12 +581,14 @@ size_t FinalRenderEmberController<T>::SyncAndComputeMemory()
m_Renderer->CreateTemporalFilter(b);
m_Renderer->NumChannels(channels);
m_Renderer->ComputeBounds();
m_Renderer->ComputeCamera();
CancelPreviewRender();
m_FinalPreviewRenderFunc();
return m_Renderer->MemoryRequired(m_FinalRenderDialog->Strips(), true);
p.first = m_Renderer->MemoryRequired(m_FinalRenderDialog->Strips(), true);
p.second = m_Renderer->TotalIterCount(m_FinalRenderDialog->Strips());
}
return 0;
return p;
}
/// <summary>