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/stroke/StrokeTesselator.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/stroke/StrokeTesselator.cpp')
-rw-r--r--source/blender/freestyle/intern/stroke/StrokeTesselator.cpp76
1 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index bebab7f1bf3..e135f83cfef 100644
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -30,56 +30,56 @@ namespace Freestyle {
LineRep *StrokeTesselator::Tesselate(Stroke *iStroke)
{
- if (0 == iStroke)
- return 0;
+ if (0 == iStroke)
+ return 0;
- LineRep *line;
- line = new OrientedLineRep();
+ LineRep *line;
+ line = new OrientedLineRep();
- Stroke::vertex_iterator v, vend;
- if (2 == iStroke->vertices_size()) {
- line->setStyle(LineRep::LINES);
- v = iStroke->vertices_begin();
- StrokeVertex *svA = (*v);
- v++;
- StrokeVertex *svB = (*v);
- Vec3r A((*svA)[0], (*svA)[1], 0);
- Vec3r B((*svB)[0], (*svB)[1], 0);
- line->AddVertex(A);
- line->AddVertex(B);
- }
- else {
- if (_overloadFrsMaterial)
- line->setFrsMaterial(_FrsMaterial);
+ Stroke::vertex_iterator v, vend;
+ if (2 == iStroke->vertices_size()) {
+ line->setStyle(LineRep::LINES);
+ v = iStroke->vertices_begin();
+ StrokeVertex *svA = (*v);
+ v++;
+ StrokeVertex *svB = (*v);
+ Vec3r A((*svA)[0], (*svA)[1], 0);
+ Vec3r B((*svB)[0], (*svB)[1], 0);
+ line->AddVertex(A);
+ line->AddVertex(B);
+ }
+ else {
+ if (_overloadFrsMaterial)
+ line->setFrsMaterial(_FrsMaterial);
- line->setStyle(LineRep::LINE_STRIP);
+ line->setStyle(LineRep::LINE_STRIP);
- for (v = iStroke->vertices_begin(), vend = iStroke->vertices_end(); v != vend; v++) {
- StrokeVertex *sv = (*v);
- Vec3r V((*sv)[0], (*sv)[1], 0);
- line->AddVertex(V);
- }
- }
- line->setId(iStroke->getId());
- line->ComputeBBox();
+ for (v = iStroke->vertices_begin(), vend = iStroke->vertices_end(); v != vend; v++) {
+ StrokeVertex *sv = (*v);
+ Vec3r V((*sv)[0], (*sv)[1], 0);
+ line->AddVertex(V);
+ }
+ }
+ line->setId(iStroke->getId());
+ line->ComputeBBox();
- return line;
+ return line;
}
template<class StrokeVertexIterator>
NodeGroup *StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexIterator end)
{
- NodeGroup *group = new NodeGroup;
- NodeShape *tshape = new NodeShape;
- group->AddChild(tshape);
- //tshape->material().setDiffuse(0.0f, 0.0f, 0.0f, 1.0f);
- tshape->setFrsMaterial(_FrsMaterial);
+ NodeGroup *group = new NodeGroup;
+ NodeShape *tshape = new NodeShape;
+ group->AddChild(tshape);
+ //tshape->material().setDiffuse(0.0f, 0.0f, 0.0f, 1.0f);
+ tshape->setFrsMaterial(_FrsMaterial);
- for (StrokeVertexIterator c = begin, cend = end; c != cend; c++) {
- tshape->AddRep(Tesselate((*c)));
- }
+ for (StrokeVertexIterator c = begin, cend = end; c != cend; c++) {
+ tshape->AddRep(Tesselate((*c)));
+ }
- return group;
+ return group;
}
} /* namespace Freestyle */