solstice

commit 779c02afbcb574df92b475fef401ed56d6e4621b
parent 23164bb2ea5d52d7a4fe40cfc5582c0e167bd061
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Fri, 21 Apr 2017 10:21:17 +0200

Change some default values and add aparam to cylinders.

Diffstat:
M
doc/input
 | 
16
++++++++--------
M
src/parser/solparser_shape.h
 | 
1
+

2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/doc/input b/doc/input
@@ -144,8 +144,8 @@
   cylinder:
     height: REAL # in ]0, INF)
     radius: REAL # in ]0, INF)
-[   slices: INTEGER ] # in [4, 4096]. Default 16
-[   stacks: INTEGER ] # in [1, 4096]. Default 1
+[   slices: INTEGER # in [4, 4096]. Default 32 ]
+[   stacks: INTEGER # in [1, 4096]. Default 1 ]
 
 <obj> ::=
   obj:
@@ -158,7 +158,7 @@
     clip: <polyclip-list>
     # By default slices is automatically computed with respect to the parabol
     # curvature
-[   slices: INTEGER ] # in [4, 4096)
+[   slices: INTEGER # in [4, 4096) ]
 
 <parabolic-cylinder> ::=
   parabolic-cylinder: # y^2 - 4*focal*z = 0
@@ -166,7 +166,7 @@
     clip: <polyclip-list>
     # By default slices is automatically computed with respect to the hyperbol
     # curvature
-[   slices: INTEGER ] # in [4, 4096)
+[   slices: INTEGER # in [4, 4096) ] 
 
 # (x^2 + y^2) / a^2 - (z + z0 - g/2)^2 / b^2 + 1 = 0
 #      with g = img_focal + real_focal; f = real_focal / g;
@@ -177,7 +177,7 @@
     clip: <polyclip-list>
     # By default slices is automatically compute with respect to the hyperbol
     # curvature
-[   slices: INTEGER ] # in [4, 4096)
+[   slices: INTEGER # in [4, 4096) ]
 
 <hyperboloid_focals> ::=
   real: REAL # in ]0, INF)
@@ -190,7 +190,7 @@
 [   clip: <polyclip-list> ]
     # By default slices is automatically compute with respect to the hemisphere
     # extension
-[   slices: INTEGER ] # in [4, 4096)
+[   slices: INTEGER # in [4, 4096) ]
 
 <plane> ::=
   plane:
@@ -200,8 +200,8 @@
 <sphere> ::=
   sphere:
     radius: REAL # in ]0, INF)
-[   slices: INTEGER ] # in [4, 4096]. Default 16
-[   stacks: INTEGER ] # in [2, 4096]. Default slices/2
+[   slices: INTEGER # in [4, 4096). Default 32 ]
+[   stacks: INTEGER # in [2, 4096]. Default slices/2 ]
 
 <stl> ::=
   stl:
diff --git a/src/parser/solparser_shape.h b/src/parser/solparser_shape.h
@@ -267,6 +267,7 @@ struct solparser_shape_hemisphere {
   double radius;
   struct darray_polyclip polyclips;
   long nslices; /* < 0 if not defined */
+  long nstacks; /* < 0 if not defined */
 };
 
 static INLINE void