depthmap Normal resize

Author: Erika

depthmap/depthmap.cpp

@@ -220,8 +220,12 @@ void Depthmap::depthIntegrateNormals(){
 	for(size_t i = 0; i < normals.size(); i++)
 		for(int k = 0; k < 3; k++)
 			normals_float[i*3+k] = normals[i][k];
+	elevation.clear();
+	elevation.resize(normals.size(), 0);
 	bni_integrate(callback, width, height, normals_float, elevation);
-
+	for(float &h: elevation){
+		h = -h;
+	}
 }
 void Depthmap::resizeNormals (int factorPowerOfTwo, int step = 1) {
 	int factor = 1 << factorPowerOfTwo;
@@ -276,13 +280,14 @@ void Depthmap::resizeNormals (int factorPowerOfTwo, int step = 1) {
 	normals = resizedNormals;
 	width = targetWidth;
 	height = targetHeight;
+	resolution *= factor;
 
-	QString filename = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/surface.jpg";
-	saveNormals(filename.toStdString().c_str());
+	//QString filename = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/surface.jpg";
+	//saveNormals(filename.toStdString().c_str());
  //chiama l'integrale integra le normali e salva il ply
-	depthIntegrateNormals();
-	QString plyFilename = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resize_normals.obj";
-	saveObj(plyFilename.toStdString().c_str());
+	//depthIntegrateNormals();
+	//QString plyFilename = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resize_normals.obj";
+	//saveObj(plyFilename.toStdString().c_str());
 
 }
 
@@ -333,8 +338,6 @@ Eigen::Vector3f Depthmap::pixelToRealCoordinates(int pixelX, int pixelY, float p
 	return Eigen::Vector3f(realX, realY, realZ);
 }
 
-
-
 bool Camera::loadXml(const QString &pathXml){
 	//orientation xml
 	QFile file(pathXml);

depthmap/depthmap.pro

@@ -10,14 +10,17 @@ CONFIG -= app_bundle
 
 LIBS += -L /opt/homebrew/lib -ltiff
 SOURCES += \
+        ../src/bni_normal_integration.cpp \
         depthmap.cpp \
         main.cpp
-INCLUDEPATH += -I /opt/homebrew/include
+INCLUDEPATH += /opt/homebrew/include \
+    /opt/homebrew/Cellar/eigen/3.4.0_1/include/eigen3
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
 HEADERS += \
+    ../src/bni_normal_integration.h \
     depthmap.h

depthmap/main.cpp

@@ -6,25 +6,31 @@
 #include <eigen3/Eigen/Dense>
 
 using namespace std;
-
+// carica il tif, calcola e integra normali per vedere se la superficie è la stessa.
+//
 int main(int argc, char *argv[]) {
 	/*if(argc != 3) {
 		cerr << "Usage: " << argv[0] << "<input.tiff> <output.png>" << endl;
 		return 1;
 	}*/
+
 	QString depthmapPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/Malt/Z_Num7_DeZoom4_STD-MALT.tif";
 	QString orientationXmlPath = "/Users/erika/Desktop/testcenterRel_copia/photogrammetry/Ori-Relative/Orientation-L05C12.tif.xml";
 	QString output = "out.png";
 	Depthmap depth;
 	depth.load(qPrintable(depthmapPath));
 	depth.computeNormals();
-	depth.saveNormals(qPrintable(output));
-	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/output.obj");
+	depth.saveNormals("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/original.obj");
+	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/original.obj");
+
 	depth.depthIntegrateNormals();
-	depth.saveNormals("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/surface.jpg");
+	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/integrated.obj");
+
 	int factorPowerOfTwo = 1;
 	depth.resizeNormals(factorPowerOfTwo, 2);
-	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resize_normals.obj");
+	depth.depthIntegrateNormals();
+	depth.saveNormals("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resized_integrated.jpg");
+	depth.saveObj("/Users/erika/Desktop/testcenterRel_copia/photogrammetry/resized_integrated.obj");
 
 
 	Camera camera;
@@ -34,8 +40,6 @@ int main(int argc, char *argv[]) {
 	float pixelZ = 4.5;
 
 
-
-
 	Eigen::Matrix3f rotationMatrix;
 	Eigen::Vector3f center;
 

relight-cli/relight-cli.pro

@@ -31,7 +31,7 @@ mac:LIBS += -L /usr/local/lib /usr/local/lib/libomp.dylib
 
 DESTDIR = "../bin"
 
-SOURCES += main.cpp \
+©main.cpp \
     ../src/getopt.cpp \
     ../src/imageset.cpp \
     ../src/jpeg_decoder.cpp \

src/bni_normal_integration.h

@@ -14,16 +14,16 @@ void bni_integrate(std::function<bool(std::string s, int n)> progressed,
 								  double k = 2.0,
 								  double tolerance = 1e-5,
 								  double solver_tolerance = 1e-5,
-								  int max_iterations = 150,
-								  int max_solver_iterations = 5000);
+								  int max_iterations = 5,
+								  int max_solver_iterations = 100);
 
 std::vector<float> bni_pyramid(std::function<bool(std::string s, int n)> progressed,
 								  int &w, int &h, std::vector<float> &normalmap,
 								  double k = 2.0,
 								  double tolerance = 1e-5,
 								  double solver_tolerance = 1e-5,
 								  int max_iterations = 150,
-								  int max_solver_iterations = 5000,
+								  int max_solver_iterations = 500,
 								  int scale = 0);
 
 bool savePly(const QString &filename, int w, int h, std::vector<float> &z);