bgfixing normals export.

Author: ponchio

relight-cli/rtibuilder.cpp

@@ -97,11 +97,8 @@ bool RtiBuilder::setupFromFolder(const string &folder) {
 			imageset.images.removeAt(skip_image);
 			dome.directions.erase(dome.directions.begin() + skip_image);
 		}
-		imageset.lights1 = dome.directions;
-		imageset.light3d = false;
-
 		imageset.initImages(folder.c_str());
-
+		imageset.setLights(dome.directions, Dome::DIRECTIONAL);
 
 	} catch(QString e) {
 		error = e.toStdString();
@@ -474,13 +471,13 @@ MaterialBuilder RtiBuilder::pickBaseHSH(std::vector<Vector3f> &lights, Rti::Type
 void RtiBuilder::pickBases(PixelArray &sample) {
 	//rbf can't 3d, bilinear just resample (and then single base)
 	if(!imageset.light3d) {
-		materialbuilder = pickBase(sample, imageset.lights1);
+		materialbuilder = pickBase(sample, imageset.lights());
 
 	} else {
 
 		if(type == RBF || type == BILINEAR) {
 
-			materialbuilder = pickBase(sample, imageset.lights1); //lights are unused for rbf
+			materialbuilder = pickBase(sample, imageset.lights()); //lights are unused for rbf
 
 		} else {
 			materialbuilders.resize(resample_width * resample_height);
@@ -782,14 +779,14 @@ bool RtiBuilder::saveJSON(QDir &dir, int quality) {
 	}
 	stream << "\",\n";
 
-	if(imageset.lights1.size()) {
+	if(imageset.lights().size()) {
 		if(type == RBF)
 			stream << "\"sigma\": " << sigma << ",\n";
 		stream << "\"lights\": [";
-		for(uint32_t i = 0; i < imageset.lights1.size(); i++) {
-			Vector3f &l = imageset.lights1[i];
+		for(uint32_t i = 0; i < imageset.lights().size(); i++) {
+			Vector3f &l = imageset.lights()[i];
 			stream << QString::number(l[0], 'f', 3) << ", " << QString::number(l[1], 'f', 3) << ", " << QString::number(l[2], 'f', 3);
-			if(i != imageset.lights1.size()-1)
+			if(i != imageset.lights().size()-1)
 				stream << ", ";
 		}
 		stream << "],\n";
@@ -1296,9 +1293,9 @@ size_t RtiBuilder::save(const string &output, int quality) {
 			int side = 32;
 			QImage img(side*(nplanes+1), side, QImage::Format_RGB32);
 			img.fill(qRgb(0, 0, 0));
-			for(uint32_t i = 0; i < imageset.lights1.size(); i++) {
+			for(uint32_t i = 0; i < imageset.lights().size(); i++) {
 				float dx, dy;
-				toOcta(imageset.lights1[i], dx, dy, side);
+				toOcta(imageset.lights()[i], dx, dy, side);
 				int x = dx;
 				int y = dy;
 				int r = (int)materialbuilder.mean[i*3+0];
@@ -1310,9 +1307,9 @@ size_t RtiBuilder::save(const string &output, int quality) {
 				Material::Plane &plane = material.planes[p];
 				float *eigen = materialbuilder.proj.data() + p*dim;
 				uint32_t X = (p+1)*side;
-				for(size_t i = 0; i < imageset.lights1.size(); i++) {
+				for(size_t i = 0; i < imageset.lights().size(); i++) {
 					float dx, dy;
-					toOcta(imageset.lights1[i], dx, dy, side);
+					toOcta(imageset.lights()[i], dx, dy, side);
 					uint32_t x = dx;
 					int y = dy;
 					int r = (int)(127 + plane.range*eigen[i*3+0]);
@@ -1474,10 +1471,11 @@ void RtiBuilder::processLine(PixelArray &sample, PixelArray &resample, std::vect
 			for(uint32_t y = 0; y < sample.nlights; y++)
 				A(y, 0) = sample[x][y].mean();
 
-			for(uint32_t y = 0; y < imageset.lights1.size(); y++) {
-				b(y, 0) = imageset.lights1[y][0];
-				b(y, 1) = imageset.lights1[y][1];
-				b(y, 2) = imageset.lights1[y][2];
+			for(uint32_t y = 0; y < imageset.lights().size(); y++) {
+				Eigen::Vector3f &l = imageset.lights()[y];
+				b(y, 0) = l[0];
+				b(y, 1) = l[1];
+				b(y, 2) = l[2];
 			}
 
 			Eigen::MatrixXf r = (A.transpose() * A).ldlt().solve(A.transpose() * b);
@@ -1685,7 +1683,7 @@ void RtiBuilder::resamplePixel(Pixel &sample, Pixel &pixel) { //pos in pixels.
 //notice how sample are already intensity corrected.
 vector<Vector3f> RtiBuilder::relativeNormalizedLights(int x, int y) {
 
-	vector<Vector3f> relights = imageset.lights1;;
+	vector<Vector3f> relights = imageset.lights();
 	for(Vector3f &light: relights) {
 		light = imageset.relativeLight(light, x, y);
 		light.normalize();
@@ -1695,7 +1693,7 @@ vector<Vector3f> RtiBuilder::relativeNormalizedLights(int x, int y) {
 
 void RtiBuilder::buildResampleMaps() {
 	if(!imageset.light3d) {
-		buildResampleMap(imageset.lights1, resamplemap);
+		buildResampleMap(imageset.lights(), resamplemap);
 		return;
 	}
 	resamplemaps.resize(resample_height*resample_width);
@@ -1900,7 +1898,7 @@ std::vector<float> RtiBuilder::toPrincipal(Pixel &pixel, MaterialBuilder &materi
 		float weight = 0;
 		for(uint32_t i = 0; i < ndimensions; i++) {
 			Color3f &c = pixel[i];
-			float w = 0.25 - pow(asin(imageset.lights1[i][2])/(M_PI/2) - 0.5, 2);
+			float w = 0.25 - pow(asin(imageset.lights()[i][2])/(M_PI/2) - 0.5, 2);
 			mean += c*w;
 			weight += w;
 		}

relightlab/main.cpp

@@ -18,6 +18,7 @@ int main(int argc, char *argv[]) {
 
 	RelightApp app(argc, argv);
 
+	QApplication::setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);
 	setlocale(LC_ALL, "en_US.UTF8"); //needs to be called AFTER QApplication creation.
 
 	QCoreApplication::setOrganizationName("VCG");

relightlab/normalsframe.cpp

@@ -74,12 +74,24 @@ void NormalsFrame::init() {
 }
 
 void NormalsFrame::save() {
-	if(parameters.compute && qRelightApp->project().dome.directions.size() == 0) {
-		QMessageBox::warning(this, "Missing light directions.", "You need light directions for this dataset to build a normalmap.\n"
+	if(parameters.compute) {
+		//make sure we have some light directions defined
+		if(qRelightApp->project().dome.directions.size() == 0) {
+			QMessageBox::warning(this, "Missing light directions.", "You need light directions for this dataset to build a normalmap.\n"
 																"You can either load a dome or .lp file or mark a reflective sphere in the 'Lights' tab.");
-		return;
-	}
+			return;
+		}
+	} else {
+		if(parameters.flatMethod == FlatMethod::FLAT_NONE && parameters.surface_integration == SurfaceIntegration::SURFACE_NONE) {
+			QMessageBox::warning(this, "Nothing to do.", "Using an existing normalmap ma no flattening or integration method specified");
+			return;
+		}
 
+		if(parameters.input_path == parameters.path) {
+			QMessageBox::warning(this, "Input and output normalmap have the same name", "The input normal map would be overwritten. Change the output filename");
+			return;
+		}
+	}
 	NormalsTask *task = new NormalsTask();
 	task->parameters = parameters;
 	task->output = parameters.path;

relightlab/normalsplan.cpp

@@ -23,21 +23,24 @@ NormalsSourceRow::NormalsSourceRow(NormalsParameters &_parameters, QFrame *paren
 	label->help->setId("normals/normalmap");
 
 	compute = new QLabelButton("Compute", "Compute normals from images");
-
-	file = new QLabelButton("Normalmap", "Loat a normalmap image.");
 	buttons->addWidget(compute, 0, Qt::AlignCenter);
 
-	QVBoxLayout *button_layout =new QVBoxLayout;
-	button_layout->addWidget(file);
-
-	QHBoxLayout *loader_layout = new QHBoxLayout;
-	loader_layout->addWidget(path = new QLineEdit);
-	loader_layout->addWidget(open = new QPushButton("..."));
 
-	button_layout->addLayout(loader_layout);
+	{
+		QVBoxLayout *button_layout =new QVBoxLayout;
+		file = new QLabelButton("Normalmap", "Load a normalmap image.");
 
+		button_layout->addWidget(file);
+		{
+			QHBoxLayout *loader_layout = new QHBoxLayout;
+			loader_layout->addWidget(input_path = new QLineEdit);
+			loader_layout->addWidget(open = new QPushButton("..."));
+			button_layout->addLayout(loader_layout);
+			connect(open, &QPushButton::clicked, this, &NormalsSourceRow::selectOutput);
 
-	buttons->addLayout(button_layout, 0); //, Qt::AlignCenter);
+		}
+		buttons->addLayout(button_layout, 0); //, Qt::AlignCenter);
+	}
 
 	connect(compute, &QAbstractButton::clicked, this, [this](){ setComputeSource(true); });
 	connect(file, &QAbstractButton::clicked, this, [this](){ setComputeSource(false); });
@@ -59,6 +62,25 @@ void NormalsSourceRow::setComputeSource(bool build) {
 }
 
 
+void NormalsSourceRow::selectOutput() {
+	//get folder if not legacy.
+	QString output_parent = qRelightApp->lastOutputDir();
+
+	QString output = QFileDialog::getOpenFileName(this, "Select an output folder", output_parent);
+	if(output.isNull()) return;
+
+	QDir output_parent_dir(output);
+	output_parent_dir.cdUp();
+	setSourcePath(output);
+}
+
+void NormalsSourceRow::setSourcePath(QString path) {
+	parameters.input_path = path;
+	input_path->setText(path);
+}
+
+
+
 
 NormalsFlattenRow::NormalsFlattenRow(NormalsParameters &_parameters, QFrame *parent):
 	NormalsPlanRow(_parameters, parent) {
@@ -78,7 +100,8 @@ 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.01, 1);
+	max_frequency->setRange(0.0001, 1);
+	max_frequency->setDecimals(4);
 
 	button_layout->addLayout(loader_layout);
 

relightlab/normalsplan.h

@@ -20,15 +20,19 @@ class NormalsPlanRow: public PlanRow {
 
 
 class NormalsSourceRow: public NormalsPlanRow {
+	Q_OBJECT
 public:
 	NormalsSourceRow(NormalsParameters &_parameters, QFrame *parent = nullptr);
 
 	void setComputeSource(bool compute);
-	void setSourcePaht(QString path);
+	void setSourcePath(QString path);
+public slots:
+	void selectOutput();
 
+protected:
 	QLabelButton *compute = nullptr;
 	QLabelButton *file = nullptr;
-	QLineEdit *path = nullptr;
+	QLineEdit *input_path = nullptr;
 	QPushButton *open = nullptr;
 };
 

relightlab/normalstask.cpp

@@ -40,7 +40,7 @@ void NormalsTask::initFromProject(Project &project) {
 	imageset.images = project.getImages();
 	imageset.initImages(project.dir.absolutePath().toStdString().c_str());
 	imageset.initFromDome(project.dome);
-	assert(imageset.lights1.size() == imageset.images.size());
+	assert(imageset.lights().size() == imageset.images.size());
 	QRect &crop = project.crop;
 	if(!crop.isNull()) {
 		imageset.crop(crop.left(), crop.top(), crop.width(), crop.height());
@@ -124,16 +124,16 @@ void NormalsTask::run() {
 			normalsd[i] = (double)normals[i];
 
 		NormalsImage ni;
-		ni.load(normalsd, imageset.width, imageset.height);
+		ni.load(normalsd, width, height);
 		switch(parameters.flatMethod) {
 			case FLAT_NONE: break;
 			case FLAT_RADIAL:
 				ni.flattenRadial();
 				break;
 			case FLAT_FOURIER:
 				//convert radius to frequencies
-				double sigma = 100/parameters.m_FlatRadius;
-				ni.flattenFourier(imageset.width/10, sigma);
+				double sigma = 100*parameters.m_FlatRadius;
+				ni.flattenFourier(width/10, sigma);
 				break;
 		}
 		normalsd = ni.normals;
@@ -145,11 +145,11 @@ void NormalsTask::run() {
 	if(parameters.compute || parameters.flatMethod != FLAT_NONE) {
 		// Save the normals
 
-		vector<uint8_t> normalmap(imageset.width * imageset.height * 3);
+		vector<uint8_t> normalmap(width * height * 3);
 		for(size_t i = 0; i < normals.size(); i++)
 			normalmap[i] = floor(((normals[i] + 1.0f) / 2.0f) * 255);
 
-		QImage img(normalmap.data(), imageset.width, imageset.height, imageset.width*3, QImage::Format_RGB888);
+		QImage img(normalmap.data(), width, height, width*3, QImage::Format_RGB888);
 
 
 		// Set spatial resolution if known. Need to convert as pixelSize stored in mm/pixel whereas QImage requires pixels/m
@@ -158,7 +158,7 @@ void NormalsTask::run() {
 			img.setDotsPerMeterX(dotsPerMeter);
 			img.setDotsPerMeterY(dotsPerMeter);
 		}
-		img.save(output);
+		img.save(parameters.path);
 
 	}
 
@@ -177,7 +177,7 @@ void NormalsTask::run() {
 			return;
 
 		vector<float> z;
-		bni_integrate(callback, imageset.width, imageset.height, normals, z, parameters.bni_k);
+		bni_integrate(callback, width, height, normals, z, parameters.bni_k);
 		if(z.size() == 0) {
 			error = "Failed to integrate normals";
 			status = FAILED;
@@ -187,7 +187,7 @@ void NormalsTask::run() {
 
 		progressed("Saving surface...", 99);
 		QString filename = output.left(output.size() -4) + ".ply";
-		savePly(filename, imageset.width, imageset.height, z);
+		savePly(filename, width, height, z);
 	}
 	progressed("Done", 100);
 }
@@ -220,8 +220,8 @@ bool saveObj(const char *filename, pmp::SurfaceMesh &mesh) {
 
 void NormalsTask::assm(QString filename, vector<float> &_normals, float approx_error) {
 	Grid<Eigen::Vector3f> normals(imageset.width, imageset.height, Eigen::Vector3f(0.0f, 0.0f, 0.0f));
-	for(size_t y = 0; y < imageset.height; y++)
-		for(size_t x = 0; x < imageset.width; x++) {
+	for(int y = 0; y < imageset.height; y++)
+		for(int x = 0; x < imageset.width; x++) {
 			int i = 3*(x + y*imageset.width);
 			normals.at(y, x) = Eigen::Vector3f(-_normals[i+0], -_normals[i+1], -_normals[i+2]);
 		}
@@ -245,15 +245,12 @@ void NormalsTask::assm(QString filename, vector<float> &_normals, float approx_e
 void NormalsWorker::run() {
 	switch (solver)
 	{
-	// L2 solver
 	case NORMALS_L2:
 		solveL2();
 		break;
-		// SBL solver
 	case NORMALS_SBL:
 		solveSBL();
 		break;
-		// RPCA solver
 	case NORMALS_RPCA:
 		solveRPCA();
 		break;
@@ -264,7 +261,7 @@ void NormalsWorker::run() {
 
 void NormalsWorker::solveL2()
 {
-	vector<Vector3f> &m_Lights = m_Imageset.lights1;
+	vector<Vector3f> &m_Lights = m_Imageset.lights();
 
 	// Pixel data
 	Eigen::MatrixXd mLights(m_Lights.size(), 3);