diff options
| author |  robertphillips <robertphillips@google.com> | 2015-07-13 13:16:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-13 13:16:44 -0700 |
| commit | 3d32d768cd8b66c49c070495c08f7933b9dd2423 (patch) | |
| tree | 6676e917988dcecc00b5f33f5e33a4e7c2849344 /gm | |
| parent | 52e7657cd850f95e66eb23c6d138ee45149a1039 (diff) | |
Add new SkPoint3 class
The existing Light filter and the upcoming Lighting Shader both need a Point3 class
Review URL: https://codereview.chromium.org/1229693009
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/imagefiltersscaled.cpp | 9 | ||||
| -rw-r--r-- | gm/lighting.cpp | 17 |
2 files changed, 17 insertions, 9 deletions
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 9a80964a0e..e7a68d747d 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -16,6 +16,7 @@ #include "SkMorphologyImageFilter.h" #include "SkOffsetImageFilter.h" #include "SkPerlinNoiseShader.h" +#include "SkPoint3.h" #include "SkRectShaderImageFilter.h" #include "SkScalar.h" #include "gm.h" @@ -75,9 +76,11 @@ protected: SkAutoTUnref<SkShader> noise(SkPerlinNoiseShader::CreateFractalNoise( SkDoubleToScalar(0.1), SkDoubleToScalar(0.05), 1, 0)); - SkPoint3 pointLocation(0, 0, SkIntToScalar(10)); - SkPoint3 spotLocation(SkIntToScalar(-10), SkIntToScalar(-10), SkIntToScalar(20)); - SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0); + SkPoint3 pointLocation = SkPoint3::Make(0, 0, SkIntToScalar(10)); + SkPoint3 spotLocation = SkPoint3::Make(SkIntToScalar(-10), + SkIntToScalar(-10), + SkIntToScalar(20)); + SkPoint3 spotTarget = SkPoint3::Make(SkIntToScalar(40), SkIntToScalar(40), 0); SkScalar spotExponent = SK_Scalar1; SkScalar cutoffAngle = SkIntToScalar(15); SkScalar kd = SkIntToScalar(2); diff --git a/gm/lighting.cpp b/gm/lighting.cpp index 0bfbb47a95..6df58516b2 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -8,6 +8,7 @@ #include "gm.h" #include "SkLightingImageFilter.h" #include "SkOffsetImageFilter.h" +#include "SkPoint3.h" #define WIDTH 330 #define HEIGHT 660 @@ -69,14 +70,18 @@ protected: canvas->restore(); } } - SkPoint3 pointLocation(0, 0, SkIntToScalar(10)); + SkPoint3 pointLocation = SkPoint3::Make(0, 0, SkIntToScalar(10)); SkScalar azimuthRad = SkDegreesToRadians(SkIntToScalar(225)); SkScalar elevationRad = SkDegreesToRadians(SkIntToScalar(5)); - SkPoint3 distantDirection(SkScalarMul(SkScalarCos(azimuthRad), SkScalarCos(elevationRad)), - SkScalarMul(SkScalarSin(azimuthRad), SkScalarCos(elevationRad)), - SkScalarSin(elevationRad)); - SkPoint3 spotLocation(SkIntToScalar(-10), SkIntToScalar(-10), SkIntToScalar(20)); - SkPoint3 spotTarget(SkIntToScalar(40), SkIntToScalar(40), 0); + SkPoint3 distantDirection = SkPoint3::Make(SkScalarMul(SkScalarCos(azimuthRad), + SkScalarCos(elevationRad)), + SkScalarMul(SkScalarSin(azimuthRad), + SkScalarCos(elevationRad)), + SkScalarSin(elevationRad)); + SkPoint3 spotLocation = SkPoint3::Make(SkIntToScalar(-10), + SkIntToScalar(-10), + SkIntToScalar(20)); + SkPoint3 spotTarget = SkPoint3::Make(SkIntToScalar(40), SkIntToScalar(40), 0); SkScalar spotExponent = SK_Scalar1; SkScalar cutoffAngle = SkIntToScalar(15); SkScalar kd = SkIntToScalar(2); |