Fixed per pixel normal correction.

cnr-isti-vclab · Nov 19, 2024 · 63291c1 · 63291c1
1 parent f5d0311
commit 63291c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/relight/normalstask.cpp b/relight/normalstask.cpp
@@ -195,7 +195,7 @@ void NormalsWorker::solveL2()
 
 		if(m_Imageset.light3d) {
 			for(size_t i = 0; i < m_Lights3d.size(); i++) {
-				Vector3f light = m_Imageset.relativeLight(m_Lights3d[i], p, row);
+				Vector3f light = m_Imageset.relativeLight(m_Lights3d[i], p, m_Imageset.height - row);
 				light.normalize();
 				for (int j = 0; j < 3; j++)
 					mLights(i, j) = light[j];

diff --git a/src/lens.h b/src/lens.h
@@ -36,9 +36,14 @@ class Lens {
 	Vector3f viewDirection(float x, float y) {
 		if(!focalLength)
 			return Vector3f(0, 0, -1);
+		float focal = focalLength;
+		if(focal35equivalent) {
+			double w = pixelSizeX * width;
+			focal  = focalLength * w / 35;
+		}
 		x -= width/2;
 		y -= height/2;
-		return Vector3f(x*pixelSizeX, -y*pixelSizeY, -focalLength);
+		return Vector3f(x*pixelSizeX, -y*pixelSizeY, -focal);
 	}
 
 	double ccdWidth() {