diff options
author | robertphillips <robertphillips@google.com> | 2015-07-30 05:09:17 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-30 05:09:17 -0700 |
commit | 640898f5881df1fd56d306190608dd79b1f32044 (patch) | |
tree | 58e24fcee1e3278c11d9fabe6d55948d1df1372c /gm/lightingshader.cpp | |
parent | a15cd9cb7fad31b93cd44541993b69bd5d006582 (diff) |
Update SkLightingShader to take a localMatrix
W/o this we can't draw lit objects anywhere but the origin.
Review URL: https://codereview.chromium.org/1253223003
Diffstat (limited to 'gm/lightingshader.cpp')
-rw-r--r-- | gm/lightingshader.cpp | 106 |
1 files changed, 89 insertions, 17 deletions
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index e920fb5cc3..ad8823d27d 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -18,12 +18,12 @@ static SkBitmap make_checkerboard(int texSize) { sk_tool_utils::draw_checkerboard(&canvas, sk_tool_utils::color_to_565(0x0), sk_tool_utils::color_to_565(0xFF804020), - 16); + 2); return bitmap; } // Create a hemispherical normal map -static SkBitmap make_normalmap(int texSize) { +static SkBitmap make_hemi_normalmap(int texSize) { SkBitmap hemi; hemi.allocN32Pixels(texSize, texSize); @@ -49,6 +49,53 @@ static SkBitmap make_normalmap(int texSize) { return hemi; } +// Create a truncated pyramid normal map +static SkBitmap make_frustum_normalmap(int texSize) { + SkBitmap frustum; + frustum.allocN32Pixels(texSize, texSize); + + SkIRect inner = SkIRect::MakeWH(texSize, texSize); + inner.inset(texSize/4, texSize/4); + + SkPoint3 norm; + const SkPoint3 left = SkPoint3::Make(-SK_ScalarRoot2Over2, 0.0f, SK_ScalarRoot2Over2); + const SkPoint3 up = SkPoint3::Make(0.0f, -SK_ScalarRoot2Over2, SK_ScalarRoot2Over2); + const SkPoint3 right = SkPoint3::Make(SK_ScalarRoot2Over2, 0.0f, SK_ScalarRoot2Over2); + const SkPoint3 down = SkPoint3::Make(0.0f, SK_ScalarRoot2Over2, SK_ScalarRoot2Over2); + + for (int y = 0; y < texSize; ++y) { + for (int x = 0; x < texSize; ++x) { + if (inner.contains(x, y)) { + norm.set(0.0f, 0.0f, 1.0f); + } else { + SkScalar locX = x + 0.5f - texSize/2.0f; + SkScalar locY = y + 0.5f - texSize/2.0f; + + if (locX >= 0.0f) { + if (locY > 0.0f) { + norm = locX >= locY ? right : down; // LR corner + } else { + norm = locX > -locY ? right : up; // UR corner + } + } else { + if (locY > 0.0f) { + norm = -locX > locY ? left : down; // LL corner + } else { + norm = locX > locY ? up : left; // UL corner + } + } + } + + SkASSERT(SkScalarNearlyEqual(norm.length(), 1.0f)); + unsigned char r = static_cast<unsigned char>((0.5f * norm.fX + 0.5f) * 255); + unsigned char g = static_cast<unsigned char>((-0.5f * norm.fY + 0.5f) * 255); + unsigned char b = static_cast<unsigned char>((0.5f * norm.fZ + 0.5f) * 255); + *frustum.getAddr32(x, y) = SkPackARGB32(0xFF, r, g, b); + } + } + + return frustum; +} namespace skiagm { @@ -57,6 +104,13 @@ class LightingShaderGM : public GM { public: LightingShaderGM() { this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC)); + + fLight.fColor = SkColorSetRGB(0xff, 0xff, 0xff); + fLight.fDirection.fX = 0.0f; + fLight.fDirection.fY = 0.0f; + fLight.fDirection.fZ = 1.0f; + + fAmbient = SkColorSetRGB(0x1f, 0x1f, 0x1f); } protected: @@ -66,40 +120,58 @@ protected: } SkISize onISize() override { - return SkISize::Make(kTexSize, kTexSize); + return SkISize::Make(kGMSize, kGMSize); } void onOnceBeforeDraw() override { fDiffuse = make_checkerboard(kTexSize); - fNormalMap = make_normalmap(kTexSize); + fHemiNormalMap = make_hemi_normalmap(kTexSize); + fFrustumNormalMap = make_frustum_normalmap(kTexSize); } - void onDraw(SkCanvas* canvas) override { - - SkColor ambient = SkColorSetRGB(0x1f, 0x1f, 0x1f); + void drawRect(SkCanvas* canvas, const SkRect& r, bool hemi) { - SkLightingShader::Light light; - light.fColor = SkColorSetRGB(0xff, 0xff, 0xff); - light.fDirection.fX = 0.0f; - light.fDirection.fY = 0.0f; - light.fDirection.fZ = 1.0f; + SkRect bitmapBounds = SkRect::MakeIWH(fDiffuse.width(), fDiffuse.height()); - SkAutoTUnref<SkShader> fShader(SkLightingShader::Create(fDiffuse, fNormalMap, - light, ambient)); + SkMatrix matrix; + matrix.setRectToRect(bitmapBounds, r, SkMatrix::kFill_ScaleToFit); + + SkAutoTUnref<SkShader> fShader(SkLightingShader::Create( + fDiffuse, + hemi ? fHemiNormalMap : fFrustumNormalMap, + fLight, fAmbient, + &matrix)); SkPaint paint; paint.setShader(fShader); + canvas->drawRect(r, paint); + } + + void onDraw(SkCanvas* canvas) override { SkRect r = SkRect::MakeWH(SkIntToScalar(kTexSize), SkIntToScalar(kTexSize)); + this->drawRect(canvas, r, true); - canvas->drawRect(r, paint); + r.offset(kGMSize - kTexSize, 0); + this->drawRect(canvas, r, false); + + r.offset(0, kGMSize - kTexSize); + this->drawRect(canvas, r, true); + + r.offset(kTexSize - kGMSize, 0); + this->drawRect(canvas, r, false); } private: static const int kTexSize = 128; + static const int kGMSize = 512; + + SkBitmap fDiffuse; + SkBitmap fHemiNormalMap; + SkBitmap fFrustumNormalMap; - SkBitmap fDiffuse; - SkBitmap fNormalMap; + SkLightingShader::Light fLight; + SkColor fAmbient; typedef GM INHERITED; }; |