diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-22 03:04:22 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-22 03:04:22 (GMT) |
| commit | ef9d8a853be1a6d6ca48239fcc79106ba374ee21 (patch) | |
| tree | 041fe3424e663a40986208e6829df5e955838e33 /src/dxftess-cgal.cc | |
| parent | 470588b296aea880c84071ee53a23f055f9c5bf0 (diff) | |
| parent | 71ab237aada8db602045063f0f1c6082ef06972a (diff) | |
Merge branch 'master' into issue304
Diffstat (limited to 'src/dxftess-cgal.cc')
| -rw-r--r-- | src/dxftess-cgal.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dxftess-cgal.cc b/src/dxftess-cgal.cc index 0197473..16eaf9f 100644 --- a/src/dxftess-cgal.cc +++ b/src/dxftess-cgal.cc @@ -101,7 +101,7 @@ void mark_inner_outer(std::vector<struct triangle> &tri, Grid2d<point_info_t> &p } } -void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_triangle_splitting */, double h) +void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, Vector2d scale, bool up, bool /* do_triangle_splitting */, double h) { CDT cdt; @@ -314,8 +314,8 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_tr int idx = up ? j : (2-j); double px = tri[i].p[idx].x; double py = tri[i].p[idx].y; - ps->append_vertex(px * cos(rot*M_PI/180) + py * sin(rot*M_PI/180), - px * -sin(rot*M_PI/180) + py * cos(rot*M_PI/180), h); + ps->append_vertex(scale[0] * (px * cos(rot*M_PI/180) + py * sin(rot*M_PI/180)), + scale[1] * (px * -sin(rot*M_PI/180) + py * cos(rot*M_PI/180)), h); path[j] = point_info.data(px, py).pathidx; point[j] = point_info.data(px, py).pointidx; } |