[ci skip] Updating doc and version (#116)

doyubkim · Sep 4, 2017 · ca44dd5 · ca44dd5
1 parent 718326e
commit ca44dd5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -50,6 +50,12 @@ Here are some of the example simulations generated using Jet framework. Correspo
 ![Cubic-smoke Example](https://github.com/doyubkim/fluid-engine-dev/raw/master/doc/img/smoke_cubic.png "Cubic-smoke Example")
 ![Linear-smoke Example](https://github.com/doyubkim/fluid-engine-dev/raw/master/doc/img/smoke_linear.png "Linear-smoke Example")
 
+### Point-to-Surface Examples 
+
+![Point-to-Surface Example](https://github.com/doyubkim/fluid-engine-dev/raw/master/doc/img/point_to_surface.png "Point-to-Surface Example")
+
+> Top-left: spherical, top-right: SPH blobby, bottom-left: Zhu and Bridson's method, and bottom-right: Anisotropic kernel
+
 ## License
 
 Jet is under the MIT license. For more information, check out [LICENSE.md](https://github.com/doyubkim/fluid-engine-dev/blob/master/LICENSE.md). Jet also utilizes other open source codes. Checkout [3RD_PARTY.md](https://github.com/doyubkim/fluid-engine-dev/blob/master/3RD_PARTY.md) for more details.

diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Jet
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.1.0
+PROJECT_NUMBER         = v1.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/doc/doxygen/main.md b/doc/doxygen/main.md
@@ -9,6 +9,7 @@ Jet framework is a fluid simulation engine SDK for computer graphics application
 * PIC, FLIP, and APIC fluid simulators
 * Upwind, ENO, and FMM level set solvers
 * Jacobi, Gauss-Seidel, SOR, MG, CG, ICCG, and MGPCG linear system solvers
+* Spherical, SPH, Zhu & Bridson, and Anisotropic kernel for points-to-surface converter 
 * Converters between signed distance function and triangular mesh
 * C++ and Python API
 

diff --git a/doc/img/point_to_surface.png b/doc/img/point_to_surface.png
diff --git a/setup.py b/setup.py
@@ -69,7 +69,7 @@ def build_extension(self, ext):
 
 setup(
     name='pyjet',
-    version='1.1.0',
+    version='1.2.0',
     author='Doyub Kim',
     author_email='[email protected]',
     description='Fluid simulation engine for computer graphics applications',

diff --git a/src/python/sph_points_to_implicit.cpp b/src/python/sph_points_to_implicit.cpp
@@ -19,7 +19,7 @@ void addSphPointsToImplicit2(pybind11::module& m) {
                                         R"pbdoc(
         2-D points-to-implicit converter based on standard SPH kernel.
 
-        \see Müller, Matthias, David Charypar, and Markus Gross.
+        \see M\"uller, Matthias, David Charypar, and Markus Gross.
              "Particle-based fluid simulation for interactive applications."
              Proceedings of the 2003 ACM SIGGRAPH/Eurographics symposium on Computer
              animation. Eurographics Association, 2003.
@@ -44,7 +44,7 @@ void addSphPointsToImplicit3(pybind11::module& m) {
                                         R"pbdoc(
         3-D points-to-implicit converter based on standard SPH kernel.
 
-        \see Müller, Matthias, David Charypar, and Markus Gross.
+        \see M\"uller, Matthias, David Charypar, and Markus Gross.
              "Particle-based fluid simulation for interactive applications."
              Proceedings of the 2003 ACM SIGGRAPH/Eurographics symposium on Computer
              animation. Eurographics Association, 2003.