Index: samplecode/SampleShaderText.cpp |
diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp |
index 89abfc234549d0b355f64e2e3b346e823a07a8ab..9fdae842ab5c2c6bf5efee01966c9125a253015b 100644 |
--- a/samplecode/SampleShaderText.cpp |
+++ b/samplecode/SampleShaderText.cpp |
@@ -72,13 +72,13 @@ static SkShader* MakeSweep(const SkPoint pts[2], const GradData& data, SkShader: |
return SkGradientShader::CreateSweep(center.fX, center.fY, data.fColors, data.fPos, data.fCount); |
} |
-static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { |
+static SkShader* Make2Conical(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm) { |
SkPoint center0, center1; |
center0.set(SkScalarAve(pts[0].fX, pts[1].fX), |
SkScalarAve(pts[0].fY, pts[1].fY)); |
center1.set(SkScalarInterp(pts[0].fX, pts[1].fX, SkIntToScalar(3)/5), |
SkScalarInterp(pts[0].fY, pts[1].fY, SkIntToScalar(1)/4)); |
- return SkGradientShader::CreateTwoPointRadial( |
+ return SkGradientShader::CreateTwoPointConical( |
center1, (pts[1].fX - pts[0].fX) / 7, |
center0, (pts[1].fX - pts[0].fX) / 2, |
data.fColors, data.fPos, data.fCount, tm); |
@@ -87,7 +87,7 @@ static SkShader* Make2Radial(const SkPoint pts[2], const GradData& data, SkShade |
typedef SkShader* (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); |
static const GradMaker gGradMakers[] = { |
- MakeLinear, MakeRadial, MakeSweep, Make2Radial |
+ MakeLinear, MakeRadial, MakeSweep, Make2Conical |
}; |
/////////////////////////////////////////////////////////////////////////////// |