- updated Catch2

- fixes for new gcc version

Author: janbender

Changelog.txt

@@ -1,3 +1,7 @@
+2.11.6
+	- updated Catch2
+	- fixes for new gcc version
+
 2.11.5 
 	- updated cxxopts
 

Tools/MeshSkinning/main.cpp

@@ -112,11 +112,6 @@ unsigned int getNeighbor(const unsigned int pointSetIndex, const unsigned int in
 	return neighborhoodSearch->point_set(0).neighbor(pointSetIndex, index, k);
 }
 
-std::istream& operator >> (std::istream& istream, Vector3r& r)
-{
-	return istream >> std::skipws >> r[0] >> r[1] >> r[2];
-}
-
 std::ostream& operator << (std::ostream& out, const Vector3r& r)
 {
 	out << r[0] << ", " << r[1] << ", " << r[2];
@@ -142,9 +137,9 @@ int main( int argc, char **argv )
 			("m,mesh", "Mesh file ", cxxopts::value<std::string>())
 			("scene", "Scene file (all settings are imported from the scene file)", cxxopts::value<std::string>())
 			("partioPath", "Path of the partio files (when using a scene file). If not set, it is assumed that the files are in the standard output path.", cxxopts::value<std::string>())
-			("scale", "Scaling of input geometry (e.g. --scale \"2 1 2\")", cxxopts::value<Vector3r>()->default_value("1 1 1"))
-			("t,translation", "Translation of input geometry (e.g. --translation \"2 1 2\")", cxxopts::value<Vector3r>()->default_value("1 1 1"))
-			("axis", "Rotation axis of input geometry (e.g. --axis \"1 0 0\")", cxxopts::value<Vector3r>()->default_value("1 0 0"))
+			("scale", "Scaling of input geometry (e.g. --scale 2,1,2)", cxxopts::value<std::vector<Real>>()->default_value("1,1,1"))
+			("t,translation", "Translation of input geometry (e.g. --translation 2,1,2)", cxxopts::value<std::vector<Real>>()->default_value("0,0,0"))
+			("axis", "Rotation axis of input geometry (e.g. --axis 1,0,0)", cxxopts::value<std::vector<Real>>()->default_value("1,0,0"))
 			("angle", "Angle of input geometry (e.g. --angle 1)", cxxopts::value<Real>()->default_value("0.0"))
 			("s,startframe", "Start frame", cxxopts::value<unsigned int>()->default_value("1"))
 			("e,endframe", "End frame", cxxopts::value<unsigned int>())
@@ -222,18 +217,18 @@ int main( int argc, char **argv )
 			}
 
 			if (result.count("scale"))
-				scale = result["scale"].as<Vector3r>();
+				scale = Vector3r(result["scale"].as<std::vector<Real>>().data()); 
 			LOG_INFO << "Scale: " << scale;
 
 			if (result.count("translation"))
-				translation = result["translation"].as<Vector3r>();
+				translation = Vector3r(result["translation"].as<std::vector<Real>>().data()); 
 			LOG_INFO << "Translation: " << translation;
 
 			Vector3r axis = Vector3r::Zero();
 			Real angle = 0.0;
 			rotation = Matrix3r::Identity();
 			if (result.count("axis"))
-				axis = result["axis"].as<Vector3r>();
+				axis = Vector3r(result["axis"].as<std::vector<Real>>().data()); 
 			if (result.count("angle"))
 			{
 				angle = result["angle"].as<Real>();

Tools/PartioViewer/GUI/imgui/PartioViewer_GUI_imgui.cpp

@@ -15,12 +15,6 @@
 using namespace SPH;
 
 
-std::istream& operator >> (std::istream& istream, Vector3r& v)
-{
-	return istream >> std::skipws >> v[0] >> v[1] >> v[2];
-}
-
-
 PartioViewer_GUI_imgui::PartioViewer_GUI_imgui(PartioViewer *viewer) :
 	PartioViewer_GUI_Base()
 {	
@@ -85,19 +79,19 @@ void PartioViewer_GUI_imgui::stop()
 void PartioViewer_GUI_imgui::addOptions(cxxopts::Options &options)
 {
  	options.add_options()
-		("camPos", "Camera position (e.g. --camPos \"0 1 5\")", cxxopts::value<Vector3r>()->default_value("0 3 10"))
-		("camLookat", "Camera lookat (e.g. --camLookat \"0 0 0\")", cxxopts::value<Vector3r>()->default_value("0 0 0"))
+		("camPos", "Camera position (e.g. --camPos 0,1,5)", cxxopts::value<std::vector<Real>>()->default_value("0,3,10"))
+		("camLookat", "Camera lookat (e.g. --camLookat 0,0,0)", cxxopts::value<std::vector<Real>>()->default_value("0,0,0"))
 		("showBBox", "Show bounding box.")
  		;
 }
 
 void PartioViewer_GUI_imgui::parseOptions(cxxopts::ParseResult &result)
 {
 	if (result.count("camPos"))
-		m_camPos = result["camPos"].as<Vector3r>();
+		m_camPos = Vector3r(result["camPos"].as<std::vector<Real>>().data());
 
 	if (result.count("camLookat"))
-		m_camLookat = result["camLookat"].as<Vector3r>();
+		m_camLookat = Vector3r(result["camLookat"].as<std::vector<Real>>().data());
 
 	m_showBBox = result.count("showBBox") != 0;
 }

Tools/SurfaceSampling/main.cpp

@@ -36,11 +36,6 @@ Vector3r translation = Vector3r::Zero();
 Vector3r rotationAxis = Vector3r::UnitY();
 Real angle = 0;
 
-std::istream& operator >> (std::istream& istream, Vector3r& v)
-{
-	return istream >> std::skipws >> v[0] >> v[1] >> v[2];
-}
-
 
 // main 
 int main( int argc, char **argv )
@@ -60,10 +55,10 @@ int main( int argc, char **argv )
 			("i,input", "Input file (obj)", cxxopts::value<std::string>())
 			("o,output", "Output file (bgeo)", cxxopts::value<std::string>())
 			("r,radius", "Particle radius", cxxopts::value<Real>()->default_value("0.025"))
-			("s,scale", "Scaling of input geometry (e.g. --scale \"1 2 3\")", cxxopts::value<Vector3r>())
+			("s,scale", "Scaling of input geometry (e.g. --scale 1,2,3)", cxxopts::value<std::vector<Real>>())
 			("m,mode", "Sampling mode 0 Poisson disk, 1 Regular, 2 2D sampling", cxxopts::value<unsigned int>()->default_value("1"))
-			("t,translation", "Translation for 2D sampling (default: \"0 0 0\")", cxxopts::value<Vector3r>())
-			("rotationAxis", "Rotation axis for 2D sampling (default: \"0 1 0\")", cxxopts::value<Vector3r>())
+			("t,translation", "Translation for 2D sampling (default: 0,0,0)", cxxopts::value<std::vector<Real>>())
+			("rotationAxis", "Rotation axis for 2D sampling (default: 0,1,0)", cxxopts::value<std::vector<Real>>())
 			("a,angle", "Rotation angle for 2D simulation", cxxopts::value<Real>()->default_value("0"))
 			;
 
@@ -94,17 +89,17 @@ int main( int argc, char **argv )
 		std::cout << "Radius: " << particleRadius << std::endl;
 
 		if (result.count("scale"))
-			scale = result["scale"].as<Vector3r>();
+			scale = Vector3r(result["scale"].as<std::vector<Real>>().data());
 		std::cout << "Scale: [" << scale.transpose() << "]^T" << std::endl;
 
 		if (result.count("mode"))
 			samplingMode = result["mode"].as<unsigned int>();
 		std::cout << "Sampling mode: " << samplingMode << std::endl;
 
 		if (result.count("translation"))
-			translation = result["translation"].as<Vector3r>();
+			translation = Vector3r(result["translation"].as<std::vector<Real>>().data());
 		if (result.count("rotationAxis"))
-			rotationAxis = result["rotationAxis"].as<Vector3r>();
+			rotationAxis = Vector3r(result["rotationAxis"].as<std::vector<Real>>().data());
 		if (result.count("angle"))
 			angle = result["angle"].as<Real>();
 

Tools/VolumeSampling/main.cpp

@@ -62,33 +62,12 @@ bool useCache = true;
 std::shared_ptr<Discregrid::CubicLagrangeDiscreteGrid> distanceField;
 
 
-std::istream& operator >> (std::istream& istream, SamplingBase::Region& r)
-{
-	return istream >> std::skipws >> r.m_min[0] >> r.m_min[1] >> r.m_min[2] >> r.m_max[0] >> r.m_max[1] >> r.m_max[2];
-}
-
-std::ostream& operator << (std::ostream& out, const SamplingBase::Region& r)
-{
-	out << r.m_min[0] << ", " << r.m_min[1] << ", " << r.m_min[2] << ", " << r.m_max[0] << ", " << r.m_max[1] << ", " << r.m_max[2];
-	return out;
-}
-
-std::istream& operator >> (std::istream& istream, Eigen::Matrix<unsigned int, 3, 1>& r)
-{
-	return istream >> std::skipws >> r[0] >> r[1] >> r[2];
-}
-
 std::ostream& operator << (std::ostream& out, const Eigen::Matrix<unsigned int, 3, 1>& r)
 {
 	out << r[0] << ", " << r[1] << ", " << r[2];
 	return out;
 }
 
-std::istream& operator >> (std::istream& istream, Vector3r& r)
-{
-	return istream >> std::skipws >> r[0] >> r[1] >> r[2];
-}
-
 std::ostream& operator << (std::ostream& out, const Vector3r& r)
 {
 	out << r[0] << ", " << r[1] << ", " << r[2];
@@ -113,17 +92,17 @@ int main(int argc, char **argv)
 			("i,input", "Input file (obj)", cxxopts::value<std::string>())
 			("o,output", "Output file (bgeo or vtk)", cxxopts::value<std::string>())
 			("r,radius", "Particle radius", cxxopts::value<Real>()->default_value("0.025"))
-			("s,scale", "Scaling of input geometry (e.g. --scale \"2 1 2\")", cxxopts::value<Vector3r>()->default_value("1 1 1"))
+			("s,scale", "Scaling of input geometry (e.g. --scale 2,1,2)", cxxopts::value<std::vector<Real>>()->default_value("1,1,1"))
 			("m,mode", "Mode (regular=0, almost dense=1, dense=2, Jiang et al. 2015=3, Kugelstadt et al. 2021=4)", cxxopts::value<int>()->default_value("4"))
-			("region", "Region to fill with particles (e.g. --region \"0 0 0 1 1 1\")", cxxopts::value<SamplingBase::Region>())
+			("region", "Region to fill with particles (e.g. --region 0,0,0,1,1,1)", cxxopts::value<std::vector<Real>>())
 			("steps", "SPH time steps", cxxopts::value<unsigned int>()->default_value("100"))
 			("cflFactor", "CFL factor", cxxopts::value<Real>()->default_value("0.25"))
 			("viscosity", "Viscosity coefficient (XSPH)", cxxopts::value<Real>()->default_value("0.25"))
 			("cohesion", "Cohesion coefficient", cxxopts::value<Real>())
 			("adhesion", "Adhesion coefficient", cxxopts::value<Real>())
 			("stiffness", "Stiffness coefficient (only mode 3)", cxxopts::value<Real>()->default_value("10000.0"))
 			("dt", "Time step size (only mode 3)", cxxopts::value<Real>()->default_value("0.0005"))
-			("res", "Resolution of the Signed Distance Field (e.g. --res \"30 30 30\")", cxxopts::value<Eigen::Matrix<unsigned int, 3, 1>>())
+			("res", "Resolution of the Signed Distance Field (e.g. --res 30,30,30)", cxxopts::value<std::vector<unsigned int>>())
 			("invert", "Invert the SDF to sample the outside of the object in the bounding box/region")
 			("no-cache", "Disable caching of SDF.")
 			;
@@ -182,7 +161,7 @@ int main(int argc, char **argv)
 		LOG_INFO << "Radius: " << radius;
 
 		if (result.count("scale"))
-			scale = result["scale"].as<Vector3r>();
+			scale = Vector3r(result["scale"].as<std::vector<Real>>().data()); 
 		LOG_INFO << "Scale: " << scale;
 
 		if (result.count("steps"))
@@ -213,7 +192,7 @@ int main(int argc, char **argv)
 
 		if (result.count("res"))
 		{
-			resolutionSDF = result["res"].as<Eigen::Matrix<unsigned int, 3, 1>>();
+			resolutionSDF = Eigen::Matrix<unsigned int, 3, 1>(result["res"].as<std::vector<unsigned int>>().data());
 			LOG_INFO << "SDF resolution: " << resolutionSDF;
 		}
 
@@ -227,9 +206,14 @@ int main(int argc, char **argv)
 
 		if (result.count("region"))
 		{
-			region = result["region"].as<SamplingBase::Region>();
+			const std::vector<Real> &v = result["region"].as<std::vector<Real>>();
+			if (v.size() == 6)
+				region = SamplingBase::Region(v[0], v[1], v[2], v[3], v[4], v[5]);
+			else 
+				LOG_WARN << "Region parameter has wrong number of elements.";
 			useRegion = true;
-			LOG_INFO << "Region: " << region;
+			LOG_INFO << "Region - min: " << region.m_min.transpose();
+			LOG_INFO << "Region - max: " << region.m_max.transpose();
 		}
 	}
 	catch (const cxxopts::exceptions::exception& e)