Moved ambient lights out of SkLight's light array

samplecode/SampleShadowing.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkPictureRecorder.h"
 #include "SkShadowPaintFilterCanvas.h"
@@ skipping 141 matching lines @@
             SkPaint paint;
             paint.setColor(SK_ColorBLACK);
             canvas->drawRect(fSliders[i].fGeometry, paint);
         }
     }
 
     SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
         return new SkView::Click(this);
     }
 
     void updateLights(int x, int y) {

[robertphillips, 2016/08/26 19:45:00]

I'm okay with this change but don't you want to keep the old point light
behavior ?

[vjiaoblack, 2016/08/28 20:11:56]

Mmmm..... I was going to do another pass and fix it later, but then I guess
point lights already landed. 

I'll keep the old one.

+        float recipX = 1.0f / kWidth;
+        float recipY = 1.0f / kHeight;
+
         SkLights::Builder builder;
-        builder.add(SkLights::Light::MakePoint(SkColor3f::Make(0.2f, 0.4f, 0.6f),
-                                               SkVector3::Make(x - 50,
-                                                               350 - y,
-                                                               fLightDepth),
-                                               1024));
-        builder.add(SkLights::Light::MakePoint(SkColor3f::Make(0.6f, 0.4f, 0.2f),
-                                               SkVector3::Make(x + 50,
-                                                               450 - y,
-                                                               fLightDepth),
-                                               1024));
-        builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.2f, 0.2f, 0.2f),
-                                                     SkVector3::Make(0.2f, 0.2f, 1.0f)));
+        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.setAmbientLightColor(SkColor3f::Make(0.4f, 0.4f, 0.4f));
         fLights = builder.finish();
     }
 
     void updateFromSelectedSlider() {
         SkScalar newValue = fSliders[fSelectedSliderID].fGeometry.fLeft *
                             fSliders[fSelectedSliderID].fScale +
                             fSliders[fSelectedSliderID].fOffset;
 
         switch (fSelectedSliderID) {
             case 0:
@@ skipping 112 matching lines @@
     sk_sp<SkLights> fLights;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 static SkView* MyFactory() { return new ShadowingView; }
 static SkViewRegister reg(MyFactory);
 
 #endif