diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h | 235 |
1 files changed, 130 insertions, 105 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index 30fe7277fdb..606e8561401 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -34,119 +34,144 @@ namespace Freestyle { -class WingedEdgeBuilder : public SceneVisitor -{ -public: - inline WingedEdgeBuilder() : SceneVisitor() - { - _current_wshape = NULL; - _current_frs_material = NULL; - _current_matrix = NULL; - _winged_edge = new WingedEdge; // Not deleted by the destructor - _pRenderMonitor = NULL; - } - - virtual ~WingedEdgeBuilder() - { - for (vector<Matrix44r*>::iterator it = _matrices_stack.begin(); it != _matrices_stack.end(); ++it) - delete *it; - _matrices_stack.clear(); - } - - VISIT_DECL(IndexedFaceSet) - VISIT_DECL(NodeShape) - VISIT_DECL(NodeTransform) - - virtual void visitNodeTransformAfter(NodeTransform&); - - // - // Accessors - // - ///////////////////////////////////////////////////////////////////////////// - - inline WingedEdge *getWingedEdge() - { - return _winged_edge; - } - - inline WShape *getCurrentWShape() - { - return _current_wshape; - } - - inline FrsMaterial *getCurrentFrsMaterial() - { - return _current_frs_material; - } - - inline Matrix44r *getCurrentMatrix() - { - return _current_matrix; - } - - // - // Modifiers - // - ///////////////////////////////////////////////////////////////////////////// - - inline void setCurrentWShape(WShape *wshape) - { - _current_wshape = wshape; - } - - inline void setCurrentFrsMaterial(FrsMaterial *mat) - { - _current_frs_material = mat; - } +class WingedEdgeBuilder : public SceneVisitor { + public: + inline WingedEdgeBuilder() : SceneVisitor() + { + _current_wshape = NULL; + _current_frs_material = NULL; + _current_matrix = NULL; + _winged_edge = new WingedEdge; // Not deleted by the destructor + _pRenderMonitor = NULL; + } + + virtual ~WingedEdgeBuilder() + { + for (vector<Matrix44r *>::iterator it = _matrices_stack.begin(); it != _matrices_stack.end(); + ++it) + delete *it; + _matrices_stack.clear(); + } + + VISIT_DECL(IndexedFaceSet) + VISIT_DECL(NodeShape) + VISIT_DECL(NodeTransform) + + virtual void visitNodeTransformAfter(NodeTransform &); + + // + // Accessors + // + ///////////////////////////////////////////////////////////////////////////// + + inline WingedEdge *getWingedEdge() + { + return _winged_edge; + } + + inline WShape *getCurrentWShape() + { + return _current_wshape; + } + + inline FrsMaterial *getCurrentFrsMaterial() + { + return _current_frs_material; + } + + inline Matrix44r *getCurrentMatrix() + { + return _current_matrix; + } + + // + // Modifiers + // + ///////////////////////////////////////////////////////////////////////////// + + inline void setCurrentWShape(WShape *wshape) + { + _current_wshape = wshape; + } + + inline void setCurrentFrsMaterial(FrsMaterial *mat) + { + _current_frs_material = mat; + } #if 0 - inline void setCurrentMatrix(Matrix44r *matrix) - { - _current_matrix = matrix; - } + inline void setCurrentMatrix(Matrix44r *matrix) + { + _current_matrix = matrix; + } #endif - inline void setRenderMonitor(RenderMonitor *iRenderMonitor) { - _pRenderMonitor = iRenderMonitor; - } - -protected: - virtual bool buildWShape(WShape& shape, IndexedFaceSet& ifs); - virtual void buildWVertices(WShape& shape, const float *vertices, unsigned vsize); - - RenderMonitor *_pRenderMonitor; - -private: - void buildTriangleStrip(const float *vertices, const float *normals, vector<FrsMaterial>& iMaterials, - const float *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, - const unsigned *vindices, const unsigned *nindices, const unsigned *mindices, - const unsigned *tindices, const unsigned nvertices); - - void buildTriangleFan(const float *vertices, const float *normals, vector<FrsMaterial>& iMaterials, - const float *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, - const unsigned *vindices, const unsigned *nindices, const unsigned *mindices, - const unsigned *tindices, const unsigned nvertices); - - void buildTriangles(const float *vertices, const float *normals, vector<FrsMaterial>& iMaterials, - const float *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, - const unsigned *vindices, const unsigned *nindices, const unsigned *mindices, - const unsigned *tindices, const unsigned nvertices); - - void transformVertices(const float *vertices, unsigned vsize, const Matrix44r& transform, float *res); - - void transformNormals(const float *normals, unsigned nsize, const Matrix44r& transform, float *res); - - WShape *_current_wshape; - FrsMaterial *_current_frs_material; - WingedEdge *_winged_edge; - Matrix44r *_current_matrix; - vector<Matrix44r *> _matrices_stack; + inline void setRenderMonitor(RenderMonitor *iRenderMonitor) + { + _pRenderMonitor = iRenderMonitor; + } + + protected: + virtual bool buildWShape(WShape &shape, IndexedFaceSet &ifs); + virtual void buildWVertices(WShape &shape, const float *vertices, unsigned vsize); + + RenderMonitor *_pRenderMonitor; + + private: + void buildTriangleStrip(const float *vertices, + const float *normals, + vector<FrsMaterial> &iMaterials, + const float *texCoords, + const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, + const unsigned *vindices, + const unsigned *nindices, + const unsigned *mindices, + const unsigned *tindices, + const unsigned nvertices); + + void buildTriangleFan(const float *vertices, + const float *normals, + vector<FrsMaterial> &iMaterials, + const float *texCoords, + const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, + const unsigned *vindices, + const unsigned *nindices, + const unsigned *mindices, + const unsigned *tindices, + const unsigned nvertices); + + void buildTriangles(const float *vertices, + const float *normals, + vector<FrsMaterial> &iMaterials, + const float *texCoords, + const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, + const unsigned *vindices, + const unsigned *nindices, + const unsigned *mindices, + const unsigned *tindices, + const unsigned nvertices); + + void transformVertices(const float *vertices, + unsigned vsize, + const Matrix44r &transform, + float *res); + + void transformNormals(const float *normals, + unsigned nsize, + const Matrix44r &transform, + float *res); + + WShape *_current_wshape; + FrsMaterial *_current_frs_material; + WingedEdge *_winged_edge; + Matrix44r *_current_matrix; + vector<Matrix44r *> _matrices_stack; #ifdef WITH_CXX_GUARDEDALLOC - MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdgeBuilder") + MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdgeBuilder") #endif }; } /* namespace Freestyle */ -#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ +#endif // __FREESTYLE_WINGED_EDGE_BUILDER_H__ |