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

samplecode/SampleLighting.cpp

diff --git a/samplecode/SampleLighting.cpp b/samplecode/SampleLighting.cpp
index 1c86c99..bab2b5d 100755
--- a/samplecode/SampleLighting.cpp
+++ b/samplecode/SampleLighting.cpp
@@ -21,8 +21,8 @@
 
     SkLights::Builder builder;
 
-    builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, blue), dir));
-    builder.add(SkLights::Light(SkColor3f::Make(0.1f, 0.1f, 0.1f)));
+    builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, blue), dir));
+    builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.1f, 0.1f, 0.1f)));
 
     return builder.finish();
 }

samplecode/SampleLitAtlas.cpp

diff --git a/samplecode/SampleLitAtlas.cpp b/samplecode/SampleLitAtlas.cpp
index 5f62e2a..cb49bf3 100644
--- a/samplecode/SampleLitAtlas.cpp
+++ b/samplecode/SampleLitAtlas.cpp
@@ -182,8 +182,9 @@
     void updateLights() {        
         SkLights::Builder builder;
 
-        builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f), fLightDir));
-        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), fLightDir));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
 
         fLights = builder.finish();
     }

samplecode/SampleShadowing.cpp

diff --git a/samplecode/SampleShadowing.cpp b/samplecode/SampleShadowing.cpp
index 7b434bc..d0b37fb 100644
--- a/samplecode/SampleShadowing.cpp
+++ b/samplecode/SampleShadowing.cpp
@@ -19,11 +19,11 @@
 
         this->setBGColor(0xFFCCCCCC);
         SkLights::Builder builder;
-        builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.3f, 0.4f),
-                                    SkVector3::Make(0.2f, 0.05f, 1.0f)));
-        builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.3f, 0.2f),
-                                    SkVector3::Make(0.05f, 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.05f, 1.0f)));
+        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.4f, 0.3f, 0.2f),
+                                                     SkVector3::Make(0.05f, 0.2f, 1.0f)));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.4f, 0.4f, 0.4f)));
         fLights = builder.finish();
 
         fTestRects[0].fColor = 0xFFEE8888;
@@ -139,15 +139,18 @@
                 float recipY = 1.0f / kHeight;
 
                 SkLights::Builder builder;
-                builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.3f, 0.4f),
-                                            SkVector3::Make(0.2f + (200.0f - x) * recipX,
-                                                            0.05f + (200.0f - y) * recipY,
-                                                            1.0f)));
-                builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.3f, 0.2f),
-                                            SkVector3::Make(0.05f + (200.0f - x) * recipX,
-                                                            0.2f + (200.0f - y) * recipY,
-                                                            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 + (200.0f - x) * recipX,
+                                        0.05f + (200.0f - y) * recipY,
+                                        1.0f)));
+                builder.add(SkLights::Light::MakeDirectional(
+                        SkColor3f::Make(0.4f, 0.3f, 0.2f),
+                        SkVector3::Make(0.05f + (200.0f - x) * recipX,
+                                        0.2f + (200.0f - y) * recipY,
+                                        1.0f)));
+                builder.add(SkLights::Light::MakeAmbient(
+                        SkColor3f::Make(0.4f, 0.4f, 0.4f)));
                 fLights = builder.finish();
 
                 fLightsChanged = true;