diff options
author | vjiaoblack <vjiaoblack@google.com> | 2016-08-29 10:22:09 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-29 10:22:09 -0700 |
commit | a8eabc4a2a5559a1410fdbb348f967cd1554b325 (patch) | |
tree | 03d8a80ef4b2e62eaacbfee605b3ffc3162fa5c7 /gm | |
parent | 84839f6fb3d0de9088be3d53e81df195331ed1c9 (diff) |
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
Review-Url: https://codereview.chromium.org/2287553002
Diffstat (limited to 'gm')
-rw-r--r-- | gm/lightingshader.cpp | 2 | ||||
-rw-r--r-- | gm/lightingshader2.cpp | 6 | ||||
-rw-r--r-- | gm/lightingshaderbevel.cpp | 2 | ||||
-rw-r--r-- | gm/shadowmaps.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index 4a79ebea1d..137fd64a26 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -52,7 +52,7 @@ public: SkVector3::Make(SK_ScalarRoot2Over2, 0.0f, SK_ScalarRoot2Over2))); - builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); fLights = builder.finish(); } diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index 5afe2558b9..886c647ff7 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.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); fLights = builder.finish(); // No directional lights SkLights::Builder builderNoDir; - builderNoDir.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builderNoDir.setAmbientLightColor(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.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builderTwoDir.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); fLightsTwoDir = builderTwoDir.finish(); fRect = SkRect::MakeIWH(kTexSize, kTexSize); diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp index 9107cc6c94..4e95c8ecc2 100644 --- a/gm/lightingshaderbevel.cpp +++ b/gm/lightingshaderbevel.cpp @@ -38,7 +38,7 @@ protected: builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f), kLightFromUpperRight)); - builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f)); fLights = builder.finish(); // fRect is assumed to be square throughout this file diff --git a/gm/shadowmaps.cpp b/gm/shadowmaps.cpp index 6c9738b247..d8682ce44f 100644 --- a/gm/shadowmaps.cpp +++ b/gm/shadowmaps.cpp @@ -74,7 +74,7 @@ public: SkVector3::Make(0.2f, 0.1f, 1.0f))); builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.4f, 0.3f, 0.2f), SkVector3::Make(0.1f, 0.2f, 1.0f))); - builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.4f, 0.4f, 0.4f))); + builder.setAmbientLightColor(SkColor3f::Make(0.4f, 0.4f, 0.4f)); fLights = builder.finish(); fShadowParams.fShadowRadius = 4.0f; |