AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update SkLightingShader to take a localMatrix

Browse Source 
W/o this we can't draw lit objects anywhere but the origin.

Review URL: https://codereview.chromium.org/1253223003
This commit is contained in:
robertphillips 2015-07-30 05:09:17 -07:00 committed by Commit bot
parent a15cd9cb7f
commit 640898f588
4 changed files with 111 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
gm/lightingshader.cpp
View File

@ -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 {
void drawRect(SkCanvas* canvas, const SkRect& r, bool hemi) {
SkColor ambient = SkColorSetRGB(0x1f, 0x1f, 0x1f);
SkRect bitmapBounds = SkRect::MakeIWH(fDiffuse.width(), fDiffuse.height());
SkLightingShader::Light light;
light.fColor = SkColorSetRGB(0xff, 0xff, 0xff);
light.fDirection.fX = 0.0f;
light.fDirection.fY = 0.0f;
light.fDirection.fZ = 1.0f;
SkMatrix matrix;
matrix.setRectToRect(bitmapBounds, r, SkMatrix::kFill_ScaleToFit);
SkAutoTUnref<SkShader> fShader(SkLightingShader::Create(fDiffuse, fNormalMap,
light, ambient));
SkAutoTUnref<SkShader> fShader(SkLightingShader::Create(
fDiffuse,
hemi ? fHemiNormalMap : fFrustumNormalMap,
fLight, fAmbient,
&matrix));
SkPaint paint;
paint.setShader(fShader);
SkRect r = SkRect::MakeWH(SkIntToScalar(kTexSize), SkIntToScalar(kTexSize));
canvas->drawRect(r, paint);
}
void onDraw(SkCanvas* canvas) override {
SkRect r = SkRect::MakeWH(SkIntToScalar(kTexSize), SkIntToScalar(kTexSize));
this->drawRect(canvas, r, true);
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 fNormalMap;
SkBitmap fDiffuse;
SkBitmap fHemiNormalMap;
SkBitmap fFrustumNormalMap;
SkLightingShader::Light fLight;
SkColor fAmbient;
typedef GM INHERITED;
};

4
samplecode/SampleLighting.cpp
View File

@ -41,7 +41,7 @@ public:
fAmbientColor = SkColorSetRGB(0x1f, 0x1f, 0x1f);
fShader.reset(SkLightingShader::Create(fDiffuseBitmap, fNormalBitmap,
light, fAmbientColor));
light, fAmbientColor, nullptr));
}
virtual ~LightingView() {}
@ -67,7 +67,7 @@ protected:
light.fDirection.fZ = SkScalarCos(SK_ScalarPI*0.25f);
fShader.reset(SkLightingShader::Create(fDiffuseBitmap, fNormalBitmap,
light, fAmbientColor));
light, fAmbientColor, nullptr));
SkPaint paint;
paint.setShader(fShader);

19
src/effects/SkLightingShader.cpp
View File

@ -51,8 +51,9 @@ public:
*/
SkLightingShaderImpl(const SkBitmap& diffuse, const SkBitmap& normal,
const SkLightingShader::Light& light,
const SkColor ambient)
: fDiffuseMap(diffuse)
const SkColor ambient, const SkMatrix* localMatrix)
: INHERITED(localMatrix)
, fDiffuseMap(diffuse)
, fNormalMap(normal)
, fLight(light)
, fAmbientColor(ambient) {
@ -480,6 +481,9 @@ void SkLightingShaderImpl::toString(SkString* str) const {
#endif
SkFlattenable* SkLightingShaderImpl::CreateProc(SkReadBuffer& buf) {
SkMatrix localMatrix;
buf.readMatrix(&localMatrix);
SkBitmap diffuse;
if (!buf.readBitmap(&diffuse)) {
return NULL;
@ -500,12 +504,12 @@ SkFlattenable* SkLightingShaderImpl::CreateProc(SkReadBuffer& buf) {
SkColor ambient = buf.readColor();
// TODO: this would be nice to enable
// return SkCreateLightingShader(diffuse, normal, light, ambient, NULL);
return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient));
return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient, &localMatrix));
}
void SkLightingShaderImpl::flatten(SkWriteBuffer& buf) const {
buf.writeMatrix(this->getLocalMatrix());
buf.writeBitmap(fDiffuseMap);
buf.writeBitmap(fNormalMap);
buf.writeScalarArray(&fLight.fDirection.fX, 3);
@ -565,7 +569,8 @@ static bool bitmap_is_too_big(const SkBitmap& bm) {
SkShader* SkLightingShader::Create(const SkBitmap& diffuse, const SkBitmap& normal,
const SkLightingShader::Light& light,
const SkColor ambient) {
const SkColor ambient,
const SkMatrix* localMatrix) {
if (diffuse.isNull() || bitmap_is_too_big(diffuse) ||
normal.isNull() || bitmap_is_too_big(normal) ||
diffuse.width() != normal.width() ||
@ -573,7 +578,7 @@ SkShader* SkLightingShader::Create(const SkBitmap& diffuse, const SkBitmap& norm
return nullptr;
}
return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient));
return SkNEW_ARGS(SkLightingShaderImpl, (diffuse, normal, light, ambient, localMatrix));
}
///////////////////////////////////////////////////////////////////////////////

12
src/effects/SkLightingShader.h
View File

@ -26,10 +26,11 @@ public:
It returns a shader with a reference count of 1.
The caller should decrement the shader's reference count when done with the shader.
It is an error for count to be < 2.
@param diffuse the diffuse bitmap
@param normal the normal map
@param light the light applied to the normal map
@param ambient the linear (unpremul) ambient light color. Note: alpha assumed to be 255.
@param diffuse the diffuse bitmap
@param normal the normal map
@param light the light applied to the normal map
@param ambient the linear (unpremul) ambient light color. Note: alpha assumed to be 255.
@param localMatrix the matrix mapping the textures to the dest rect
NULL will be returned if:
either 'diffuse' or 'normal' are empty
@ -37,7 +38,8 @@ public:
'diffuse' and 'normal' aren't the same size
*/
static SkShader* Create(const SkBitmap& diffuse, const SkBitmap& normal,
const SkLightingShader::Light& light, const SkColor ambient);
const SkLightingShader::Light& light, const SkColor ambient,
const SkMatrix* localMatrix);
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
};