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-glu.cc | |
| parent | 470588b296aea880c84071ee53a23f055f9c5bf0 (diff) | |
| parent | 71ab237aada8db602045063f0f1c6082ef06972a (diff) | |
Merge branch 'master' into issue304
Diffstat (limited to 'src/dxftess-glu.cc')
| -rw-r--r-- | src/dxftess-glu.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dxftess-glu.cc b/src/dxftess-glu.cc index 3f87729..89999c3 100644 --- a/src/dxftess-glu.cc +++ b/src/dxftess-glu.cc @@ -201,7 +201,7 @@ inline void do_emplace( boost::unordered_multimap<int, pair_ii> &tri_by_atan2, i rot: CLOCKWISE rotation around positive Z axis */ -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) { GLUtesselator *tobj = gluNewTess(); @@ -244,8 +244,8 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool do_trian dxf.points[dxf.paths[i].indices[j]][1], h) = std::pair<int,int>(i, j); vl.push_back(tess_vdata()); - vl.back().v[0] = dxf.points[dxf.paths[i].indices[j]][0]; - vl.back().v[1] = dxf.points[dxf.paths[i].indices[j]][1]; + vl.back().v[0] = scale[0] * dxf.points[dxf.paths[i].indices[j]][0]; + vl.back().v[1] = scale[1] * dxf.points[dxf.paths[i].indices[j]][1]; vl.back().v[2] = h; gluTessVertex(tobj, vl.back().v, vl.back().v); } |