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
98 lines
2.9 KiB
C++
98 lines
2.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 "SampleCode.h"
|
|
#include "SkView.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkCornerPathEffect.h"
|
|
#include "SkCullPoints.h"
|
|
#include "SkGradientShader.h"
|
|
#include "SkPath.h"
|
|
#include "SkRegion.h"
|
|
#include "SkShader.h"
|
|
#include "SkUtils.h"
|
|
|
|
class FillTypeView : public SampleView {
|
|
SkPath fPath;
|
|
public:
|
|
FillTypeView() {
|
|
const SkScalar radius = SkIntToScalar(45);
|
|
fPath.addCircle(SkIntToScalar(50), SkIntToScalar(50), radius);
|
|
fPath.addCircle(SkIntToScalar(100), SkIntToScalar(100), radius);
|
|
|
|
this->setBGColor(0xFFDDDDDD);
|
|
}
|
|
|
|
protected:
|
|
// overrides from SkEventSink
|
|
virtual bool onQuery(SkEvent* evt) {
|
|
if (SampleCode::TitleQ(*evt)) {
|
|
SampleCode::TitleR(evt, "FillType");
|
|
return true;
|
|
}
|
|
return this->INHERITED::onQuery(evt);
|
|
}
|
|
|
|
void showPath(SkCanvas* canvas, int x, int y, SkPath::FillType ft,
|
|
SkScalar scale, const SkPaint& paint) {
|
|
|
|
const SkRect r = { 0, 0, SkIntToScalar(150), SkIntToScalar(150) };
|
|
|
|
canvas->save();
|
|
canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
|
|
canvas->clipRect(r);
|
|
canvas->drawColor(SK_ColorWHITE);
|
|
fPath.setFillType(ft);
|
|
canvas->translate(r.centerX(), r.centerY());
|
|
canvas->scale(scale, scale);
|
|
canvas->translate(-r.centerX(), -r.centerY());
|
|
canvas->drawPath(fPath, paint);
|
|
canvas->restore();
|
|
}
|
|
|
|
void showFour(SkCanvas* canvas, SkScalar scale, const SkPaint& paint) {
|
|
showPath(canvas, 0, 0, SkPath::kWinding_FillType,
|
|
scale, paint);
|
|
showPath(canvas, 200, 0, SkPath::kEvenOdd_FillType,
|
|
scale, paint);
|
|
showPath(canvas, 00, 200, SkPath::kInverseWinding_FillType,
|
|
scale, paint);
|
|
showPath(canvas, 200, 200, SkPath::kInverseEvenOdd_FillType,
|
|
scale, paint);
|
|
}
|
|
|
|
virtual void onDrawContent(SkCanvas* canvas) {
|
|
canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
|
|
|
|
SkPaint paint;
|
|
const SkScalar scale = SkIntToScalar(5)/4;
|
|
|
|
paint.setAntiAlias(false);
|
|
paint.setColor(0x8000FF00);
|
|
|
|
showFour(canvas, SK_Scalar1, paint);
|
|
canvas->translate(SkIntToScalar(450), 0);
|
|
showFour(canvas, scale, paint);
|
|
|
|
paint.setAntiAlias(true);
|
|
|
|
canvas->translate(SkIntToScalar(-450), SkIntToScalar(450));
|
|
showFour(canvas, SK_Scalar1, paint);
|
|
canvas->translate(SkIntToScalar(450), 0);
|
|
showFour(canvas, scale, paint);
|
|
}
|
|
|
|
private:
|
|
typedef SampleView INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static SkView* MyFactory() { return new FillTypeView; }
|
|
static SkViewRegister reg(MyFactory);
|
|
|