Added distance attenuation and diffuse shading to PointLights

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
@@ skipping 12 matching lines @@
     public:
         enum LightType {
             kAmbient_LightType,       // only 'fColor' is used
             kDirectional_LightType,
             kPoint_LightType
         };
 
         Light(const Light& other)
             : fType(other.fType)
             , fColor(other.fColor)
-            , fDirection(other.fDirection)
+            , fDirOrPos(other.fDirOrPos)
+            , fIntensity(other.fIntensity)
             , fShadowMap(other.fShadowMap) {
         }
 
         Light(Light&& other)
             : fType(other.fType)
             , fColor(other.fColor)
-            , fDirection(other.fDirection)
+            , 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.fDirection.normalize()) {
-                light.fDirection.set(0.0f, 0.0f, 1.0f);
+            if (!light.fDirOrPos.normalize()) {
+                light.fDirOrPos.set(0.0f, 0.0f, 1.0f);
             }
             return light;
         }
 
-        static Light MakePoint(const SkColor3f& color, const SkPoint3& pos) {
-            return Light(kPoint_LightType, color, pos);
+        static Light MakePoint(const SkColor3f& color, const SkPoint3& pos, SkScalar intensity) {

[robertphillips, 2016/08/18 17:12:59]

Add intensity as last param to the unifying ctor and default it to 0.0

[vjiaoblack, 2016/08/18 18:05:33]

Done.

+            Light light(kPoint_LightType, color, pos);
+            light.fIntensity = intensity;
+            return light;
         }
 
         LightType type() const { return fType; }
         const SkColor3f& color() const { return fColor; }
         const SkVector3& dir() const {
             SkASSERT(kDirectional_LightType == fType);
-            return fDirection;
+            return fDirOrPos;
         }
         const SkPoint3& pos() const {
             SkASSERT(kPoint_LightType == fType);
-            return fDirection;
+            return fDirOrPos;
+        }
+        SkScalar intensity() const {
+            SkASSERT(kPoint_LightType == fType);
+            return fIntensity;
         }
 
         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;
+            fDirOrPos = b.fDirOrPos;

[robertphillips, 2016/08/18 17:12:59]

copy fIntensity too ?

[vjiaoblack, 2016/08/18 18:05:33]

Done.

             fShadowMap = b.fShadowMap;
             return *this;
         }
     private:
         LightType   fType;
         SkColor3f   fColor;           // linear (unpremul) color. Range is 0..1 in each channel.
-        SkVector3   fDirection;       // For directional lights, holds the direction towards the
+
+        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
+

[robertphillips, 2016/08/18 17:12:59]

Now, why can't we just make the light's color dimmer ?

[vjiaoblack, 2016/08/18 18:05:33]

We can.

But we can't make the light's color brighter.

+        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) {
             fType = type;
             fColor = color;
-            fDirection = dir;
+            fDirOrPos = dir;
+            fIntensity = 0.0f;
         }
     };
 
     class Builder {
     public:
         Builder() : fLights(new SkLights) { }
 
         void add(const Light& light) {
             if (fLights) {
                 fLights->fLights.push_back(light);
@@ skipping 30 matching lines @@
 
     void flatten(SkWriteBuffer& buf) const;
 
 private:
     SkLights() {}
     SkTArray<Light> fLights;
     typedef SkRefCnt INHERITED;
 };
 
 #endif