diff options
| author |  vjiaoblack <vjiaoblack@google.com> | 2016-08-12 11:38:47 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-12 11:38:47 -0700 |
| commit | 772b5ee446d7545eec4ca7d6dc9d75461e2a9c38 (patch) | |
| tree | 1470d1bb00cbf863ccee98a328799eb84dd31856 /gm | |
| parent | e1a3bc67690886dbc72271f447dec073363fe84c (diff) | |
Added PointLights to SkLights::Light
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2237493002
Review-Url: https://codereview.chromium.org/2237493002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/lightingshader.cpp | 10 | ||||
| -rw-r--r-- | gm/lightingshader2.cpp | 6 | ||||
| -rw-r--r-- | gm/lightingshaderbevel.cpp | 6 | ||||
| -rw-r--r-- | gm/shadowmaps.cpp | 10 |
4 files changed, 16 insertions, 16 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index 54318ee445..4a79ebea1d 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -48,11 +48,11 @@ public: SkLights::Builder builder; - builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f), - SkVector3::Make(SK_ScalarRoot2Over2, - 0.0f, - SK_ScalarRoot2Over2))); - builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f), + SkVector3::Make(SK_ScalarRoot2Over2, + 0.0f, + SK_ScalarRoot2Over2))); + builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f))); fLights = builder.finish(); } diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index 5e0d19b661..70c9e29f69 100644 --- a/gm/lightingshader2.cpp +++ b/gm/lightingshader2.cpp @@ -43,9 +43,9 @@ protected: SkLights::Builder builder; const SkVector3 kLightFromUpperRight = SkVector3::Make(0.788f, 0.394f, 0.473f); - builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f), - kLightFromUpperRight)); - builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + 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))); fLights = builder.finish(); fRect = SkRect::MakeIWH(kTexSize, kTexSize); diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp index dfc46e4471..9107cc6c94 100644 --- a/gm/lightingshaderbevel.cpp +++ b/gm/lightingshaderbevel.cpp @@ -36,9 +36,9 @@ protected: SkLights::Builder builder; const SkVector3 kLightFromUpperRight = SkVector3::Make(0.788f, 0.394f, 0.473f); - builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f), - kLightFromUpperRight)); - builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f))); + 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))); fLights = builder.finish(); // fRect is assumed to be square throughout this file diff --git a/gm/shadowmaps.cpp b/gm/shadowmaps.cpp index b343d9b142..f953550d4b 100644 --- a/gm/shadowmaps.cpp +++ b/gm/shadowmaps.cpp @@ -70,11 +70,11 @@ public: // - soft white ambient light SkLights::Builder builder; - builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.3f, 0.4f), - SkVector3::Make(0.2f, 0.1f, 1.0f))); - builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.3f, 0.2f), - SkVector3::Make(0.1f, 0.2f, 1.0f))); - builder.add(SkLights::Light(SkColor3f::Make(0.4f, 0.4f, 0.4f))); + builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(0.2f, 0.3f, 0.4f), + 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))); fLights = builder.finish(); } |