From 8a68f4f80814a28d68055a0ae0b22a7efe1c2619 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 26 Sep 2022 10:04:44 +1000 Subject: Cleanup: replace unsigned with uint, use function style casts for C++ --- .../blender/freestyle/intern/winged_edge/WEdge.cpp | 8 ++-- .../freestyle/intern/winged_edge/WXEdge.cpp | 10 ++--- .../freestyle/intern/winged_edge/WXEdgeBuilder.cpp | 2 +- .../intern/winged_edge/WingedEdgeBuilder.cpp | 44 +++++++++++----------- 4 files changed, 32 insertions(+), 32 deletions(-) (limited to 'source/blender/freestyle/intern/winged_edge') diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp index 8af34d5e0ac..33f72cc0c9f 100644 --- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp @@ -451,7 +451,7 @@ WShape *WFace::getShape() * * **********************************/ -unsigned WShape::_SceneCurrentId = 0; +uint WShape::_SceneCurrentId = 0; WShape *WShape::duplicate() { @@ -585,7 +585,7 @@ WShape::WShape(WShape &iBrother) WFace *WShape::MakeFace(vector &iVertexList, vector &iFaceEdgeMarksList, - unsigned iMaterial) + uint iMaterial) { // allocate the new face WFace *face = instanciateFace(); @@ -601,7 +601,7 @@ WFace *WShape::MakeFace(vector &iVertexList, vector &iNormalsList, vector &iTexCoordsList, vector &iFaceEdgeMarksList, - unsigned iMaterial) + uint iMaterial) { // allocate the new face WFace *face = MakeFace(iVertexList, iFaceEdgeMarksList, iMaterial); @@ -620,7 +620,7 @@ WFace *WShape::MakeFace(vector &iVertexList, WFace *WShape::MakeFace(vector &iVertexList, vector &iFaceEdgeMarksList, - unsigned iMaterial, + uint iMaterial, WFace *face) { int id = _FaceList.size(); diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index f04c6e3f2be..2c107a01d13 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp @@ -64,7 +64,7 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() bool ok = false; vector cuspEdgesIndices; int indexStart, indexEnd; - unsigned nedges = _pWXFace->numberOfEdges(); + uint nedges = _pWXFace->numberOfEdges(); if (_nNullDotP == nedges) { _pSmoothEdge = nullptr; return _pSmoothEdge; @@ -118,8 +118,8 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge() _pSmoothEdge = nullptr; return nullptr; } - unsigned index0 = Get0VertexIndex(); // retrieve the 0 vertex index - unsigned nedges = _pWXFace->numberOfEdges(); + uint index0 = Get0VertexIndex(); // retrieve the 0 vertex index + uint nedges = _pWXFace->numberOfEdges(); if (_DotP[cuspEdgesIndices[0]] > 0.0f) { woea = _pWXFace->GetOEdge(cuspEdgesIndices[0]); woeb = _pWXFace->GetOEdge(index0); @@ -257,7 +257,7 @@ void WXFace::ComputeCenter() WFace *WXShape::MakeFace(vector &iVertexList, vector &iFaceEdgeMarksList, - unsigned iMaterialIndex) + uint iMaterialIndex) { WFace *face = WShape::MakeFace(iVertexList, iFaceEdgeMarksList, iMaterialIndex); if (!face) { @@ -280,7 +280,7 @@ WFace *WXShape::MakeFace(vector &iVertexList, vector &iNormalsList, vector &iTexCoordsList, vector &iFaceEdgeMarksList, - unsigned iMaterialIndex) + uint iMaterialIndex) { WFace *face = WShape::MakeFace( iVertexList, iNormalsList, iTexCoordsList, iFaceEdgeMarksList, iMaterialIndex); diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp index b1daedb0cd0..929e9b7e4dd 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp @@ -27,7 +27,7 @@ void WXEdgeBuilder::visitIndexedFaceSet(IndexedFaceSet &ifs) // ifs.setId(shape->GetId()); } -void WXEdgeBuilder::buildWVertices(WShape &shape, const float *vertices, unsigned vsize) +void WXEdgeBuilder::buildWVertices(WShape &shape, const float *vertices, uint vsize) { WXVertex *vertex; for (uint i = 0; i < vsize; i += 3) { diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp index d1389ac17c1..bb6ff066d03 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp @@ -94,7 +94,7 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs) vector frs_materials; if (ifs.msize()) { const FrsMaterial *const *mats = ifs.frs_materials(); - for (unsigned i = 0; i < ifs.msize(); ++i) { + for (uint i = 0; i < ifs.msize(); ++i) { frs_materials.push_back(*(mats[i])); } shape.setFrsMaterials(frs_materials); @@ -228,7 +228,7 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs) return true; } -void WingedEdgeBuilder::buildWVertices(WShape &shape, const float *vertices, unsigned vsize) +void WingedEdgeBuilder::buildWVertices(WShape &shape, const float *vertices, uint vsize) { WVertex *vertex; for (uint i = 0; i < vsize; i += 3) { @@ -243,15 +243,15 @@ void WingedEdgeBuilder::buildTriangleStrip(const float * /*vertices*/, vector & /*iMaterials*/, const float *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, - const unsigned *vindices, - const unsigned *nindices, - const unsigned *mindices, - const unsigned *tindices, - const unsigned nvertices) + const uint *vindices, + const uint *nindices, + const uint *mindices, + const uint *tindices, + const uint nvertices) { - unsigned nDoneVertices = 2; // number of vertices already treated - unsigned nTriangle = 0; // number of the triangle currently being treated - // int nVertex = 0; // vertex number + uint nDoneVertices = 2; /* Number of vertices already treated. */ + uint nTriangle = 0; /* Number of the triangle currently being treated. */ + // int nVertex = 0; /* Vertex number. */ WShape *currentShape = _current_wshape; // the current shape being built vector triangleVertices; @@ -340,11 +340,11 @@ void WingedEdgeBuilder::buildTriangleFan(const float * /*vertices*/, vector & /*iMaterials*/, const float * /*texCoords*/, const IndexedFaceSet::FaceEdgeMark * /*iFaceEdgeMarks*/, - const unsigned * /*vindices*/, - const unsigned * /*nindices*/, - const unsigned * /*mindices*/, - const unsigned * /*tindices*/, - const unsigned /*nvertices*/) + const uint * /*vindices*/, + const uint * /*nindices*/, + const uint * /*mindices*/, + const uint * /*tindices*/, + const uint /*nvertices*/) { // Nothing to be done } @@ -354,11 +354,11 @@ void WingedEdgeBuilder::buildTriangles(const float * /*vertices*/, vector & /*iMaterials*/, const float *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks, - const unsigned *vindices, - const unsigned *nindices, - const unsigned *mindices, - const unsigned *tindices, - const unsigned nvertices) + const uint *vindices, + const uint *nindices, + const uint *mindices, + const uint *tindices, + const uint nvertices) { WShape *currentShape = _current_wshape; // the current shape begin built vector triangleVertices; @@ -405,7 +405,7 @@ void WingedEdgeBuilder::buildTriangles(const float * /*vertices*/, } void WingedEdgeBuilder::transformVertices(const float *vertices, - unsigned vsize, + uint vsize, const Matrix44r &transform, float *res) { @@ -424,7 +424,7 @@ void WingedEdgeBuilder::transformVertices(const float *vertices, } void WingedEdgeBuilder::transformNormals(const float *normals, - unsigned nsize, + uint nsize, const Matrix44r &transform, float *res) { -- cgit v1.2.3