Update sample to use new perlin noise shader, and make cloud like

samplecode/PerlinPatch.cpp

 /*
  * Copyright 2015 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 "SkAnimTimer.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPatchUtils.h"
-#include "SkPerlinNoiseShader.h"
+#include "SkPerlinNoiseShader2/SkPerlinNoiseShader2.h"
 #include "SkComposeShader.h"
 
 static void draw_control_points(SkCanvas* canvas, const SkPoint cubics[12]) {
     //draw control points
     SkPaint paint;
     SkPoint bottom[SkPatchUtils::kNumPtsCubic];
     SkPatchUtils::getBottomCubic(cubics, bottom);
     SkPoint top[SkPatchUtils::kNumPtsCubic];
     SkPatchUtils::getTopCubic(cubics, top);
     SkPoint left[SkPatchUtils::kNumPtsCubic];
@@ skipping 63 matching lines @@
         //bottom points
         fPts[6].set(300, 300);
         fPts[7].set(250, 250);
         //left points
         fPts[8].set(150, 350);
         fPts[9].set(100, 300);
         fPts[10].set(50, 250);
         fPts[11].set(150, 150);
 
         const SkColor colors[SkPatchUtils::kNumCorners] = {
-            SK_ColorBLUE, SK_ColorYELLOW
+            0xFF5555FF, 0xFF8888FF, 0xFFCCCCFF
         };
-
-        fShader0 = SkGradientShader::CreateRadial(SkPoint::Make(128.0f, 128.0f),
-                                                  180.0f,
+        const SkPoint points[2] = { SkPoint::Make(0.0f, 0.0f),
+                                    SkPoint::Make(100.0f, 100.0f) };
+        fShader0 = SkGradientShader::CreateLinear(points,
                                                   colors,
                                                   NULL,
-                                                  2,
+                                                  3,
                                                   SkShader::kMirror_TileMode,
                                                   0,
                                                   NULL);
-        fShader1 = SkPerlinNoiseShader::CreateTurbulence(fXFreq, fYFreq, 2, fSeed, NULL);
-        fShaderCompose = new SkComposeShader(fShader0, fShader1);
     }
 
     virtual ~PerlinPatchView() {
         SkSafeUnref(fShader0);
-        SkSafeUnref(fShader1);
-        SkSafeUnref(fShaderCompose);
     }
 protected:
     // overrides from SkEventSink
     bool onQuery(SkEvent* evt)  override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "PerlinPatch");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     bool onAnimate(const SkAnimTimer& timer) override {
+        fSeed += 0.005f;
         return true;
     }
 
 
     void onDrawContent(SkCanvas* canvas) override {
         if (!canvas->getTotalMatrix().invert(&fInvMatrix)) {
             return;
         }
 
         SkPaint paint;
         
         SkScalar texWidth = fTexScale * TexWidth;
         SkScalar texHeight = fTexScale * TexHeight;
         const SkPoint texCoords[SkPatchUtils::kNumCorners] = {
             { fTexX - texWidth, fTexY - texHeight},
             { fTexX + texWidth, fTexY - texHeight},
             { fTexX + texWidth, fTexY + texHeight},
             { fTexX - texWidth, fTexY + texHeight}}
         ;
         
         SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(SkXfermode::kSrc_Mode));
 
+        SkScalar scaleFreq = 2.0;
+        fShader1 = SkPerlinNoiseShader2::CreateImprovedNoise(fXFreq/scaleFreq, fYFreq/scaleFreq, 4,
+                                                             fSeed);
+        fShaderCompose = new SkComposeShader(fShader0, fShader1);
+
         paint.setShader(fShaderCompose);
         canvas->drawPatch(fPts, nullptr, texCoords, xfer, paint);
 
         draw_control_points(canvas, fPts);
+        SkSafeUnref(fShader1);
+        SkSafeUnref(fShaderCompose);
     }
 
     class PtClick : public Click {
     public:
         int fIndex;
         PtClick(SkView* 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);
@@ skipping 35 matching lines @@
         this->inval(nullptr);
         return true;
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 DEF_SAMPLE( return new PerlinPatchView(); )