fly/fgdata
1
0
Fork 0
Code Activity

Merge /u/jsb1685/fgdata/ branch jsb-next into next

Browse source 
https://sourceforge.net/p/flightgear/fgdata/merge-requests/117/
This commit is contained in:
James Turner 2018-12-02 11:12:04 +00:00
commit 6f26451c08
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Nasal/canvas/svg.nas
View file

@ -499,7 +499,7 @@ var parsesvg = func(group, path, options = nil)
}); });
return; return;
} }
else if( name == "path" or name == "rect" ) else if( name == "path" or name == "rect" or name == "circle" or name == "ellipse")
{ {
pushElement('path', attr['id']); pushElement('path', attr['id']);
@ -523,8 +523,22 @@ var parsesvg = func(group, path, options = nil)
stack[-1].rect(x, y, width, height, cfg); stack[-1].rect(x, y, width, height, cfg);
} }
else if (name == "circle") {
var cx = evalCSSNum(attr['cx']);
var cy = evalCSSNum(attr['cy']);
var r = evalCSSNum(attr['r']);
stack[-1].moveTo(cx-r,cy).arcSmallCW(r,r,0,2*r,0).arcSmallCW(r,r,0,-2*r,0);
}
if (name == "ellipse") {
var cx = evalCSSNum(attr['cx']);
var cy = evalCSSNum(attr['cy']);
var rx = evalCSSNum(attr['rx']);
var ry = evalCSSNum(attr['ry']);
stack[-1].moveTo(cx-rx,cy).arcSmallCW(rx,ry,0,2*rx,0).arcSmallCW(rx,ry,0,-2*rx,0);
}
if (name == "path") {
parsePath(attr['d']); parsePath(attr['d']);
}
var fill = style['fill']; var fill = style['fill'];
if( fill != nil ) if( fill != nil )
@ -563,7 +577,7 @@ var parsesvg = func(group, path, options = nil)
{ {
var ref = attr["xlink:href"]; var ref = attr["xlink:href"];
if( ref == nil or size(ref) < 2 or ref[0] != `#` ) if( ref == nil or size(ref) < 2 or ref[0] != `#` )
return printlog("warn", "Invalid or missing href: '" ~ ref ~ '"'); return printlog("warn", "Invalid or missing href: '" ~ ref ~ "'");
var el_src = id_dict[ substr(ref, 1) ]; var el_src = id_dict[ substr(ref, 1) ];
if( el_src == nil ) if( el_src == nil )