--User changes

-Allow for continuous update during interactive rendering. --Code changes -Make some variation related functions const where appropriate. -Use auto keyword more.
2025-07-02 14:26:17 -04:00 · 2015-06-28 17:48:26 -07:00
parent e8af1050b3
commit 770ff4622c
17 changed files with 91 additions and 68 deletions
--- a/Source/Fractorium/FractoriumRender.cpp
+++ b/Source/Fractorium/FractoriumRender.cpp
@ -369,7 +369,7 @@ bool FractoriumEmberController<T>::Render()
 	if (ProcessState() != ACCUM_DONE)
 	{
 		//if (m_Renderer->Run(m_FinalImage, 0) == RENDER_OK)//Full, non-incremental render for debugging.
-		if (m_Renderer->Run(m_FinalImage[m_FinalImageIndex], 0, m_SubBatchCount, iterBegin) == RENDER_OK)//Force output on iterBegin.
+		if (m_Renderer->Run(m_FinalImage[m_FinalImageIndex], 0, m_SubBatchCount, (iterBegin || m_Fractorium->m_Settings->ContinuousUpdate())) == 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.
--- a/Source/Fractorium/FractoriumSettings.cpp
+++ b/Source/Fractorium/FractoriumSettings.cpp
@ -119,6 +119,9 @@ void FractoriumSettings::Double(bool b)						  { setValue(DOUBLEPRECISION, b);
 bool FractoriumSettings::ShowAllXforms()					  { return value(SHOWALLXFORMS).toBool();		 }
 void FractoriumSettings::ShowAllXforms(bool b)				  { setValue(SHOWALLXFORMS, b);					 }

+bool FractoriumSettings::ContinuousUpdate()					  { return value(CONTUPDATE).toBool();			 }
+void FractoriumSettings::ContinuousUpdate(bool b)			  { setValue(CONTUPDATE, b);					 }
+
 uint FractoriumSettings::PlatformIndex()              { return value(PLATFORMINDEX).toUInt();        }
 void FractoriumSettings::PlatformIndex(uint i)        { setValue(PLATFORMINDEX, i);                  }
 															  
--- a/Source/Fractorium/FractoriumSettings.h
+++ b/Source/Fractorium/FractoriumSettings.h
@ -11,6 +11,7 @@
 #define TRANSPARENCY         "render/transparency"
 #define OPENCL               "render/opencl"
 #define DOUBLEPRECISION		 "render/dp64"
+#define CONTUPDATE			 "render/continuousupdate"
 #define SHOWALLXFORMS	     "render/dragshowallxforms"
 #define PLATFORMINDEX        "render/platformindex"
 #define DEVICEINDEX          "render/deviceindex"
@ -89,6 +90,9 @@ public:
 	bool ShowAllXforms();
 	void ShowAllXforms(bool b);

+	bool ContinuousUpdate();
+	void ContinuousUpdate(bool b);
+
 	uint PlatformIndex();
 	void PlatformIndex(uint b);

--- a/Source/Fractorium/FractoriumXformsVariations.cpp
+++ b/Source/Fractorium/FractoriumXformsVariations.cpp
@ -40,7 +40,7 @@ void FractoriumEmberController<T>::SetupVariationTree()
 	for (size_t i = 0; i < m_VariationList.Size(); i++)
 	{
 		auto var = m_VariationList.GetVariation(i);
-		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);
+		auto parVar = dynamic_cast<const ParametricVariation<T>*>(var);

 		//First add the variation, with a spinner for its weight.
 		auto item = new VariationTreeWidgetItem(var->VariationId(), tree);
@ -61,7 +61,7 @@ void FractoriumEmberController<T>::SetupVariationTree()
 		//Check to see if the variation was parametric, and add a tree entry with a spinner for each parameter.
 		if (parVar)
 		{
-			ParamWithName<T>* params = parVar->Params();
+			auto params = parVar->Params();

 			for (size_t j = 0; j < parVar->ParamCount(); j++)
 			{
@ -138,7 +138,7 @@ void FractoriumEmberController<T>::VariationSpinBoxValueChanged(double d)//Would
 	if (sender && xform)
 	{
 		auto var = m_VariationList.GetVariation(sender->GetVariationId());//The variation attached to the sender, for reference only.
-		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);//The parametric cast of that variation.
+		auto parVar = dynamic_cast<const ParametricVariation<T>*>(var);//The parametric cast of that variation.
 		auto xformVar = xform->GetVariationById(var->VariationId());//The corresponding variation in the currently selected xform.
 		auto widgetItem = sender->WidgetItem();
 		bool isParam = parVar && sender->IsParam();
@ -227,7 +227,7 @@ void FractoriumEmberController<T>::FillVariationTreeWithXform(Xform<T>* xform)
 		auto item = dynamic_cast<VariationTreeWidgetItem*>(tree->topLevelItem(i));
 		auto var = xform->GetVariationById(item->Id());//See if this variation in the tree was contained in the xform.
 		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);//Attempt cast to parametric variation for later.
-		auto origParVar = dynamic_cast<ParametricVariation<T>*>(m_VariationList.GetVariation(item->Id()));
+		auto origParVar = dynamic_cast<const ParametricVariation<T>*>(m_VariationList.GetVariation(item->Id()));

 		if (auto spinBox = dynamic_cast<VariationTreeDoubleSpinBox*>(tree->itemWidget(item, 1)))//Get the widget for the item, and cast the widget to the VariationTreeDoubleSpinBox type.
 		{
--- a/Source/Fractorium/OptionsDialog.cpp
+++ b/Source/Fractorium/OptionsDialog.cpp
@ -65,12 +65,13 @@ FractoriumOptionsDialog::FractoriumOptionsDialog(FractoriumSettings* settings, Q
 		ui.OpenCLCheckBox->setEnabled(false);
 	}

-	ui.EarlyClipCheckBox->setChecked(	   m_Settings->EarlyClip());
-	ui.YAxisUpCheckBox->setChecked(		   m_Settings->YAxisUp());
-	ui.TransparencyCheckBox->setChecked(   m_Settings->Transparency());
-	ui.DoublePrecisionCheckBox->setChecked(m_Settings->Double());
-	ui.ShowAllXformsCheckBox->setChecked(  m_Settings->ShowAllXforms());
-	ui.ThreadCountSpin->setValue(		   m_Settings->ThreadCount());
+	ui.EarlyClipCheckBox->setChecked(	    m_Settings->EarlyClip());
+	ui.YAxisUpCheckBox->setChecked(		    m_Settings->YAxisUp());
+	ui.TransparencyCheckBox->setChecked(    m_Settings->Transparency());
+	ui.ContinuousUpdateCheckBox->setChecked(m_Settings->ContinuousUpdate());
+	ui.DoublePrecisionCheckBox->setChecked( m_Settings->Double());
+	ui.ShowAllXformsCheckBox->setChecked(   m_Settings->ShowAllXforms());
+	ui.ThreadCountSpin->setValue(		    m_Settings->ThreadCount());
 	
 	if (m_Settings->CpuDEFilter())
 		ui.CpuFilteringDERadioButton->setChecked(true);
@ -100,6 +101,7 @@ FractoriumOptionsDialog::FractoriumOptionsDialog(FractoriumSettings* settings, Q
 bool FractoriumOptionsDialog::EarlyClip() { return ui.EarlyClipCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::YAxisUp() { return ui.YAxisUpCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::Transparency() { return ui.TransparencyCheckBox->isChecked(); }
+bool FractoriumOptionsDialog::ContinuousUpdate() { return ui.ContinuousUpdateCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::OpenCL() { return ui.OpenCLCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::Double() { return ui.DoublePrecisionCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::ShowAllXforms() { return ui.ShowAllXformsCheckBox->isChecked(); }
@ -152,6 +154,7 @@ void FractoriumOptionsDialog::accept()
 	m_Settings->EarlyClip(EarlyClip());
 	m_Settings->YAxisUp(YAxisUp());
 	m_Settings->Transparency(Transparency());
+	m_Settings->ContinuousUpdate(ContinuousUpdate());
 	m_Settings->OpenCL(OpenCL());
 	m_Settings->Double(Double());
 	m_Settings->ShowAllXforms(ShowAllXforms());
@ -187,6 +190,7 @@ void FractoriumOptionsDialog::reject()
 	ui.EarlyClipCheckBox->setChecked(m_Settings->EarlyClip());
 	ui.YAxisUpCheckBox->setChecked(m_Settings->YAxisUp());
 	ui.TransparencyCheckBox->setChecked(m_Settings->Transparency());
+	ui.ContinuousUpdateCheckBox->setChecked(m_Settings->ContinuousUpdate());
 	ui.OpenCLCheckBox->setChecked(m_Settings->OpenCL());
 	ui.DoublePrecisionCheckBox->setChecked(m_Settings->Double());
 	ui.ShowAllXformsCheckBox->setChecked(m_Settings->ShowAllXforms());
--- a/Source/Fractorium/OptionsDialog.h
+++ b/Source/Fractorium/OptionsDialog.h
@ -37,6 +37,7 @@ private:
 	bool YAxisUp();
 	bool AlphaChannel();
 	bool Transparency();
+	bool ContinuousUpdate();
 	bool OpenCL();
 	bool Double();
 	bool ShowAllXforms();
--- a/Source/Fractorium/OptionsDialog.ui
+++ b/Source/Fractorium/OptionsDialog.ui
@ -113,13 +113,13 @@
         </property>
        </widget>
       </item>
-       <item row="5" column="0" colspan="2">
+       <item row="6" column="0" colspan="2">
        <widget class="QComboBox" name="PlatformCombo"/>
       </item>
-       <item row="6" column="0" colspan="2">
+       <item row="7" column="0" colspan="2">
        <widget class="QComboBox" name="DeviceCombo"/>
       </item>
-       <item row="7" column="0">
+       <item row="8" column="0">
        <widget class="QSpinBox" name="ThreadCountSpin">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The number of threads to use with CPU rendering.&lt;/p&gt;&lt;p&gt;Decrease for more responsive editing, increase for better performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -135,7 +135,7 @@
         </property>
        </widget>
       </item>
-       <item row="10" column="0">
+       <item row="11" column="0">
        <widget class="QGroupBox" name="InteraciveCpuFilteringGroupBox">
         <property name="title">
          <string>CPU Filtering</string>
@ -182,7 +182,7 @@
         </layout>
        </widget>
       </item>
-       <item row="11" column="0">
+       <item row="12" column="0">
        <widget class="QGroupBox" name="InteraciveGpuFilteringGroupBox">
         <property name="title">
          <string>OpenCL Filtering</string>
@ -226,7 +226,7 @@
         </layout>
        </widget>
       </item>
-       <item row="8" column="0">
+       <item row="9" column="0">
        <widget class="QSpinBox" name="CpuSubBatchSpin">
         <property name="toolTip">
          <string>The number of 10,000 iteration chunks ran per thread on the CPU
@ -243,7 +243,7 @@ in interactive mode for each mouse movement</string>
         </property>
        </widget>
       </item>
-       <item row="9" column="0">
+       <item row="10" column="0">
        <widget class="QSpinBox" name="OpenCLSubBatchSpin">
         <property name="toolTip">
          <string>The number of ~8M iteration chunks ran using OpenCL
@ -300,6 +300,16 @@ in interactive mode for each mouse movement</string>
         </property>
        </widget>
       </item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="ContinuousUpdateCheckBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Continually update output image during interactive rendering.&lt;/p&gt;&lt;p&gt;This will slow down performance, but will give continuous updates on how the final render will look. Note that only log scale filtering is applied on each update. Full DE is not applied until iteration is complete.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Continuous Update</string>
+         </property>
+        </widget>
+       </item>
      </layout>
     </widget>
     <widget class="QWidget" name="OptionsXmlSavingTab">
@ -716,11 +726,12 @@ in interactive mode for each mouse movement</string>
 </customwidgets>
 <tabstops>
  <tabstop>EarlyClipCheckBox</tabstop>
-  <tabstop>YAxisUpCheckBox</tabstop>
-  <tabstop>TransparencyCheckBox</tabstop>
  <tabstop>OpenCLCheckBox</tabstop>
+  <tabstop>YAxisUpCheckBox</tabstop>
  <tabstop>DoublePrecisionCheckBox</tabstop>
+  <tabstop>TransparencyCheckBox</tabstop>
  <tabstop>ShowAllXformsCheckBox</tabstop>
+  <tabstop>ContinuousUpdateCheckBox</tabstop>
  <tabstop>PlatformCombo</tabstop>
  <tabstop>DeviceCombo</tabstop>
  <tabstop>ThreadCountSpin</tabstop>
@ -730,9 +741,7 @@ in interactive mode for each mouse movement</string>
  <tabstop>CpuFilteringDERadioButton</tabstop>
  <tabstop>OpenCLFilteringLogRadioButton</tabstop>
  <tabstop>OpenCLFilteringDERadioButton</tabstop>
-  <tabstop>OptionsXmlSavingTable</tabstop>
-  <tabstop>OptionsIdentityTable</tabstop>
-  <tabstop>OptionsButtonBox</tabstop>
+  <tabstop>AutoUniqueCheckBox</tabstop>
 </tabstops>
 <resources/>
 <connections>