diff options
Diffstat (limited to 'source/blender/freestyle')
23 files changed, 133 insertions, 138 deletions
diff --git a/source/blender/freestyle/intern/application/AppCanvas.h b/source/blender/freestyle/intern/application/AppCanvas.h index 9a92cf482d0..ed473e22489 100644 --- a/source/blender/freestyle/intern/application/AppCanvas.h +++ b/source/blender/freestyle/intern/application/AppCanvas.h @@ -69,7 +69,7 @@ public: virtual float thickness() const; AppView *_pViewer; - inline const AppView * viewer() const {return _pViewer;} + inline const AppView *viewer() const {return _pViewer;} /*! modifiers */ void setViewer(AppView *iViewer); diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h index ae1d96e06d8..d7572aa1a04 100644 --- a/source/blender/freestyle/intern/application/AppConfig.h +++ b/source/blender/freestyle/intern/application/AppConfig.h @@ -44,7 +44,7 @@ namespace Config { class Path { protected: - static Path * _pInstance; + static Path *_pInstance; string _ProjectDir; string _ModelsPath; string _PatternsPath; diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 46db99a8d51..03dc5f67d43 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -642,11 +642,11 @@ void Controller::ComputeSteerableViewMap() NodeShape *completeNS = new NodeShape; completeNS->material().setDiffuse(c,c,c,1); ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS); - SteerableViewMap * svm = _Canvas->getSteerableViewMap(); + SteerableViewMap *svm = _Canvas->getSteerableViewMap(); svm->Reset(); ViewMap::fedges_container& fedges = _ViewMap->FEdges(); - LineRep * fRep; + LineRep *fRep; NodeShape *ns; for (ViewMap::fedges_container::iterator f = fedges.begin(), fend = fedges.end(); f != fend; @@ -722,7 +722,7 @@ void Controller::ComputeSteerableViewMap() void Controller::saveSteerableViewMapImages() { - SteerableViewMap * svm = _Canvas->getSteerableViewMap(); + SteerableViewMap *svm = _Canvas->getSteerableViewMap(); if (!svm) { cerr << "the Steerable ViewMap has not been computed yet" << endl; return; @@ -1003,7 +1003,7 @@ void Controller::resetModified(bool iMod) _Canvas->resetModified(iMod); } -NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, vector<ViewEdge*>::iterator vedges_end) +NodeGroup *Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, vector<ViewEdge*>::iterator vedges_end) { ViewMapTesselator2D tesselator2D; FrsMaterial mat; @@ -1052,7 +1052,7 @@ void Controller::resetInterpreter() void Controller::displayDensityCurves(int x, int y) { - SteerableViewMap * svm = _Canvas->getSteerableViewMap(); + SteerableViewMap *svm = _Canvas->getSteerableViewMap(); if (!svm) return; diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 894f8eeeb4e..290701936e3 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -82,7 +82,7 @@ public: virtual ~BlenderFileLoader(); /*! Loads the 3D scene and returns a pointer to the scene root node */ - NodeGroup * Load(); + NodeGroup *Load(); /*! Gets the number of read faces */ inline unsigned int numFacesRead() {return _numFacesRead;} diff --git a/source/blender/freestyle/intern/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h index 62c0e58232a..0a9be01aba1 100644 --- a/source/blender/freestyle/intern/geometry/Grid.h +++ b/source/blender/freestyle/intern/geometry/Grid.h @@ -30,7 +30,7 @@ #include <cstring> // for memset #include <float.h> -#include <stdint.h> // For SET_UINT_IN_POINTER, i.e. uintptr_t. +#include <stdint.h> // For POINTER_FROM_UINT, i.e. uintptr_t. #include <vector> #include "Geom.h" @@ -290,8 +290,9 @@ public: * Returns the first intersection (occluder,t,u,v) or null. * Starts with a call to InitRay. */ - Polygon3r * castRayToFindFirstIntersection(const Vec3r& orig, const Vec3r& dir, double& t, - double& u, double& v, unsigned timestamp); + Polygon3r *castRayToFindFirstIntersection( + const Vec3r& orig, const Vec3r& dir, double& t, + double& u, double& v, unsigned timestamp); /*! Init all structures and values for computing the cells intersected by this new ray */ @@ -338,8 +339,8 @@ protected: visitor.discoverCell(current_cell); OccludersSet& occluders = current_cell->getOccluders(); // FIXME: I had forgotten the ref & for (OccludersSet::iterator it = occluders.begin(); it != occluders.end(); it++) { - if (GET_UINT_FROM_POINTER((*it)->userdata2) != _timestamp) { - (*it)->userdata2 = SET_UINT_IN_POINTER(_timestamp); + if (POINTER_AS_UINT((*it)->userdata2) != _timestamp) { + (*it)->userdata2 = POINTER_FROM_UINT(_timestamp); visitor.examineOccluder(*it); } } diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index 98e860862bb..3edd045320f 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -72,7 +72,7 @@ public: } public: - void * userdata; // FIXME + void *userdata; // FIXME Edge *EdgeA; // first segment Edge *EdgeB; // second segment diff --git a/source/blender/freestyle/intern/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h index fdbfd20d764..f460d56e5a5 100644 --- a/source/blender/freestyle/intern/image/GaussianFilter.h +++ b/source/blender/freestyle/intern/image/GaussianFilter.h @@ -120,18 +120,16 @@ protected: }; /* - - ############################################# - ############################################# - ############################################# - ###### ###### - ###### I M P L E M E N T A T I O N ###### - ###### ###### - ############################################# - ############################################# - ############################################# - -*/ + * ############################################# + * ############################################# + * ############################################# + * ###### ###### + * ###### I M P L E M E N T A T I O N ###### + * ###### ###### + * ############################################# + * ############################################# + * ############################################# + */ template<class Map> float GaussianFilter::getSmoothedPixel(Map *map, int x, int y) diff --git a/source/blender/freestyle/intern/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp index b81f8303945..db92cc68286 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.cpp +++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp @@ -61,7 +61,7 @@ ImagePyramid::~ImagePyramid() } } -GrayImage * ImagePyramid::getLevel(int l) +GrayImage *ImagePyramid::getLevel(int l) { return _levels[l]; } diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index a0e0b578c10..976b760a325 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -98,53 +98,53 @@ extern "C" { // C++ => Python //============================== -PyObject * PyBool_from_bool(bool b); -PyObject * Vector_from_Vec2f(Vec2f& v); -PyObject * Vector_from_Vec3f(Vec3f& v); -PyObject * Vector_from_Vec3r(Vec3r& v); - -PyObject * Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D); -PyObject * Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D); -PyObject * Any_BPy_FEdge_from_FEdge(FEdge& fe); -PyObject * Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); - -PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb); -PyObject * BPy_CurvePoint_from_CurvePoint(CurvePoint& cp); -PyObject * BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve); -PyObject * BPy_FEdge_from_FEdge(FEdge& fe); -PyObject * BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes); -PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes); -PyObject * BPy_Id_from_Id(Id& id); -PyObject * BPy_Interface0D_from_Interface0D(Interface0D& if0D); -PyObject * BPy_Interface1D_from_Interface1D(Interface1D& if1D); -PyObject * BPy_IntegrationType_from_IntegrationType(IntegrationType i); -PyObject * BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m); -PyObject * BPy_Nature_from_Nature(unsigned short n); -PyObject * BPy_MediumType_from_MediumType(Stroke::MediumType n); -PyObject * BPy_SShape_from_SShape(SShape& ss); -PyObject * BPy_Stroke_from_Stroke(Stroke& s); -PyObject * BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa); -PyObject * BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv); -PyObject * BPy_SVertex_from_SVertex(SVertex& sv); -PyObject * BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); -PyObject * BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv); -PyObject * BPy_TVertex_from_TVertex(TVertex& tv); -PyObject * BPy_ViewEdge_from_ViewEdge(ViewEdge& ve); -PyObject * BPy_Chain_from_Chain(Chain& c); -PyObject * BPy_ViewShape_from_ViewShape(ViewShape& vs); - -PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it); -PyObject * BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, bool reversed); -PyObject * BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it); -PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it, +PyObject *PyBool_from_bool(bool b); +PyObject *Vector_from_Vec2f(Vec2f& v); +PyObject *Vector_from_Vec3f(Vec3f& v); +PyObject *Vector_from_Vec3r(Vec3r& v); + +PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D); +PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D); +PyObject *Any_BPy_FEdge_from_FEdge(FEdge& fe); +PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); + +PyObject *BPy_BBox_from_BBox(const BBox< Vec3r > &bb); +PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp); +PyObject *BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve); +PyObject *BPy_FEdge_from_FEdge(FEdge& fe); +PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes); +PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes); +PyObject *BPy_Id_from_Id(Id& id); +PyObject *BPy_Interface0D_from_Interface0D(Interface0D& if0D); +PyObject *BPy_Interface1D_from_Interface1D(Interface1D& if1D); +PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i); +PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m); +PyObject *BPy_Nature_from_Nature(unsigned short n); +PyObject *BPy_MediumType_from_MediumType(Stroke::MediumType n); +PyObject *BPy_SShape_from_SShape(SShape& ss); +PyObject *BPy_Stroke_from_Stroke(Stroke& s); +PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa); +PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv); +PyObject *BPy_SVertex_from_SVertex(SVertex& sv); +PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex& vv); +PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv); +PyObject *BPy_TVertex_from_TVertex(TVertex& tv); +PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge& ve); +PyObject *BPy_Chain_from_Chain(Chain& c); +PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs); + +PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it); +PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, bool reversed); +PyObject *BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it); +PyObject *BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it, bool reversed); -PyObject * BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it); -PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it, +PyObject *BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it); +PyObject *BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it, bool reversed); -PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it); -PyObject * BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it); -PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it); -PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it); +PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it); +PyObject *BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it); +PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it); +PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it); //============================== // Python => C++ diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp index 548ab529f34..a6683f538c6 100644 --- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp +++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp @@ -63,7 +63,7 @@ PyDoc_STRVAR(Integrator_integrate_doc, " :class:`UnaryFunction0DUnsigned` type.\n" " :rtype: int or float"); -static PyObject * Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds) +static PyObject *Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"func", "it", "it_end", "integration_type", NULL}; PyObject *obj1, *obj4 = 0; diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index 0fc3ec41dec..c5a07fd295b 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -138,7 +138,7 @@ PyDoc_STRVAR(Interface1D_vertices_begin_doc, " :return: An Interface0DIterator pointing to the first vertex.\n" " :rtype: :class:`Interface0DIterator`"); -static PyObject * Interface1D_vertices_begin(BPy_Interface1D *self) +static PyObject *Interface1D_vertices_begin(BPy_Interface1D *self) { Interface0DIterator if0D_it(self->if1D->verticesBegin()); return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false); @@ -153,7 +153,7 @@ PyDoc_STRVAR(Interface1D_vertices_end_doc, " :return: An Interface0DIterator pointing after the last vertex.\n" " :rtype: :class:`Interface0DIterator`"); -static PyObject * Interface1D_vertices_end(BPy_Interface1D *self) +static PyObject *Interface1D_vertices_end(BPy_Interface1D *self) { Interface0DIterator if0D_it(self->if1D->verticesEnd()); return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, true); @@ -173,7 +173,7 @@ PyDoc_STRVAR(Interface1D_points_begin_doc, " :return: An Interface0DIterator pointing to the first point.\n" " :rtype: :class:`Interface0DIterator`"); -static PyObject * Interface1D_points_begin(BPy_Interface1D *self, PyObject *args, PyObject *kwds) +static PyObject *Interface1D_points_begin(BPy_Interface1D *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"t", NULL}; float f = 0.0f; @@ -198,7 +198,7 @@ PyDoc_STRVAR(Interface1D_points_end_doc, " :return: An Interface0DIterator pointing after the last point.\n" " :rtype: :class:`Interface0DIterator`"); -static PyObject * Interface1D_points_end(BPy_Interface1D *self, PyObject *args, PyObject *kwds) +static PyObject *Interface1D_points_end(BPy_Interface1D *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"t", NULL}; float f = 0.0f; diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index cf4880ad3f7..28c9e815196 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -122,7 +122,7 @@ PyDoc_STRVAR(SShape_add_vertex_doc, " :arg vertex: An SVertex object.\n" " :type vertex: :class:`SVertex`"); -static PyObject * SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds) +static PyObject *SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"edge", NULL}; PyObject *py_sv = 0; diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp index fb7eb49127c..b390bb293d5 100644 --- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp +++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp @@ -135,7 +135,7 @@ static void StrokeAttribute_dealloc(BPy_StrokeAttribute *self) Py_TYPE(self)->tp_free((PyObject *)self); } -static PyObject * StrokeAttribute_repr(BPy_StrokeAttribute *self) +static PyObject *StrokeAttribute_repr(BPy_StrokeAttribute *self) { stringstream repr("StrokeAttribute:"); repr << " r: " << self->sa->getColorR() << " g: " << self->sa->getColorG() << " b: " << self->sa->getColorB() << @@ -282,7 +282,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_real_doc, " :arg value: The attribute value.\n" " :type value: float\n"); -static PyObject * StrokeAttribute_set_attribute_real(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) +static PyObject *StrokeAttribute_set_attribute_real(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"name", "value", NULL}; char *s = 0; @@ -306,7 +306,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_vec2_doc, " :arg value: The attribute value.\n" " :type value: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n"); -static PyObject * StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) +static PyObject *StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"name", "value", NULL}; char *s; @@ -335,7 +335,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_vec3_doc, " :arg value: The attribute value.\n" " :type value: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n"); -static PyObject * StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) +static PyObject *StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds) { static const char *kwlist[] = {"name", "value", NULL}; char *s; diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index a8fe3d8bbfa..4103d3299d4 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -113,7 +113,7 @@ public: * 0 : the arrays are not copied. The pointers passed as arguments are used. IndexedFaceSet takes these * arrays desallocation in charge. * 1 : the arrays are copied. The caller is in charge of the arrays, passed as arguments desallocation. - */ + */ IndexedFaceSet(float *iVertices, unsigned iVSize, float *iNormals, unsigned iNSize, FrsMaterial **iMaterials, unsigned iMSize, float *iTexCoords, unsigned iTSize, unsigned iNumFaces, unsigned *iNumVertexPerFace, TRIANGLES_STYLE *iFaceStyle, FaceEdgeMark *iFaceEdgeMarks, unsigned *iVIndices, unsigned iVISize, diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index c2f70d514a8..2fc6a00f955 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -68,12 +68,12 @@ public: /*! Matrix is copied */ void setProjectionMatrix(double projection_matrix[16]); - double * modelViewMatrix() + double *modelViewMatrix() { return modelview_matrix_; } - double * projectionMatrix() + double *projectionMatrix() { return projection_matrix_; } diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index 5ba96f31272..50b55027de7 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -68,7 +68,7 @@ protected: /*! [ Geometry Shader ]. * Spatial Noise stroke shader. * Moves the vertices to make the stroke more noisy. - * @see \htmlonly <a href=noise/noise.html>noise/noise.html</a> \endhtmlonly + * \see \htmlonly <a href=noise/noise.html>noise/noise.html</a> \endhtmlonly */ class SpatialNoiseShader : public StrokeShader { @@ -106,7 +106,7 @@ protected: * (Moves the vertices to make the stroke smoother). * Uses curvature flow to converge towards a curve of constant curvature. The diffusion method we use is anisotropic * to prevent the diffusion accross corners. - * @see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> \endhtmlonly + * \see \htmlonly <a href=/smoothing/smoothing.html>smoothing/smoothing.html</a> \endhtmlonly */ class SmoothingShader : public StrokeShader { diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h index d3d19beba95..1cdc754d725 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h @@ -428,7 +428,7 @@ public: /*! [ Geometry Shader. ] * Resamples the stroke. - * @see Stroke::Resample(float). + * \see Stroke::Resample(float). */ class SamplingShader: public StrokeShader { @@ -479,7 +479,7 @@ public: /*! [ Geometry Shader ]. * Transforms the stroke backbone geometry so that it corresponds to a Bezier Curve approximation of the * original backbone geometry. - * @see \htmlonly <a href=bezier/bezier.html>bezier/bezier.html</a> \endhtmlonly + * \see \htmlonly <a href=bezier/bezier.html>bezier/bezier.html</a> \endhtmlonly */ class BezierCurveShader : public StrokeShader { diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 60b8c21067f..ce63c528ac3 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -583,8 +583,8 @@ public: * \param iNVertices * The number of StrokeVertices we eventually want in our Stroke. * \return the sampling that must be used in the Resample(float) method. - * @see Resample(int) - * @see Resample(float) + * \see Resample(int) + * \see Resample(float) */ float ComputeSampling(int iNVertices); diff --git a/source/blender/freestyle/intern/view_map/Interface0D.cpp b/source/blender/freestyle/intern/view_map/Interface0D.cpp index 1d8515700d3..5cfd216cda2 100644 --- a/source/blender/freestyle/intern/view_map/Interface0D.cpp +++ b/source/blender/freestyle/intern/view_map/Interface0D.cpp @@ -78,7 +78,7 @@ Geometry::Vec2r Interface0D::getPoint2D() const return 0; } -FEdge * Interface0D::getFEdge(Interface0D&) +FEdge *Interface0D::getFEdge(Interface0D&) { PyErr_SetString(PyExc_TypeError, "method getFEdge() not properly overridden"); return 0; @@ -96,25 +96,25 @@ Nature::VertexNature Interface0D::getNature() const return Nature::POINT; } -SVertex * Interface0D::castToSVertex() +SVertex *Interface0D::castToSVertex() { PyErr_SetString(PyExc_TypeError, "method castToSVertex() not properly overridden"); return 0; } -ViewVertex * Interface0D::castToViewVertex() +ViewVertex *Interface0D::castToViewVertex() { PyErr_SetString(PyExc_TypeError, "method castToViewVertex() not properly overridden"); return 0; } -NonTVertex * Interface0D::castToNonTVertex() +NonTVertex *Interface0D::castToNonTVertex() { PyErr_SetString(PyExc_TypeError, "method castToNonTVertex() not properly overridden"); return 0; } -TVertex * Interface0D::castToTVertex() +TVertex *Interface0D::castToTVertex() { PyErr_SetString(PyExc_TypeError, "method castToTVertex() not properly overridden"); return 0; diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 16c9699dcef..74fb875ffc6 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -1625,16 +1625,16 @@ public: /* - ############################################# - ############################################# - ############################################# - ###### ###### - ###### I M P L E M E N T A T I O N ###### - ###### ###### - ############################################# - ############################################# - ############################################# -*/ + * ############################################# + * ############################################# + * ############################################# + * ###### ###### + * ###### I M P L E M E N T A T I O N ###### + * ###### ###### + * ############################################# + * ############################################# + * ############################################# + */ /* for inline functions */ void ViewShape::SplitEdge(FEdge *fe, const vector<TVertex*>& iViewVertices, vector<FEdge*>& ioNewEdges, diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index 3e80c004b5f..c0562cbb417 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp @@ -979,7 +979,7 @@ int load(istream& in, ViewMap *vm, ProgressBar *pb) READ(flags); Options::setFlags(flags); - // Read the size of the five ViewMap's lists (with some extra informations for the ViewVertices) + // Read the size of the five ViewMap's lists (with some extra information for the ViewVertices) // and instantiate them (with default costructors) unsigned vs_s, fe_s, fe_rle1, fe_rle2, sv_s, ve_s, vv_s, vv_rle1, vv_rle2; READ(vs_s); @@ -1102,23 +1102,23 @@ int save(ostream& out, ViewMap *vm, ProgressBar *pb) // For every object, initialize its userdata member to its index in the ViewMap list for (unsigned int i0 = 0; i0 < vm->ViewShapes().size(); i0++) { - vm->ViewShapes()[i0]->userdata = SET_UINT_IN_POINTER(i0); - vm->ViewShapes()[i0]->sshape()->userdata = SET_UINT_IN_POINTER(i0); + vm->ViewShapes()[i0]->userdata = POINTER_FROM_UINT(i0); + vm->ViewShapes()[i0]->sshape()->userdata = POINTER_FROM_UINT(i0); } for (unsigned int i1 = 0; i1 < vm->FEdges().size(); i1++) - vm->FEdges()[i1]->userdata = SET_UINT_IN_POINTER(i1); + vm->FEdges()[i1]->userdata = POINTER_FROM_UINT(i1); for (unsigned int i2 = 0; i2 < vm->SVertices().size(); i2++) - vm->SVertices()[i2]->userdata = SET_UINT_IN_POINTER(i2); + vm->SVertices()[i2]->userdata = POINTER_FROM_UINT(i2); for (unsigned int i3 = 0; i3 < vm->ViewEdges().size(); i3++) - vm->ViewEdges()[i3]->userdata = SET_UINT_IN_POINTER(i3); + vm->ViewEdges()[i3]->userdata = POINTER_FROM_UINT(i3); for (unsigned int i4 = 0; i4 < vm->ViewVertices().size(); i4++) - vm->ViewVertices()[i4]->userdata = SET_UINT_IN_POINTER(i4); + vm->ViewVertices()[i4]->userdata = POINTER_FROM_UINT(i4); // Write the current options unsigned char flags = Options::getFlags(); WRITE(flags); - // Write the size of the five lists (with some extra informations for the ViewVertices) + // Write the size of the five lists (with some extra information for the ViewVertices) unsigned size; size = vm->ViewShapes().size(); WRITE(size); diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h index 14109fba843..30f55ff7e73 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WEdge.h @@ -1370,18 +1370,16 @@ private: /* - -############################################# -############################################# -############################################# -###### ###### -###### I M P L E M E N T A T I O N ###### -###### ###### -############################################# -############################################# -############################################# - -*/ + * ############################################# + * ############################################# + * ############################################# + * ###### ###### + * ###### I M P L E M E N T A T I O N ###### + * ###### ###### + * ############################################# + * ############################################# + * ############################################# + */ /* for inline functions */ void WOEdge::RetrieveCWOrderedEdges(vector<WEdge *>& oEdges) { diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h index 774cc67f3ab..cabb1f81c1a 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.h +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h @@ -802,18 +802,16 @@ public: }; /* - -############################################# -############################################# -############################################# -###### ###### -###### I M P L E M E N T A T I O N ###### -###### ###### -############################################# -############################################# -############################################# - -*/ + * ############################################# + * ############################################# + * ############################################# + * ###### ###### + * ###### I M P L E M E N T A T I O N ###### + * ###### ###### + * ############################################# + * ############################################# + * ############################################# + */ /* for inline functions */ bool WXVertex::isFeature() |