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
5.1 KiB
C++
154 lines
5.1 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 "SkGradientShader.h"
|
|
#include "SkGraphics.h"
|
|
#include "SkImageDecoder.h"
|
|
#include "SkPath.h"
|
|
#include "SkRegion.h"
|
|
#include "SkShader.h"
|
|
#include "SkUtils.h"
|
|
#include "SkXfermode.h"
|
|
#include "SkColorPriv.h"
|
|
#include "SkColorFilter.h"
|
|
#include "SkParsePath.h"
|
|
#include "SkTime.h"
|
|
#include "SkTypeface.h"
|
|
|
|
#include "SkGeometry.h"
|
|
|
|
class ConcavePathView : public SampleView {
|
|
public:
|
|
ConcavePathView() {}
|
|
|
|
protected:
|
|
// overrides from SkEventSink
|
|
virtual bool onQuery(SkEvent* evt) {
|
|
if (SampleCode::TitleQ(*evt)) {
|
|
SampleCode::TitleR(evt, "ConcavePaths");
|
|
return true;
|
|
}
|
|
return this->INHERITED::onQuery(evt);
|
|
}
|
|
|
|
virtual void onDrawContent(SkCanvas* canvas) {
|
|
SkPaint paint;
|
|
|
|
paint.setAntiAlias(true);
|
|
paint.setStyle(SkPaint::kFill_Style);
|
|
|
|
// Concave test
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->translate(0, 0);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(30), SkIntToScalar(30));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
canvas->drawPath(path, paint);
|
|
}
|
|
// Reverse concave test
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(100, 0);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(30), SkIntToScalar(30));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
// Bowtie (intersection)
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(200, 0);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
// "fake" bowtie (concave, but no intersection)
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(300, 0);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(50), SkIntToScalar(40));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(50), SkIntToScalar(60));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
// Fish test (intersection/concave)
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(0, 100);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(70), SkIntToScalar(50));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(0), SkIntToScalar(50));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
// Collinear test
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(100, 100);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(50), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(50), SkIntToScalar(80));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
// Hole test
|
|
if (1) {
|
|
SkPath path;
|
|
canvas->save();
|
|
canvas->translate(200, 100);
|
|
path.moveTo(SkIntToScalar(20), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(20));
|
|
path.lineTo(SkIntToScalar(80), SkIntToScalar(80));
|
|
path.lineTo(SkIntToScalar(20), SkIntToScalar(80));
|
|
path.moveTo(SkIntToScalar(30), SkIntToScalar(30));
|
|
path.lineTo(SkIntToScalar(30), SkIntToScalar(70));
|
|
path.lineTo(SkIntToScalar(70), SkIntToScalar(70));
|
|
path.lineTo(SkIntToScalar(70), SkIntToScalar(30));
|
|
canvas->drawPath(path, paint);
|
|
canvas->restore();
|
|
}
|
|
}
|
|
|
|
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
|
|
this->inval(NULL);
|
|
return this->INHERITED::onFindClickHandler(x, y);
|
|
}
|
|
|
|
private:
|
|
typedef SampleView INHERITED;
|
|
};
|
|
|
|
//////////////////////////////////////////////////////////////////////////////
|
|
|
|
static SkView* MyFactory() { return new ConcavePathView; }
|
|
static SkViewRegister reg(MyFactory);
|
|
|