Added PointLights to SkLights::Light

include/core/SkLights.h

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLights_DEFINED
 #define SkLights_DEFINED
 
+#include "../private/SkTArray.h"
 #include "SkPoint3.h"
 #include "SkRefCnt.h"
-#include "../private/SkTArray.h"
-#include "SkImage.h"
+
+class SkReadBuffer;
+class SkWriteBuffer;
+class SkImage;
 
 class SK_API SkLights  : public SkRefCnt {
 public:
     class Light {
     public:
         enum LightType {
             kAmbient_LightType,       // only 'fColor' is used
-            kDirectional_LightType
+            kDirectional_LightType,
+            kPoint_LightType
         };
 
         Light(const Light& other)
             : fType(other.fType)
             , fColor(other.fColor)
             , fDirection(other.fDirection)
             , fShadowMap(other.fShadowMap) {
         }
 
         Light(Light&& other)
             : fType(other.fType)
             , fColor(other.fColor)
             , fDirection(other.fDirection)
             , fShadowMap(std::move(other.fShadowMap)) {
         }
 
-        Light(const SkColor3f& color)
-            : fType(kAmbient_LightType)
-            , fColor(color) {
-            fDirection.set(0.0f, 0.0f, 1.0f);
+        static Light MakeAmbient(const SkColor3f& color) {
+            return Light(kAmbient_LightType, color, SkVector3::Make(0.0f, 0.0f, 1.0f));
         }
 
-        Light(const SkColor3f& color, const SkVector3& dir)
-            : fType(kDirectional_LightType)
-            , fColor(color)
-            , fDirection(dir) {
-            if (!fDirection.normalize()) {
-                fDirection.set(0.0f, 0.0f, 1.0f);
+        static Light MakeDirectional(const SkColor3f& color, const SkVector3& dir) {
+            Light light(kDirectional_LightType, color, dir);
+            if (!light.fDirection.normalize()) {
+                light.fDirection.set(0.0f, 0.0f, 1.0f);
             }
+            return light;
+        }
+
+        static Light MakePoint(const SkColor3f& color, const SkPoint3& pos) {
+            return Light(kPoint_LightType, color, pos);
         }
 
         LightType type() const { return fType; }
         const SkColor3f& color() const { return fColor; }
-        const SkVector3& dir() const { 
-            SkASSERT(kAmbient_LightType != fType);
-            return fDirection; 
+        const SkVector3& dir() const {
+            SkASSERT(kDirectional_LightType == fType);
+            return fDirection;
+        }
+        const SkPoint3& pos() const {
+            SkASSERT(kPoint_LightType == fType);
+            return fDirection;
         }
 
         void setShadowMap(sk_sp<SkImage> shadowMap) {
             fShadowMap = std::move(shadowMap);
         }
 
         SkImage* getShadowMap() const {
             return fShadowMap.get();
         }
 
         Light& operator= (const Light& b) {
             if (this == &b) {
                 return *this;
             }
 
             fColor = b.fColor;
             fType = b.fType;
             fDirection = b.fDirection;
             fShadowMap = b.fShadowMap;
             return *this;
         }
-
     private:
         LightType   fType;
         SkColor3f   fColor;           // linear (unpremul) color. Range is 0..1 in each channel.
-        SkVector3   fDirection;       // direction towards the light (+Z is out of the screen).
+        SkVector3   fDirection;       // For directional lights, holds the direction towards the
+                                      // light (+Z is out of the screen).
                                       // If degenerate, it will be replaced with (0, 0, 1).
+                                      // For point lights, holds location of point light
         sk_sp<SkImage> fShadowMap;
+

[robertphillips, 2016/08/12 13:34:48]

const SkColor3f& color, const SkVector3& dir);

[vjiaoblack, 2016/08/12 14:12:10]

Done.

+        Light(LightType type, const SkColor3f color, const SkVector3 dir);
     };
 
     class Builder {
     public:
         Builder() : fLights(new SkLights) { }
     
-        void add(const Light& light) {
-            if (fLights) {
-                fLights->fLights.push_back(light);
-            }
-        }
+        void add(const Light& light);
 
-        void add(Light&& light) {
-            if (fLights) {
-                fLights->fLights.push_back(std::move(light));
-            }
-        }
+        void add(Light&& light);
 
-        sk_sp<SkLights> finish() {
-            return std::move(fLights);
-        }
+        sk_sp<SkLights> finish();
 
     private:
         sk_sp<SkLights> fLights;
     };
 
-    int numLights() const {

[robertphillips, 2016/08/12 13:34:48]

Why out line these ?

-        return fLights.count();
-    }
+    int numLights() const;
 
-    const Light& light(int index) const {
-        return fLights[index];
-    }
+    const Light& light(int index) const;
 
-    Light& light(int index) {
-        return fLights[index];
-    }
+    Light& light(int index);
+
+    static sk_sp<SkLights> MakeFromBuffer(SkReadBuffer& buf);
+
+    void flatten(SkWriteBuffer& buf) const;
 
 private:

[robertphillips, 2016/08/12 13:34:48]

no ';' needed

[vjiaoblack, 2016/08/12 14:12:10]

Done.

-    SkLights() {}
-
+    SkLights() {};
     SkTArray<Light> fLights;
-
     typedef SkRefCnt INHERITED;
 };
 
 #endif