aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/lightingshader.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-05-31 12:08:25 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-05-31 12:08:25 -0700
commit71e055279336096f92d63c5c855641b4b31d6a54 (patch)
tree4606c66902fcc7b7b392379eba01881e5d4e4e04 /gm/lightingshader.cpp
parent4b421344561cef5a8747361768a99024691cc542 (diff)
Make use of new SkLights class
Diffstat (limited to 'gm/lightingshader.cpp')
-rw-r--r--gm/lightingshader.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp
index 54f698a753..ae6a24f9f0 100644
--- a/gm/lightingshader.cpp
+++ b/gm/lightingshader.cpp
@@ -46,13 +46,13 @@ public:
LightingShaderGM() {
this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
- SkLightingShader::Lights::Builder builder;
+ SkLights::Builder builder;
- builder.add(SkLight(SkColor3f::Make(1.0f, 1.0f, 1.0f),
- SkVector3::Make(1.0f, 0.0f, 0.0f)));
- builder.add(SkLight(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
+ builder.add(SkLights::Light(SkColor3f::Make(1.0f, 1.0f, 1.0f),
+ SkVector3::Make(1.0f, 0.0f, 0.0f)));
+ builder.add(SkLights::Light(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
- fLights.reset(builder.finish());
+ fLights = builder.finish();
}
protected:
@@ -162,10 +162,10 @@ private:
static const int kTexSize = 128;
static const int kGMSize = 512;
- SkBitmap fDiffuse;
- SkBitmap fNormalMaps[kNormalMapCount];
+ SkBitmap fDiffuse;
+ SkBitmap fNormalMaps[kNormalMapCount];
- SkAutoTUnref<const SkLightingShader::Lights> fLights;
+ sk_sp<SkLights> fLights;
typedef GM INHERITED;
};