diff --git a/Makefile b/Makefile index 745aa18..be643cf 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=$(shell python -c "import frentos; print(frentos.__version__)") +VERSION=$(shell grep '__version__ = ' setup.py | sed 's/[^0-9]*\([0-9\.]*\).*/\1/') # Make sure we're on the master branch ifneq "$(shell git rev-parse --abbrev-ref HEAD)" "master" diff --git a/README.md b/README.md index eb6fa54..0b9c798 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,7 @@ frontend to [gmsh](http://gmsh.info/)) and ### Examples #### A simple ball -
- -
+![Ball](https://nschloe.github.io/frentos/ball.png) ```python import frentos @@ -72,9 +70,7 @@ frentos.generate_mesh( ``` #### Other primitive shapes -- -
+![Tetrahedron](https://nschloe.github.io/frentos/tetra.png) frentos provides out-of-the-box support for balls, cuboids, ellpsoids, tori, cones, cylinders, and tetrahedra. Try for example @@ -93,9 +89,7 @@ frentos.generate_mesh( ``` #### Domain combinations -- -
+![Balls difference](https://nschloe.github.io/frentos/ball-difference.png) Supported are unions, intersections, and differences of all domains. As mentioned above, however, the sharp intersections between two domains are not @@ -140,9 +134,7 @@ of the mesh generation. This makes sure that it fits in nicely with the rest of the mesh. #### Domain deformations -- -
+![Egg](https://nschloe.github.io/frentos/egg.png) You can of coure translate, rotate, scale, and stretch any domain. Try, for example, @@ -162,9 +154,7 @@ frentos.generate_mesh( ``` #### Extrusion of 2D polygons -- -
+![triangle rotated](https://nschloe.github.io/frentos/triangle-rotated.png) frentos lets you extrude any polygon into a 3D body. It even supports rotation alongside! @@ -191,9 +181,7 @@ Feature edges are automatically preserved here, which is why an edge length needs to be given to `frentos.Extrude`. #### Rotation bodies -- -
+![triangle ring extruded](https://nschloe.github.io/frentos/circle-rotate-extr.png) Polygons in the x-z-plane can also be rotated around the z-axis to yield a rotation body. @@ -213,9 +201,8 @@ frentos.generate_mesh( ``` #### Your own custom level set function -- -
+![triangle ring extruded](https://nschloe.github.io/frentos/heart.png) + If all of the variety is not enough for you, you can define your own custom level set function. You simply need to subclass `frentos.DomainBase` and specify a function, e.g., @@ -265,9 +252,7 @@ documention](http://doc.cgal.org/latest/Surface_mesher/index.html) for the options. #### Meshes from OFF files -- -
+![elephant](https://nschloe.github.io/frentos/elephant.png) If you have an OFF file at hand (like [elephant.off](https://raw.githubusercontent.com/CGAL/cgal-swig-bindings/master/examples/data/elephant.off) diff --git a/setup.py b/setup.py index 4273ec4..c6b61f4 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import os import codecs -__version__ = '0.1.1' +__version__ = '0.1.2' __license__ = 'MIT License' __author__ = 'Nico Schlömer' __email__ = 'nico.schloemer@gmail.com' diff --git a/src/frentos.i b/src/frentos.i index 9f442a6..740edcb 100644 --- a/src/frentos.i +++ b/src/frentos.i @@ -1,7 +1,7 @@ %module(directors="1") frentos %pythoncode %{ -__version__ = '0.1.1' +__version__ = '0.1.2' __license__ = 'MIT License' __author__ = 'Nico Schlömer' __email__ = 'nico.schloemer@gmail.com'