diff options
Diffstat (limited to 'source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp index 00f5cc90cc4..18edc82b096 100644 --- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp +++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp @@ -36,45 +36,45 @@ HeuristicGridDensityProviderFactory::HeuristicGridDensityProviderFactory(real si HeuristicGridDensityProviderFactory::~HeuristicGridDensityProviderFactory() {} -auto_ptr<GridDensityProvider> +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const real proscenium[4]) { - auto_ptr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); - auto_ptr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); + AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); if (avg->cellSize() > p23->cellSize()) { - return (auto_ptr<GridDensityProvider>) p23; + return (AutoPtr<GridDensityProvider>) p23; } else { - return (auto_ptr<GridDensityProvider>) avg; + return (AutoPtr<GridDensityProvider>) avg; } } -auto_ptr<GridDensityProvider> +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, const GridHelpers::Transform& transform) { - auto_ptr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, bbox, - transform, sizeFactor)); - auto_ptr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, bbox, transform, numFaces)); + AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, bbox, + transform, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, bbox, transform, numFaces)); if (avg->cellSize() > p23->cellSize()) { - return (auto_ptr<GridDensityProvider>) p23; + return (AutoPtr<GridDensityProvider>) p23; } else { - return (auto_ptr<GridDensityProvider>) avg; + return (AutoPtr<GridDensityProvider>) avg; } } -auto_ptr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) +AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(OccluderSource& source) { real proscenium[4]; GridDensityProvider::calculateOptimalProscenium(source, proscenium); - auto_ptr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); - auto_ptr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); + AutoPtr<AverageAreaGridDensityProvider> avg(new AverageAreaGridDensityProvider(source, proscenium, sizeFactor)); + AutoPtr<Pow23GridDensityProvider> p23(new Pow23GridDensityProvider(source, proscenium, numFaces)); if (avg->cellSize() > p23->cellSize()) { - return (auto_ptr<GridDensityProvider>) p23; + return (AutoPtr<GridDensityProvider>) p23; } else { - return (auto_ptr<GridDensityProvider>) avg; + return (AutoPtr<GridDensityProvider>) avg; } } |