More options for particles2obj app (#113)

* Adding more reconstruction methods to the example
* FMM as an option
* Minor fixes

Author: doyubkim

include/jet/anisotropic_points_to_implicit2.h

@@ -37,7 +37,8 @@ class AnisotropicPointsToImplicit2 final : public PointsToImplicit2 {
     AnisotropicPointsToImplicit2(double kernelRadius = 1.0,
                                  double cutOffDensity = 0.5,
                                  double positionSmoothingFactor = 0.0,
-                                 size_t minNumNeighbors = 8);
+                                 size_t minNumNeighbors = 8,
+                                 bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector2D>& points,
@@ -48,6 +49,7 @@ class AnisotropicPointsToImplicit2 final : public PointsToImplicit2 {
     double _cutOffDensity = 0.5;
     double _positionSmoothingFactor = 0.0;
     size_t _minNumNeighbors = 8;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer for the AnisotropicPointsToImplicit2 type.

include/jet/anisotropic_points_to_implicit3.h

@@ -37,7 +37,8 @@ class AnisotropicPointsToImplicit3 final : public PointsToImplicit3 {
     AnisotropicPointsToImplicit3(double kernelRadius = 1.0,
                                  double cutOffDensity = 0.5,
                                  double positionSmoothingFactor = 0.0,
-                                 size_t minNumNeighbors = 25);
+                                 size_t minNumNeighbors = 25,
+                                 bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector3D>& points,
@@ -48,6 +49,7 @@ class AnisotropicPointsToImplicit3 final : public PointsToImplicit3 {
     double _cutOffDensity = 0.5;
     double _positionSmoothingFactor = 0.0;
     size_t _minNumNeighbors = 25;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer for the AnisotropicPointsToImplicit3 type.

include/jet/sph_points_to_implicit2.h

@@ -22,7 +22,8 @@ namespace jet {
 class SphPointsToImplicit2 final : public PointsToImplicit2 {
  public:
     //! Constructs the converter with given kernel radius and cut-off density.
-    SphPointsToImplicit2(double kernelRadius = 1.0, double cutOffDensity = 0.5);
+    SphPointsToImplicit2(double kernelRadius = 1.0, double cutOffDensity = 0.5,
+                         bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector2D>& points,
@@ -31,6 +32,7 @@ class SphPointsToImplicit2 final : public PointsToImplicit2 {
  private:
     double _kernelRadius = 1.0;
     double _cutOffDensity = 0.5;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for SphPointsToImplicit2 class.

include/jet/sph_points_to_implicit3.h

@@ -22,7 +22,8 @@ namespace jet {
 class SphPointsToImplicit3 final : public PointsToImplicit3 {
  public:
     //! Constructs the converter with given kernel radius and cut-off density.
-    SphPointsToImplicit3(double kernelRadius = 1.0, double cutOffDensity = 0.5);
+    SphPointsToImplicit3(double kernelRadius = 1.0, double cutOffDensity = 0.5,
+                         bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector3D>& points,
@@ -31,6 +32,7 @@ class SphPointsToImplicit3 final : public PointsToImplicit3 {
  private:
     double _kernelRadius = 1.0;
     double _cutOffDensity = 0.5;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for SphPointsToImplicit3 class.

include/jet/spherical_points_to_implicit2.h

@@ -17,14 +17,15 @@ namespace jet {
 class SphericalPointsToImplicit2 final : public PointsToImplicit2 {
  public:
     //! Constructs the converter with given sphere radius.
-    SphericalPointsToImplicit2(double radius = 1.0);
+    SphericalPointsToImplicit2(double radius = 1.0, bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector2D>& points,
                  ScalarGrid2* output) const override;
 
  private:
     double _radius = 1.0;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for SphericalPointsToImplicit2.

include/jet/spherical_points_to_implicit3.h

@@ -17,14 +17,15 @@ namespace jet {
 class SphericalPointsToImplicit3 final : public PointsToImplicit3 {
  public:
     //! Constructs the converter with given sphere radius.
-    SphericalPointsToImplicit3(double radius = 1.0);
+    SphericalPointsToImplicit3(double radius = 1.0, bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector3D>& points,
                  ScalarGrid3* output) const override;
 
  private:
     double _radius = 1.0;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for SphericalPointsToImplicit3.

include/jet/zhu_bridson_points_to_implicit2.h

@@ -21,7 +21,8 @@ class ZhuBridsonPointsToImplicit2 final : public PointsToImplicit2 {
  public:
     //! Constructs the converter with given kernel radius and cut-off threshold.
     ZhuBridsonPointsToImplicit2(double kernelRadius = 1.0,
-                                double cutOffThreshold = 0.25);
+                                double cutOffThreshold = 0.25,
+                                bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector2D>& points,
@@ -30,6 +31,7 @@ class ZhuBridsonPointsToImplicit2 final : public PointsToImplicit2 {
  private:
     double _kernelRadius = 1.0;
     double _cutOffThreshold = 0.25;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for ZhuBridsonPointsToImplicit2 class

include/jet/zhu_bridson_points_to_implicit3.h

@@ -21,7 +21,8 @@ class ZhuBridsonPointsToImplicit3 final : public PointsToImplicit3 {
  public:
     //! Constructs the converter with given kernel radius and cut-off threshold.
     ZhuBridsonPointsToImplicit3(double kernelRadius = 1.0,
-                                double cutOffThreshold = 0.25);
+                                double cutOffThreshold = 0.25,
+                                bool isOutputSdf = true);
 
     //! Converts the given points to implicit surface scalar field.
     void convert(const ConstArrayAccessor1<Vector3D>& points,
@@ -30,6 +31,7 @@ class ZhuBridsonPointsToImplicit3 final : public PointsToImplicit3 {
  private:
     double _kernelRadius = 1.0;
     double _cutOffThreshold = 0.25;
+    bool _isOutputSdf = true;
 };
 
 //! Shared pointer type for ZhuBridsonPointsToImplicit3 class

src/examples/hybrid_liquid_sim/main.cpp

@@ -73,7 +73,7 @@ void printUsage() {
         "   -o, --output: output directory name "
         "(default is " APP_NAME
         "_output)\n"
-        "   -e, --example: example number (between 1 and 5, default is 1)\n"
+        "   -e, --example: example number (between 1 and 6, default is 1)\n"
         "   -m, --format: particle output format (xyz or pos. default is xyz)\n"
         "   -h, --help: print this message\n");
 }
@@ -476,13 +476,20 @@ void runExample6(const std::string& rootDir, size_t resolutionX,
 
     // Manually emit particles
     std::mt19937 rng;
-    std::uniform_real_distribution<> dist(0, 1);
-    for (size_t i = 0; i < 8 * resolutionX * resolutionX * resolutionX; ++i) {
-        Vector3D pt{dist(rng), dist(rng), dist(rng)};
-        if ((pt - sphere->center).length() < sphere->radius && pt.x > 0.5) {
-            solver->particleSystemData()->addParticle(pt);
-        }
-    }
+    std::uniform_real_distribution<> dist(-0.1 * solver->gridSpacing().x,
+                                          0.1 * solver->gridSpacing().x);
+    BccLatticePointGenerator pointGenerator;
+    pointGenerator.forEachPoint(
+        BoundingBox3D({0.75, 0, 0}, {1, 1, 1}), 0.5 * solver->gridSpacing().x,
+        [&](const Vector3D& pt) -> bool {
+            Vector3D newPos = pt + Vector3D{dist(rng), dist(rng), dist(rng)};
+            if ((pt - Vector3D{0.5, 0.5, 0.5}).length() < 0.4) {
+                solver->particleSystemData()->addParticle(newPos);
+            }
+            return true;
+        });
+    printf("Number of particles: %zu\n",
+           solver->particleSystemData()->numberOfParticles());
 
     // Print simulation info
     printf("Running example 6 (sphere boundary with APIC)\n");