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/scene_graph/IndexedFaceSet.cpp | |
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/scene_graph/IndexedFaceSet.cpp')
-rw-r--r-- | source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp | 545 |
1 files changed, 280 insertions, 265 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp index d39f6fac75d..7a6b276bc44 100644 --- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp +++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp @@ -25,288 +25,303 @@ namespace Freestyle { IndexedFaceSet::IndexedFaceSet() : Rep() { - _Vertices = NULL; - _Normals = NULL; - _FrsMaterials = 0; - _TexCoords = NULL; - _FaceEdgeMarks = 0; - _VSize = 0; - _NSize = 0; - _MSize = 0; - _TSize = 0; - _NumFaces = 0; - _NumVertexPerFace = NULL; - _FaceStyle = NULL; - _VIndices = NULL; - _VISize = 0; - _NIndices = NULL; - _NISize = 0; - _MIndices = NULL; - _MISize = 0; - _TIndices = NULL; - _TISize = 0; + _Vertices = NULL; + _Normals = NULL; + _FrsMaterials = 0; + _TexCoords = NULL; + _FaceEdgeMarks = 0; + _VSize = 0; + _NSize = 0; + _MSize = 0; + _TSize = 0; + _NumFaces = 0; + _NumVertexPerFace = NULL; + _FaceStyle = NULL; + _VIndices = NULL; + _VISize = 0; + _NIndices = NULL; + _NISize = 0; + _MIndices = NULL; + _MISize = 0; + _TIndices = NULL; + _TISize = 0; } -IndexedFaceSet::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, - unsigned *iNIndices, unsigned iNISize, unsigned *iMIndices, unsigned iMISize, - unsigned *iTIndices, unsigned iTISize, unsigned iCopy) -: Rep() +IndexedFaceSet::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, + unsigned *iNIndices, + unsigned iNISize, + unsigned *iMIndices, + unsigned iMISize, + unsigned *iTIndices, + unsigned iTISize, + unsigned iCopy) + : Rep() { - if (1 == iCopy) { - _VSize = iVSize; - _Vertices = new float[_VSize]; - memcpy(_Vertices, iVertices, iVSize * sizeof(float)); - - _NSize = iNSize; - _Normals = new float[_NSize]; - memcpy(_Normals, iNormals, iNSize * sizeof(float)); - - _MSize = iMSize; - _FrsMaterials = 0; - if (iMaterials) { - _FrsMaterials = new FrsMaterial * [_MSize]; - for (unsigned int i = 0; i < _MSize; ++i) - _FrsMaterials[i] = new FrsMaterial(*(iMaterials[i])); - } - _TSize = iTSize; - _TexCoords = 0; - if (_TSize) { - _TexCoords = new float[_TSize]; - memcpy(_TexCoords, iTexCoords, iTSize * sizeof(float)); - } - - _NumFaces = iNumFaces; - _NumVertexPerFace = new unsigned[_NumFaces]; - memcpy(_NumVertexPerFace, iNumVertexPerFace, _NumFaces * sizeof(unsigned)); - - _FaceStyle = new TRIANGLES_STYLE[_NumFaces]; - memcpy(_FaceStyle, iFaceStyle, _NumFaces * sizeof(TRIANGLES_STYLE)); - - _FaceEdgeMarks = new FaceEdgeMark[_NumFaces]; - memcpy(_FaceEdgeMarks, iFaceEdgeMarks, _NumFaces * sizeof(FaceEdgeMark)); - - _VISize = iVISize; - _VIndices = new unsigned[_VISize]; - memcpy(_VIndices, iVIndices, _VISize * sizeof(unsigned)); - - _NISize = iNISize; - _NIndices = new unsigned[_NISize]; - memcpy(_NIndices, iNIndices, _NISize * sizeof(unsigned)); - - _MISize = iMISize; - _MIndices = 0; - if (iMIndices) { - _MIndices = new unsigned[_MISize]; - memcpy(_MIndices, iMIndices, _MISize * sizeof(unsigned)); - } - _TISize = iTISize; - _TIndices = 0; - if (_TISize) { - _TIndices = new unsigned[_TISize]; - memcpy(_TIndices, iTIndices, _TISize * sizeof(unsigned)); - } - } - else { - _VSize = iVSize; - _Vertices = iVertices; - - _NSize = iNSize; - _Normals = iNormals; - - _MSize = iMSize; - _FrsMaterials = 0; - if (iMaterials) - _FrsMaterials = iMaterials; - - _TSize = iTSize; - _TexCoords = iTexCoords; - - _NumFaces = iNumFaces; - _NumVertexPerFace = iNumVertexPerFace; - _FaceStyle = iFaceStyle; - _FaceEdgeMarks = iFaceEdgeMarks; - - _VISize = iVISize; - _VIndices = iVIndices; - - _NISize = iNISize; - _NIndices = iNIndices; - - _MISize = iMISize; - _MIndices = 0; - if (iMISize) - _MIndices = iMIndices; - - _TISize = iTISize; - _TIndices = iTIndices; - } + if (1 == iCopy) { + _VSize = iVSize; + _Vertices = new float[_VSize]; + memcpy(_Vertices, iVertices, iVSize * sizeof(float)); + + _NSize = iNSize; + _Normals = new float[_NSize]; + memcpy(_Normals, iNormals, iNSize * sizeof(float)); + + _MSize = iMSize; + _FrsMaterials = 0; + if (iMaterials) { + _FrsMaterials = new FrsMaterial *[_MSize]; + for (unsigned int i = 0; i < _MSize; ++i) + _FrsMaterials[i] = new FrsMaterial(*(iMaterials[i])); + } + _TSize = iTSize; + _TexCoords = 0; + if (_TSize) { + _TexCoords = new float[_TSize]; + memcpy(_TexCoords, iTexCoords, iTSize * sizeof(float)); + } + + _NumFaces = iNumFaces; + _NumVertexPerFace = new unsigned[_NumFaces]; + memcpy(_NumVertexPerFace, iNumVertexPerFace, _NumFaces * sizeof(unsigned)); + + _FaceStyle = new TRIANGLES_STYLE[_NumFaces]; + memcpy(_FaceStyle, iFaceStyle, _NumFaces * sizeof(TRIANGLES_STYLE)); + + _FaceEdgeMarks = new FaceEdgeMark[_NumFaces]; + memcpy(_FaceEdgeMarks, iFaceEdgeMarks, _NumFaces * sizeof(FaceEdgeMark)); + + _VISize = iVISize; + _VIndices = new unsigned[_VISize]; + memcpy(_VIndices, iVIndices, _VISize * sizeof(unsigned)); + + _NISize = iNISize; + _NIndices = new unsigned[_NISize]; + memcpy(_NIndices, iNIndices, _NISize * sizeof(unsigned)); + + _MISize = iMISize; + _MIndices = 0; + if (iMIndices) { + _MIndices = new unsigned[_MISize]; + memcpy(_MIndices, iMIndices, _MISize * sizeof(unsigned)); + } + _TISize = iTISize; + _TIndices = 0; + if (_TISize) { + _TIndices = new unsigned[_TISize]; + memcpy(_TIndices, iTIndices, _TISize * sizeof(unsigned)); + } + } + else { + _VSize = iVSize; + _Vertices = iVertices; + + _NSize = iNSize; + _Normals = iNormals; + + _MSize = iMSize; + _FrsMaterials = 0; + if (iMaterials) + _FrsMaterials = iMaterials; + + _TSize = iTSize; + _TexCoords = iTexCoords; + + _NumFaces = iNumFaces; + _NumVertexPerFace = iNumVertexPerFace; + _FaceStyle = iFaceStyle; + _FaceEdgeMarks = iFaceEdgeMarks; + + _VISize = iVISize; + _VIndices = iVIndices; + + _NISize = iNISize; + _NIndices = iNIndices; + + _MISize = iMISize; + _MIndices = 0; + if (iMISize) + _MIndices = iMIndices; + + _TISize = iTISize; + _TIndices = iTIndices; + } } -IndexedFaceSet::IndexedFaceSet(const IndexedFaceSet& iBrother) : Rep(iBrother) +IndexedFaceSet::IndexedFaceSet(const IndexedFaceSet &iBrother) : Rep(iBrother) { - _VSize = iBrother.vsize(); - _Vertices = new float[_VSize]; - memcpy(_Vertices, iBrother.vertices(), _VSize * sizeof(float)); - - _NSize = iBrother.nsize(); - _Normals = new float[_NSize]; - memcpy(_Normals, iBrother.normals(), _NSize * sizeof(float)); - - _MSize = iBrother.msize(); - if (_MSize) { - _FrsMaterials = new FrsMaterial * [_MSize]; - for (unsigned int i = 0; i < _MSize; ++i) { - _FrsMaterials[i] = new FrsMaterial(*(iBrother._FrsMaterials[i])); - } - } - else { - _FrsMaterials = 0; - } - - _TSize = iBrother.tsize(); - _TexCoords = 0; - if (_TSize) { - _TexCoords = new float[_TSize]; - memcpy(_TexCoords, iBrother.texCoords(), _TSize * sizeof(float)); - } - - _NumFaces = iBrother.numFaces(); - _NumVertexPerFace = new unsigned[_NumFaces]; - memcpy(_NumVertexPerFace, iBrother.numVertexPerFaces(), _NumFaces * sizeof(unsigned)); - - _FaceStyle = new TRIANGLES_STYLE[_NumFaces]; - memcpy(_FaceStyle, iBrother.trianglesStyle(), _NumFaces * sizeof(TRIANGLES_STYLE)); - - _FaceEdgeMarks = new FaceEdgeMark[_NumFaces]; - memcpy(_FaceEdgeMarks, iBrother.faceEdgeMarks(), _NumFaces * sizeof(FaceEdgeMark)); - - _VISize = iBrother.visize(); - _VIndices = new unsigned[_VISize]; - memcpy(_VIndices, iBrother.vindices(), _VISize * sizeof(unsigned)); - - _NISize = iBrother.nisize(); - _NIndices = new unsigned[_NISize]; - memcpy(_NIndices, iBrother.nindices(), _NISize * sizeof(unsigned)); - - _MISize = iBrother.misize(); - if (_MISize) { - _MIndices = new unsigned[_MISize]; - memcpy(_MIndices, iBrother.mindices(), _MISize * sizeof(unsigned)); - } - else { - _MIndices = 0; - } - - _TISize = iBrother.tisize(); - _TIndices = 0; - if (_TISize) { - _TIndices = new unsigned[_TISize]; - memcpy(_TIndices, iBrother.tindices(), _TISize * sizeof(unsigned)); - } + _VSize = iBrother.vsize(); + _Vertices = new float[_VSize]; + memcpy(_Vertices, iBrother.vertices(), _VSize * sizeof(float)); + + _NSize = iBrother.nsize(); + _Normals = new float[_NSize]; + memcpy(_Normals, iBrother.normals(), _NSize * sizeof(float)); + + _MSize = iBrother.msize(); + if (_MSize) { + _FrsMaterials = new FrsMaterial *[_MSize]; + for (unsigned int i = 0; i < _MSize; ++i) { + _FrsMaterials[i] = new FrsMaterial(*(iBrother._FrsMaterials[i])); + } + } + else { + _FrsMaterials = 0; + } + + _TSize = iBrother.tsize(); + _TexCoords = 0; + if (_TSize) { + _TexCoords = new float[_TSize]; + memcpy(_TexCoords, iBrother.texCoords(), _TSize * sizeof(float)); + } + + _NumFaces = iBrother.numFaces(); + _NumVertexPerFace = new unsigned[_NumFaces]; + memcpy(_NumVertexPerFace, iBrother.numVertexPerFaces(), _NumFaces * sizeof(unsigned)); + + _FaceStyle = new TRIANGLES_STYLE[_NumFaces]; + memcpy(_FaceStyle, iBrother.trianglesStyle(), _NumFaces * sizeof(TRIANGLES_STYLE)); + + _FaceEdgeMarks = new FaceEdgeMark[_NumFaces]; + memcpy(_FaceEdgeMarks, iBrother.faceEdgeMarks(), _NumFaces * sizeof(FaceEdgeMark)); + + _VISize = iBrother.visize(); + _VIndices = new unsigned[_VISize]; + memcpy(_VIndices, iBrother.vindices(), _VISize * sizeof(unsigned)); + + _NISize = iBrother.nisize(); + _NIndices = new unsigned[_NISize]; + memcpy(_NIndices, iBrother.nindices(), _NISize * sizeof(unsigned)); + + _MISize = iBrother.misize(); + if (_MISize) { + _MIndices = new unsigned[_MISize]; + memcpy(_MIndices, iBrother.mindices(), _MISize * sizeof(unsigned)); + } + else { + _MIndices = 0; + } + + _TISize = iBrother.tisize(); + _TIndices = 0; + if (_TISize) { + _TIndices = new unsigned[_TISize]; + memcpy(_TIndices, iBrother.tindices(), _TISize * sizeof(unsigned)); + } } IndexedFaceSet::~IndexedFaceSet() { - if (NULL != _Vertices) { - delete[] _Vertices; - _Vertices = NULL; - } - - if (NULL != _Normals) { - delete[] _Normals; - _Normals = NULL; - } - - if (NULL != _FrsMaterials) { - for (unsigned int i = 0; i < _MSize; ++i) - delete _FrsMaterials[i]; - delete[] _FrsMaterials; - _FrsMaterials = NULL; - } - - if (NULL != _TexCoords) { - delete[] _TexCoords; - _TexCoords = NULL; - } - - if (NULL != _NumVertexPerFace) { - delete[] _NumVertexPerFace; - _NumVertexPerFace = NULL; - } - - if (NULL != _FaceStyle) { - delete[] _FaceStyle; - _FaceStyle = NULL; - } - - if (NULL != _FaceEdgeMarks) { - delete[] _FaceEdgeMarks; - _FaceEdgeMarks = NULL; - } - - if (NULL != _VIndices) { - delete[] _VIndices; - _VIndices = NULL; - } - - if (NULL != _NIndices) { - delete[] _NIndices; - _NIndices = NULL; - } - - if (NULL != _MIndices) { - delete[] _MIndices; - _MIndices = NULL; - } - if (NULL != _TIndices) { - delete[] _TIndices; - _TIndices = NULL; - } + if (NULL != _Vertices) { + delete[] _Vertices; + _Vertices = NULL; + } + + if (NULL != _Normals) { + delete[] _Normals; + _Normals = NULL; + } + + if (NULL != _FrsMaterials) { + for (unsigned int i = 0; i < _MSize; ++i) + delete _FrsMaterials[i]; + delete[] _FrsMaterials; + _FrsMaterials = NULL; + } + + if (NULL != _TexCoords) { + delete[] _TexCoords; + _TexCoords = NULL; + } + + if (NULL != _NumVertexPerFace) { + delete[] _NumVertexPerFace; + _NumVertexPerFace = NULL; + } + + if (NULL != _FaceStyle) { + delete[] _FaceStyle; + _FaceStyle = NULL; + } + + if (NULL != _FaceEdgeMarks) { + delete[] _FaceEdgeMarks; + _FaceEdgeMarks = NULL; + } + + if (NULL != _VIndices) { + delete[] _VIndices; + _VIndices = NULL; + } + + if (NULL != _NIndices) { + delete[] _NIndices; + _NIndices = NULL; + } + + if (NULL != _MIndices) { + delete[] _MIndices; + _MIndices = NULL; + } + if (NULL != _TIndices) { + delete[] _TIndices; + _TIndices = NULL; + } } -void IndexedFaceSet::accept(SceneVisitor& v) +void IndexedFaceSet::accept(SceneVisitor &v) { - Rep::accept(v); - v.visitIndexedFaceSet(*this); + Rep::accept(v); + v.visitIndexedFaceSet(*this); } void IndexedFaceSet::ComputeBBox() { - float XMax = _Vertices[0]; - float YMax = _Vertices[1]; - float ZMax = _Vertices[2]; - - float XMin = _Vertices[0]; - float YMin = _Vertices[1]; - float ZMin = _Vertices[2]; - - // parse all the coordinates to find the Xmax, YMax, ZMax - float *v = _Vertices; - - for (unsigned int i = 0; i < (_VSize / 3); ++i) { - if (*v > XMax) - XMax = *v; - if (*v < XMin) - XMin = *v; - ++v; - - if (*v > YMax) - YMax = *v; - if (*v < YMin) - YMin = *v; - ++v; - - if (*v > ZMax) - ZMax = *v; - if (*v < ZMin) - ZMin = *v; - ++v; - } - - setBBox(BBox<Vec3f>(Vec3f(XMin, YMin, ZMin), Vec3f(XMax, YMax, ZMax))); + float XMax = _Vertices[0]; + float YMax = _Vertices[1]; + float ZMax = _Vertices[2]; + + float XMin = _Vertices[0]; + float YMin = _Vertices[1]; + float ZMin = _Vertices[2]; + + // parse all the coordinates to find the Xmax, YMax, ZMax + float *v = _Vertices; + + for (unsigned int i = 0; i < (_VSize / 3); ++i) { + if (*v > XMax) + XMax = *v; + if (*v < XMin) + XMin = *v; + ++v; + + if (*v > YMax) + YMax = *v; + if (*v < YMin) + YMin = *v; + ++v; + + if (*v > ZMax) + ZMax = *v; + if (*v < ZMin) + ZMin = *v; + ++v; + } + + setBBox(BBox<Vec3f>(Vec3f(XMin, YMin, ZMin), Vec3f(XMax, YMax, ZMax))); } } /* namespace Freestyle */ |