diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
commit | 2d801f2bec3c4de663f33b0f0f198a12f09ef989 (patch) | |
tree | dfe16a3ca2213bd5b6579ed3bc2ac2902b678067 /source/blender/freestyle/intern/scene_graph | |
parent | 4a92d82626980d6d1690113b9d27aae282fd48eb (diff) |
Another big code clean-up patch from Bastien Montagne, thanks again!
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph')
6 files changed, 19 insertions, 20 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp index f373b730d0f..20c33713db4 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp @@ -231,8 +231,7 @@ IndexedFaceSet::~IndexedFaceSet() _Vertices = NULL; } - if (NULL != _Normals) - { + if (NULL != _Normals) { delete[] _Normals; _Normals = NULL; } diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h index 6ec769f4caf..c2715812eee 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h @@ -185,12 +185,12 @@ public: } /*! Accessors */ - virtual const real * vertices() const + virtual const real *vertices() const { return _Vertices; } - virtual const real * normals() const + virtual const real *normals() const { return _Normals; } @@ -200,7 +200,7 @@ public: return _FrsMaterials; } - virtual const real* texCoords() const + virtual const real *texCoords() const { return _TexCoords; } @@ -230,37 +230,37 @@ public: return _NumFaces; } - virtual const unsigned * numVertexPerFaces() const + virtual const unsigned *numVertexPerFaces() const { return _NumVertexPerFace; } - virtual const TRIANGLES_STYLE * trianglesStyle() const + virtual const TRIANGLES_STYLE *trianglesStyle() const { return _FaceStyle; } - virtual const unsigned char * faceEdgeMarks() const + virtual const unsigned char *faceEdgeMarks() const { return _FaceEdgeMarks; } - virtual const unsigned* vindices() const + virtual const unsigned *vindices() const { return _VIndices; } - virtual const unsigned* nindices() const + virtual const unsigned *nindices() const { return _NIndices; } - virtual const unsigned* mindices() const + virtual const unsigned *mindices() const { return _MIndices; } - virtual const unsigned* tindices() const + virtual const unsigned *tindices() const { return _TIndices; } diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h index 626a0913233..03e9343f7e7 100644 --- a/source/blender/freestyle/intern/scene_graph/Node.h +++ b/source/blender/freestyle/intern/scene_graph/Node.h @@ -57,7 +57,7 @@ public: _BBox = iBrother.bbox(); } - virtual ~Node(){} + virtual ~Node() {} /*! Accept the corresponding visitor * Each inherited node must overload this method @@ -85,10 +85,10 @@ public: /*! Makes the union of _BBox and iBox */ virtual void AddBBox(const BBox<Vec3r>& iBox) { - if(iBox.empty()) + if (iBox.empty()) return; - if(_BBox.empty()) + if (_BBox.empty()) _BBox = iBox; else _BBox += iBox; diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h index 1c5b106d5c6..aed9562903e 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.h +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h @@ -48,7 +48,7 @@ class LIB_SCENE_GRAPH_EXPORT NodeGroup : public Node { public: inline NodeGroup(): Node() {} - virtual ~NodeGroup(){} + virtual ~NodeGroup() {} /*! Adds a child. Makes a addRef on the iChild reference counter */ virtual void AddChild(Node *iChild); diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h index 45cda3610f2..28b620f5c80 100644 --- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h +++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h @@ -49,7 +49,7 @@ public: * v2 * second vertex */ - inline OrientedLineRep(const Vec3r& v1, const Vec3r& v2) : LineRep(v1,v2) {} + inline OrientedLineRep(const Vec3r& v1, const Vec3r& v2) : LineRep(v1, v2) {} /*! Builds a line rep from a vertex chain */ inline OrientedLineRep(const vector<Vec3r>& vertices) : LineRep(vertices) {} diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h index c1b29d3fceb..055ec0674f8 100644 --- a/source/blender/freestyle/intern/scene_graph/Rep.h +++ b/source/blender/freestyle/intern/scene_graph/Rep.h @@ -70,10 +70,10 @@ public: inline void swap(Rep& ioOther) { - std::swap(_BBox,ioOther._BBox); + std::swap(_BBox, ioOther._BBox); std::swap(_Id, ioOther._Id); std::swap(_Name, ioOther._Name); - std::swap(_FrsMaterial,ioOther._FrsMaterial); + std::swap(_FrsMaterial, ioOther._FrsMaterial); } Rep& operator=(const Rep& iBrother) @@ -137,7 +137,7 @@ public: return _Name; } - inline const FrsMaterial * frs_material() const + inline const FrsMaterial *frs_material() const { return _FrsMaterial; } |