From 685d785c98c9b1ee3e7da6e1a148ae2b911e8998 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Fri, 4 Apr 2014 16:34:49 +0900 Subject: Freestyle: Fix for class definitions of 0D/1D functions (functors). Symbol 'real' is an alias of double and is subject to future change, while the interface of 0D/1D functions is part of the stable Freestyle Python API. So all occurrences of this type in the class definitions were replaced with double. --- .../freestyle/intern/view_map/Functions0D.h | 16 +++++------ .../freestyle/intern/view_map/Functions1D.h | 32 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index e9474191319..7b90eacc218 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -143,7 +143,7 @@ namespace Functions0D { // GetXF0D /*! Returns the X 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D { public: /*! Returns the string "GetXF0D" */ @@ -162,7 +162,7 @@ public: // GetYF0D /*! Returns the Y 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D { public: /*! Returns the string "GetYF0D" */ @@ -181,7 +181,7 @@ public: // GetZF0D /*! Returns the Z 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D { public: /*! Returns the string "GetZF0D" */ @@ -200,7 +200,7 @@ public: // GetProjectedXF0D /*! Returns the X 3D projected coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedXF0D" */ @@ -219,7 +219,7 @@ public: // GetProjectedYF0D /*! Returns the Y projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedYF0D" */ @@ -238,7 +238,7 @@ public: // GetProjectedZF0D /*! Returns the Z projected 3D coordinate of an Interface0D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D +class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D { public: /*! Returns the string "GetProjectedZF0D" */ @@ -331,7 +331,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 +class LIB_VIEW_MAP_EXPORT Curvature2DAngleF0D : public UnaryFunction0D { public: /*! Returns the string "Curvature2DAngleF0D" */ @@ -349,7 +349,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 +class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D { public: /*! Returns the string "ZDiscontinuityF0D" */ diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index 7b10d1b5185..ff109903e9b 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -185,7 +185,7 @@ namespace Functions1D { // GetXF1D /*! Returns the X 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetXF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetXF1D : public UnaryFunction1D { private: Functions0D::GetXF0D _func; @@ -195,7 +195,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetXF1D(IntegrationType iType) : UnaryFunction1D(iType) {} + GetXF1D(IntegrationType iType) : UnaryFunction1D(iType) {} /*! Returns the string "GetXF1D" */ string getName() const @@ -209,7 +209,7 @@ public: // GetYF1D /*! Returns the Y 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetYF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetYF1D : public UnaryFunction1D { private: Functions0D::GetYF0D _func; @@ -219,7 +219,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + GetYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "GetYF1D" */ string getName() const @@ -233,7 +233,7 @@ public: // GetZF1D /*! Returns the Z 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetZF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetZF1D : public UnaryFunction1D { private: Functions0D::GetZF0D _func; @@ -243,7 +243,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + GetZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "GetZF1D" */ string getName() const @@ -257,7 +257,7 @@ public: // GetProjectedXF1D /*! Returns the projected X 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedXF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetProjectedXF1D : public UnaryFunction1D { private: Functions0D::GetProjectedXF0D _func; @@ -267,7 +267,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetProjectedXF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + GetProjectedXF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "GetProjectedXF1D" */ string getName() const @@ -281,7 +281,7 @@ public: // GetProjectedYF1D /*! Returns the projected Y 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedYF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetProjectedYF1D : public UnaryFunction1D { private: Functions0D::GetProjectedYF0D _func; @@ -291,7 +291,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetProjectedYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + GetProjectedYF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "GetProjectedYF1D" */ string getName() const @@ -305,7 +305,7 @@ public: // GetProjectedZF1D /*! Returns the projected Z 3D coordinate of an Interface1D. */ -class LIB_VIEW_MAP_EXPORT GetProjectedZF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT GetProjectedZF1D : public UnaryFunction1D { private: Functions0D::GetProjectedZF0D _func; @@ -315,7 +315,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - GetProjectedZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + GetProjectedZF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "GetProjectedZF1D" */ string getName() const @@ -380,7 +380,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 +class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D { private: Functions0D::ZDiscontinuityF0D _func; @@ -390,7 +390,7 @@ public: * \param iType * The integration method used to compute a single value from a set of values. */ - ZDiscontinuityF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + ZDiscontinuityF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "ZDiscontinuityF1D" */ string getName() const @@ -506,14 +506,14 @@ public: // Curvature2DAngleF1D /*! Returns the 2D curvature as an angle for an Interface1D. */ -class LIB_VIEW_MAP_EXPORT Curvature2DAngleF1D : public UnaryFunction1D +class LIB_VIEW_MAP_EXPORT Curvature2DAngleF1D : public UnaryFunction1D { public: /*! Builds the functor. * \param iType * The integration method used to compute a single value from a set of values. */ - Curvature2DAngleF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} + Curvature2DAngleF1D(IntegrationType iType = MEAN) : UnaryFunction1D(iType) {} /*! Returns the string "Curvature2DAngleF1D" */ string getName() const -- cgit v1.2.3