FGFS-4.1/simgear
3
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:25:03 +01:00
parent e955a18126
commit 477594d7bc
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/canvas/elements/CanvasPath.cxx
+8 -1
View File
@@ -277,7 +277,8 @@ namespace canvas
{ {
osg::BoundingBox bb; 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; VGubyte cmd_index = 0;
for( size_t i = 0, ci = 0; for( size_t i = 0, ci = 0;
i < _cmds.size() && ci < _coords.size(); i < _cmds.size() && ci < _coords.size();
@@ -297,6 +298,7 @@ namespace canvas
switch( cmd ) switch( cmd )
{ {
case VG_CLOSE_PATH: case VG_CLOSE_PATH:
cur = sub;
break; break;
case VG_MOVE_TO: case VG_MOVE_TO:
case VG_LINE_TO: case VG_LINE_TO:
@@ -352,7 +354,12 @@ namespace canvas
} }
if( num_coords > 0 ) if( num_coords > 0 )
{
cur = points[ num_coords - 1 ]; cur = points[ num_coords - 1 ];
if( cmd == VG_MOVE_TO )
sub = cur;
}
} }
return bb; return bb;