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

experimental/SkPerlinNoiseShader2/SkPerlinNoiseShader2.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDither.h"
 #include "SkPerlinNoiseShader2.h"
 #include "SkColorFilter.h"
@@ skipping 1058 matching lines @@
     GrGLSLProgramDataManager::UniformHandle fBaseFrequencyUni;
 
 private:
     typedef GrGLFragmentProcessor INHERITED;
 };
 
 /////////////////////////////////////////////////////////////////////
 
 class GrImprovedPerlinNoiseEffect : public GrFragmentProcessor {
 public:
-    static GrFragmentProcessor* Create(SkScalar octaves, SkScalar z, 
+    static GrFragmentProcessor* Create(int octaves, SkScalar z, 
                                        SkPerlinNoiseShader2::PaintingData* paintingData,
                                        GrTexture* permutationsTexture, GrTexture* gradientTexture,
                                        const SkMatrix& matrix) {
         return new GrImprovedPerlinNoiseEffect(octaves, z, paintingData, permutationsTexture,
                                                gradientTexture, matrix);
     }
 
     virtual ~GrImprovedPerlinNoiseEffect() { delete fPaintingData; }
 
     const char* name() const override { return "ImprovedPerlinNoise"; }
@@ skipping 195 matching lines @@
     noiseOctavesCode.append("p *= 2.0;");
     noiseOctavesCode.append("ratio *= 2.0;");
     noiseOctavesCode.append("}");
     noiseOctavesCode.append("return (result + 1.0) / 2.0;");
     fsBuilder->emitFunction(kFloat_GrSLType, "noiseOctaves", SK_ARRAY_COUNT(noiseOctavesArgs), 
                             noiseOctavesArgs, noiseOctavesCode.c_str(), &noiseOctavesFuncName);
 
     fsBuilder->codeAppendf("vec2 coords = %s * %s;", vCoords.c_str(), baseFrequencyUni);
     fsBuilder->codeAppendf("float r = %s(vec3(coords, %s), %s);", noiseOctavesFuncName.c_str(), 
                            zUni, octavesUni);
-    fsBuilder->codeAppendf("float g = %s(vec3(coords, %s + 1000.0), %s);", 
+    fsBuilder->codeAppendf("float g = %s(vec3(coords, %s + 0000.0), %s);", 
                            noiseOctavesFuncName.c_str(), zUni, octavesUni);
-    fsBuilder->codeAppendf("float b = %s(vec3(coords, %s + 2000.0), %s);", 
+    fsBuilder->codeAppendf("float b = %s(vec3(coords, %s + 0000.0), %s);", 
                            noiseOctavesFuncName.c_str(), zUni, octavesUni);
-    fsBuilder->codeAppendf("float a = %s(vec3(coords, %s + 3000.0), %s);", 
+    fsBuilder->codeAppendf("float a = %s(vec3(coords, %s + 0000.0), %s);", 
                            noiseOctavesFuncName.c_str(), zUni, octavesUni);
     fsBuilder->codeAppendf("%s = vec4(r, g, b, a);", args.fOutputColor);
 
     // Clamp values
     fsBuilder->codeAppendf("%s = clamp(%s, 0.0, 1.0);", args.fOutputColor, args.fOutputColor);
 
     // Pre-multiply the result
     fsBuilder->codeAppendf("\n\t\t%s = vec4(%s.rgb * %s.aaa, %s.a);\n",
                            args.fOutputColor, args.fOutputColor,
                            args.fOutputColor, args.fOutputColor);
 }
 
 void GrGLImprovedPerlinNoise::GenKey(const GrProcessor& processor, const GrGLSLCaps&,
                                      GrProcessorKeyBuilder* b) {
 }
 
 void GrGLImprovedPerlinNoise::onSetData(const GrGLSLProgramDataManager& pdman,
                                 const GrProcessor& processor) {
     INHERITED::onSetData(pdman, processor);
 
     const GrImprovedPerlinNoiseEffect& noise = processor.cast<GrImprovedPerlinNoiseEffect>();
 
     const SkVector& baseFrequency = noise.baseFrequency();
     pdman.set2f(fBaseFrequencyUni, baseFrequency.fX, baseFrequency.fY);
 
-    pdman.set1f(fOctavesUni, noise.octaves());
+    pdman.set1f(fOctavesUni, SkIntToScalar(noise.octaves()));
 
     pdman.set1f(fZUni, noise.z());
 }
 
 /////////////////////////////////////////////////////////////////////
 const GrFragmentProcessor* SkPerlinNoiseShader2::asFragmentProcessor(
                                                     GrContext* context,
                                                     const SkMatrix& viewM,
                                                     const SkMatrix* externalLocalMatrix,
                                                     SkFilterQuality) const {
@@ skipping 90 matching lines @@
     str->append(" seed: ");
     str->appendScalar(fSeed);
     str->append(" stitch tiles: ");
     str->append(fStitchTiles ? "true " : "false ");
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif