Update SkLightingShader to take a localMatrix

src/effects/SkLightingShader.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 "SkBitmapProcState.h"
 #include "SkColor.h"
@@ skipping 33 matching lines @@
 
     /** Create a new lighting shader that use the provided normal map, light
         and ambient color to light the diffuse bitmap.
         @param diffuse the diffuse bitmap
         @param normal  the normal map
         @param light   the light applied to the normal map
         @param ambient the linear (unpremul) ambient light color
     */
     SkLightingShaderImpl(const SkBitmap& diffuse, const SkBitmap& normal,
                          const SkLightingShader::Light& light,
-                         const SkColor ambient) 
-        : fDiffuseMap(diffuse)
+                         const SkColor ambient, const SkMatrix* localMatrix) 
+        : INHERITED(localMatrix)
+        , fDiffuseMap(diffuse)
         , fNormalMap(normal)
         , fLight(light)
         , fAmbientColor(ambient) {
         if (!fLight.fDirection.normalize()) {
             fLight.fDirection = SkPoint3::Make(0.0f, 0.0f, 1.0f);
         }
         SkColorSetA(fLight.fColor, 0xFF);
         SkColorSetA(fAmbientColor, 0xFF);
     }
 
@@ skipping 407 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////
 
 #ifndef SK_IGNORE_TO_STRING
 void SkLightingShaderImpl::toString(SkString* str) const {
     str->appendf("LightingShader: ()");
 }
 #endif
 
 SkFlattenable* SkLightingShaderImpl::CreateProc(SkReadBuffer& buf) {
+    SkMatrix localMatrix;
+    buf.readMatrix(&localMatrix);
+
     SkBitmap diffuse;
     if (!buf.readBitmap(&diffuse)) {
         return NULL;
     }
     diffuse.setImmutable();
 
     SkBitmap normal;
     if (!buf.readBitmap(&normal)) {
         return NULL;
     }
     normal.setImmutable();
 
     SkLightingShader::Light light;
     if (!buf.readScalarArray(&light.fDirection.fX, 3)) {
         return NULL;
     }
     light.fColor = buf.readColor();
 
     SkColor ambient = buf.readColor();
 
-    // TODO: this would be nice to enable
-    //    return SkCreateLightingShader(diffuse, normal, light, ambient, NULL);
-    return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient));
+    return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient, &localMatrix));
 }
 
 void SkLightingShaderImpl::flatten(SkWriteBuffer& buf) const {
+    buf.writeMatrix(this->getLocalMatrix());
+
     buf.writeBitmap(fDiffuseMap);
     buf.writeBitmap(fNormalMap);
     buf.writeScalarArray(&fLight.fDirection.fX, 3);
     buf.writeColor(fLight.fColor);
     buf.writeColor(fAmbientColor);
 }
 
 SkShader::Context* SkLightingShaderImpl::onCreateContext(const ContextRec& rec,
                                                          void* storage) const {
 
@@ skipping 39 matching lines @@
     // communicates between its matrix-proc and its sampler-proc. Until we can
     // widen that, we have to reject bitmaps that are larger.
     //
     static const int kMaxSize = 65535;
 
     return bm.width() > kMaxSize || bm.height() > kMaxSize;
 }
 
 SkShader* SkLightingShader::Create(const SkBitmap& diffuse, const SkBitmap& normal,
                                    const SkLightingShader::Light& light,
-                                   const SkColor ambient) {
+                                   const SkColor ambient,
+                                   const SkMatrix* localMatrix) {
     if (diffuse.isNull() || bitmap_is_too_big(diffuse) ||
         normal.isNull() || bitmap_is_too_big(normal) ||
         diffuse.width() != normal.width() ||
         diffuse.height() != normal.height()) {
         return nullptr;
     }
 
-    return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient));
+    return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient, localMatrix));
 }
 
 ///////////////////////////////////////////////////////////////////////////////