|
23 | 23 | brush(surface_brush_factory& f, error_code& ec) noexcept;
|
24 | 24 |
|
25 | 25 | // \ref{brush.modifiers}, modifiers:
|
26 |
| - void extend(experimental::io2d::extend e) noexcept; |
| 26 | + void tiling(experimental::io2d::tiling e) noexcept; |
27 | 27 | void filter(experimental::io2d::filter f) noexcept;
|
28 | 28 | void matrix(const matrix_2d& m) noexcept;
|
29 | 29 |
|
30 | 30 | // \ref{brush.observers}, observers:
|
31 |
| - experimental::io2d::extend extend() const noexcept; |
| 31 | + experimental::io2d::tiling tiling() const noexcept; |
32 | 32 | experimental::io2d::filter filter() const noexcept;
|
33 | 33 | matrix_2d matrix() const noexcept;
|
34 | 34 | brush_type type() const noexcept;
|
35 | 35 |
|
36 | 36 | private:
|
37 |
| - experimental::io2d::extend _Extend; // \expos |
| 37 | + experimental::io2d::tiling _Tiling; // \expos |
38 | 38 | experimental::io2d::filter _Filter; // \expos
|
39 | 39 | matrix_2d _Matrix; // \expos
|
40 | 40 | brush_type _Brush_type; // \expos
|
|
55 | 55 | A \tcode{brush} object's graphics data is immutable. It is observable only by the effect that it produces when the brush is used as a Source Brush (\ref{surface.sourcebrush}) or as a Mask Brush (\ref{surface.rendering} and \ref{surface.masking}).
|
56 | 56 |
|
57 | 57 | \pnum
|
58 |
| -A \tcode{brush} object also has mutable \tcode{extend}, \tcode{filter}, and \tcode{matrix_2d} observable state data values. |
| 58 | +A \tcode{brush} object also has mutable \tcode{tiling}, \tcode{filter}, and \tcode{matrix_2d} observable state data values. |
59 | 59 |
|
60 | 60 | \pnum
|
61 | 61 | A \tcode{brush} object has an immutable \tcode{brush_type} observable state data value which indicates the type of brush factory that was used in creating the \tcode{brush} object (Table~\ref{tab:brushtype.meanings}).
|
|
82 | 82 | \rSec2 [brush.sampling.solidcolor] {Sampling from a solid color brush}
|
83 | 83 |
|
84 | 84 | \pnum
|
85 |
| -When \tcode{b} is a solid color brush, then when sampling from \tcode{b}, the visual data returned shall always be the visual data equivalent to the result of calling \tcode{solid_color_brush_factory::color} on the \tcode{solid_color_brush_factory} from which \tcode{b} was created, regardless of the point which is to be sampled and regardless of the return values of \tcode{b.extend()}, \tcode{b.filter()}, and \tcode{b.matrix()}. |
| 85 | +When \tcode{b} is a solid color brush, then when sampling from \tcode{b}, the visual data returned shall always be the visual data equivalent to the result of calling \tcode{solid_color_brush_factory::color} on the \tcode{solid_color_brush_factory} from which \tcode{b} was created, regardless of the point which is to be sampled and regardless of the return values of \tcode{b.tiling()}, \tcode{b.filter()}, and \tcode{b.matrix()}. |
86 | 86 |
|
87 | 87 | \rSec2 [brush.sampling.linear] {Sampling from a linear gradient brush}
|
88 | 88 |
|
89 | 89 | \pnum
|
90 |
| -When \tcode{b} is a linear gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered linear gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered linear gradient is created as specified by \ref{gradients.linear} and \ref{gradients.sampling}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}. |
| 90 | +When \tcode{b} is a linear gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered linear gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered linear gradient is created as specified by \ref{gradients.linear} and \ref{gradients.sampling}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}. |
91 | 91 |
|
92 | 92 | \rSec2 [brush.sampling.radial] {Sampling from a radial gradient brush}
|
93 | 93 |
|
94 | 94 | \pnum
|
95 |
| -When \tcode{b} is a radial gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered radial gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered radial gradient is created as specified by \ref{gradients.radial} and \ref{gradients.sampling}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}. |
| 95 | +When \tcode{b} is a radial gradient brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the rendered radial gradient, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords} and the rendered radial gradient is created as specified by \ref{gradients.radial} and \ref{gradients.sampling}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}. |
96 | 96 |
|
97 | 97 | \rSec2 [brush.sampling.surface] {Sampling from a surface brush}
|
98 | 98 |
|
99 | 99 | \pnum
|
100 |
| -When \tcode{b} is a surface brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the graphics data of the brush, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords}, taking into account the value of \tcode{b.extend()} and \tcode{b.filter()}. |
| 100 | +When \tcode{b} is a surface brush, then when sampling from \tcode{b}, the visual data returned shall be from the point \tcode{pt} in the graphics data of the brush, where \tcode{pt} is the return value when passing the point to be sampled to \tcode{b.matrix().transform_coords}, taking into account the value of \tcode{b.tiling()} and \tcode{b.filter()}. |
101 | 101 |
|
102 | 102 | \rSec1 [brush.cons] {\tcode{brush} constructors and assignment operators}
|
103 | 103 |
|
|
118 | 118 | \postconditions
|
119 | 119 | \tcode{_Brush_type == brush_type::solid_color}.
|
120 | 120 |
|
121 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 121 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
122 | 122 |
|
123 | 123 | \tcode{_Filter == std::experimental::io2d::filter::fast}.
|
124 | 124 |
|
|
152 | 152 | \postconditions
|
153 | 153 | \tcode{_Brush_type == brush_type::linear}.
|
154 | 154 |
|
155 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 155 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
156 | 156 |
|
157 |
| -\tcode{_Filter == std::experimental::io2d::extend::good}. |
| 157 | +\tcode{_Filter == std::experimental::io2d::tiling::good}. |
158 | 158 |
|
159 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 159 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
160 | 160 |
|
161 | 161 | \pnum
|
162 | 162 | \throws
|
|
186 | 186 | \postconditions
|
187 | 187 | \tcode{_Brush_type == brush_type::radial}.
|
188 | 188 |
|
189 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 189 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
190 | 190 |
|
191 |
| -\tcode{_Filter == std::experimental::io2d::extend::good}. |
| 191 | +\tcode{_Filter == std::experimental::io2d::tiling::good}. |
192 | 192 |
|
193 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 193 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
194 | 194 |
|
195 | 195 | \pnum
|
196 | 196 | \throws
|
|
217 | 217 | %\postconditions
|
218 | 218 | %\tcode{_Brush_type == brush_type::mesh}.
|
219 | 219 | %
|
220 |
| -%\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 220 | +%\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
221 | 221 | %
|
222 |
| -%\tcode{_Filter == std::experimental::io2d::extend::good}. |
| 222 | +%\tcode{_Filter == std::experimental::io2d::tiling::good}. |
223 | 223 | %
|
224 |
| -%\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 224 | +%\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
225 | 225 | %
|
226 | 226 | %\pnum
|
227 | 227 | %\throws
|
|
251 | 251 | \postconditions
|
252 | 252 | \tcode{_Brush_type == brush_type::surface}.
|
253 | 253 |
|
254 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 254 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
255 | 255 |
|
256 |
| -\tcode{_Filter == std::experimental::io2d::extend::good}. |
| 256 | +\tcode{_Filter == std::experimental::io2d::tiling::good}. |
257 | 257 |
|
258 |
| -\tcode{_Extend == std::experimental::io2d::extend::none}. |
| 258 | +\tcode{_Tiling == std::experimental::io2d::tiling::none}. |
259 | 259 |
|
260 | 260 | \pnum
|
261 | 261 | \throws
|
|
270 | 270 |
|
271 | 271 | \rSec1 [brush.modifiers]{\tcode{brush} modifiers}
|
272 | 272 |
|
273 |
| -\indexlibrary{\idxcode{brush}!\idxcode{extend}} |
274 |
| -\indexlibrary{\idxcode{extend}!\idxcode{brush}} |
| 273 | +\indexlibrary{\idxcode{brush}!\idxcode{tiling}} |
| 274 | +\indexlibrary{\idxcode{tiling}!\idxcode{brush}} |
275 | 275 | \begin{itemdecl}
|
276 |
| -void extend(experimental::io2d::extend e) noexcept; |
| 276 | +void tiling(experimental::io2d::tiling e) noexcept; |
277 | 277 | \end{itemdecl}
|
278 | 278 | \begin{itemdescr}
|
279 | 279 | \pnum
|
280 | 280 | \effects
|
281 |
| -Sets the \tcode{extend} value for the \tcode{brush} object. |
| 281 | +Sets the \tcode{tiling} value for the \tcode{brush} object. |
282 | 282 |
|
283 | 283 | \pnum
|
284 | 284 | \postconditions
|
285 |
| -\tcode{_Extend == e}. |
| 285 | +\tcode{_Tiling == e}. |
286 | 286 | \end{itemdescr}
|
287 | 287 |
|
288 | 288 | \indexlibrary{\idxcode{brush}!\idxcode{filter}}
|
|
317 | 317 |
|
318 | 318 | \rSec1 [brush.observers]{\tcode{brush} observers}
|
319 | 319 |
|
320 |
| -\indexlibrary{\idxcode{brush}!\idxcode{extend}} |
321 |
| -\indexlibrary{\idxcode{extend}!\idxcode{brush}} |
| 320 | +\indexlibrary{\idxcode{brush}!\idxcode{tiling}} |
| 321 | +\indexlibrary{\idxcode{tiling}!\idxcode{brush}} |
322 | 322 | \begin{itemdecl}
|
323 |
| -experimental::io2d::extend extend() const noexcept; |
| 323 | +experimental::io2d::tiling tiling() const noexcept; |
324 | 324 | \end{itemdecl}
|
325 | 325 | \begin{itemdescr}
|
326 | 326 | \pnum
|
327 | 327 | \returns
|
328 |
| -\tcode{_Extend}. |
| 328 | +\tcode{_Tiling}. |
329 | 329 | \end{itemdescr}
|
330 | 330 |
|
331 | 331 | \indexlibrary{\idxcode{brush}!\idxcode{filter}}
|
|
0 commit comments