Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: samplecode/SampleAARects.cpp

Issue 85463005: remove SkFloatToScalar macro (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: add failing test back Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« include/core/SkScalar.h ('K') | « samplecode/ClockFaceView.cpp ('k') | samplecode/SampleAll.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 #include "SampleCode.h" 8 #include "SampleCode.h"
9 #include "SkView.h" 9 #include "SkView.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 SkScalar dy = SkIntToScalar(100); 78 SkScalar dy = SkIntToScalar(100);
79 SkMatrix matrix; 79 SkMatrix matrix;
80 for (size_t p = 0; p < SK_ARRAY_COUNT(paints); ++p) { 80 for (size_t p = 0; p < SK_ARRAY_COUNT(paints); ++p) {
81 for (int stroke = 0; stroke < 2; ++stroke) { 81 for (int stroke = 0; stroke < 2; ++stroke) {
82 paints[p].setStyle(stroke ? SkPaint::kStroke_Style : SkPaint::kF ill_Style); 82 paints[p].setStyle(stroke ? SkPaint::kStroke_Style : SkPaint::kF ill_Style);
83 for (int a = 0; a < 3; ++ a) { 83 for (int a = 0; a < 3; ++ a) {
84 paints[p].setAntiAlias(a > 0); 84 paints[p].setAntiAlias(a > 0);
85 paints[p].setAlpha(a > 1 ? 0x80 : 0xff); 85 paints[p].setAlpha(a > 1 ? 0x80 : 0xff);
86 86
87 canvas->save(); 87 canvas->save();
88 rect = SkRect::MakeLTRB(SkFloatToScalar(0.f), 88 rect = SkRect::MakeLTRB(0.f,
89 SkFloatToScalar(0.f), 89 0.f,
90 SkFloatToScalar(40.f), 90 40.f,
91 SkFloatToScalar(40.f)); 91 40.f);
92 canvas->drawRect(rect, paints[p]); 92 canvas->drawRect(rect, paints[p]);
93 canvas->translate(dx, 0); 93 canvas->translate(dx, 0);
94 94
95 rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), 95 rect = SkRect::MakeLTRB(0.5f,
96 SkFloatToScalar(0.5f), 96 0.5f,
97 SkFloatToScalar(40.5f), 97 40.5f,
98 SkFloatToScalar(40.5f)); 98 40.5f);
99 canvas->drawRect(rect, paints[p]); 99 canvas->drawRect(rect, paints[p]);
100 canvas->translate(dx, 0); 100 canvas->translate(dx, 0);
101 101
102 rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), 102 rect = SkRect::MakeLTRB(0.5f,
103 SkFloatToScalar(0.5f), 103 0.5f,
104 SkFloatToScalar(40.f), 104 40.f,
105 SkFloatToScalar(40.f)); 105 40.f);
106 canvas->drawRect(rect, paints[p]); 106 canvas->drawRect(rect, paints[p]);
107 canvas->translate(dx, 0); 107 canvas->translate(dx, 0);
108 108
109 rect = SkRect::MakeLTRB(SkFloatToScalar(0.75f), 109 rect = SkRect::MakeLTRB(0.75f,
110 SkFloatToScalar(0.75f), 110 0.75f,
111 SkFloatToScalar(40.75f), 111 40.75f,
112 SkFloatToScalar(40.75f)); 112 40.75f);
113 canvas->drawRect(rect, paints[p]); 113 canvas->drawRect(rect, paints[p]);
114 canvas->translate(dx, 0); 114 canvas->translate(dx, 0);
115 115
116 canvas->save(); 116 canvas->save();
117 canvas->translate(SkFloatToScalar(.33f), SkFloatToSc alar(.67f)); 117 canvas->translate(.33f, .67f);
118 rect = SkRect::MakeLTRB(SkFloatToScalar(0.0f), 118 rect = SkRect::MakeLTRB(0.0f,
119 SkFloatToScalar(0.0f), 119 0.0f,
120 SkFloatToScalar(40.0f), 120 40.0f,
121 SkFloatToScalar(40.0f)); 121 40.0f);
122 canvas->drawRect(rect, paints[p]); 122 canvas->drawRect(rect, paints[p]);
123 canvas->restore(); 123 canvas->restore();
124 canvas->translate(dx, 0); 124 canvas->translate(dx, 0);
125 125
126 canvas->save(); 126 canvas->save();
127 matrix.setRotate(SkFloatToScalar(45.f)); 127 matrix.setRotate(45.f);
128 canvas->concat(matrix); 128 canvas->concat(matrix);
129 canvas->translate(SkFloatToScalar(20.0f / sqrtf(2.f) ), 129 canvas->translate(20.0f / sqrtf(2.f),
130 SkFloatToScalar(20.0f / sqrtf(2. f))); 130 20.0f / sqrtf(2.f));
131 rect = SkRect::MakeLTRB(SkFloatToScalar(-20.0f), 131 rect = SkRect::MakeLTRB(-20.0f,
132 SkFloatToScalar(-20.0f), 132 -20.0f,
133 SkFloatToScalar(20.0f), 133 20.0f,
134 SkFloatToScalar(20.0f)); 134 20.0f);
135 canvas->drawRect(rect, paints[p]); 135 canvas->drawRect(rect, paints[p]);
136 canvas->restore(); 136 canvas->restore();
137 canvas->translate(dx, 0); 137 canvas->translate(dx, 0);
138 138
139 canvas->save(); 139 canvas->save();
140 canvas->rotate(SkFloatToScalar(90.f)); 140 canvas->rotate(90.f);
141 rect = SkRect::MakeLTRB(SkFloatToScalar(0.0f), 141 rect = SkRect::MakeLTRB(0.0f,
142 SkFloatToScalar(0.0f), 142 0.0f,
143 SkFloatToScalar(40.0f), 143 40.0f,
144 SkFloatToScalar(-40.0f)); 144 -40.0f);
145 canvas->drawRect(rect, paints[p]); 145 canvas->drawRect(rect, paints[p]);
146 canvas->restore(); 146 canvas->restore();
147 canvas->translate(dx, 0); 147 canvas->translate(dx, 0);
148 148
149 canvas->save(); 149 canvas->save();
150 canvas->rotate(SkFloatToScalar(90.f)); 150 canvas->rotate(90.f);
151 rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), 151 rect = SkRect::MakeLTRB(0.5f,
152 SkFloatToScalar(0.5f), 152 0.5f,
153 SkFloatToScalar(40.5f), 153 40.5f,
154 SkFloatToScalar(-40.5f)); 154 -40.5f);
155 canvas->drawRect(rect, paints[p]); 155 canvas->drawRect(rect, paints[p]);
156 canvas->restore(); 156 canvas->restore();
157 canvas->translate(dx, 0); 157 canvas->translate(dx, 0);
158 158
159 canvas->save(); 159 canvas->save();
160 matrix.setScale(SkFloatToScalar(-1.f), SkFloatToScal ar(-1.f)); 160 matrix.setScale(-1.f, -1.f);
161 canvas->concat(matrix); 161 canvas->concat(matrix);
162 rect = SkRect::MakeLTRB(SkFloatToScalar(0.5f), 162 rect = SkRect::MakeLTRB(0.5f,
163 SkFloatToScalar(0.5f), 163 0.5f,
164 SkFloatToScalar(-40.5f), 164 -40.5f,
165 SkFloatToScalar(-40.5f)); 165 -40.5f);
166 canvas->drawRect(rect, paints[p]); 166 canvas->drawRect(rect, paints[p]);
167 canvas->restore(); 167 canvas->restore();
168 canvas->translate(dx, 0); 168 canvas->translate(dx, 0);
169 169
170 canvas->save(); 170 canvas->save();
171 matrix.setScale(SkFloatToScalar(2.1f), SkFloatToScal ar(4.1f)); 171 matrix.setScale(2.1f, 4.1f);
172 canvas->concat(matrix); 172 canvas->concat(matrix);
173 rect = SkRect::MakeLTRB(SkFloatToScalar(0.1f), 173 rect = SkRect::MakeLTRB(0.1f,
174 SkFloatToScalar(0.1f), 174 0.1f,
175 SkFloatToScalar(19.1f), 175 19.1f,
176 SkFloatToScalar(9.1f)); 176 9.1f);
177 canvas->drawRect(rect, paints[p]); 177 canvas->drawRect(rect, paints[p]);
178 canvas->restore(); 178 canvas->restore();
179 canvas->translate(dx, 0); 179 canvas->translate(dx, 0);
180 180
181 canvas->restore(); 181 canvas->restore();
182 canvas->translate(0, dy); 182 canvas->translate(0, dy);
183 } 183 }
184 } 184 }
185 } 185 }
186 } 186 }
187 187
188 private: 188 private:
189 int fWidth; 189 int fWidth;
190 190
191 typedef SampleView INHERITED; 191 typedef SampleView INHERITED;
192 }; 192 };
193 193
194 ////////////////////////////////////////////////////////////////////////////// 194 //////////////////////////////////////////////////////////////////////////////
195 195
196 static SkView* MyFactory() { return new AARectView; } 196 static SkView* MyFactory() { return new AARectView; }
197 static SkViewRegister reg(MyFactory); 197 static SkViewRegister reg(MyFactory);
OLDNEW
« include/core/SkScalar.h ('K') | « samplecode/ClockFaceView.cpp ('k') | samplecode/SampleAll.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698