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"
 #include "SkShadowShader.h"
 #include "SkSurface.h"
 
 #ifdef SK_EXPERIMENTAL_SHADOWING
 
 class ShadowingView : public SampleView {
 public:
     ShadowingView()
         : fSceneChanged(true)
         , fLightsChanged(true)
         , fMoveLight(false)
         , fClearShadowMaps(false)
         , fSelectedRectID(-1)
         , fSelectedSliderID(-1)
         , fLightDepth(300.0f)  {
         this->setBGColor(0xFFCCCCCC);
 

[robertphillips, 2016/08/26 19:16:02]

In the prior CL you were calling updateLights. Why stop doing so?

[vjiaoblack, 2016/08/26 19:25:17]

Done.

-        this->updateLights(200, 200);
+        SkLights::Builder builder;
+        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.setAmbientLightColor(SkColor3f::Make(0.4f, 0.4f, 0.4f));
+        fLights = builder.finish();
 
         fTestRects[0].fColor = 0xFFEE8888;
         fTestRects[0].fDepth = 80;
         fTestRects[0].fGeometry = SkRect::MakeLTRB(200,150,350,300);
 
         fTestRects[1].fColor = 0xFF88EE88;
         fTestRects[1].fDepth = 160;
         fTestRects[1].fGeometry = SkRect::MakeLTRB(150,200,300,350);
 
         fTestRects[2].fColor = 0xFF8888EE;
@@ skipping 114 matching lines @@
             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) {
+        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 11 matching lines @@
     }
 
     bool onClick(Click *click) override {
         SkScalar x = click->fCurr.fX;
         SkScalar y = click->fCurr.fY;
 
         SkScalar dx = x - click->fPrev.fX;
         SkScalar dy = y - click->fPrev.fY;
 
         if (fMoveLight) {
             if (dx != 0 || dy != 0) {

[robertphillips, 2016/08/26 19:16:02]

this-> - from prior CL

-                this->updateLights(x, y);
+                updateLights(x, y);
                 fLightsChanged = true;
                 this->inval(nullptr);
             }
             return true;
         }
 
         if (click->fState == Click::State::kUp_State) {
             fSelectedRectID = -1;
             fSelectedSliderID = -1;
             return true;
@@ skipping 79 matching lines @@
     sk_sp<SkLights> fLights;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 static SkView* MyFactory() { return new ShadowingView; }
 static SkViewRegister reg(MyFactory);
 
 #endif