dense: fix bug in tower generation

(cherry picked from commit e62b65f2593dff34a32a0e04bca07f819c788eb7)

apps/InterfaceCOLMAP/InterfaceCOLMAP.cpp

@@ -699,18 +699,18 @@ typedef Eigen::Matrix<double,3,1> EVec3d;
 
 bool DetermineInputSource(const String& filenameTXT, const String& filenameBIN, std::ifstream& file, String& filenameCamera, bool& binary)
 {
-	file.open(filenameTXT);
-	if (file.good()) {
-		filenameCamera = filenameTXT;
-		binary = false;
-		return true;
-	}
 	file.open(filenameBIN, std::ios::binary);
 	if (file.good()) {
 		filenameCamera = filenameBIN;
 		binary = true;
 		return true;
 	}
+	file.open(filenameTXT);
+	if (file.good()) {
+		filenameCamera = filenameTXT;
+		binary = false;
+		return true;
+	}
 	VERBOSE("error: unable to open file '%s'", filenameTXT.c_str());
 	VERBOSE("error: unable to open file '%s'", filenameBIN.c_str());
 	return false;

libs/MVS/Scene.cpp

@@ -2080,13 +2080,13 @@ PointCloud Scene::BuildTowerMesh(const PointCloud& origPointCloud, const Point2f
 					topPoints.swap(botPoints);
 			}
 		}
-		mesh.Save("tower_mesh.ply");
+		mesh.Save(MAKE_PATH("tower_mesh.ply"));
 	} else
 	#endif
 	{
 		mesh.Release();
 	}
-	towerPC.Save("tower.ply");
+	towerPC.Save(MAKE_PATH("tower.ply"));
 	return towerPC;
 }
 
@@ -2108,9 +2108,9 @@ void Scene::InitTowerScene(const int towerMode)
 	mesh.Release();
 
 	const auto AppendPointCloud = [this](const PointCloud& towerPC) {
-		bool bHasNormal(pointcloud.normals.size() == pointcloud.GetSize());
-		bool bHasColor(pointcloud.colors.size() == pointcloud.GetSize());
-		bool bHasWeights(pointcloud.pointWeights.size() == pointcloud.GetSize());
+		bool bHasNormal(towerPC.normals.size() == towerPC.GetSize());
+		bool bHasColor(towerPC.colors.size() == towerPC.GetSize());
+		bool bHasWeights(towerPC.pointWeights.size() == towerPC.GetSize());
 		FOREACH(idxPoint, towerPC.points) {
 			pointcloud.points.emplace_back(towerPC.points[idxPoint]);
 			pointcloud.pointViews.emplace_back(towerPC.pointViews[idxPoint]);