|
@@ -894,19 +894,15 @@ SVGLoader.prototype = {
|
|
|
|
|
|
var transform = parseNodeTransform( node );
|
|
var transform = parseNodeTransform( node );
|
|
|
|
|
|
- if ( transform ) {
|
|
|
|
-
|
|
|
|
- if ( transformStack.length > 0 ) {
|
|
|
|
|
|
+ if ( transformStack.length > 0 ) {
|
|
|
|
|
|
- transform.premultiply( transformStack[ transformStack.length - 1 ] );
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- currentTransform.copy( transform );
|
|
|
|
- transformStack.push( transform );
|
|
|
|
|
|
+ transform.premultiply( transformStack[ transformStack.length - 1 ] );
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ currentTransform.copy( transform );
|
|
|
|
+ transformStack.push( transform );
|
|
|
|
+
|
|
return transform;
|
|
return transform;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -1191,11 +1187,10 @@ SVGLoader.prototype = {
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
-SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, miterLimit ) {
|
|
|
|
|
|
+SVGLoader.getStrokeStyle = function ( width, color, lineJoin, lineCap, miterLimit ) {
|
|
|
|
|
|
// Param width: Stroke width
|
|
// Param width: Stroke width
|
|
// Param color: As returned by Color.getStyle()
|
|
// Param color: As returned by Color.getStyle()
|
|
- // Param opacity: 0 (transparent) to 1 (opaque)
|
|
|
|
// Param lineJoin: One of "round", "bevel", "miter" or "miter-limit"
|
|
// Param lineJoin: One of "round", "bevel", "miter" or "miter-limit"
|
|
// Param lineCap: One of "round", "square" or "butt"
|
|
// Param lineCap: One of "round", "square" or "butt"
|
|
// Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance)
|
|
// Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance)
|
|
@@ -1203,7 +1198,6 @@ SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap,
|
|
|
|
|
|
width = width !== undefined ? width : 1;
|
|
width = width !== undefined ? width : 1;
|
|
color = color !== undefined ? color : '#000';
|
|
color = color !== undefined ? color : '#000';
|
|
- opacity = opacity !== undefined ? opacity : 1;
|
|
|
|
lineJoin = lineJoin !== undefined ? lineJoin : 'miter';
|
|
lineJoin = lineJoin !== undefined ? lineJoin : 'miter';
|
|
lineCap = lineCap !== undefined ? lineCap : 'butt';
|
|
lineCap = lineCap !== undefined ? lineCap : 'butt';
|
|
miterLimit = miterLimit !== undefined ? miterLimit : 4;
|
|
miterLimit = miterLimit !== undefined ? miterLimit : 4;
|