API change to allow for NormalSource selection at the user level.

samplecode/SampleLighting.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 "DecodeFile.h"
 #include "SampleCode.h"
 #include "Resources.h"
 
@@ skipping 46 matching lines @@
 
     void onDrawContent(SkCanvas* canvas) override {
         fLightAngle += 0.015f;
         fColorFactor += 0.01f;
         if (fColorFactor > 1.0f) {
             fColorFactor = 0.0f;
         }
 
         sk_sp<SkLights> lights(create_lights(fLightAngle, fColorFactor));
         SkPaint paint;
-        paint.setShader(SkLightingShader::Make(fDiffuseBitmap, fNormalBitmap,
-                                               std::move(lights), SkVector::Make(1.0f, 0.0f),
-                                               nullptr, nullptr));
+        auto normalSource = SkLightingShader::NormalMapSource::Make(fNormalBitmap,
+                                                                    SkVector::Make(1.0f, 0.0f),
+                                                                    nullptr);
+        paint.setShader(SkLightingShader::Make(fDiffuseBitmap, std::move(lights), nullptr,
+                                               normalSource));

[egdaniel, 2016/06/16 13:15:08]

move?

[dvonbeck, 2016/06/16 23:21:56]

Done.

         paint.setColor(SK_ColorBLACK);
 
         SkRect r = SkRect::MakeWH((SkScalar)fDiffuseBitmap.width(),
                                   (SkScalar)fDiffuseBitmap.height());
         canvas->drawRect(r, paint);
 
         // so we're constantly updating
         this->inval(nullptr);
     }
 
     SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
         this->inval(nullptr);
         return this->INHERITED::onFindClickHandler(x, y, modi);
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new LightingView; }
 static SkViewRegister reg(MyFactory);