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 17:31:28]

??

-        this->updateLights(200, 200);
+        this->setBGColor(0xFFCCCCCC);
+        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 158 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 17:31:28]

??

-                this->updateLights(x, y);
+                float recipX = 1.0f / kWidth;
+                float recipY = 1.0f / kHeight;
+
+                SkLights::Builder builder;
+                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();
+
                 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