diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke')
17 files changed, 62 insertions, 80 deletions
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); |