diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-11 10:56:51 +0400 |
commit | 2d801f2bec3c4de663f33b0f0f198a12f09ef989 (patch) | |
tree | dfe16a3ca2213bd5b6579ed3bc2ac2902b678067 /source/blender/freestyle/intern/winged_edge/Curvature.cpp | |
parent | 4a92d82626980d6d1690113b9d27aae282fd48eb (diff) |
Another big code clean-up patch from Bastien Montagne, thanks again!
Diffstat (limited to 'source/blender/freestyle/intern/winged_edge/Curvature.cpp')
-rw-r--r-- | source/blender/freestyle/intern/winged_edge/Curvature.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp index 64b897c5596..5cf45a2a934 100644 --- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp +++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp @@ -64,8 +64,8 @@ static bool angle_obtuse(WVertex *v, WFace *f) WOEdge *e; f->getOppositeEdge(v, e); - Vec3r vec1(e->GetaVertex()->GetVertex()-v->GetVertex()); - Vec3r vec2(e->GetbVertex()->GetVertex()-v->GetVertex()); + Vec3r vec1(e->GetaVertex()->GetVertex() - v->GetVertex()); + Vec3r vec2(e->GetbVertex()->GetVertex() - v->GetVertex()); return ((vec1 * vec2) < 0); } @@ -147,12 +147,12 @@ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh) WVertex::incoming_edge_iterator itE; - for (itE=v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) + for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) area += (*itE)->GetaFace()->getArea(); Kh = Vec3r(0.0, 0.0, 0.0); - for (itE=v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) { + for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) { WOEdge *e = (*itE)->getPrevOnFace(); #if 0 if ((e->GetaVertex() == v) || (e->GetbVertex() == v)) @@ -348,12 +348,12 @@ void gts_vertex_principal_directions(WVertex *v, Vec3r Kh, real Kg, Vec3r &e1, V aterm_da = bterm_da = cterm_da = const_da = 0.0; aterm_db = bterm_db = cterm_db = const_db = 0.0; - int nb_edges=v->GetEdges().size(); + int nb_edges = v->GetEdges().size(); - weights = (real *)malloc(sizeof (real) * nb_edges); - kappas = (real *)malloc(sizeof (real) * nb_edges); - d1s = (real *)malloc(sizeof (real) * nb_edges); - d2s = (real *)malloc(sizeof (real) * nb_edges); + weights = (real *)malloc(sizeof(real) * nb_edges); + kappas = (real *)malloc(sizeof(real) * nb_edges); + d1s = (real *)malloc(sizeof(real) * nb_edges); + d2s = (real *)malloc(sizeof(real) * nb_edges); edge_count = 0; for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) { |