Moved ambient lights out of SkLight's light array

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"
 
 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,
             kPoint_LightType
         };
 
         Light(const Light& other)
             : fType(other.fType)
             , fColor(other.fColor)
             , fDirOrPos(other.fDirOrPos)
             , fIntensity(other.fIntensity)
             , fShadowMap(other.fShadowMap) {
         }
 
         Light(Light&& other)
             : fType(other.fType)
             , fColor(other.fColor)
             , fDirOrPos(other.fDirOrPos)
             , fIntensity(other.fIntensity)
             , fShadowMap(std::move(other.fShadowMap)) {
         }
 
-        static Light MakeAmbient(const SkColor3f& color) {
-            return Light(kAmbient_LightType, color, SkVector3::Make(0.0f, 0.0f, 1.0f));
-        }
-
         static Light MakeDirectional(const SkColor3f& color, const SkVector3& dir) {
             Light light(kDirectional_LightType, color, dir);
             if (!light.fDirOrPos.normalize()) {
                 light.fDirOrPos.set(0.0f, 0.0f, 1.0f);
             }
             return light;
         }
 
         static Light MakePoint(const SkColor3f& color, const SkPoint3& pos, SkScalar intensity) {
             return Light(kPoint_LightType, color, pos, intensity);
@@ skipping 45 matching lines @@
                    (fDirOrPos  == b.fDirOrPos) &&
                    (fShadowMap == b.fShadowMap) &&
                    (fIntensity == b.fIntensity);
         }
 
         bool operator!= (const Light& b) { return !(this->operator==(b)); }
 
     private:
         LightType   fType;
         SkColor3f   fColor;           // linear (unpremul) color. Range is 0..1 in each channel.
-
         SkVector3   fDirOrPos;        // 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
 
         SkScalar    fIntensity;       // For point lights, dictates the light intensity.
                                       // Simply a multiplier to the final light output value.
         sk_sp<SkImage> fShadowMap;
 
         Light(LightType type, const SkColor3f& color,
-              const SkVector3& dir, SkScalar intensity = 0.0f) {
+              const SkVector3& dirOrPos, SkScalar intensity = 0.0f) {
             fType = type;
             fColor = color;
-            fDirOrPos = dir;
+            fDirOrPos = dirOrPos;
             fIntensity = intensity;
         }
     };
 
     class Builder {
     public:
         Builder() : fLights(new SkLights) { }
 
         void add(const Light& light) {
             if (fLights) {
                 fLights->fLights.push_back(light);
             }
         }
 
         void add(Light&& light) {
             if (fLights) {
                 fLights->fLights.push_back(std::move(light));
             }
         }
 
+        void setAmbientLightColor(const SkColor3f& color) {
+            if (fLights) {
+                fLights->fAmbientLightColor = color;
+            }
+        }
+
         sk_sp<SkLights> finish() {
             return std::move(fLights);
         }
 
     private:
         sk_sp<SkLights> fLights;
     };
 
     int numLights() const {
         return fLights.count();
     }
 
     const Light& light(int index) const {
         return fLights[index];
     }
 
     Light& light(int index) {
         return fLights[index];
     }
 
+    const SkColor3f& ambientLightColor() const {
+        return fAmbientLightColor;
+    }
+
     static sk_sp<SkLights> MakeFromBuffer(SkReadBuffer& buf);
 
     void flatten(SkWriteBuffer& buf) const;
 
 private:
     SkLights() {}
     SkTArray<Light> fLights;
+    SkColor3f fAmbientLightColor;
     typedef SkRefCnt INHERITED;
 };
 
 #endif