aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/vertexdump.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-25 19:44:07 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-25 19:44:07 +0000
commit4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c (patch)
treedae12c217068df2844c0ce18fb2c62311ae8c5e9 /samplecode/vertexdump.cpp
parent2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (diff)
remove SkFloatToScalar macro
BUG= R=reed@google.com, djsollen@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/85463005 git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/vertexdump.cpp')
-rw-r--r--samplecode/vertexdump.cpp64
1 files changed, 32 insertions, 32 deletions
diff --git a/samplecode/vertexdump.cpp b/samplecode/vertexdump.cpp
index ae310a5d54..9bfb0ce40a 100644
--- a/samplecode/vertexdump.cpp
+++ b/samplecode/vertexdump.cpp
@@ -10,38 +10,38 @@
void setup_vertexbug(SkPoint verts[], SkPoint texs[], uint16_t index[]);
void setup_vertexbug(SkPoint verts[], SkPoint texs[], uint16_t index[]) {
- verts[0].set(SkFloatToScalar(107), SkFloatToScalar(189));
- texs[0].set(SkFloatToScalar(0), SkFloatToScalar(0));
- verts[1].set(SkFloatToScalar(116), SkFloatToScalar(189));
- texs[1].set(SkFloatToScalar(9), SkFloatToScalar(0));
- verts[2].set(SkFloatToScalar(203), SkFloatToScalar(189));
- texs[2].set(SkFloatToScalar(35), SkFloatToScalar(0));
- verts[3].set(SkFloatToScalar(212), SkFloatToScalar(189));
- texs[3].set(SkFloatToScalar(44), SkFloatToScalar(0));
- verts[4].set(SkFloatToScalar(107), SkFloatToScalar(198));
- texs[4].set(SkFloatToScalar(0), SkFloatToScalar(9));
- verts[5].set(SkFloatToScalar(116), SkFloatToScalar(198));
- texs[5].set(SkFloatToScalar(9), SkFloatToScalar(9));
- verts[6].set(SkFloatToScalar(203), SkFloatToScalar(198));
- texs[6].set(SkFloatToScalar(35), SkFloatToScalar(9));
- verts[7].set(SkFloatToScalar(212), SkFloatToScalar(198));
- texs[7].set(SkFloatToScalar(44), SkFloatToScalar(9));
- verts[8].set(SkFloatToScalar(107), SkFloatToScalar(224));
- texs[8].set(SkFloatToScalar(0), SkFloatToScalar(39));
- verts[9].set(SkFloatToScalar(116), SkFloatToScalar(224));
- texs[9].set(SkFloatToScalar(9), SkFloatToScalar(39));
- verts[10].set(SkFloatToScalar(203), SkFloatToScalar(224));
- texs[10].set(SkFloatToScalar(35), SkFloatToScalar(39));
- verts[11].set(SkFloatToScalar(212), SkFloatToScalar(224));
- texs[11].set(SkFloatToScalar(44), SkFloatToScalar(39));
- verts[12].set(SkFloatToScalar(107), SkFloatToScalar(233));
- texs[12].set(SkFloatToScalar(0), SkFloatToScalar(48));
- verts[13].set(SkFloatToScalar(116), SkFloatToScalar(233));
- texs[13].set(SkFloatToScalar(9), SkFloatToScalar(48));
- verts[14].set(SkFloatToScalar(203), SkFloatToScalar(233));
- texs[14].set(SkFloatToScalar(35), SkFloatToScalar(48));
- verts[15].set(SkFloatToScalar(212), SkFloatToScalar(233));
- texs[15].set(SkFloatToScalar(44), SkFloatToScalar(48));
+ verts[0].set(107, 189);
+ texs[0].set(0, 0);
+ verts[1].set(116, 189);
+ texs[1].set(9, 0);
+ verts[2].set(203, 189);
+ texs[2].set(35, 0);
+ verts[3].set(212, 189);
+ texs[3].set(44, 0);
+ verts[4].set(107, 198);
+ texs[4].set(0, 9);
+ verts[5].set(116, 198);
+ texs[5].set(9, 9);
+ verts[6].set(203, 198);
+ texs[6].set(35, 9);
+ verts[7].set(212, 198);
+ texs[7].set(44, 9);
+ verts[8].set(107, 224);
+ texs[8].set(0, 39);
+ verts[9].set(116, 224);
+ texs[9].set(9, 39);
+ verts[10].set(203, 224);
+ texs[10].set(35, 39);
+ verts[11].set(212, 224);
+ texs[11].set(44, 39);
+ verts[12].set(107, 233);
+ texs[12].set(0, 48);
+ verts[13].set(116, 233);
+ texs[13].set(9, 48);
+ verts[14].set(203, 233);
+ texs[14].set(35, 48);
+ verts[15].set(212, 233);
+ texs[15].set(44, 48);
index[0] = 0; index[1] = 5; index[2] = 1;
index[3] = 0; index[4] = 4; index[5] = 5;
#if 0