commit 772b5ee446d7545eec4ca7d6dc9d75461e2a9c38
author vjiaoblack <vjiaoblack@google.com> Fri Aug 12 11:38:47 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Aug 12 11:38:47 2016 -0700
tree 1470d1bb00cbf863ccee98a328799eb84dd31856
parent e1a3bc67690886dbc72271f447dec073363fe84c

Added PointLights to SkLights::Light

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2237493002

Review-Url: https://codereview.chromium.org/2237493002

gm/lightingshader.cpp

diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp
index 54318ee..4a79ebe 100644
--- a/gm/lightingshader.cpp
+++ b/gm/lightingshader.cpp
@@ -48,11 +48,11 @@
 
         SkLights::Builder builder;
 
-        builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f),
-                                    SkVector3::Make(SK_ScalarRoot2Over2,
-                                                    0.0f,
-                                                    SK_ScalarRoot2Over2)));
-        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f),
+                                                     SkVector3::Make(SK_ScalarRoot2Over2,
+                                                                     0.0f,
+                                                                     SK_ScalarRoot2Over2)));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
 
         fLights = builder.finish();
     }

gm/lightingshader2.cpp

diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp
index 5e0d19b..70c9e29 100644
--- a/gm/lightingshader2.cpp
+++ b/gm/lightingshader2.cpp
@@ -43,9 +43,9 @@
         SkLights::Builder builder;
         const SkVector3 kLightFromUpperRight = SkVector3::Make(0.788f, 0.394f, 0.473f);
 
-        builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f),
-                                    kLightFromUpperRight));
-        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f),
+                                                     kLightFromUpperRight));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
         fLights = builder.finish();
 
         fRect = SkRect::MakeIWH(kTexSize, kTexSize);

gm/lightingshaderbevel.cpp

diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp
index dfc46e4..9107cc6 100644
--- a/gm/lightingshaderbevel.cpp
+++ b/gm/lightingshaderbevel.cpp
@@ -36,9 +36,9 @@
         SkLights::Builder builder;
         const SkVector3 kLightFromUpperRight = SkVector3::Make(0.788f, 0.394f, 0.473f);
 
-        builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f),
-                                    kLightFromUpperRight));
-        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f),
+                                                     kLightFromUpperRight));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
         fLights = builder.finish();
 
         // fRect is assumed to be square throughout this file

gm/shadowmaps.cpp

diff --git a/gm/shadowmaps.cpp b/gm/shadowmaps.cpp
index b343d9b..f953550 100644
--- a/gm/shadowmaps.cpp
+++ b/gm/shadowmaps.cpp
@@ -70,11 +70,11 @@
         //   - soft white ambient light
 
         SkLights::Builder builder;
-        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.3f, 0.4f),
-                                    SkVector3::Make(0.2f, 0.1f, 1.0f)));
-        builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.3f, 0.2f),
-                                    SkVector3::Make(0.1f, 0.2f, 1.0f)));
-        builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.4f, 0.4f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.2f, 0.3f, 0.4f),
+                                                     SkVector3::Make(0.2f, 0.1f, 1.0f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.4f, 0.3f, 0.2f),
+                                                     SkVector3::Make(0.1f, 0.2f, 1.0f)));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.4f, 0.4f, 0.4f)));
         fLights = builder.finish();
     }