diff options
| author |  vjiaoblack <vjiaoblack@google.com> | 2016-08-29 08:38:04 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-29 08:38:04 -0700 |
| commit | 84cddf6fa7a2ee4a8163f99c9238d5fba6b49566 (patch) | |
| tree | e14502025540f7fdcf2c3678bde5cdd6ea2de588 /gm/lightingshader2.cpp | |
| parent | b398ecc2a41684bd33138a920b446e987b2b30d0 (diff) | |
Revert of Moved ambient lights out of SkLight's light array (patchset #7 id:120001 of https://codereview.chromium.org/2287553002/ )
Reason for revert:
Made Deigo's GM miss their ambient lights
Original issue's description:
> Moved ambient lights out of SkLight's light array
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2287553002
>
> Committed: https://skia.googlesource.com/skia/+/8f98f0aa2d3f7571a890b916c7c4b5ee831e9686
TBR=robertphillips@google.com,djsollen@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2291663002
Diffstat (limited to 'gm/lightingshader2.cpp')
| -rw-r--r-- | gm/lightingshader2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index 886c647ff7..5afe2558b9 100644 --- a/gm/lightingshader2.cpp +++ b/gm/lightingshader2.cpp @@ -47,12 +47,12 @@ protected: SkLights::Builder builder; builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f), kLightFromUpperRight)); - builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); + builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); fLights = builder.finish(); // No directional lights SkLights::Builder builderNoDir; - builderNoDir.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); + builderNoDir.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); fLightsNoDir = builderNoDir.finish(); // Two directional lights @@ -61,7 +61,7 @@ protected: kLightFromUpperRight)); builderTwoDir.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.0f, 1.0f, 1.0f), kLightFromUpperLeft)); - builderTwoDir.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); + builderTwoDir.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); fLightsTwoDir = builderTwoDir.finish(); fRect = SkRect::MakeIWH(kTexSize, kTexSize); |