diff options
author | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-06-03 02:35:01 +0000 |
---|---|---|
committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2009-06-03 02:35:01 +0000 |
commit | 6b82d1adc6a4726e36674e468ff1157e0b75373f (patch) | |
tree | b54346ec55abc1e2ed1986883ea5e6931287a6ba /samplecode | |
parent | 4a7fd2bd275446ecad0e70aff2b9fd31d2bc8e95 (diff) |
add isConvex() hit to SkPath, to be used to speed up fills and opengl
set linewidth in gldevice for hair rects
remove some cruft from samples
add more gl-unimpl messages
git-svn-id: http://skia.googlecode.com/svn/trunk@199 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleAll.cpp | 24 | ||||
-rw-r--r-- | samplecode/SamplePatch.cpp | 36 | ||||
-rw-r--r-- | samplecode/SampleText.cpp | 2 |
3 files changed, 21 insertions, 41 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index 8719e67892..03940566c0 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -30,8 +30,6 @@ #include "SkXfermode.h" #include <math.h> - -extern void Dump(); static inline SkPMColor rgb2gray(SkPMColor c) { @@ -427,7 +425,6 @@ protected: break; } while (true); } - Dump(); } void drawPicture(SkCanvas* canvas, int spriteOffset) @@ -710,7 +707,6 @@ SkCornerPathEffect.h:28:class SkCornerPathEffect : public SkPathEffect { void drawOneRaster(SkCanvas* canvas) { canvas->save(); -// canvas->scale(SK_Scalar1*2, SK_Scalar1*2, 0, 0); SkScalar x = SkIntToScalar(20); SkScalar y = SkIntToScalar(40); @@ -742,31 +738,13 @@ SkCornerPathEffect.h:28:class SkCornerPathEffect : public SkPathEffect { paint.setStyle(SkPaint::kStroke_Style); canvas->drawOval(oval, paint); paint.setStyle(SkPaint::kFill_Style); - if (0) - { - SkPath path; - paint.getTextPath(str.c_str(), str.size(), x + SkIntToScalar(260), y, &path); - canvas->drawPath(path, paint); - } y += paint.getFontSpacing(); } canvas->restore(); - if (0) - { - SkPoint pts[] = { 0, 0, 0, SkIntToScalar(150) }; - SkColor colors[] = { 0xFFE6E6E6, 0xFFFFFFFF }; - SkShader* s = SkGradientShader::CreateLinear(pts, colors, NULL, 2, SkShader::kClamp_TileMode); - - paint.reset(); - paint.setShader(s)->unref(); - canvas->drawRectCoords(0, 0, SkIntToScalar(120), SkIntToScalar(150), paint); - } - - if (1) - { + if (1) { SkAvoidXfermode mode(SK_ColorWHITE, 0xFF, SkAvoidXfermode::kTargetColor_Mode); SkPaint paint; diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp index 919c251a10..02b6f92733 100644 --- a/samplecode/SamplePatch.cpp +++ b/samplecode/SamplePatch.cpp @@ -214,11 +214,11 @@ static void drawpatches(SkCanvas* canvas, const SkPaint& paint, int nu, int nv, SkAutoCanvasRestore ar(canvas, true); patch->draw(canvas, paint, 10, 10, false, false); - canvas->translate(SkIntToScalar(300), 0); + canvas->translate(SkIntToScalar(180), 0); patch->draw(canvas, paint, 10, 10, true, false); - canvas->translate(SkIntToScalar(300), 0); + canvas->translate(SkIntToScalar(180), 0); patch->draw(canvas, paint, 10, 10, false, true); - canvas->translate(SkIntToScalar(300), 0); + canvas->translate(SkIntToScalar(180), 0); patch->draw(canvas, paint, 10, 10, true, true); } @@ -237,20 +237,20 @@ public: } fShader1 = make_shader1(fSize1); - const SkScalar S = SkIntToScalar(90); - const SkScalar T = SkIntToScalar(64); - fPts[0].set(S*1, T); - fPts[1].set(S*2, T); - fPts[2].set(S*3, T); - fPts[3].set(S*4, T); - fPts[4].set(S*4, T*2); - fPts[5].set(S*4, T*3); - fPts[6].set(S*4, T*4); - fPts[7].set(S*3, T*4); - fPts[8].set(S*2, T*4); - fPts[9].set(S*1, T*4); - fPts[10].set(S*1, T*3); - fPts[11].set(S*1, T*2); + const SkScalar S = SkIntToScalar(50); + const SkScalar T = SkIntToScalar(40); + fPts[0].set(S*0, T); + fPts[1].set(S*1, T); + fPts[2].set(S*2, T); + fPts[3].set(S*3, T); + fPts[4].set(S*3, T*2); + fPts[5].set(S*3, T*3); + fPts[6].set(S*3, T*4); + fPts[7].set(S*2, T*4); + fPts[8].set(S*1, T*4); + fPts[9].set(S*0, T*4); + fPts[10].set(S*0, T*3); + fPts[11].set(S*0, T*2); } virtual ~PatchView() { @@ -352,6 +352,8 @@ protected: return; } + canvas->translate(SkIntToScalar(20), 0); + Patch patch; paint.setShader(fShader0); diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 7b8bcf0314..6deb5d0cb8 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -436,7 +436,7 @@ public: test_breakText(); test_typefaceCache(); - test_poly(); +// test_poly(); } virtual ~TextSpeedView() |