move setshader to sk_sp

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 13 matching lines @@
     builder.add(SkLight(SkColor3f::Make(1.0f, 1.0f, blue), dir));
     builder.add(SkLight(SkColor3f::Make(0.1f, 0.1f, 0.1f)));
 
     return builder.finish();
 }
 
 ////////////////////////////////////////////////////////////////////////////
 
 class LightingView : public SampleView {
 public:
-    SkAutoTUnref<SkShader> fShader;
-    SkBitmap               fDiffuseBitmap;
-    SkBitmap               fNormalBitmap;
-    SkScalar               fLightAngle;
-    SkScalar               fColorFactor;
+    sk_sp<SkShader> fShader;
+    SkBitmap        fDiffuseBitmap;
+    SkBitmap        fNormalBitmap;
+    SkScalar        fLightAngle;
+    SkScalar        fColorFactor;
 
     LightingView() {
         SkString diffusePath = GetResourcePath("brickwork-texture.jpg");
         decode_file(diffusePath.c_str(), &fDiffuseBitmap);
         SkString normalPath = GetResourcePath("brickwork_normal-map.jpg");
         decode_file(normalPath.c_str(), &fNormalBitmap);
 
         fLightAngle = 0.0f;
         fColorFactor = 0.0f;
 
         SkAutoTUnref<const SkLightingShader::Lights> lights(create_lights(fLightAngle, 1.0f));
 
-        fShader.reset(SkLightingShader::Create(fDiffuseBitmap, fNormalBitmap,
-                                               lights, SkVector::Make(1.0f, 0.0f),
-                                               nullptr, nullptr));
+        fShader = SkLightingShader::Make(fDiffuseBitmap, fNormalBitmap,
+                                         lights, SkVector::Make(1.0f, 0.0f),
+                                         nullptr, nullptr);
     }
 
-    virtual ~LightingView() {}
-
 protected:
     // overrides from SkEventSink
     bool onQuery(SkEvent* evt) override {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "Lighting");
             return true;
         }
         return this->INHERITED::onQuery(evt);
     }
 
     void onDrawContent(SkCanvas* canvas) override {
         fLightAngle += 0.015f;
         fColorFactor += 0.01f;
         if (fColorFactor > 1.0f) {
             fColorFactor = 0.0f;
         }
 
         SkAutoTUnref<const SkLightingShader::Lights> lights(create_lights(fLightAngle,
                                                                           fColorFactor));
 
-        fShader.reset(SkLightingShader::Create(fDiffuseBitmap, fNormalBitmap,
-                                               lights, SkVector::Make(1.0f, 0.0f),
-                                               nullptr, nullptr));
+        fShader = SkLightingShader::Make(fDiffuseBitmap, fNormalBitmap,
+                                         lights, SkVector::Make(1.0f, 0.0f),
+                                         nullptr, nullptr);

[tomhudson, 2016/03/25 14:28:07]

We have to regenerate this every time the lights change angle and color? :(

But if it's never valid, is there a point to storing it in fShader? Or should we
just set it on the paint?

[reed1, 2016/03/25 15:04:31]

The lights are animating, so we have to regenerate each time. I have removed
fShader as a field.

 
         SkPaint paint;
         paint.setShader(fShader);
         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);