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/view_map/HeuristicGridDensityProviderFactory.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/view_map/HeuristicGridDensityProviderFactory.cpp')
-rw-r--r-- | source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp | 80 |
1 files changed, 44 insertions, 36 deletions
diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp index 676ce8046ad..55bc02b8358 100644 --- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp +++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp @@ -23,53 +23,61 @@ namespace Freestyle { -HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real sizeFactor, unsigned numFaces) -: sizeFactor(sizeFactor), numFaces(numFaces) +HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real sizeFactor, + unsigned numFaces) + : sizeFactor(sizeFactor), numFaces(numFaces) { } -HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory() {} +HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory() +{ +} -AutoPtr<GridDensityProvider> -HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider( + OccluderSource &source, const real proscenium[4]) { - AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); - AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); - if (avg->cellSize() > p23->cellSize()) { - return (AutoPtr<GridDensityProvider>) p23; - } - else { - return (AutoPtr<GridDensityProvider>) avg; - } + AutoPtr<AverageAreaGridDensityProvider> avg( + new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23( + new Pow23GridDensityProvider(source, proscenium, numFaces)); + if (avg->cellSize() > p23->cellSize()) { + return (AutoPtr<GridDensityProvider>)p23; + } + else { + return (AutoPtr<GridDensityProvider>)avg; + } } -AutoPtr<GridDensityProvider> -HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, - const GridHelpers::Transform& transform) +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider( + OccluderSource &source, const BBox<Vec3r> &bbox, const GridHelpers::Transform &transform) { - AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, bbox, - transform, sizeFactor)); - AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, bbox, transform, numFaces)); - if (avg->cellSize() > p23->cellSize()) { - return (AutoPtr<GridDensityProvider>) p23; - } - else { - return (AutoPtr<GridDensityProvider>) avg; - } + AutoPtr<AverageAreaGridDensityProvider> avg( + new AverageAreaGridDensityProvider(source, bbox, transform, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23( + new Pow23GridDensityProvider(source, bbox, transform, numFaces)); + if (avg->cellSize() > p23->cellSize()) { + return (AutoPtr<GridDensityProvider>)p23; + } + else { + return (AutoPtr<GridDensityProvider>)avg; + } } -AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider( + OccluderSource &source) { - real proscenium[4]; - GridDensityProvider::calculateOptimalProscenium(source, proscenium); - AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); - AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); - if (avg->cellSize() > p23->cellSize()) { - return (AutoPtr<GridDensityProvider>) p23; - } - else { - return (AutoPtr<GridDensityProvider>) avg; - } + real proscenium[4]; + GridDensityProvider::calculateOptimalProscenium(source, proscenium); + AutoPtr<AverageAreaGridDensityProvider> avg( + new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23( + new Pow23GridDensityProvider(source, proscenium, numFaces)); + if (avg->cellSize() > p23->cellSize()) { + return (AutoPtr<GridDensityProvider>)p23; + } + else { + return (AutoPtr<GridDensityProvider>)avg; + } } } /* namespace Freestyle */ |