diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:19:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:37:13 +0400 |
| commit | 1674a04488143149b19fda4985193dd8431fcac4 (patch) | |
| tree | 180eebe2356f2560e9e2a022a0aad1a2a068eb9d | |
| parent | 62258d9f30d453172508803eef882d98ca103238 (diff) | |
Freestyle: removed unused *_EXPORT qualifiers for building Windows DLLs.
These qualifiers were leftovers of the stand alone Freestyle program and not used
(set to an empty string) in Blender for years.
75 files changed, 178 insertions, 276 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 17c0dd0c6db..d16a311991a 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -74,7 +74,7 @@ struct LoaderState { float maxBBox[3]; }; -class LIB_SCENE_GRAPH_EXPORT BlenderFileLoader +class BlenderFileLoader { public: /*! Builds a MaxFileLoader */ diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h index 96ce8c1be7e..4bedffc4738 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h @@ -39,7 +39,7 @@ extern "C" { namespace Freestyle { -class LIB_STROKE_EXPORT BlenderStrokeRenderer : public StrokeRenderer +class BlenderStrokeRenderer : public StrokeRenderer { public: BlenderStrokeRenderer(Render *re, int render_count); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h index b6cb303942a..7edbefd327b 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h @@ -32,7 +32,7 @@ namespace Freestyle { /*! Class to load textures */ -class LIB_RENDERING_EXPORT BlenderTextureManager : public TextureManager +class BlenderTextureManager : public TextureManager { public: BlenderTextureManager(); diff --git a/source/blender/freestyle/intern/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h index 34af31d0ba8..ed26803c2a2 100644 --- a/source/blender/freestyle/intern/geometry/Bezier.h +++ b/source/blender/freestyle/intern/geometry/Bezier.h @@ -42,7 +42,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_GEOMETRY_EXPORT BezierCurveSegment +class BezierCurveSegment { private: std::vector<Vec2d> _ControlPolygon; @@ -70,7 +70,7 @@ public: #endif }; -class LIB_GEOMETRY_EXPORT BezierCurve +class BezierCurve { private: std::vector<Vec2d> _ControlPolygon; diff --git a/source/blender/freestyle/intern/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h index 0982c1a7d7c..355a6e53399 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.h +++ b/source/blender/freestyle/intern/geometry/FastGrid.h @@ -36,7 +36,7 @@ namespace Freestyle { * We don't use a hashtable here. The grid is explicitly stored for faster computations. * However, this might result in significant increase in memory usage (compared to the regular grid) */ -class LIB_GEOMETRY_EXPORT FastGrid : public Grid +class FastGrid : public Grid { public: FastGrid() : Grid() diff --git a/source/blender/freestyle/intern/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h index 809ef875c0a..2268f6be1b7 100644 --- a/source/blender/freestyle/intern/geometry/FitCurve.h +++ b/source/blender/freestyle/intern/geometry/FitCurve.h @@ -74,7 +74,7 @@ typedef struct Point2Struct typedef Point2 Vector2; -class LIB_GEOMETRY_EXPORT FitCurveWrapper +class FitCurveWrapper { private: std::vector<Vector2> _vertices; diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h index 0b97614f6ea..d516c5623b9 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.h +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h @@ -40,7 +40,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_GEOMETRY_EXPORT GeomCleaner +class GeomCleaner { public: inline GeomCleaner() {} diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h index dbb7a5d4e75..64aa6379e80 100644 --- a/source/blender/freestyle/intern/geometry/GeomUtils.h +++ b/source/blender/freestyle/intern/geometry/GeomUtils.h @@ -83,17 +83,14 @@ typedef enum { COINCIDENT, } intersection_test; -LIB_GEOMETRY_EXPORT intersection_test intersect2dSeg2dSeg(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment Vec2r& res); // found intersection point -LIB_GEOMETRY_EXPORT intersection_test intersect2dLine2dLine(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment Vec2r& res); // found intersection point -LIB_GEOMETRY_EXPORT intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1, const Vec2r& p2, // first segment const Vec2r& p3, const Vec2r& p4, // second segment real& t, // I = P1 + t * P1P2) @@ -101,26 +98,21 @@ intersection_test intersect2dSeg2dSegParametric(const Vec2r& p1, const Vec2r& p2 real epsilon = M_EPSILON); /*! check whether a 2D segment intersect a 2D region or not */ -LIB_GEOMETRY_EXPORT bool intersect2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, const Vec2r& B); /*! check whether a 2D segment is included in a 2D region or not */ -LIB_GEOMETRY_EXPORT bool include2dSeg2dArea(const Vec2r& min, const Vec2r& max, const Vec2r& A, const Vec2r& B); /*! Box-triangle overlap test, adapted from Tomas Akenine-Möller code */ -LIB_GEOMETRY_EXPORT bool overlapTriangleBox(Vec3r& boxcenter, Vec3r& boxhalfsize, Vec3r triverts[3]); /*! Fast, Minimum Storage Ray-Triangle Intersection, adapted from Tomas Möller and Ben Trumbore code. */ -LIB_GEOMETRY_EXPORT bool intersectRayTriangle(const Vec3r& orig, const Vec3r& dir, const Vec3r& v0, const Vec3r& v1, const Vec3r& v2, real& t, // I = orig + t * dir real& u, real& v, // I = (1 - u - v) * v0 + u * v1 + v * v2 const real epsilon = M_EPSILON); // the epsilon to use /*! Intersection between plane and ray adapted from Graphics Gems, Didier Badouel */ -LIB_GEOMETRY_EXPORT intersection_test intersectRayPlane(const Vec3r& orig, const Vec3r& dir, // ray origin and direction // plane's normal and offset (plane = { P / P.N + d = 0 }) const Vec3r& norm, const real d, @@ -130,7 +122,6 @@ intersection_test intersectRayPlane(const Vec3r& orig, const Vec3r& dir, // ray /*! Intersection Ray-Bounding box (axis aligned). * Adapted from Williams et al, "An Efficient Robust Ray-Box Intersection Algorithm", JGT 10:1 (2005), pp. 49-54. */ -LIB_GEOMETRY_EXPORT bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir, // ray origin and direction const Vec3r& boxMin, const Vec3r& boxMax, // the bbox // the interval in which at least on of the intersections must happen @@ -140,16 +131,12 @@ bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir, // ray origin an real epsilon = M_EPSILON); // the epsilon to use /*! Checks whether 3D point P lies inside or outside of the triangle ABC */ -LIB_GEOMETRY_EXPORT bool includePointTriangle(const Vec3r& P, const Vec3r& A, const Vec3r& B, const Vec3r& C); -LIB_GEOMETRY_EXPORT void transformVertex(const Vec3r& vert, const Matrix44r& matrix, Vec3r& res); -LIB_GEOMETRY_EXPORT void transformVertices(const vector<Vec3r>& vertices, const Matrix44r& trans, vector<Vec3r>& res); -LIB_GEOMETRY_EXPORT Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v); // @@ -171,7 +158,6 @@ Vec3r rotateVector(const Matrix44r& mat, const Vec3r& v); * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport) */ -LIB_GEOMETRY_EXPORT void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4], const real projection_matrix[4][4], const int viewport[4]); @@ -186,7 +172,6 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][ * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport) */ -LIB_GEOMETRY_EXPORT void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], const int viewport[4]); /*! Projects from world coordinates to camera coordinates @@ -200,7 +185,6 @@ void fromWorldToImage(const Vec3r& p, Vec3r& q, const real transform[4][4], cons * The model view matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromWorldToCamera(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4]); /*! Projects from World Coordinates to retina coordinates @@ -213,7 +197,6 @@ void fromWorldToCamera(const Vec3r& p, Vec3r& q, const real model_view_matrix[4] * The projection matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromCameraToRetina(const Vec3r& p, Vec3r& q, const real projection_matrix[4][4]); /*! From retina to image. @@ -225,7 +208,6 @@ void fromCameraToRetina(const Vec3r& p, Vec3r& q, const real projection_matrix[4 * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport). */ -LIB_GEOMETRY_EXPORT void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]); /*! From image to retina @@ -236,7 +218,6 @@ void fromRetinaToImage(const Vec3r& p, Vec3r& q, const int viewport[4]); * viewport * The viewport: x,y coordinates followed by width and height (OpenGL like viewport). */ -LIB_GEOMETRY_EXPORT void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]); /*! computes the coordinates of q in the camera coordinates system, @@ -251,7 +232,6 @@ void fromImageToRetina(const Vec3r& p, Vec3r& q, const int viewport[4]); * The projection matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromRetinaToCamera(const Vec3r& p, Vec3r& q, real z, const real projection_matrix[4][4]); /*! Projects from camera coordinates to world coordinates @@ -265,7 +245,6 @@ void fromRetinaToCamera(const Vec3r& p, Vec3r& q, real z, const real projection_ * The model view matrix expressed in line major order (OpenGL * matrices are column major ordered) */ -LIB_GEOMETRY_EXPORT void fromCameraToWorld(const Vec3r& p, Vec3r& q, const real model_view_matrix[4][4]); } // end of namespace GeomUtils diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 25988b3b0f8..c0cab2a05db 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -62,7 +62,7 @@ typedef vector<Polygon3r*> OccludersSet; // /////////////////////////////////////////////////////////////////////////////// -class LIB_GEOMETRY_EXPORT Cell +class Cell { public: Cell(Vec3r& orig) { @@ -175,7 +175,7 @@ public: // /////////////////////////////////////////////////////////////////////////////// -class LIB_GEOMETRY_EXPORT Grid +class Grid { public: /*! Builds a Grid. Must be followed by a call to configure() */ diff --git a/source/blender/freestyle/intern/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h index 7013a969eb5..4ea7c7146a4 100644 --- a/source/blender/freestyle/intern/geometry/HashGrid.h +++ b/source/blender/freestyle/intern/geometry/HashGrid.h @@ -60,7 +60,7 @@ struct GridHasher }; /*! Class to define a regular grid used for ray casting computations */ -class LIB_GEOMETRY_EXPORT HashGrid : public Grid +class HashGrid : public Grid { public: typedef map<Vec3u, Cell*> GridHashTable; diff --git a/source/blender/freestyle/intern/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h index 8798bc45a93..88994fac0d1 100644 --- a/source/blender/freestyle/intern/geometry/Noise.h +++ b/source/blender/freestyle/intern/geometry/Noise.h @@ -45,7 +45,7 @@ namespace Freestyle { using namespace Geometry; /*! Class to provide Perlin Noise functionalities */ -class LIB_GEOMETRY_EXPORT Noise +class Noise { public: /*! Builds a Noise object */ diff --git a/source/blender/freestyle/intern/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h index 162e2f85d3c..d65b0ea803b 100644 --- a/source/blender/freestyle/intern/geometry/matrix_util.h +++ b/source/blender/freestyle/intern/geometry/matrix_util.h @@ -61,7 +61,6 @@ namespace MatrixUtil { * @param eigen_values (return) are in decreasing order * size = n, must be allocated by caller */ - LIB_GEOMETRY_EXPORT void semi_definite_symmetric_eigen(const double *mat, int n, double *eigen_vec, double *eigen_val); } // MatrixUtil namespace diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h index 7a63acdf52a..53bc23c6eb3 100644 --- a/source/blender/freestyle/intern/geometry/normal_cycle.h +++ b/source/blender/freestyle/intern/geometry/normal_cycle.h @@ -70,7 +70,7 @@ template <class T> inline void ogf_swap(T& x, T& y) * D. Cohen-Steiner and J.M. Morvan, * SOCG 2003 */ -class LIB_GEOMETRY_EXPORT NormalCycle { +class NormalCycle { public: NormalCycle(); void begin(); diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index d3175e86382..7abd1bc18bc 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -43,7 +43,7 @@ extern "C" { namespace Freestyle { -class LIB_IMAGE_EXPORT GaussianFilter +class GaussianFilter { protected: /* The mask is a symetrical 2d array (with respect to the middle point). diff --git a/source/blender/freestyle/intern/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index 5ce937ed9f8..9a24ac6e1c8 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h @@ -40,7 +40,7 @@ namespace Freestyle { class GrayImage; -class LIB_IMAGE_EXPORT ImagePyramid +class ImagePyramid { protected: std::vector<GrayImage*> _levels; @@ -88,7 +88,7 @@ public: #endif }; -class LIB_IMAGE_EXPORT GaussianPyramid : public ImagePyramid +class GaussianPyramid : public ImagePyramid { protected: float _sigma; diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index 1ffddc9b24d..d3a10aab4dd 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -38,7 +38,7 @@ namespace Freestyle { -class LIB_SCENE_GRAPH_EXPORT IndexedFaceSet : public Rep +class IndexedFaceSet : public Rep { public: /*! Triangles description style:*/ diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h index 6452e1260ad..6d1ac2825c0 100644 --- a/source/blender/freestyle/intern/scene_graph/LineRep.h +++ b/source/blender/freestyle/intern/scene_graph/LineRep.h @@ -40,7 +40,7 @@ using namespace std; namespace Freestyle { /*! Base class for all lines objects */ -class LIB_SCENE_GRAPH_EXPORT LineRep : public Rep +class LineRep : public Rep { public: /*! Line description style */ diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index ba8549f5128..546458bad48 100644 --- a/source/blender/freestyle/intern/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h @@ -43,7 +43,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_SCENE_GRAPH_EXPORT Node : public BaseObject +class Node : public BaseObject { public: inline Node() : BaseObject() {} diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index ee630e91884..5d84a624830 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -42,7 +42,7 @@ class NodeOrthographicCamera; class NodePerspectiveCamera; -class LIB_SCENE_GRAPH_EXPORT NodeCamera : public Node +class NodeCamera : public Node { public: typedef enum { @@ -90,7 +90,7 @@ protected: }; -class LIB_SCENE_GRAPH_EXPORT NodeOrthographicCamera : public NodeCamera +class NodeOrthographicCamera : public NodeCamera { public: NodeOrthographicCamera(); @@ -157,7 +157,7 @@ private: }; -class LIB_SCENE_GRAPH_EXPORT NodePerspectiveCamera : public NodeCamera +class NodePerspectiveCamera : public NodeCamera { public: NodePerspectiveCamera(); diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h index d3329693a06..d053d67c6ba 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h +++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h @@ -35,7 +35,7 @@ namespace Freestyle { -class LIB_SCENE_GRAPH_EXPORT NodeDrawingStyle : public NodeGroup +class NodeDrawingStyle : public NodeGroup { public: inline NodeDrawingStyle() : NodeGroup() {} diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index 8123639e01f..69c8a2c8f3b 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h @@ -39,7 +39,7 @@ using namespace std; namespace Freestyle { -class LIB_SCENE_GRAPH_EXPORT NodeGroup : public Node +class NodeGroup : public Node { public: inline NodeGroup(): Node() {} diff --git a/source/blender/freestyle/intern/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h index 25e13a768ec..c633a6bc7b8 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeLight.h +++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h @@ -38,7 +38,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_SCENE_GRAPH_EXPORT NodeLight : public Node +class NodeLight : public Node { public: NodeLight(); diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h index 3b4491f8b6d..351ccb8f743 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeShape.h +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h @@ -45,7 +45,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_SCENE_GRAPH_EXPORT NodeShape : public Node +class NodeShape : public Node { public: inline NodeShape() : Node() {} diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h index 544075998a4..c4de08ac4a7 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h @@ -39,7 +39,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_SCENE_GRAPH_EXPORT NodeTransform : public NodeGroup +class NodeTransform : public NodeGroup { public: inline NodeTransform() : NodeGroup() diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h index 7272d47892a..8fafe72ac51 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h @@ -34,7 +34,7 @@ namespace Freestyle { -class LIB_SCENE_GRAPH_EXPORT OrientedLineRep : public LineRep +class OrientedLineRep : public LineRep { public: OrientedLineRep() : LineRep() {} diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h index 92624199c40..88ee0d2a801 100644 --- a/source/blender/freestyle/intern/scene_graph/Rep.h +++ b/source/blender/freestyle/intern/scene_graph/Rep.h @@ -42,7 +42,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_SCENE_GRAPH_EXPORT Rep : public BaseObject +class Rep : public BaseObject { public: inline Rep() : BaseObject() diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h index d3870fe835d..c00f5124a31 100644 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h @@ -66,7 +66,7 @@ class IndexedFaceSet; class DrawingStyle; class FrsMaterial; -class LIB_SCENE_GRAPH_EXPORT SceneVisitor +class SceneVisitor { public: SceneVisitor() {} diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h index d204d128de4..d101cfd7988 100644 --- a/source/blender/freestyle/intern/scene_graph/TriangleRep.h +++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h @@ -34,7 +34,7 @@ namespace Freestyle { /*! Base class for all lines objects */ -class LIB_SCENE_GRAPH_EXPORT TriangleRep : public Rep +class TriangleRep : public Rep { public: /*! Line description style */ diff --git a/source/blender/freestyle/intern/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h index 1f1284fe163..87420429e00 100644 --- a/source/blender/freestyle/intern/scene_graph/VertexRep.h +++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h @@ -32,7 +32,7 @@ namespace Freestyle { -class LIB_SCENE_GRAPH_EXPORT VertexRep : public Rep +class VertexRep : public Rep { public: inline VertexRep() : Rep() diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h index f8204fb2c1c..48d5cd4803e 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h @@ -48,7 +48,7 @@ namespace Functions0D { * This density is evaluated using a pixels square window around the evaluation point and integrating * these values using a gaussian. */ -class LIB_STROKE_EXPORT DensityF0D : public UnaryFunction0D<double> +class DensityF0D : public UnaryFunction0D<double> { public: /*! Builds the functor from the gaussian sigma value. @@ -78,7 +78,7 @@ private: /*! Returns the average depth around a point. * The result is obtained by querying the depth buffer on a window around that point. */ -class LIB_STROKE_EXPORT LocalAverageDepthF0D : public UnaryFunction0D<double> +class LocalAverageDepthF0D : public UnaryFunction0D<double> { private: GaussianFilter _filter; @@ -102,7 +102,7 @@ public: // ReadMapPixel /*! Reads a pixel in a map. */ -class LIB_STROKE_EXPORT ReadMapPixelF0D : public UnaryFunction0D<float> +class ReadMapPixelF0D : public UnaryFunction0D<float> { private: const char * _mapName; @@ -134,7 +134,7 @@ public: // ReadSteerableViewMapPixel /*! Reads a pixel in one of the level of one of the steerable viewmaps. */ -class LIB_STROKE_EXPORT ReadSteerableViewMapPixelF0D : public UnaryFunction0D<float> +class ReadSteerableViewMapPixelF0D : public UnaryFunction0D<float> { private: unsigned _orientation; @@ -165,7 +165,7 @@ public: // ReadCompleteViewMapPixel /*! Reads a pixel in one of the level of the complete viewmap. */ -class LIB_STROKE_EXPORT ReadCompleteViewMapPixelF0D : public UnaryFunction0D<float> +class ReadCompleteViewMapPixelF0D : public UnaryFunction0D<float> { private: int _level; @@ -192,7 +192,7 @@ public: // GetViewMapGradientNormF0D /*! Returns the norm of the gradient of the global viewmap density image. */ -class LIB_STROKE_EXPORT GetViewMapGradientNormF0D: public UnaryFunction0D< float> +class GetViewMapGradientNormF0D: public UnaryFunction0D< float> { private: int _level; diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h index f58acf02d48..cbdff4ed96c 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h +++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h @@ -130,7 +130,7 @@ private: * The density is evaluated for a set of points along the Interface1D (using the ReadCompleteViewMapPixelF0D functor) * and then integrated into a single value using a user-defined integration method. */ -class LIB_STROKE_EXPORT GetCompleteViewMapDensityF1D : public UnaryFunction1D<double> +class GetCompleteViewMapDensityF1D : public UnaryFunction1D<double> { public: /*! Builds the functor. @@ -172,7 +172,7 @@ private: * The density is evaluated for a set of points along the Interface1D (using the ReadSteerableViewMapPixelF0D functor) * and then integrated into a single value using a user-defined integration method. */ -class LIB_STROKE_EXPORT GetDirectionalViewMapDensityF1D : public UnaryFunction1D<double> +class GetDirectionalViewMapDensityF1D : public UnaryFunction1D<double> { public: /*! Builds the functor. @@ -212,7 +212,7 @@ private: /*! Returns the density of the viewmap for a given Interface1D. The density of each FEdge is evaluated * in the proper steerable ViewMap depending on its oorientation. */ -class LIB_STROKE_EXPORT GetSteerableViewMapDensityF1D : public UnaryFunction1D<double> +class GetSteerableViewMapDensityF1D : public UnaryFunction1D<double> { private: int _level; @@ -253,7 +253,7 @@ public: /*! Returns the density of the viewmap for a given Interface1D. The density of each FEdge is evaluated in * the proper steerable ViewMap depending on its oorientation. */ -class LIB_STROKE_EXPORT GetViewMapGradientNormF1D : public UnaryFunction1D<double> +class GetViewMapGradientNormF1D : public UnaryFunction1D<double> { private: int _level; diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index 18472ff2c2a..a9ef49aa802 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -37,7 +37,7 @@ namespace Freestyle { * i.e. The stroke will be the thickest in a main direction, the thinest in the direction perpendicular to this one, * and an interpolation inbetween. */ -class LIB_STROKE_EXPORT CalligraphicShader : public StrokeShader +class CalligraphicShader : public StrokeShader { public: /*! Builds the shader. @@ -70,7 +70,7 @@ protected: * Moves the vertices to make the stroke more noisy. * @see \htmlonly <a href=noise/noise.html>noise/noise.html</a> \endhtmlonly */ -class LIB_STROKE_EXPORT SpatialNoiseShader : public StrokeShader +class SpatialNoiseShader : public StrokeShader { public: /*! Builds the shader. @@ -108,7 +108,7 @@ protected: * to prevent the diffusion accross corners. * @see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> \endhtmlonly */ -class LIB_STROKE_EXPORT SmoothingShader : public StrokeShader +class SmoothingShader : public StrokeShader { public: /*! Builds the shader. @@ -149,7 +149,7 @@ protected: real _carricatureFactor; }; -class LIB_STROKE_EXPORT Smoother +class Smoother { public: Smoother(Stroke &ioStroke); @@ -184,7 +184,7 @@ protected: bool _safeTest; }; -class LIB_STROKE_EXPORT Omitter : public Smoother +class Omitter : public Smoother { public: Omitter(Stroke &ioStroke); @@ -203,7 +203,7 @@ protected: }; /*! Omission shader */ -class LIB_STROKE_EXPORT OmissionShader : public StrokeShader +class OmissionShader : public StrokeShader { public: OmissionShader(real sizeWindow, real thrVari, real thrFlat, real lFlat); diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index d55a689def4..5559613debb 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -52,7 +52,7 @@ namespace StrokeShaders { /*! [ Thickness Shader ]. * Assigns an absolute constant thickness to every vertices of the Stroke. */ -class LIB_STROKE_EXPORT ConstantThicknessShader : public StrokeShader +class ConstantThicknessShader : public StrokeShader { public: /*! Builds the shader. @@ -85,7 +85,7 @@ private: * is its thickness from the point to the strip border in the direction pointing outside the object the * Stroke delimitates. */ -class LIB_STROKE_EXPORT ConstantExternThicknessShader : public StrokeShader +class ConstantExternThicknessShader : public StrokeShader { public: ConstantExternThicknessShader(float thickness) : StrokeShader() @@ -112,7 +112,7 @@ private: * and the last vertex. * The thickness is linearly interpolated from A to B. */ -class LIB_STROKE_EXPORT IncreasingThicknessShader : public StrokeShader +class IncreasingThicknessShader : public StrokeShader { public: /*! Builds the shader. @@ -147,7 +147,7 @@ private: * Same as previous but here we allow the user to control the ratio thickness/length so that we don't get * fat short lines */ -class LIB_STROKE_EXPORT ConstrainedIncreasingThicknessShader : public StrokeShader +class ConstrainedIncreasingThicknessShader : public StrokeShader { private: float _ThicknessMin; @@ -185,7 +185,7 @@ public: /* [ Thickness Shader ]. * Modifys the thickness in a relative way depending on its length. */ -class LIB_STROKE_EXPORT LengthDependingThicknessShader : public StrokeShader +class LengthDependingThicknessShader : public StrokeShader { private: float _minThickness; @@ -218,7 +218,7 @@ public: * The new thicknesses are the result of the multiplication * of the pattern and the original thickness */ -class LIB_STROKE_EXPORT ThicknessVariationPatternShader : public StrokeShader +class ThicknessVariationPatternShader : public StrokeShader { public: /*! Builds the shader. @@ -263,7 +263,7 @@ private: * Adds some noise to the stroke thickness. * \see \htmlonly <a href=noise/noise.html>noise/noise.html</a>\endhtmlonly */ -class LIB_STROKE_EXPORT ThicknessNoiseShader : public StrokeShader +class ThicknessNoiseShader : public StrokeShader { private: float _amplitude; @@ -297,7 +297,7 @@ public: /*! [ Color Shader ]. * Assigns a constant color to every vertices of the Stroke. */ -class LIB_STROKE_EXPORT ConstantColorShader : public StrokeShader +class ConstantColorShader : public StrokeShader { public: /*! Builds the shader from a user-specified color. @@ -335,7 +335,7 @@ private: * The user specifies 2 colors A and B. The stroke color will change linearly from A to B between the * first and the last vertex. */ -class LIB_STROKE_EXPORT IncreasingColorShader : public StrokeShader +class IncreasingColorShader : public StrokeShader { private: float _colorMin[4]; @@ -388,7 +388,7 @@ public: * Applys a pattern to vary original color. * The new color is the result of the multiplication of the pattern and the original color */ -class LIB_STROKE_EXPORT ColorVariationPatternShader : public StrokeShader +class ColorVariationPatternShader : public StrokeShader { public: /*! Builds the shader from the pattern texture file name. @@ -425,7 +425,7 @@ private: /* [ Color Shader ]. * Assigns a color to the stroke depending on the material of the shape to which ot belongs to. (Disney shader) */ -class LIB_STROKE_EXPORT MaterialColorShader : public StrokeShader +class MaterialColorShader : public StrokeShader { private: float _coefficient; @@ -444,7 +444,7 @@ public: virtual int shade(Stroke& stroke) const; }; -class LIB_STROKE_EXPORT CalligraphicColorShader : public StrokeShader +class CalligraphicColorShader : public StrokeShader { private: /* UNUSED */ @@ -469,7 +469,7 @@ public: /*! [ Color Shader ]. * Shader to add noise to the stroke colors. */ -class LIB_STROKE_EXPORT ColorNoiseShader : public StrokeShader +class ColorNoiseShader : public StrokeShader { private: float _amplitude; @@ -516,7 +516,7 @@ public: * Any other value will lead to the following preset: * default) -> /brushes/smoothAlpha.bmp, OPAQUE_MEDIUM. */ -class LIB_STROKE_EXPORT TextureAssignerShader : public StrokeShader // FIXME +class TextureAssignerShader : public StrokeShader // FIXME { private: int _textureId; @@ -544,7 +544,7 @@ public: * Assigns a texture and a blending mode to the stroke * in order to simulate its marks system. */ -class LIB_STROKE_EXPORT StrokeTextureShader : public StrokeShader +class StrokeTextureShader : public StrokeShader { private: string _texturePath; @@ -601,7 +601,7 @@ public: /*! [ Geometry Shader ]. * Stretches the stroke at its two extremities and following the respective directions: v(1)v(0) and v(n-1)v(n). */ -class LIB_STROKE_EXPORT BackboneStretcherShader : public StrokeShader +class BackboneStretcherShader : public StrokeShader { private: float _amount; @@ -629,7 +629,7 @@ public: * Resamples the stroke. * @see Stroke::Resample(float). */ -class LIB_STROKE_EXPORT SamplingShader: public StrokeShader +class SamplingShader: public StrokeShader { private: float _sampling; @@ -654,7 +654,7 @@ public: }; -class LIB_STROKE_EXPORT ExternalContourStretcherShader : public StrokeShader +class ExternalContourStretcherShader : public StrokeShader { private: float _amount; @@ -674,7 +674,7 @@ public: }; // B-Spline stroke shader -class LIB_STROKE_EXPORT BSplineShader: public StrokeShader +class BSplineShader: public StrokeShader { public: BSplineShader() : StrokeShader() {} @@ -694,7 +694,7 @@ public: * original backbone geometry. * @see \htmlonly <a href=bezier/bezier.html>bezier/bezier.html</a> \endhtmlonly */ -class LIB_STROKE_EXPORT BezierCurveShader : public StrokeShader +class BezierCurveShader : public StrokeShader { private: float _error; @@ -723,7 +723,7 @@ public: * The displacement value is proportional to the 2d curvature at the considered point (the higher the curvature, * the smaller the displacement) and to a value specified by the user. */ -class LIB_STROKE_EXPORT InflateShader : public StrokeShader +class InflateShader : public StrokeShader { private: float _amount; @@ -756,7 +756,7 @@ public: * The basic idea is to start from the minimal stroke approximation consisting in a line joining the first vertex * to the last one and to subdivide using the original stroke vertices until a certain error is reached. */ -class LIB_STROKE_EXPORT PolygonalizationShader : public StrokeShader +class PolygonalizationShader : public StrokeShader { private: float _error; @@ -789,7 +789,7 @@ public: * Indeed, the precision of the approximation will depend on the size of the stroke's pieces. * The bigger the pieces, the rougher the approximation. */ -class LIB_STROKE_EXPORT GuidingLinesShader : public StrokeShader +class GuidingLinesShader : public StrokeShader { private: float _offset; @@ -817,7 +817,7 @@ public: /*! [ Geometry Shader ]. * Removes the stroke's extremities. */ -class LIB_STROKE_EXPORT TipRemoverShader : public StrokeShader +class TipRemoverShader : public StrokeShader { public: /*! Builds the shader. @@ -844,7 +844,7 @@ protected: /*! [ output Shader ]. * streams the Stroke */ -class LIB_STROKE_EXPORT streamShader : public StrokeShader +class streamShader : public StrokeShader { public: /*! Destructor. */ @@ -863,7 +863,7 @@ public: /*! [ output Shader ]. * streams the Stroke in a file */ -class LIB_STROKE_EXPORT fstreamShader : public StrokeShader +class fstreamShader : public StrokeShader { protected: mutable ofstream _stream; diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index 09c8d9ed74e..69d37f61df9 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -56,10 +56,8 @@ using namespace std; namespace Freestyle { -LIB_STROKE_EXPORT Canvas *Canvas::_pInstance = 0; -LIB_STROKE_EXPORT const char *Canvas::_MapsPath = 0; Canvas::Canvas() diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h index 038b4b3af0f..b56b5f92c14 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.h +++ b/source/blender/freestyle/intern/stroke/Canvas.h @@ -71,7 +71,7 @@ class StyleModule; /*! Class to define the canvas on which strokes are drawn. * It's used to store state information about the drawing. */ -class LIB_STROKE_EXPORT Canvas +class Canvas { public: /*! Returns a pointer on the Canvas instance */ diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h index ff9203d3af6..5d05ed2776d 100644 --- a/source/blender/freestyle/intern/stroke/ChainingIterators.h +++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h @@ -46,7 +46,7 @@ namespace Freestyle { // Adjacency iterator used in the chaining process // /////////////////////////////////////////////////////////// -class LIB_STROKE_EXPORT AdjacencyIterator : public Iterator +class AdjacencyIterator : public Iterator { protected: ViewVertexInternal::orientedViewEdgeIterator _internalIterator; @@ -150,7 +150,7 @@ protected: * If you specify restriction rules (such as "Chain only ViewEdges of the selection"), they will be included * in the adjacency iterator. (i.e, the adjacent iterator will only stop on "valid" edges). */ -class LIB_STROKE_EXPORT ChainingIterator : public ViewEdgeInternal::ViewEdgeIterator +class ChainingIterator : public ViewEdgeInternal::ViewEdgeIterator { protected: bool _restrictToSelection; @@ -258,7 +258,7 @@ public: * In the case of an iteration over a set of ViewEdge that are both Silhouette and Crease, there will be a precedence * of the silhouette over the crease criterion. */ -class LIB_STROKE_EXPORT ChainSilhouetteIterator : public ChainingIterator +class ChainSilhouetteIterator : public ChainingIterator { public: /*! Builds a ChainSilhouetteIterator from the first ViewEdge used for iteration and its orientation. @@ -309,7 +309,7 @@ public: * selection. The first ViewEdge respecting both the unary predicate and the binary predicate is kept as the next one. * If none of the potential next ViewEdge respects these 2 predicates, 0 is returned. */ -class LIB_STROKE_EXPORT ChainPredicateIterator : public ChainingIterator +class ChainPredicateIterator : public ChainingIterator { protected: BinaryPredicate1D *_binary_predicate; // the caller is responsible for the deletion of this object diff --git a/source/blender/freestyle/intern/stroke/ContextFunctions.h b/source/blender/freestyle/intern/stroke/ContextFunctions.h index 28ce918e919..d8b780e77a0 100644 --- a/source/blender/freestyle/intern/stroke/ContextFunctions.h +++ b/source/blender/freestyle/intern/stroke/ContextFunctions.h @@ -45,27 +45,22 @@ namespace ContextFunctions { // GetTimeStamp /*! Returns the system time stamp */ -LIB_STROKE_EXPORT unsigned GetTimeStampCF(); // GetCanvasWidth /*! Returns the canvas width */ -LIB_STROKE_EXPORT unsigned GetCanvasWidthCF(); // GetCanvasHeight /*! Returns the canvas height */ -LIB_STROKE_EXPORT unsigned GetCanvasHeightCF(); // GetBorder /*! Returns the border */ -LIB_STROKE_EXPORT BBox<Vec2i> GetBorderCF(); // Load map /*! Loads an image map for further reading */ -LIB_STROKE_EXPORT void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels = 4, float iSigma = 1.0f); // ReadMapPixel @@ -80,7 +75,6 @@ void LoadMapCF(const char *iFileName, const char *iMapName, unsigned iNbLevels = * \param y * The y-coordinate of the pixel we wish to read. The origin is in the lower-left corner. */ -LIB_STROKE_EXPORT float ReadMapPixelCF(const char *iMapName, int level, unsigned x, unsigned y); // ReadCompleteViewMapPixel @@ -93,7 +87,6 @@ float ReadMapPixelCF(const char *iMapName, int level, unsigned x, unsigned y); * \param y * The y-coordinate of the pixel we wish to read. The origin is in the lower-left corner. */ -LIB_STROKE_EXPORT float ReadCompleteViewMapPixelCF(int level, unsigned x, unsigned y); // ReadOrientedViewMapPixel @@ -108,11 +101,9 @@ float ReadCompleteViewMapPixelCF(int level, unsigned x, unsigned y); * \param y * The y-coordinate of the pixel we wish to read. The origin is in the lower-left corner. */ -LIB_STROKE_EXPORT float ReadDirectionalViewMapPixelCF(int iOrientation, int level, unsigned x, unsigned y); // DEBUG -LIB_STROKE_EXPORT FEdge *GetSelectedFEdgeCF(); } // end of namespace ContextFunctions diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index fd4150c6c13..17b9a5c0a1f 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -66,7 +66,7 @@ using namespace Geometry; * Thus, a CurvePoint is built by lineraly interpolating two SVertex. * CurvePoint can be used as virtual points while querying 0D information along a curve at a given resolution. */ -class LIB_STROKE_EXPORT CurvePoint : public Interface0D +class CurvePoint : public Interface0D { public: // Implementation of Interface0D /*! Returns the string "CurvePoint"*/ @@ -365,7 +365,7 @@ class CurvePointIterator; * SVertex is the type of the initial curve vertices. * A Chain is a specialization of a Curve. */ -class LIB_STROKE_EXPORT Curve : public Interface1D +class Curve : public Interface1D { public: typedef CurvePoint Vertex; diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index eed3c913057..2e68aa0c1fa 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -38,10 +38,10 @@ namespace Freestyle { -LIB_STROKE_EXPORT Operators::I1DContainer Operators::_current_view_edges_set; -LIB_STROKE_EXPORT Operators::I1DContainer Operators::_current_chains_set; -LIB_STROKE_EXPORT Operators::I1DContainer *Operators::_current_set = NULL; -LIB_STROKE_EXPORT Operators::StrokesContainer Operators::_current_strokes_set; +Operators::I1DContainer Operators::_current_view_edges_set; +Operators::I1DContainer Operators::_current_chains_set; +Operators::I1DContainer *Operators::_current_set = NULL; +Operators::StrokesContainer Operators::_current_strokes_set; int Operators::select(UnaryPredicate1D& pred) { diff --git a/source/blender/freestyle/intern/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h index dcd61b8ce84..59ebec57246 100644 --- a/source/blender/freestyle/intern/stroke/Operators.h +++ b/source/blender/freestyle/intern/stroke/Operators.h @@ -53,7 +53,7 @@ namespace Freestyle { * There are 4 classes of operators: Selection, Chaining, Splitting and Creating. All these operators are * user controlled in the scripting language through Functors, Predicates and Shaders that are taken as arguments. */ -class LIB_STROKE_EXPORT Operators { +class Operators { public: typedef vector<Interface1D*> I1DContainer; diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h index 7958fbb311b..c802bf4291a 100644 --- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h @@ -44,7 +44,7 @@ namespace Freestyle { /* */ /**********************************/ -class LIB_STROKE_EXPORT PSStrokeRenderer : public StrokeRenderer +class PSStrokeRenderer : public StrokeRenderer { public: PSStrokeRenderer(const char *iFileName = NULL); diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index d116edc6ace..66dc5a1acf4 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -53,7 +53,7 @@ namespace Freestyle { /*! Class to define an attribute associated to a Stroke Vertex. * This attribute stores the color, alpha and thickness values for a Stroke Vertex. */ -class LIB_STROKE_EXPORT StrokeAttribute +class StrokeAttribute { public: /*! default constructor */ @@ -314,7 +314,7 @@ private: //////////////////////////////////////////////////////// /*! Class to define a stroke vertex. */ -class LIB_STROKE_EXPORT StrokeVertex : public CurvePoint +class StrokeVertex : public CurvePoint { public: // Implementation of Interface0D /*! Returns the string "StrokeVertex" */ @@ -489,7 +489,7 @@ class StrokeVertexIterator; * This set of vertices defines the stroke's backbone geometry. * Each of these stroke vertices defines the stroke's shape and appearance at this vertex position. */ -class LIB_STROKE_EXPORT Stroke : public Interface1D +class Stroke : public Interface1D { public: // Implementation of Interface1D /*! Returns the string "Stroke" */ diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index daaf6239987..f3833e04143 100644 --- a/source/blender/freestyle/intern/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h @@ -36,13 +36,10 @@ namespace Freestyle { -LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute); -LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const StrokeVertex& iStrokeVertex); -LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const Stroke& iStroke); } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp index f9d7413e2f9..d7b37d65a6d 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp @@ -41,7 +41,6 @@ namespace Freestyle { /* */ /**********************************/ -LIB_STROKE_EXPORT TextureManager *StrokeRenderer::_textureManager = 0; StrokeRenderer::StrokeRenderer() {} @@ -64,13 +63,10 @@ bool StrokeRenderer::loadTextures() /**********************************/ -LIB_STROKE_EXPORT TextureManager *TextureManager::_pInstance = 0; -LIB_STROKE_EXPORT string TextureManager::_patterns_path; -LIB_STROKE_EXPORT string TextureManager::_brushes_path; TextureManager::TextureManager() diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h index 90f41a0d0ac..868f61224de 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h @@ -55,7 +55,7 @@ namespace Freestyle { /*! Class to load textures */ -class LIB_STROKE_EXPORT TextureManager +class TextureManager { public: TextureManager (); @@ -79,7 +79,7 @@ public: return _defaultTextureId; } - struct LIB_STROKE_EXPORT Options + struct Options { static void setPatternsPath(const string& path); static string getPatternsPath(); @@ -128,7 +128,7 @@ protected: /**********************************/ /*! Class to render a stroke. Creates a triangle strip and stores it strip is lazily created at the first rendering */ -class LIB_STROKE_EXPORT StrokeRenderer +class StrokeRenderer { public: StrokeRenderer(); diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index 8e89847ca3d..02f7177b95c 100644 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -52,7 +52,7 @@ namespace Freestyle { /* */ /**********************************/ -class LIB_STROKE_EXPORT TextStrokeRenderer : public StrokeRenderer +class TextStrokeRenderer : public StrokeRenderer { public: TextStrokeRenderer(const char *iFileName = NULL); diff --git a/source/blender/freestyle/intern/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h index 56f52a5fb80..60430143eac 100644 --- a/source/blender/freestyle/intern/system/BaseObject.h +++ b/source/blender/freestyle/intern/system/BaseObject.h @@ -37,7 +37,7 @@ namespace Freestyle { -class LIB_SYSTEM_EXPORT BaseObject +class BaseObject { public: inline BaseObject() diff --git a/source/blender/freestyle/intern/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h index dedc4152ae9..2111988a104 100644 --- a/source/blender/freestyle/intern/system/Exception.h +++ b/source/blender/freestyle/intern/system/Exception.h @@ -36,7 +36,7 @@ namespace Freestyle { -class LIB_SYSTEM_EXPORT Exception +class Exception { public: typedef enum { diff --git a/source/blender/freestyle/intern/system/FreestyleConfig.h b/source/blender/freestyle/intern/system/FreestyleConfig.h index 5c53479029f..752940d83a5 100644 --- a/source/blender/freestyle/intern/system/FreestyleConfig.h +++ b/source/blender/freestyle/intern/system/FreestyleConfig.h @@ -46,44 +46,6 @@ namespace Config { static const string PATH_SEP(":"); #endif // WIN32 -// DLL import/export macros for Win32 - -#ifndef LIB_SYSTEM_EXPORT -# define LIB_SYSTEM_EXPORT -#endif // LIB_SYSTEM_EXPORT - -#ifndef LIB_IMAGE_EXPORT -# define LIB_IMAGE_EXPORT -#endif // LIB_IMAGE_EXPORT - -#ifndef LIB_GEOMETRY_EXPORT -# define LIB_GEOMETRY_EXPORT -#endif // LIB_GEOMETRY_EXPORT - -#ifndef LIB_SCENE_GRAPH_EXPORT -# define LIB_SCENE_GRAPH_EXPORT -#endif // LIB_SCENE_GRAPH_EXPORT - -#ifndef LIB_WINGED_EDGE_EXPORT -# define LIB_WINGED_EDGE_EXPORT -#endif // LIB_WINGED_EDGE_EXPORT - -#ifndef LIB_VIEW_MAP_EXPORT -# define LIB_VIEW_MAP_EXPORT -#endif // LIB_VIEW_MAP_EXPORT - -#ifndef LIB_STROKE_EXPORT -# define LIB_STROKE_EXPORT -#endif // LIB_STROKE_EXPORT - -#ifndef LIB_RENDERING_EXPORT -# define LIB_RENDERING_EXPORT -#endif // LIB_RENDERING_EXPORT - -#ifndef LIB_WRAPPER_EXPORT -# define LIB_WRAPPER_EXPORT -#endif // LIB_WRAPPER_EXPORT - } // end of namespace Config } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h index f359fc7577f..74af9f82b12 100644 --- a/source/blender/freestyle/intern/system/Interpreter.h +++ b/source/blender/freestyle/intern/system/Interpreter.h @@ -38,7 +38,7 @@ using namespace std; namespace Freestyle { -class LIB_SYSTEM_EXPORT Interpreter +class Interpreter { public: Interpreter() diff --git a/source/blender/freestyle/intern/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h index e53d8ed7a7a..b0164a74a1a 100644 --- a/source/blender/freestyle/intern/system/PseudoNoise.h +++ b/source/blender/freestyle/intern/system/PseudoNoise.h @@ -37,7 +37,7 @@ namespace Freestyle { -class LIB_SYSTEM_EXPORT PseudoNoise +class PseudoNoise { public: PseudoNoise(); diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 204c894914f..60193590944 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -55,7 +55,7 @@ extern "C" { namespace Freestyle { -class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter +class PythonInterpreter : public Interpreter { public: PythonInterpreter() diff --git a/source/blender/freestyle/intern/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h index 3c8724bcbee..7621601a635 100644 --- a/source/blender/freestyle/intern/system/RandGen.h +++ b/source/blender/freestyle/intern/system/RandGen.h @@ -40,7 +40,7 @@ namespace Freestyle { -class LIB_SYSTEM_EXPORT RandGen +class RandGen { public: static real drand48(); diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h index 92600eddc42..9aa26772d55 100644 --- a/source/blender/freestyle/intern/system/StringUtils.h +++ b/source/blender/freestyle/intern/system/StringUtils.h @@ -51,7 +51,6 @@ namespace Freestyle { namespace StringUtils { -LIB_SYSTEM_EXPORT void getPathName(const string& path, const string& base, vector<string>& pathnames); // STL related diff --git a/source/blender/freestyle/intern/system/TimeStamp.cpp b/source/blender/freestyle/intern/system/TimeStamp.cpp index 7c02095ad51..0e387a5cc54 100644 --- a/source/blender/freestyle/intern/system/TimeStamp.cpp +++ b/source/blender/freestyle/intern/system/TimeStamp.cpp @@ -29,7 +29,6 @@ namespace Freestyle { -LIB_SYSTEM_EXPORT TimeStamp TimeStamp::_instance; } /* namespace Freestyle */ diff --git a/source/blender/freestyle/intern/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h index e809aa71575..c2b45630bd1 100644 --- a/source/blender/freestyle/intern/system/TimeStamp.h +++ b/source/blender/freestyle/intern/system/TimeStamp.h @@ -36,7 +36,7 @@ namespace Freestyle { -class LIB_SYSTEM_EXPORT TimeStamp +class TimeStamp { public: static inline TimeStamp *instance() diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h index a26f8d289e7..8adf685a6eb 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h @@ -50,7 +50,7 @@ namespace Freestyle { using namespace Geometry; /*! This class takes as input a WXEdge structure and fills it */ -class LIB_VIEW_MAP_EXPORT FEdgeXDetector +class FEdgeXDetector { public: FEdgeXDetector() diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index b9b28f77636..045ad317db2 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -74,7 +74,7 @@ using namespace Geometry; * - UnaryFunction0DVec3f */ template <class T> -class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D +class UnaryFunction0D { public: T result; @@ -144,7 +144,7 @@ namespace Functions0D { // GetXF0D /*! Returns the X 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D<double> +class GetXF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetXF0D" */ @@ -163,7 +163,7 @@ public: // GetYF0D /*! Returns the Y 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D<double> +class GetYF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetYF0D" */ @@ -182,7 +182,7 @@ public: // GetZF0D /*! Returns the Z 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D<double> +class GetZF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetZF0D" */ @@ -201,7 +201,7 @@ public: // GetProjectedXF0D /*! Returns the X 3D projected coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D<double> +class GetProjectedXF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetProjectedXF0D" */ @@ -220,7 +220,7 @@ public: // GetProjectedYF0D /*! Returns the Y projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D<double> +class GetProjectedYF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetProjectedYF0D" */ @@ -239,7 +239,7 @@ public: // GetProjectedZF0D /*! Returns the Z projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D<double> +class GetProjectedZF0D : public UnaryFunction0D<double> { public: /*! Returns the string "GetProjectedZF0D" */ @@ -258,7 +258,7 @@ public: // GetCurvilinearAbscissaF0D /*! Returns the curvilinear abscissa of an Interface0D in the context of its 1D element. */ -class LIB_VIEW_MAP_EXPORT GetCurvilinearAbscissaF0D : public UnaryFunction0D<float> +class GetCurvilinearAbscissaF0D : public UnaryFunction0D<float> { public: /*! Returns the string "GetCurvilinearAbscissaF0D" */ @@ -277,7 +277,7 @@ public: // GetParameterF0D /*! Returns the parameter of an Interface0D in the context of its 1D element. */ -class LIB_VIEW_MAP_EXPORT GetParameterF0D : public UnaryFunction0D<float> +class GetParameterF0D : public UnaryFunction0D<float> { public: /*! Returns the string "GetCurvilinearAbscissaF0D" */ @@ -298,7 +298,7 @@ public: /*! Returns a Vec2r giving the 2D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT VertexOrientation2DF0D : public UnaryFunction0D<Vec2f> +class VertexOrientation2DF0D : public UnaryFunction0D<Vec2f> { public: /*! Returns the string "VertexOrientation2DF0D" */ @@ -315,7 +315,7 @@ public: /*! Returns a Vec3r giving the 3D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT VertexOrientation3DF0D : public UnaryFunction0D<Vec3f> +class VertexOrientation3DF0D : public UnaryFunction0D<Vec3f> { public: /*! Returns the string "VertexOrientation3DF0D" */ @@ -332,7 +332,7 @@ public: /*! Returns a real giving the 2D curvature (as an angle) of the 1D element to which the Interface0DIterator& * belongs to and evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT Curvature2DAngleF0D : public UnaryFunction0D<double> +class Curvature2DAngleF0D : public UnaryFunction0D<double> { public: /*! Returns the string "Curvature2DAngleF0D" */ @@ -350,7 +350,7 @@ public: * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded * by the shape to which the Interface0D belongs to, 1 is returned. */ -class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<double> +class ZDiscontinuityF0D : public UnaryFunction0D<double> { public: /*! Returns the string "ZDiscontinuityF0D" */ @@ -367,7 +367,7 @@ public: /*! Returns a Vec2f giving the normalized 2D normal to the 1D element to which the Interface0DIterator& belongs to and * evaluated at the Interface0D pointed by this Interface0DIterator&. */ -class LIB_VIEW_MAP_EXPORT Normal2DF0D : public UnaryFunction0D<Vec2f> +class Normal2DF0D : public UnaryFunction0D<Vec2f> { public: /*! Returns the string "Normal2DF0D" */ @@ -389,7 +389,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getMaterial functor. */ -class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<FrsMaterial> +class MaterialF0D : public UnaryFunction0D<FrsMaterial> { public: /*! Returns the string "MaterialF0D" */ @@ -410,7 +410,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getShapeIdF0D functor. */ -class LIB_VIEW_MAP_EXPORT ShapeIdF0D : public UnaryFunction0D<Id> +class ShapeIdF0D : public UnaryFunction0D<Id> { public: /*! Returns the string "ShapeIdF0D" */ @@ -431,7 +431,7 @@ public: * However, there still can be problematic cases, and the user willing to deal with this cases in a specific way * should implement its own getQIF0D functor. */ -class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF0D : public UnaryFunction0D<unsigned int> +class QuantitativeInvisibilityF0D : public UnaryFunction0D<unsigned int> { public: /*! Returns the string "QuantitativeInvisibilityF0D" */ @@ -446,7 +446,7 @@ public: // CurveNatureF0D /*! Returns the Nature::EdgeNature of the 1D element the Interface0DIterator& belongs to. */ -class LIB_VIEW_MAP_EXPORT CurveNatureF0D : public UnaryFunction0D<Nature::EdgeNature> +class CurveNatureF0D : public UnaryFunction0D<Nature::EdgeNature> { public: /*! Returns the string "QuantitativeInvisibilityF0D" */ @@ -461,7 +461,7 @@ public: // GetShapeF0D /*! Returns the ViewShape* containing the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetShapeF0D : public UnaryFunction0D< ViewShape*> +class GetShapeF0D : public UnaryFunction0D< ViewShape*> { public: /*! Returns the string "GetShapeF0D" */ @@ -476,7 +476,7 @@ public: // GetOccludersF0D /*! Returns a vector containing the ViewShape* occluding the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetOccludersF0D : public UnaryFunction0D< std::vector<ViewShape*> > +class GetOccludersF0D : public UnaryFunction0D< std::vector<ViewShape*> > { public: /*! Returns the string "GetOccludersF0D" */ @@ -491,7 +491,7 @@ public: // GetOccludeeF0D /*! Returns the ViewShape* "occluded" by the Interface0D */ -class LIB_VIEW_MAP_EXPORT GetOccludeeF0D: public UnaryFunction0D< ViewShape*> +class GetOccludeeF0D: public UnaryFunction0D< ViewShape*> { public: /*! Returns the string "GetOccludeeF0D" */ @@ -508,27 +508,21 @@ public: /////////////////////////// Internal //////////////////////////// // getFEdge -LIB_VIEW_MAP_EXPORT FEdge *getFEdge(Interface0D& it1, Interface0D& it2); // getFEdges -LIB_VIEW_MAP_EXPORT void getFEdges(Interface0DIterator& it, FEdge *&fe1, FEdge *&fe2); // getViewEdges -LIB_VIEW_MAP_EXPORT void getViewEdges(Interface0DIterator& it, ViewEdge *&ve1, ViewEdge *&ve2); // getShapeF0D -LIB_VIEW_MAP_EXPORT ViewShape *getShapeF0D(Interface0DIterator& it); // getOccludersF0D -LIB_VIEW_MAP_EXPORT void getOccludersF0D(Interface0DIterator& it, std::set<ViewShape*>& oOccluders); // getOccludeeF0D -LIB_VIEW_MAP_EXPORT ViewShape *getOccludeeF0D(Interface0DIterator& it); } // end of namespace Functions0D diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index 9edb705ef29..0821475ca9c 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -64,7 +64,7 @@ namespace Freestyle { * - UnaryFunction1DVec3f */ template <class T> -class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction1D +class UnaryFunction1D { public: T result; @@ -187,7 +187,7 @@ namespace Functions1D { // GetXF1D /*! Returns the X 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetXF1D : public UnaryFunction1D<double> +class GetXF1D : public UnaryFunction1D<double> { private: Functions0D::GetXF0D _func; @@ -211,7 +211,7 @@ public: // GetYF1D /*! Returns the Y 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetYF1D : public UnaryFunction1D<double> +class GetYF1D : public UnaryFunction1D<double> { private: Functions0D::GetYF0D _func; @@ -235,7 +235,7 @@ public: // GetZF1D /*! Returns the Z 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetZF1D : public UnaryFunction1D<double> +class GetZF1D : public UnaryFunction1D<double> { private: Functions0D::GetZF0D _func; @@ -259,7 +259,7 @@ public: // GetProjectedXF1D /*! Returns the projected X 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedXF1D : public UnaryFunction1D<double> +class GetProjectedXF1D : public UnaryFunction1D<double> { private: Functions0D::GetProjectedXF0D _func; @@ -283,7 +283,7 @@ public: // GetProjectedYF1D /*! Returns the projected Y 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedYF1D : public UnaryFunction1D<double> +class GetProjectedYF1D : public UnaryFunction1D<double> { private: Functions0D::GetProjectedYF0D _func; @@ -307,7 +307,7 @@ public: // GetProjectedZF1D /*! Returns the projected Z 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedZF1D : public UnaryFunction1D<double> +class GetProjectedZF1D : public UnaryFunction1D<double> { private: Functions0D::GetProjectedZF0D _func; @@ -331,7 +331,7 @@ public: // Orientation2DF1D /*! Returns the 2D orientation as a Vec2f*/ -class LIB_VIEW_MAP_EXPORT Orientation2DF1D : public UnaryFunction1D<Vec2f> +class Orientation2DF1D : public UnaryFunction1D<Vec2f> { private: Functions0D::VertexOrientation2DF0D _func; @@ -355,7 +355,7 @@ public: // Orientation3DF1D /*! Returns the 3D orientation as a Vec3f. */ -class LIB_VIEW_MAP_EXPORT Orientation3DF1D : public UnaryFunction1D<Vec3f> +class Orientation3DF1D : public UnaryFunction1D<Vec3f> { private: Functions0D::VertexOrientation3DF0D _func; @@ -382,7 +382,7 @@ public: * This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded * by the shape to which the Interface1D belongs to, 1 is returned. */ -class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<double> +class ZDiscontinuityF1D : public UnaryFunction1D<double> { private: Functions0D::ZDiscontinuityF0D _func; @@ -410,7 +410,7 @@ public: * results of a chaining (chain, stroke), then it might be made of several 1D elements of different * Quantitative Invisibilities. */ -class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF1D : public UnaryFunction1D<unsigned> +class QuantitativeInvisibilityF1D : public UnaryFunction1D<unsigned> { private: Functions0D::QuantitativeInvisibilityF0D _func; @@ -438,7 +438,7 @@ public: * Indeed, the Interface1D might result from the gathering of several 1D elements, each one being of a different * nature. An integration method, such as the MEAN, might give, in this case, irrelevant results. */ -class LIB_VIEW_MAP_EXPORT CurveNatureF1D : public UnaryFunction1D<Nature::EdgeNature> +class CurveNatureF1D : public UnaryFunction1D<Nature::EdgeNature> { private: Functions0D::CurveNatureF0D _func; @@ -462,7 +462,7 @@ public: // TimeStampF1D /*! Returns the time stamp of the Interface1D. */ -class LIB_VIEW_MAP_EXPORT TimeStampF1D : public UnaryFunction1D_void +class TimeStampF1D : public UnaryFunction1D_void { public: /*! Returns the string "TimeStampF1D" */ @@ -477,7 +477,7 @@ public: // IncrementChainingTimeStampF1D /*! Increments the chaining time stamp of the Interface1D. */ -class LIB_VIEW_MAP_EXPORT IncrementChainingTimeStampF1D : public UnaryFunction1D_void +class IncrementChainingTimeStampF1D : public UnaryFunction1D_void { public: /*! Returns the string "IncrementChainingTimeStampF1D" */ @@ -492,7 +492,7 @@ public: // ChainingTimeStampF1D /*! Sets the chaining time stamp of the Interface1D. */ -class LIB_VIEW_MAP_EXPORT ChainingTimeStampF1D : public UnaryFunction1D_void +class ChainingTimeStampF1D : public UnaryFunction1D_void { public: /*! Returns the string "ChainingTimeStampF1D" */ @@ -508,7 +508,7 @@ public: // Curvature2DAngleF1D /*! Returns the 2D curvature as an angle for an Interface1D. */ -class LIB_VIEW_MAP_EXPORT Curvature2DAngleF1D : public UnaryFunction1D<double> +class Curvature2DAngleF1D : public UnaryFunction1D<double> { public: /*! Builds the functor. @@ -536,7 +536,7 @@ private: // Normal2DF1D /*! Returns the 2D normal for an interface 1D. */ -class LIB_VIEW_MAP_EXPORT Normal2DF1D : public UnaryFunction1D<Vec2f> +class Normal2DF1D : public UnaryFunction1D<Vec2f> { public: /*! Builds the functor. @@ -564,7 +564,7 @@ private: // GetShapeF1D /*! Returns list of shapes covered by this Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetShapeF1D : public UnaryFunction1D<std::vector<ViewShape*> > +class GetShapeF1D : public UnaryFunction1D<std::vector<ViewShape*> > { public: /*! Builds the functor. */ @@ -582,7 +582,7 @@ public: // GetOccludersF1D /*! Returns list of occluding shapes covered by this Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetOccludersF1D : public UnaryFunction1D<std::vector<ViewShape*> > +class GetOccludersF1D : public UnaryFunction1D<std::vector<ViewShape*> > { public: /*! Builds the functor. */ @@ -600,7 +600,7 @@ public: // GetOccludeeF1D /*! Returns list of occluded shapes covered by this Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetOccludeeF1D : public UnaryFunction1D<std::vector<ViewShape*> > +class GetOccludeeF1D : public UnaryFunction1D<std::vector<ViewShape*> > { public: /*! Builds the functor. */ @@ -620,15 +620,12 @@ public: //////////// // getOccludeeF1D -LIB_VIEW_MAP_EXPORT void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes); // getOccludersF1D -LIB_VIEW_MAP_EXPORT void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes); // getShapeF1D -LIB_VIEW_MAP_EXPORT void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes); } // end of namespace Functions1D diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h index 88a07127837..e747f9c3e68 100644 --- a/source/blender/freestyle/intern/view_map/Silhouette.h +++ b/source/blender/freestyle/intern/view_map/Silhouette.h @@ -74,7 +74,7 @@ class ViewVertex; class SShape; /*! Class to define a vertex of the embedding. */ -class LIB_VIEW_MAP_EXPORT SVertex : public Interface0D +class SVertex : public Interface0D { public: // Implementation of Interface0D /*! Returns the string "SVertex" .*/ @@ -462,7 +462,7 @@ class ViewEdge; * This class is specialized into a smooth and a sharp version since their properties slightly vary from * one to the other. */ -class LIB_VIEW_MAP_EXPORT FEdge : public Interface1D +class FEdge : public Interface1D { public: // Implementation of Interface0D /*! Returns the string "FEdge". */ @@ -1103,7 +1103,7 @@ Interface0DIterator FEdge::pointsEnd(float t) * by two faces of the mesh. Face a lies on its right whereas Face b lies on its left. * If it is a border edge, then it doesn't have any face on its right, and thus Face a = 0. */ -class LIB_VIEW_MAP_EXPORT FEdgeSharp : public FEdge +class FEdgeSharp : public FEdge { protected: Vec3r _aNormal; // When following the edge, normal of the right face @@ -1246,7 +1246,7 @@ public: /*! Class defining a smooth edge. This kind of edge typically runs across a face of the input mesh. It can be * a silhouette, a ridge or valley, a suggestive contour. */ -class LIB_VIEW_MAP_EXPORT FEdgeSmooth : public FEdge +class FEdgeSmooth : public FEdge { protected: Vec3r _Normal; @@ -1366,7 +1366,7 @@ public: /*! Class to define a feature shape. It is the gathering of feature elements from an identified input shape */ -class LIB_VIEW_MAP_EXPORT SShape +class SShape { private: vector<FEdge*> _chains; // list of fedges that are chains starting points. diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h index 4002385a823..1234c028ca1 100644 --- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h @@ -46,7 +46,7 @@ using namespace Geometry; class SVertex; class FEdge; -class LIB_VIEW_MAP_EXPORT SilhouetteGeomEngine +class SilhouetteGeomEngine { private: // The viewpoint under which the silhouette has to be computed diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h index d6af7384fb8..0cd5d222621 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h @@ -51,7 +51,7 @@ class GrayImage; /*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve * this information from the FEdge Id. */ -class LIB_VIEW_MAP_EXPORT SteerableViewMap +class SteerableViewMap { protected: // for each vector the list of nbOrientations weigths corresponding to its contributions diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h index 6efc81efbaf..7f214919114 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h @@ -183,7 +183,7 @@ class ViewVertex; class ViewEdge; class ViewShape; -class LIB_VIEW_MAP_EXPORT ViewEdgeXBuilder +class ViewEdgeXBuilder { protected: int _currentViewId; // Id for view edges diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 2c9672be53b..eeaeada5dc6 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -65,7 +65,7 @@ class ViewShape; class TVertex; /*! Class defining the ViewMap.*/ -class LIB_VIEW_MAP_EXPORT ViewMap +class ViewMap { public: typedef vector<ViewEdge*> viewedges_container; @@ -268,7 +268,7 @@ class orientedViewEdgeIterator; * NonTVertex when it corresponds to a vertex of the initial input mesh (it is the case for vertices such as corners * for example). Thus, this class can be specialized into two classes, the TVertex class and the NonTVertex class. */ -class LIB_VIEW_MAP_EXPORT ViewVertex : public Interface0D +class ViewVertex : public Interface0D { public: // Implementation of Interface0D /*! Returns the string "ViewVertex". */ @@ -386,7 +386,7 @@ public: * Basically the front edge hides part of the back edge. * So, among the back edges, 1 is of invisibility n and the other of visibility n+1 */ -class LIB_VIEW_MAP_EXPORT TVertex : public ViewVertex +class TVertex : public ViewVertex { public: typedef vector<directedViewEdge*> edge_pointers_container; @@ -660,7 +660,7 @@ public: * Associated to a single SVertex. * Can be associated to 2 or several view edges */ -class LIB_VIEW_MAP_EXPORT NonTVertex : public ViewVertex +class NonTVertex : public ViewVertex { public: typedef vector<directedViewEdge> edges_container; @@ -891,7 +891,7 @@ template<class Traits> class vertex_iterator_base; /*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connects two ViewVertex. * It is made by connecting a set of FEdges. */ -class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D +class ViewEdge : public Interface1D { public: // Implementation of Interface0D /*! Returns the string "ViewEdge". */ @@ -1392,7 +1392,7 @@ public: /**********************************/ /*! Class gathering the elements of the ViewMap (ViewVertex, ViewEdge) that are issued from the same input shape. */ -class LIB_VIEW_MAP_EXPORT ViewShape +class ViewShape { private: vector<ViewVertex*> _Vertices; diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h index 29e393052a3..08b2fde8f31 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h @@ -60,7 +60,7 @@ namespace Freestyle { using namespace Geometry; -class LIB_VIEW_MAP_EXPORT ViewMapBuilder +class ViewMapBuilder { private: ViewMap *_ViewMap; // result diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index e2223cd5734..eb26e8adab0 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h @@ -42,10 +42,8 @@ namespace ViewMapIO { static const unsigned ZERO = UINT_MAX; -LIB_VIEW_MAP_EXPORT int load(istream& in, ViewMap *vm, ProgressBar *pb = NULL); -LIB_VIEW_MAP_EXPORT int save(ostream& out, ViewMap *vm, ProgressBar *pb = NULL); namespace Options { @@ -53,22 +51,16 @@ namespace Options { static const unsigned char FLOAT_VECTORS = 1; static const unsigned char NO_OCCLUDERS = 2; -LIB_VIEW_MAP_EXPORT void setFlags(const unsigned char flags); -LIB_VIEW_MAP_EXPORT void addFlags(const unsigned char flags); -LIB_VIEW_MAP_EXPORT void rmFlags(const unsigned char flags); -LIB_VIEW_MAP_EXPORT unsigned char getFlags(); -LIB_VIEW_MAP_EXPORT void setModelsPath(const string& path); -LIB_VIEW_MAP_EXPORT string getModelsPath(); }; // End of namepace Options diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h index 9c4d214d931..cb19875b6c7 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h +++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h @@ -50,7 +50,7 @@ class NodeGroup; class SShape; class WShape; -class LIB_VIEW_MAP_EXPORT ViewMapTesselator +class ViewMapTesselator { public: inline ViewMapTesselator() diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h index 5977f12d870..dbcecf5bc4b 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.h +++ b/source/blender/freestyle/intern/winged_edge/Curvature.h @@ -61,7 +61,7 @@ using namespace Geometry; class WVertex; -class LIB_WINGED_EDGE_EXPORT CurvatureInfo +class CurvatureInfo { public: CurvatureInfo() @@ -133,21 +133,21 @@ public: #endif }; -bool LIB_WINGED_EDGE_EXPORT gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &n); +bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &n); -bool LIB_WINGED_EDGE_EXPORT gts_vertex_gaussian_curvature(WVertex *v, real *Kg); +bool gts_vertex_gaussian_curvature(WVertex *v, real *Kg); -void LIB_WINGED_EDGE_EXPORT gts_vertex_principal_curvatures(real Kh, real Kg, real *K1, real *K2); +void gts_vertex_principal_curvatures(real Kh, real Kg, real *K1, real *K2); -void LIB_WINGED_EDGE_EXPORT gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, Vec3r &e2); +void gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, Vec3r &e2); namespace OGF { class NormalCycle ; -void LIB_WINGED_EDGE_EXPORT compute_curvature_tensor( WVertex *start, double radius, NormalCycle& nc); +void compute_curvature_tensor( WVertex *start, double radius, NormalCycle& nc); -void LIB_WINGED_EDGE_EXPORT compute_curvature_tensor_one_ring(WVertex *start, NormalCycle& nc); +void compute_curvature_tensor_one_ring(WVertex *start, NormalCycle& nc); } // OGF namespace diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 03d3cf65142..97248669822 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -470,7 +470,6 @@ WShape *WFace::getShape() * * **********************************/ -LIB_WINGED_EDGE_EXPORT unsigned WShape::_SceneCurrentId = 0; WShape *WShape::duplicate() diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 50d1de5e595..5dda41ad279 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -64,7 +64,7 @@ class WEdge; class WShape; class WFace; -class LIB_WINGED_EDGE_EXPORT WVertex +class WVertex { protected: int _Id; // an identificator @@ -166,7 +166,7 @@ public: #if defined(__GNUC__) && (__GNUC__ < 3) class incoming_edge_iterator : public input_iterator<WOEdge *, ptrdiff_t> #else - class LIB_WINGED_EDGE_EXPORT incoming_edge_iterator + class incoming_edge_iterator : public iterator<input_iterator_tag, WOEdge *, ptrdiff_t> #endif { @@ -254,7 +254,7 @@ public: #if defined(__GNUC__) && (__GNUC__ < 3) class face_iterator : public input_iterator<WFace *, ptrdiff_t> #else - class LIB_WINGED_EDGE_EXPORT face_iterator : public iterator<input_iterator_tag, WFace *, ptrdiff_t> + class face_iterator : public iterator<input_iterator_tag, WFace *, ptrdiff_t> #endif { private: @@ -366,7 +366,7 @@ public: class WFace; class WEdge; -class LIB_WINGED_EDGE_EXPORT WOEdge +class WOEdge { protected: #if 0 @@ -549,7 +549,7 @@ public: * * **********************************/ -class LIB_WINGED_EDGE_EXPORT WEdge +class WEdge { protected: WOEdge *_paOEdge; // first oriented edge @@ -737,7 +737,7 @@ public: **********************************/ -class LIB_WINGED_EDGE_EXPORT WFace +class WFace { protected: vector<WOEdge *> _OEdgeList; // list of oriented edges of bording the face @@ -1020,7 +1020,7 @@ public: **********************************/ -class LIB_WINGED_EDGE_EXPORT WShape +class WShape { protected: vector<WVertex *> _VertexList; diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h index 819bb24ffc2..1b83b81274a 100644 --- a/source/blender/freestyle/intern/winged_edge/WFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h @@ -40,7 +40,7 @@ namespace Freestyle { -class LIB_WINGED_EDGE_EXPORT WFillGrid +class WFillGrid { public: inline WFillGrid(Grid *grid = NULL, WingedEdge *winged_edge = NULL) diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h index 5b33df906a6..247999bfcbf 100644 --- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h +++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h @@ -35,7 +35,7 @@ namespace Freestyle { -class LIB_WINGED_EDGE_EXPORT WSFillGrid +class WSFillGrid { public: inline WSFillGrid(Grid *grid = NULL, WingedEdge *winged_edge = NULL) diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index 364183bbc84..ce9749369fc 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -327,7 +327,7 @@ public: */ class WXFace; -class LIB_WINGED_EDGE_EXPORT WXFaceLayer +class WXFaceLayer { public: void *userdata; diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h index 5579989072a..143c2e33608 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h @@ -35,7 +35,7 @@ namespace Freestyle { -class LIB_WINGED_EDGE_EXPORT WXEdgeBuilder : public WingedEdgeBuilder +class WXEdgeBuilder : public WingedEdgeBuilder { public: WXEdgeBuilder() : WingedEdgeBuilder() {} diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index d68acaf29c1..7fd5cd8443a 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -40,7 +40,7 @@ namespace Freestyle { -class LIB_WINGED_EDGE_EXPORT WingedEdgeBuilder : public SceneVisitor +class WingedEdgeBuilder : public SceneVisitor { public: inline WingedEdgeBuilder() : SceneVisitor() |