ec3ed6a5eb
I have manually examined all of these diffs and restored a few files that seem to require manual adjustment. The following files still need to be modified manually, in a separate CL: android_sample/SampleApp/AndroidManifest.xml android_sample/SampleApp/res/layout/layout.xml android_sample/SampleApp/res/menu/sample.xml android_sample/SampleApp/res/values/strings.xml android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java experimental/CiCarbonSampleMain.c experimental/CocoaDebugger/main.m experimental/FileReaderApp/main.m experimental/SimpleCocoaApp/main.m experimental/iOSSampleApp/Shared/SkAlertPrompt.h experimental/iOSSampleApp/Shared/SkAlertPrompt.m experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig gpu/src/android/GrGLDefaultInterface_android.cpp gyp/common.gypi gyp_skia include/ports/SkHarfBuzzFont.h include/views/SkOSWindow_wxwidgets.h make.bat make.py src/opts/memset.arm.S src/opts/memset16_neon.S src/opts/memset32_neon.S src/opts/opts_check_arm.cpp src/ports/SkDebug_brew.cpp src/ports/SkMemory_brew.cpp src/ports/SkOSFile_brew.cpp src/ports/SkXMLParser_empty.cpp src/utils/ios/SkImageDecoder_iOS.mm src/utils/ios/SkOSFile_iOS.mm src/utils/ios/SkStream_NSData.mm tests/FillPathTest.cpp Review URL: http://codereview.appspot.com/4816058 git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
154 lines
3.9 KiB
C++
154 lines
3.9 KiB
C++
|
|
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "gm.h"
|
|
#include "SkPicture.h"
|
|
#include "SkRectShape.h"
|
|
#include "SkGroupShape.h"
|
|
|
|
typedef SkScalar (*MakePathProc)(SkPath*);
|
|
|
|
static SkScalar make_frame(SkPath* path) {
|
|
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
|
|
SkIntToScalar(630), SkIntToScalar(470) };
|
|
path->addRoundRect(r, SkIntToScalar(15), SkIntToScalar(15));
|
|
|
|
SkPaint paint;
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
paint.setStrokeWidth(SkIntToScalar(5));
|
|
paint.getFillPath(*path, path);
|
|
return SkIntToScalar(15);
|
|
}
|
|
|
|
static SkScalar make_triangle(SkPath* path) {
|
|
static const int gCoord[] = {
|
|
10, 20, 15, 5, 30, 30
|
|
};
|
|
path->moveTo(SkIntToScalar(gCoord[0]), SkIntToScalar(gCoord[1]));
|
|
path->lineTo(SkIntToScalar(gCoord[2]), SkIntToScalar(gCoord[3]));
|
|
path->lineTo(SkIntToScalar(gCoord[4]), SkIntToScalar(gCoord[5]));
|
|
path->close();
|
|
path->offset(SkIntToScalar(10), SkIntToScalar(0));
|
|
return SkIntToScalar(30);
|
|
}
|
|
|
|
static SkScalar make_rect(SkPath* path) {
|
|
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
|
|
SkIntToScalar(30), SkIntToScalar(30) };
|
|
path->addRect(r);
|
|
path->offset(SkIntToScalar(10), SkIntToScalar(0));
|
|
return SkIntToScalar(30);
|
|
}
|
|
|
|
static SkScalar make_oval(SkPath* path) {
|
|
SkRect r = { SkIntToScalar(10), SkIntToScalar(10),
|
|
SkIntToScalar(30), SkIntToScalar(30) };
|
|
path->addOval(r);
|
|
path->offset(SkIntToScalar(10), SkIntToScalar(0));
|
|
return SkIntToScalar(30);
|
|
}
|
|
|
|
static SkScalar make_sawtooth(SkPath* path) {
|
|
SkScalar x = SkIntToScalar(20);
|
|
SkScalar y = SkIntToScalar(20);
|
|
const SkScalar x0 = x;
|
|
const SkScalar dx = SK_Scalar1 * 5;
|
|
const SkScalar dy = SK_Scalar1 * 10;
|
|
|
|
path->moveTo(x, y);
|
|
for (int i = 0; i < 32; i++) {
|
|
x += dx;
|
|
path->lineTo(x, y - dy);
|
|
x += dx;
|
|
path->lineTo(x, y + dy);
|
|
}
|
|
path->lineTo(x, y + (2 * dy));
|
|
path->lineTo(x0, y + (2 * dy));
|
|
path->close();
|
|
return SkIntToScalar(30);
|
|
}
|
|
|
|
static SkScalar make_star(SkPath* path, int n) {
|
|
const SkScalar c = SkIntToScalar(45);
|
|
const SkScalar r = SkIntToScalar(20);
|
|
|
|
SkScalar rad = -SK_ScalarPI / 2;
|
|
const SkScalar drad = (n >> 1) * SK_ScalarPI * 2 / n;
|
|
|
|
path->moveTo(c, c - r);
|
|
for (int i = 1; i < n; i++) {
|
|
rad += drad;
|
|
SkScalar cosV, sinV = SkScalarSinCos(rad, &cosV);
|
|
path->lineTo(c + SkScalarMul(cosV, r), c + SkScalarMul(sinV, r));
|
|
}
|
|
path->close();
|
|
return r * 2 * 6 / 5;
|
|
}
|
|
|
|
static SkScalar make_star_5(SkPath* path) { return make_star(path, 5); }
|
|
static SkScalar make_star_13(SkPath* path) { return make_star(path, 13); }
|
|
|
|
static const MakePathProc gProcs[] = {
|
|
make_frame,
|
|
make_triangle,
|
|
make_rect,
|
|
make_oval,
|
|
make_sawtooth,
|
|
make_star_5,
|
|
make_star_13
|
|
};
|
|
|
|
#define N SK_ARRAY_COUNT(gProcs)
|
|
|
|
namespace skiagm {
|
|
|
|
class PathFillGM : public GM {
|
|
SkPath fPath[N];
|
|
SkScalar fDY[N];
|
|
public:
|
|
PathFillGM() {
|
|
for (size_t i = 0; i < N; i++) {
|
|
fDY[i] = gProcs[i](&fPath[i]);
|
|
}
|
|
}
|
|
|
|
protected:
|
|
virtual SkString onShortName() {
|
|
return SkString("pathfill");
|
|
}
|
|
|
|
virtual SkISize onISize() {
|
|
return make_isize(640, 480);
|
|
}
|
|
|
|
void drawBG(SkCanvas* canvas) {
|
|
canvas->drawColor(SK_ColorWHITE);
|
|
}
|
|
|
|
virtual void onDraw(SkCanvas* canvas) {
|
|
this->drawBG(canvas);
|
|
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
|
|
for (size_t i = 0; i < N; i++) {
|
|
canvas->drawPath(fPath[i], paint);
|
|
canvas->translate(SkIntToScalar(0), fDY[i]);
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
static GM* MyFactory(void*) { return new PathFillGM; }
|
|
static GMRegistry reg(MyFactory);
|
|
|
|
}
|