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 "SkPoint3.h"
 #include "SkRefCnt.h"
 #include "../private/SkTArray.h"
 #include "SkImage.h"
 
 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)) {
         }
 

[robertphillips, 2016/08/10 16:34:37]

We could have a private Light(type, color, vec3) ctor that each one of these
calls

-        Light(const SkColor3f& color)
-            : fType(kAmbient_LightType)
-            , fColor(color) {
-            fDirection.set(0.0f, 0.0f, 1.0f);
+        static Light MakeAmbientLight(const SkColor3f& color) {
+            Light light;
+            light.fType = kAmbient_LightType;
+            light.fColor = color;
+            light.fDirection.set(0.0f, 0.0f, 1.0f);
+            return light;
         }
 
-        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 MakeDirectionalLight(const SkColor3f& color, const SkVector3& dir) {
+            Light light;
+            light.fType = kDirectional_LightType;
+            light.fColor = color;
+            light.fDirection = dir;
+            if (!light.fDirection.normalize()) {
+                light.fDirection.set(0.0f, 0.0f, 1.0f);
             }
+            return light;
+        }
+

[robertphillips, 2016/08/10 16:34:37]

SkPoint3 for pos. Right now they are typedefed to be the same.

+        static Light MakePointLight(const SkColor3f& color, const SkVector3& pos) {
+            Light light;
+            light.fType = kPoint_LightType;
+            light.fColor = color;
+            light.fDirection = pos;
+            return light;
         }
 
         LightType type() const { return fType; }
         const SkColor3f& color() const { return fColor; }
         const SkVector3& dir() const { 
-            SkASSERT(kAmbient_LightType != fType);
+            SkASSERT(kDirectional_LightType == fType);
             return fDirection; 
         }

[robertphillips, 2016/08/10 16:34:37]

SkPoint3

+        const SkVector3& 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).
                                       // If degenerate, it will be replaced with (0, 0, 1).
         sk_sp<SkImage> fShadowMap;
+
+        Light() {}
     };
 
     class Builder {
     public:
         Builder() : fLights(new SkLights) { }
     
         void add(const Light& light) {
             if (fLights) {
                 fLights->fLights.push_back(light);
             }
@@ skipping 27 matching lines @@
 
 private:
     SkLights() {}
 
     SkTArray<Light> fLights;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif