Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/geometry/FastGrid.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/geometry/FastGrid.cpp')
-rw-r--r--source/blender/freestyle/intern/geometry/FastGrid.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp
index dec22e67acb..e0d36bece6e 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp
@@ -30,52 +30,52 @@ namespace Freestyle {
void FastGrid::clear()
{
- if (!_cells)
- return;
+ if (!_cells)
+ return;
- for (unsigned int i = 0; i < _cells_size; i++) {
- if (_cells[i])
- delete _cells[i];
- }
- delete[] _cells;
- _cells = NULL;
- _cells_size = 0;
+ for (unsigned int i = 0; i < _cells_size; i++) {
+ if (_cells[i])
+ delete _cells[i];
+ }
+ delete[] _cells;
+ _cells = NULL;
+ _cells_size = 0;
- Grid::clear();
+ Grid::clear();
}
-void FastGrid::configure(const Vec3r& orig, const Vec3r& size, unsigned nb)
+void FastGrid::configure(const Vec3r &orig, const Vec3r &size, unsigned nb)
{
- Grid::configure(orig, size, nb);
- _cells_size = _cells_nb[0] * _cells_nb[1] * _cells_nb[2];
- _cells = new Cell *[_cells_size];
- memset(_cells, 0, _cells_size * sizeof(*_cells));
+ Grid::configure(orig, size, nb);
+ _cells_size = _cells_nb[0] * _cells_nb[1] * _cells_nb[2];
+ _cells = new Cell *[_cells_size];
+ memset(_cells, 0, _cells_size * sizeof(*_cells));
}
-Cell *FastGrid::getCell(const Vec3u& p)
+Cell *FastGrid::getCell(const Vec3u &p)
{
#if 0
- if (G.debug & G_DEBUG_FREESTYLE) {
- cout << _cells << " " << p << " " << _cells_nb[0] << "-" << _cells_nb[1] << "-" << _cells_nb[2]
- << " " << _cells_size << endl;
- }
+ if (G.debug & G_DEBUG_FREESTYLE) {
+ cout << _cells << " " << p << " " << _cells_nb[0] << "-" << _cells_nb[1] << "-" << _cells_nb[2]
+ << " " << _cells_size << endl;
+ }
#endif
- BLI_assert(_cells || ("_cells is a null pointer"));
- BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
- BLI_assert(p[0] < _cells_nb[0]);
- BLI_assert(p[1] < _cells_nb[1]);
- BLI_assert(p[2] < _cells_nb[2]);
- return _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]];
+ BLI_assert(_cells || ("_cells is a null pointer"));
+ BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
+ BLI_assert(p[0] < _cells_nb[0]);
+ BLI_assert(p[1] < _cells_nb[1]);
+ BLI_assert(p[2] < _cells_nb[2]);
+ return _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]];
}
-void FastGrid::fillCell(const Vec3u& p, Cell& cell)
+void FastGrid::fillCell(const Vec3u &p, Cell &cell)
{
- BLI_assert(_cells || ("_cells is a null pointer"));
- BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
- BLI_assert(p[0] < _cells_nb[0]);
- BLI_assert(p[1] < _cells_nb[1]);
- BLI_assert(p[2] < _cells_nb[2]);
- _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]] = &cell;
+ BLI_assert(_cells || ("_cells is a null pointer"));
+ BLI_assert((_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]) < _cells_size);
+ BLI_assert(p[0] < _cells_nb[0]);
+ BLI_assert(p[1] < _cells_nb[1]);
+ BLI_assert(p[2] < _cells_nb[2]);
+ _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]] = &cell;
}
} /* namespace Freestyle */