fly/flightgear
1
0
Fork 0
Code Activity

Fix setting global path options per path

Browse source
This commit is contained in:
Thomas Geymayer 2012-07-05 11:16:32 +02:00 committed by James Turner
parent d4d9669538
commit c5695f6f88
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Canvas/elements/path.cxx
View file

@ -79,8 +79,6 @@ namespace canvas
{ {
_stroke_width = width; _stroke_width = width;
_stroke_dash = dash; _stroke_dash = dash;
_attributes_dirty |= STROKE;
} }
/** /**
@ -161,23 +159,14 @@ namespace canvas
} }
// Initialize/Update the paint // Initialize/Update the paint
if( _attributes_dirty & (STROKE_COLOR | STROKE) ) if( _attributes_dirty & STROKE_COLOR )
{ {
if( _paint == VG_INVALID_HANDLE ) if( _paint == VG_INVALID_HANDLE )
_paint = vgCreatePaint(); _paint = vgCreatePaint();
if( _attributes_dirty & STROKE_COLOR )
vgSetParameterfv(_paint, VG_PAINT_COLOR, 4, _stroke_color); vgSetParameterfv(_paint, VG_PAINT_COLOR, 4, _stroke_color);
if( _attributes_dirty & STROKE )
{
vgSetf(VG_STROKE_LINE_WIDTH, _stroke_width);
vgSetfv( VG_STROKE_DASH_PATTERN, _attributes_dirty &= ~STROKE_COLOR;
_stroke_dash.size(),
_stroke_dash.empty() ? 0 : &_stroke_dash[0] );
}
_attributes_dirty &= ~(STROKE_COLOR | STROKE);
} }
// Initialize/update fill paint // Initialize/update fill paint
@ -198,6 +187,11 @@ namespace canvas
{ {
mode |= VG_STROKE_PATH; mode |= VG_STROKE_PATH;
vgSetPaint(_paint, VG_STROKE_PATH); vgSetPaint(_paint, VG_STROKE_PATH);
vgSetf(VG_STROKE_LINE_WIDTH, _stroke_width);
vgSetfv( VG_STROKE_DASH_PATTERN,
_stroke_dash.size(),
_stroke_dash.empty() ? 0 : &_stroke_dash[0] );
} }
if( _fill ) if( _fill )
{ {
@ -225,8 +219,7 @@ namespace canvas
{ {
PATH = 0x0001, PATH = 0x0001,
STROKE_COLOR = PATH << 1, STROKE_COLOR = PATH << 1,
STROKE = STROKE_COLOR << 1, FILL_COLOR = STROKE_COLOR << 1,
FILL_COLOR = STROKE << 1,
FILL = FILL_COLOR << 1 FILL = FILL_COLOR << 1
}; };