fixed flattening exponential bug (for normals exactly (0, 0, 1)).

Author: ponchio

relightlab/normalsplan.cpp

@@ -100,8 +100,9 @@ NormalsFlattenRow::NormalsFlattenRow(NormalsParameters &_parameters, QFrame *par
 	QHBoxLayout *loader_layout = new QHBoxLayout;
 	loader_layout->addWidget(new QLabel("Fourier low pass frequency."));
 	loader_layout->addWidget(max_frequency = new QDoubleSpinBox);
-	max_frequency->setRange(0.0001, 1);
+	max_frequency->setRange(0, 100);
 	max_frequency->setDecimals(4);
+	max_frequency->setValue(parameters.flatPercentage);
 
 	button_layout->addLayout(loader_layout);
 
@@ -113,9 +114,9 @@ NormalsFlattenRow::NormalsFlattenRow(NormalsParameters &_parameters, QFrame *par
 	connect(fourier, &QAbstractButton::clicked, this, [this](){ setFlattenMethod(FLAT_FOURIER); });
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	connect(max_frequency, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, [this](double v) { parameters.m_FlatRadius = v; });
+	connect(max_frequency, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, [this](double v) { parameters.flatPercentage = v; });
 #else
-	connect(max_frequency, qOverload<double>(&QDoubleSpinBox::valueChanged), this, [this](double v) { parameters.m_FlatRadius = v; });
+	connect(max_frequency, qOverload<double>(&QDoubleSpinBox::valueChanged), this, [this](double v) { parameters.flatPercentage = v; });
 #endif
 
 
@@ -136,7 +137,7 @@ void NormalsFlattenRow::setFlattenMethod(FlatMethod method) {
 }
 
 void NormalsFlattenRow::setFourierFrequency(double f) {
-	parameters.m_FlatRadius = f;
+	parameters.flatPercentage = f;
 	max_frequency->setValue(f);
 }
 

relightlab/normalstask.cpp

@@ -153,8 +153,11 @@ void NormalsTask::run() {
 				ni.flattenRadial();
 				break;
 			case FLAT_FOURIER:
+			//0 remove all details.
+			//1 remove detail on the scale of the image only.
+			//from 0 to width;
 				//convert radius to frequencies
-				double sigma = 100*parameters.m_FlatRadius;
+				double sigma = width*parameters.flatPercentage/100;
 				ni.flattenFourier(width/10, sigma);
 				break;
 		}
@@ -218,6 +221,7 @@ void NormalsTask::run() {
 		savePly(filename, width, height, z);
 	}
 	progressed("Done", 100);
+	status = DONE;
 }
 
 bool savePly(const char *filename, pmp::SurfaceMesh &mesh) {

relightlab/normalstask.h

@@ -23,7 +23,7 @@ class NormalsParameters {
 	NormalSolver solver = NORMALS_L2;
 
 	FlatMethod flatMethod = FLAT_NONE;
-	double m_FlatRadius = 0.5;
+	double flatPercentage = 50;
 
 
 	SurfaceIntegration surface_integration = SURFACE_NONE;

relightlab/processqueue.cpp

@@ -62,8 +62,11 @@ void ProcessQueue::startNewProcess() {
 	task = queue.front();
 	queue.pop_front();
 
-	task->start();
+	//task->mutex.lock();
 	task->status = Task::RUNNING;
+	//task->mutex.unlock();
+
+	task->start();
 	emit update();
 }
 

relightlab/queueitem.cpp

@@ -90,7 +90,6 @@ void QueueItem::update() {
 		break;
 	case Task::RUNNING:
 		status->setText("Starting...");
-
 		break;
 	case Task::DONE:
 		status->setText("Done");

relightlab/spherepanel.cpp

@@ -18,25 +18,24 @@ SpherePanel::SpherePanel(QWidget *parent): QGroupBox("Reflective spheres", paren
 
 	content->addSpacing(10);
 
-	QFrame *spheres_frame = new QFrame;
-
-	QPushButton *sphere = new QPushButton(QIcon::fromTheme("folder"), "New reflective sphere...");
-	sphere->setProperty("class", "large");
-	sphere->setMinimumWidth(200);
-	sphere->setMaximumWidth(300);
-	connect(sphere, SIGNAL(clicked()), this, SLOT(newSphere()));
-	content->addWidget(sphere, 0, Qt::AlignTop);
-
-	content->addWidget(spheres_frame);
-
-	spheres = new QVBoxLayout(spheres_frame);
-
-	QHBoxLayout *buttons = new QHBoxLayout;
-	content->addLayout(buttons);
+	{
+		QPushButton *sphere = new QPushButton(QIcon::fromTheme("folder"), "New reflective sphere...");
+		sphere->setProperty("class", "large");
+		sphere->setMinimumWidth(200);
+		sphere->setMaximumWidth(300);
+		connect(sphere, SIGNAL(clicked()), this, SLOT(newSphere()));
+		content->addWidget(sphere, 0, Qt::AlignTop);
+	}
+	{
+		QFrame *spheres_frame = new QFrame;
+		spheres = new QVBoxLayout;
+		spheres_frame->setLayout(spheres);
+		content->addWidget(spheres_frame);
+	}
 }
 
 void SpherePanel::clear() {
-	setVisible(false);
+	//setVisible(false);
 	while(spheres->count() > 0) {
 		QLayoutItem *item = spheres->takeAt(0);
 		SphereRow *row =  dynamic_cast<SphereRow *>(item->widget());
@@ -47,7 +46,7 @@ void SpherePanel::clear() {
 
 void SpherePanel::init() {
 	auto &project_spheres = qRelightApp->project().spheres;
-	setVisible(project_spheres.size() > 0);
+	//setVisible(project_spheres.size() > 0);
 	for(Sphere *sphere: project_spheres) {
 		sphere->fit();
 		SphereRow * row = addSphere(sphere);

relightlab/sphererow.cpp

@@ -58,15 +58,8 @@ SphereRow::SphereRow(Sphere *_sphere, QWidget *parent): QWidget(parent) {
 	reflections->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	columns->addWidget(reflections);
 
-	//QVBoxLayout *status_layout = new QVBoxLayout;
-	//columns->addLayout(status_layout, 2);
-	//status_layout->addStretch();
-	//status = new QLabel("Locating highlights...");
-	//status_layout->addWidget(status);
 	progress = new QProgressBar;
 	progress->setValue(0);
-	//status_layout->addWidget(progress);
-	//status_layout->addStretch();
 	columns->addWidget(progress, 2);
 
 	QPushButton *edit = new QPushButton(QIcon::fromTheme("edit"), "Edit...");

src/flatnormals.cpp

@@ -188,12 +188,20 @@ void NormalsImage::flattenFourier(int padding, double sigma) {
 			n[1] = normals[3*(x + y*w)+1];
 			n[2] = normals[3*(x + y*w)+2];
 
+
 			if(exponential) {
 				double t = acos(n[2]);
-				n[0] = n[0]*t/sin(t);
-				n[1] = n[1]*t/sin(t);
+				if(t > 0) {
+					n[0] = n[0]*t/sin(t);
+					n[1] = n[1]*t/sin(t);
+				}
 			}
 
+			assert(!isnan(n[0]));
+			assert(!isnan(n[1]));
+			assert(!isnan(n[2]));
+
+
 			int X = x + padding_amount;
 			int Y = y + padding_amount;
 			datax[X + Y*W].real(n[0]);
@@ -241,6 +249,8 @@ void NormalsImage::flattenFourier(int padding, double sigma) {
 			 * double g = 1.0;
 			if(r2 < sigma*sigma/4)
 				g = 1.0 - pow(cos(M_PI*r2/sigma), 2); */
+			assert(!isnan(datax[x + y*W].real()));
+			assert(!isnan(datay[x + y*W].imag()));
 
 			datax[x + y*W] *= g;
 			datay[x + y*W] *= g;
@@ -259,8 +269,10 @@ void NormalsImage::flattenFourier(int padding, double sigma) {
 			double g = datay[X + Y*W].real();
 			double d = sqrt(r*r + g*g);
 			if(exponential) {
-				r = r*sin(d)/d;
-				g = g*sin(d)/d;
+				if(d > 0) {
+					r = r*sin(d)/d;
+					g = g*sin(d)/d;
+				}
 			}
 
 			double b = sqrt(1 - r*r - g*g);