Added PointLights to SkLights::Light

src/core/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 "SkBitmapProcShader.h"
 #include "SkBitmapProcState.h"
 #include "SkColor.h"
@@ skipping 404 matching lines @@
     // Discarding SkShader flattenable params
     bool hasLocalMatrix = buf.readBool();
     SkAssertResult(!hasLocalMatrix);
 
     int numLights = buf.readInt();
 
     SkLights::Builder builder;
 
     for (int l = 0; l < numLights; ++l) {
         bool isAmbient = buf.readBool();
+        bool isPoint = buf.readBool();
 
         SkColor3f color;
         if (!buf.readScalarArray(&color.fX, 3)) {
             return nullptr;
         }
 
         if (isAmbient) {
-            builder.add(SkLights::Light(color));
+            builder.add(SkLights::Light::MakeAmbient(color));
         } else {

[robertphillips, 2016/08/10 17:48:39]

dir -> dirOrPos

[vjiaoblack, 2016/08/11 14:27:23]

Done.

             SkVector3 dir;
             if (!buf.readScalarArray(&dir.fX, 3)) {
                 return nullptr;
             }
-            builder.add(SkLights::Light(color, dir));
+            if (isPoint) {
+                builder.add(SkLights::Light::MakePoint(color, dir));
+            } else {
+                builder.add(SkLights::Light::MakeDirectional(color, dir));
+            }
         }
     }
 
     sk_sp<SkLights> lights(builder.finish());
 
     sk_sp<SkNormalSource> normalSource(buf.readFlattenable<SkNormalSource>());
 
     bool hasDiffuse = buf.readBool();
     sk_sp<SkShader> diffuseShader = nullptr;
     if (hasDiffuse) {
         diffuseShader = buf.readFlattenable<SkShader>();
     }
 
     return sk_make_sp<SkLightingShaderImpl>(std::move(diffuseShader), std::move(normalSource),
                                             std::move(lights));
 }
 
 void SkLightingShaderImpl::flatten(SkWriteBuffer& buf) const {
     this->INHERITED::flatten(buf);
 
     buf.writeInt(fLights->numLights());
     for (int l = 0; l < fLights->numLights(); ++l) {
         const SkLights::Light& light = fLights->light(l);
 
         bool isAmbient = SkLights::Light::kAmbient_LightType == light.type();
+        bool isPoint = SkLights::Light::kPoint_LightType == light.type();
 
         buf.writeBool(isAmbient);
+        buf.writeBool(isPoint);
         buf.writeScalarArray(&light.color().fX, 3);
         if (!isAmbient) {
             buf.writeScalarArray(&light.dir().fX, 3);
         }
     }
 
     buf.writeFlattenable(fNormalSource.get());
     buf.writeBool(fDiffuseShader);
     if (fDiffuseShader) {
         buf.writeFlattenable(fDiffuseShader.get());
@@ skipping 48 matching lines @@
                                             std::move(lights));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkLightingShader)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLightingShaderImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
 
 ///////////////////////////////////////////////////////////////////////////////