| Index: src/effects/SkLightingShader.h
|
| diff --git a/src/effects/SkLightingShader.h b/src/effects/SkLightingShader.h
|
| index b85e4318d3fd23e2093ae9518e4bb177d53f78a8..64d41a291e7bd8d90d402e1b33954bd3cd78a1dc 100644
|
| --- a/src/effects/SkLightingShader.h
|
| +++ b/src/effects/SkLightingShader.h
|
| @@ -18,7 +18,7 @@ public:
|
| struct Light {
|
| SkVector3 fDirection; // direction towards the light (+Z is out of the screen).
|
| // If degenerate, it will be replaced with (0, 0, 1).
|
| - SkColor fColor; // linear (unpremul) color. Note: alpha assumed to be 255.
|
| + SkColor3f fColor; // linear (unpremul) color. Range is 0..1 in each channel.
|
| };
|
|
|
| /** Returns a shader that lights the diffuse and normal maps with a single light.
|
| @@ -29,16 +29,28 @@ public:
|
| @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 ambient the linear (unpremul) ambient light color. Range is 0..1/channel.
|
| @param localMatrix the matrix mapping the textures to the dest rect
|
|
|
| NULL will be returned if:
|
| either 'diffuse' or 'normal' are empty
|
| either 'diffuse' or 'normal' are too big (> 65535 on a side)
|
| 'diffuse' and 'normal' aren't the same size
|
| +
|
| + The lighting equation is currently:
|
| + result = LightColor * DiffuseColor * (Normal * LightDir) + AmbientColor
|
| +
|
| + The normal map is currently assumed to be an 8888 image where the normal at a texel
|
| + is retrieved by:
|
| + N.x = R-127;
|
| + N.y = G-127;
|
| + N.z = B-127;
|
| + N.normalize();
|
| + The +Z axis is thus encoded in RGB as (127, 127, 255) while the -Z axis is
|
| + (127, 127, 0).
|
| */
|
| static SkShader* Create(const SkBitmap& diffuse, const SkBitmap& normal,
|
| - const SkLightingShader::Light& light, const SkColor ambient,
|
| + const SkLightingShader::Light& light, const SkColor3f& ambient,
|
| const SkMatrix* localMatrix);
|
|
|
| SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
|
|
|