diff --git a/Common/Visibility.h b/Common/Visibility.h index bdfca0ecdc2ef1bc110ce37f162a26bc3e64b00d..b6f5001244d93659ffe953305829838d3e2113f0 100644 --- a/Common/Visibility.h +++ b/Common/Visibility.h @@ -106,7 +106,7 @@ class VisibilityManager { std::vector<Vis*> _entities; int _sortMode; static VisibilityManager *manager; - VisibilityManager() : _sortMode(1) {} + VisibilityManager() : _sortMode(-1) {} public : // create the only instance of the manager diff --git a/Geo/Geo.h b/Geo/Geo.h index a691ce42dbb8bca446ae79c596a4a2a01c85cd88..9a59daef2026782ce826d717a7d4267d57d391d8 100644 --- a/Geo/Geo.h +++ b/Geo/Geo.h @@ -26,21 +26,8 @@ #include "Tree.h" #include "ExtrudeParams.h" -#define INFILE 1 -#define INSTRING 2 -#define STRINGMAX 1024 - -#define NMAX_SPLINE 100 - -#define MSH_TRSF_LINE 1 -#define MSH_TRSF_SURFACE 2 -#define MSH_TRSF_VOLUME 3 - -#define MSH_ASSOCIATION 6 - -#define MSH_RECOMBINE 5 - #define MSH_POINT 1 +#define MSH_POINT_DISCRETE 100 #define MSH_SEGM_LINE 2 #define MSH_SEGM_SPLN 3 @@ -49,26 +36,23 @@ #define MSH_SEGM_ELLI 6 #define MSH_SEGM_ELLI_INV 7 #define MSH_SEGM_LOOP 8 -#define MSH_SEGM_PARAMETRIC 888 #define MSH_SEGM_BSPLN 15 #define MSH_SEGM_URBS 16 #define MSH_SEGM_NURBS 17 #define MSH_SEGM_BEZIER 18 -#define MSH_SEGM_DISCRETE 19 +#define MSH_SEGM_PARAMETRIC 19 +#define MSH_SEGM_DISCRETE 101 #define MSH_SURF_PLAN 9 #define MSH_SURF_REGL 10 #define MSH_SURF_TRIC 11 #define MSH_SURF_NURBS 12 #define MSH_SURF_LOOP 13 -#define MSH_SURF_CYLNDR 1299 -#define MSH_SURF_TORUS 1399 -#define MSH_SURF_CONE 1499 -#define MSH_SURF_TRIMMED 1599 -#define MSH_SURF_DISCRETE 1799 +#define MSH_SURF_TRIMMED 21 +#define MSH_SURF_DISCRETE 102 #define MSH_VOLUME 14 -#define MSH_VOLUME_DISCRETE 114 +#define MSH_VOLUME_DISCRETE 103 #define MSH_PHYSICAL_POINT 300 #define MSH_PHYSICAL_LINE 310