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

remove unused SkCubicInterval

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1533393005

TBR=scroggo

Review URL: https://codereview.chromium.org/1533393005
This commit is contained in:
reed 2015-12-23 11:21:39 -08:00 committed by Commit bot
parent 3e980c3d88
commit 08e7047e68
3 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/utils.gypi
View File

@ -15,7 +15,6 @@
'<(skia_include_path)/utils/SkFrontBufferedStream.h',
'<(skia_include_path)/utils/SkCamera.h',
'<(skia_include_path)/utils/SkCanvasStateUtils.h',
'<(skia_include_path)/utils/SkCubicInterval.h',
'<(skia_include_path)/utils/SkDebugUtils.h',
'<(skia_include_path)/utils/SkDumpCanvas.h',
'<(skia_include_path)/utils/SkEventTracer.h',
@ -49,7 +48,6 @@
'<(skia_src_path)/utils/SkCanvasStack.h',
'<(skia_src_path)/utils/SkCanvasStack.cpp',
'<(skia_src_path)/utils/SkCanvasStateUtils.cpp',
'<(skia_src_path)/utils/SkCubicInterval.cpp',
'<(skia_src_path)/utils/SkDashPath.cpp',
'<(skia_src_path)/utils/SkDashPathPriv.h',
'<(skia_src_path)/utils/SkDumpCanvas.cpp',

22
include/utils/SkCubicInterval.h
View File

@ -1,22 +0,0 @@
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkCubicInterval_DEFINED
#define SkCubicInterval_DEFINED
#include "SkPoint.h"
SkScalar SkEvalCubicInterval(SkScalar x1, SkScalar y1,
SkScalar x2, SkScalar y2,
SkScalar unitX);
static inline SkScalar SkEvalCubicInterval(const SkPoint pts[2], SkScalar x) {
return SkEvalCubicInterval(pts[0].fX, pts[0].fY,
pts[1].fX, pts[1].fY, x);
}
#endif

67
src/utils/SkCubicInterval.cpp
View File

@ -1,67 +0,0 @@
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "SkCubicInterval.h"
static SkScalar eval_cubic(SkScalar c1, SkScalar c2, SkScalar c3,
SkScalar t) {
return SkScalarMul(SkScalarMul(SkScalarMul(c3, t) + c2, t) + c1, t);
}
static SkScalar find_cubic_t(SkScalar c1, SkScalar c2, SkScalar c3,
SkScalar targetX) {
SkScalar minT = 0;
SkScalar maxT = SK_Scalar1;
SkScalar t;
for (;;) {
t = SkScalarAve(minT, maxT);
SkScalar x = eval_cubic(c1, c2, c3, t);
if (SkScalarNearlyZero(x - targetX)) {
break;
}
// subdivide the range and try again
if (x < targetX) {
minT = t;
} else {
maxT = t;
}
}
return t;
}
/*
a(1-t)^3 + 3bt(1-t)^2 + 3ct^2(1-t) + dt^3
a: [0, 0]
d: [1, 1]
3bt - 6bt^2 + 3bt^3 + 3ct^2 - 3ct^3 + t^3
C1 = t^1: 3b
C2 = t^2: 3c - 6b
C3 = t^3: 3b - 3c + 1
((C3*t + C2)*t + C1)*t
*/
SkScalar SkEvalCubicInterval(SkScalar x1, SkScalar y1,
SkScalar x2, SkScalar y2,
SkScalar unitX) {
x1 = SkScalarPin(x1, 0, SK_Scalar1);
x2 = SkScalarPin(x2, 0, SK_Scalar1);
unitX = SkScalarPin(unitX, 0, SK_Scalar1);
// First compute our coefficients in X
x1 *= 3;
x2 *= 3;
// now search for t given unitX
SkScalar t = find_cubic_t(x1, x2 - 2*x1, x1 - x2 + SK_Scalar1, unitX);
// now evaluate the cubic in Y
y1 *= 3;
y2 *= 3;
return eval_cubic(y1, y2 - 2*y1, y1 - y2 + SK_Scalar1, t);
}