Move Views into Sample and Viewer.
What is left of the SkView system is used only by samples or viewer.
As a result, move it out of the Skia source tree and re-organize so it
is a bit easier to understand and use more shared code.
Move samplecode/ClockFaceView.cpp to samplecode/SampleTextEffects.cpp,
sice that's what's actually in it.
Move SkAnimTimer.h to tools/timer, since it's actually shared between gm
and samples.
Change-Id: I55dafd94c64e4f930ddbd19168e0f812af86c455
Reviewed-on: https://skia-review.googlesource.com/146161
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
diff --git a/samplecode/PerlinPatch.cpp b/samplecode/PerlinPatch.cpp
index 9faf5ca..c962e19 100644
--- a/samplecode/PerlinPatch.cpp
+++ b/samplecode/PerlinPatch.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SampleCode.h"
+#include "Sample.h"
#include "SkAnimTimer.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
@@ -59,7 +59,7 @@
const SkScalar TexWidth = 100.0f;
const SkScalar TexHeight = 100.0f;
-class PerlinPatchView : public SampleView {
+class PerlinPatchView : public Sample {
sk_sp<SkShader> fShader0;
sk_sp<SkShader> fShader1;
sk_sp<SkShader> fShaderCompose;
@@ -110,14 +110,13 @@
}
protected:
- // overrides from SkEventSink
- bool onQuery(SkEvent* evt) override {
- if (SampleCode::TitleQ(*evt)) {
- SampleCode::TitleR(evt, "PerlinPatch");
+ bool onQuery(Sample::Event* evt) override {
+ if (Sample::TitleQ(*evt)) {
+ Sample::TitleR(evt, "PerlinPatch");
return true;
}
SkUnichar uni;
- if (SampleCode::CharQ(*evt, &uni)) {
+ if (Sample::CharQ(*evt, &uni)) {
switch (uni) {
case 'g': fShowGrid = !fShowGrid; return true;
default: break;
@@ -167,14 +166,14 @@
class PtClick : public Click {
public:
int fIndex;
- PtClick(SkView* view, int index) : Click(view), fIndex(index) {}
+ PtClick(Sample* view, int index) : Click(view), fIndex(index) {}
};
static bool hittest(const SkPoint& pt, SkScalar x, SkScalar y) {
return SkPoint::Length(pt.fX - x, pt.fY - y) < SkIntToScalar(5);
}
- SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
+ Sample::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
// holding down shift
if (1 == modi) {
return new PtClick(this, -1);
@@ -211,7 +210,7 @@
}
private:
- typedef SampleView INHERITED;
+ typedef Sample INHERITED;
};
DEF_SAMPLE( return new PerlinPatchView(); )