From 61adb1b6491db3d3552d09a1c69ba5a37beb38d5 Mon Sep 17 00:00:00 2001 From: reed Date: Mon, 9 Feb 2015 13:01:05 -0800 Subject: more gms for conics BUG=skia: TBR= Review URL: https://codereview.chromium.org/869843006 --- samplecode/SampleArc.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'samplecode/SampleArc.cpp') diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index bc20e92cc3..710901bddf 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -122,8 +122,7 @@ protected: canvas->drawLine(r.centerX(), r.fTop, r.centerX(), r.fBottom, p); } - static void DrawLabel(SkCanvas* canvas, const SkRect& rect, - int start, int sweep) { + static void DrawLabel(SkCanvas* canvas, const SkRect& rect, SkScalar start, SkScalar sweep) { SkPaint paint; paint.setAntiAlias(true); @@ -131,9 +130,9 @@ protected: SkString str; - str.appendS32(start); + str.appendScalar(start); str.append(", "); - str.appendS32(sweep); + str.appendScalar(sweep); canvas->drawText(str.c_str(), str.size(), rect.centerX(), rect.fBottom + paint.getTextSize() * 5/4, paint); } @@ -141,8 +140,8 @@ protected: static void DrawArcs(SkCanvas* canvas) { SkPaint paint; SkRect r; - SkScalar w = SkIntToScalar(75); - SkScalar h = SkIntToScalar(50); + SkScalar w = 75; + SkScalar h = 50; r.set(0, 0, w, h); paint.setAntiAlias(true); @@ -153,7 +152,7 @@ protected: paint.setStrokeWidth(SkIntToScalar(1)); - static const int gAngles[] = { + static const SkScalar gAngles[] = { 0, 360, 0, 45, 0, -45, @@ -170,8 +169,7 @@ protected: DrawRectWithLines(canvas, r, paint); paint.setColor(SK_ColorRED); - canvas->drawArc(r, SkIntToScalar(gAngles[i]), - SkIntToScalar(gAngles[i+1]), false, paint); + canvas->drawArc(r, gAngles[i], gAngles[i+1], false, paint); DrawLabel(canvas, r, gAngles[i], gAngles[i+1]); -- cgit v1.2.3