Skip to content

Commit b6125db

Browse files
authored
Merge pull request #2 from nschloe/remove-raw-html
Remove raw html
2 parents 59a848f + acd4944 commit b6125db

4 files changed

Lines changed: 12 additions & 27 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=$(shell python -c "import frentos; print(frentos.__version__)")
1+
VERSION=$(shell grep '__version__ = ' setup.py | sed 's/[^0-9]*\([0-9\.]*\).*/\1/')
22

33
# Make sure we're on the master branch
44
ifneq "$(shell git rev-parse --abbrev-ref HEAD)" "master"

README.md

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ frontend to [gmsh](http://gmsh.info/)) and
4242
### Examples
4343

4444
#### A simple ball
45-
<p align="center">
46-
<img src="https://nschloe.github.io/frentos/ball.png"/>
47-
</p>
45+
![Ball](https://nschloe.github.io/frentos/ball.png)
4846
```python
4947
import frentos
5048

@@ -72,9 +70,7 @@ frentos.generate_mesh(
7270
```
7371

7472
#### Other primitive shapes
75-
<p align="center">
76-
<img src="https://nschloe.github.io/frentos/tetra.png"/>
77-
</p>
73+
![Tetrahedron](https://nschloe.github.io/frentos/tetra.png)
7874

7975
frentos provides out-of-the-box support for balls, cuboids, ellpsoids, tori,
8076
cones, cylinders, and tetrahedra. Try for example
@@ -93,9 +89,7 @@ frentos.generate_mesh(
9389
```
9490

9591
#### Domain combinations
96-
<p align="center">
97-
<img src="https://nschloe.github.io/frentos/ball-difference.png"/>
98-
</p>
92+
![Balls difference](https://nschloe.github.io/frentos/ball-difference.png)
9993

10094
Supported are unions, intersections, and differences of all domains. As
10195
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
140134
the mesh.
141135

142136
#### Domain deformations
143-
<p align="center">
144-
<img src="https://nschloe.github.io/frentos/egg.png"/>
145-
</p>
137+
![Egg](https://nschloe.github.io/frentos/egg.png)
146138

147139
You can of coure translate, rotate, scale, and stretch any domain. Try, for
148140
example,
@@ -162,9 +154,7 @@ frentos.generate_mesh(
162154
```
163155

164156
#### Extrusion of 2D polygons
165-
<p align="center">
166-
<img src="https://nschloe.github.io/frentos/triangle-rotated.png"/>
167-
</p>
157+
![triangle rotated](https://nschloe.github.io/frentos/triangle-rotated.png)
168158

169159
frentos lets you extrude any polygon into a 3D body. It even supports
170160
rotation alongside!
@@ -191,9 +181,7 @@ Feature edges are automatically preserved here, which is why an edge length
191181
needs to be given to `frentos.Extrude`.
192182

193183
#### Rotation bodies
194-
<p align="center">
195-
<img src="https://nschloe.github.io/frentos/circle-rotate-extr.png"/>
196-
</p>
184+
![triangle ring extruded](https://nschloe.github.io/frentos/circle-rotate-extr.png)
197185

198186
Polygons in the x-z-plane can also be rotated around the z-axis to yield a
199187
rotation body.
@@ -213,9 +201,8 @@ frentos.generate_mesh(
213201
```
214202

215203
#### Your own custom level set function
216-
<p align="center">
217-
<img src="https://nschloe.github.io/frentos/heart.png"/>
218-
</p>
204+
![triangle ring extruded](https://nschloe.github.io/frentos/heart.png)
205+
219206
If all of the variety is not enough for you, you can define your own custom
220207
level set function. You simply need to subclass `frentos.DomainBase` and
221208
specify a function, e.g.,
@@ -265,9 +252,7 @@ documention](http://doc.cgal.org/latest/Surface_mesher/index.html) for the
265252
options.
266253

267254
#### Meshes from OFF files
268-
<p align="center">
269-
<img src="https://nschloe.github.io/frentos/elephant.png"/>
270-
</p>
255+
![elephant](https://nschloe.github.io/frentos/elephant.png)
271256

272257
If you have an OFF file at hand (like
273258
[elephant.off](https://raw.githubusercontent.com/CGAL/cgal-swig-bindings/master/examples/data/elephant.off)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
import codecs
66

7-
__version__ = '0.1.1'
7+
__version__ = '0.1.2'
88
__license__ = 'MIT License'
99
__author__ = 'Nico Schlömer'
1010
__email__ = 'nico.schloemer@gmail.com'

src/frentos.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%module(directors="1") frentos
22

33
%pythoncode %{
4-
__version__ = '0.1.1'
4+
__version__ = '0.1.2'
55
__license__ = 'MIT License'
66
__author__ = 'Nico Schlömer'
77
__email__ = 'nico.schloemer@gmail.com'

0 commit comments

Comments
 (0)