Explorar o código

Added 'use node' style parsing

yomboprime %!s(int64=4) %!d(string=hai) anos
pai
achega
eae037b854

+ 1 - 0
examples/jsm/loaders/SVGLoader.js

@@ -126,6 +126,7 @@ SVGLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
 					break;
 					break;
 
 
 				case 'use':
 				case 'use':
+					style = parseStyle( node, style );
 					var usedNode = node.viewportElement.getElementById( node.href.baseVal.substring( 1 ) );
 					var usedNode = node.viewportElement.getElementById( node.href.baseVal.substring( 1 ) );
 					parseNode( usedNode, style );
 					parseNode( usedNode, style );
 					break;
 					break;

+ 3 - 0
examples/models/svg/tests/testDefs/Svg-defs-license.txt

@@ -0,0 +1,3 @@
+File: Svg-defs.svg
+Link: https://commons.wikimedia.org/wiki/File:Svg-defs.svg
+License: CC-BY-SA 2.5

+ 13 - 0
examples/models/svg/tests/testDefs/Svg-defs.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Created by User:Pietn for Wikipedia -->
+<svg width="105" height="85" version="1.1" 
+ xmlns="http://www.w3.org/2000/svg" 
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>...</title>
+ <defs>
+   <circle r="30" id="schijf" />
+ </defs>
+ <use x="35" y="35" xlink:href="#schijf" fill="darkorchid" />
+ <use x="70" y="50" xlink:href="#schijf" fill="orangered" />
+</svg>

+ 0 - 0
examples/models/svg/tests/latexSample.svg → examples/models/svg/tests/testDefs/latexSample.svg


+ 3 - 2
examples/webgl_loader_svg.html

@@ -101,8 +101,9 @@
 					"Test 7": 'models/svg/tests/7.svg',
 					"Test 7": 'models/svg/tests/7.svg',
 					"Test 8": 'models/svg/tests/8.svg',
 					"Test 8": 'models/svg/tests/8.svg',
 					"Units": 'models/svg/tests/units.svg',
 					"Units": 'models/svg/tests/units.svg',
-					"Latex": 'models/svg/tests/latexSample.svg',
-					"Math": 'models/svg/tests/math.svg'
+					"Latex": 'models/svg/tests/testDefs/latexSample.svg',
+					"Svg-defs": 'models/svg/tests/testDefs/Svg-defs.svg'
+
 
 
 				} ).name( 'SVG File' ).onChange( update );
 				} ).name( 'SVG File' ).onChange( update );