FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Canvas: Fix bounding box calculation for paths with subpaths.

Browse Source
This commit is contained in:
Thomas Geymayer 2014-02-08 00:22:36 +01:00
parent 943f52aedf
commit de39e0093a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
simgear/canvas/elements/CanvasPath.cxx
View File

@ -277,7 +277,8 @@ namespace canvas
{
osg::BoundingBox bb;
osg::Vec2f cur; // VG "Current point" (in local coordinates)
osg::Vec2f cur(0, 0), // VG "Current point" (in local coordinates)
sub(0, 0); // beginning of current sub path
VGubyte cmd_index = 0;
for( size_t i = 0, ci = 0;
i < _cmds.size() && ci < _coords.size();
@ -297,6 +298,7 @@ namespace canvas
switch( cmd )
{
case VG_CLOSE_PATH:
cur = sub;
break;
case VG_MOVE_TO:
case VG_LINE_TO:
@ -352,7 +354,12 @@ namespace canvas
}
if( num_coords > 0 )
{
cur = points[ num_coords - 1 ];
if( cmd == VG_MOVE_TO )
sub = cur;
}
}
return bb;