From ae08183cbd62cf4d8f911328c14881a30ce80b98 Mon Sep 17 00:00:00 2001 From: amandaghassaei Date: Thu, 22 Jun 2017 01:24:10 -0400 Subject: [PATCH] draw parsed svg to screen --- assets/Tessellations/test.svg | 6 +-- dependencies/fold.js | 10 ++--- js/pattern.js | 75 +++++++++++++++++++++++------------ 3 files changed, 56 insertions(+), 35 deletions(-) diff --git a/assets/Tessellations/test.svg b/assets/Tessellations/test.svg index 981f30f..b2d3700 100644 --- a/assets/Tessellations/test.svg +++ b/assets/Tessellations/test.svg @@ -3,10 +3,8 @@ - + - - diff --git a/dependencies/fold.js b/dependencies/fold.js index 8117307..5cfb302 100755 --- a/dependencies/fold.js +++ b/dependencies/fold.js @@ -235,23 +235,23 @@ filter.edgesAssigned = function(fold, target) { }; filter.mountainEdges = function(fold) { - return assignment.edgesAssigned(fold, 'M'); + return filter.edgesAssigned(fold, 'M'); }; filter.valleyEdges = function(fold) { - return assignment.edgesAssigned(fold, 'V'); + return filter.edgesAssigned(fold, 'V'); }; filter.flatEdges = function(fold) { - return assignment.edgesAssigned(fold, 'F'); + return filter.edgesAssigned(fold, 'F'); }; filter.boundaryEdges = function(fold) { - return assignment.edgesAssigned(fold, 'B'); + return filter.edgesAssigned(fold, 'B'); }; filter.unassignedEdges = function(fold) { - return assignment.edgesAssigned(fold, 'U'); + return filter.edgesAssigned(fold, 'U'); }; filter.keysStartingWith = function(fold, prefix) { diff --git a/js/pattern.js b/js/pattern.js index 15d4011..6e8af84 100755 --- a/js/pattern.js +++ b/js/pattern.js @@ -121,6 +121,20 @@ function initPattern(globals){ return null; } + function colorForAssignment(assignment){ + if (assignment == "B") return "#000"; + if (assignment == "M") return "#f00"; + if (assignment == "V") return "#00f"; + if (assignment == "C") return "#0f0"; + if (assignment == "F") return "#ff0"; + if (assignment == "U") return "#f0f"; + return "#0ff" + } + function opacityForAngle(angle){ + if (angle === null) return 1; + return Math.abs(angle)/Math.PI; + } + function findType(_verticesRaw, _segmentsRaw, filter, $paths, $lines, $rects, $polygons, $polylines){ parsePath(_verticesRaw, _segmentsRaw, $paths.filter(filter)); parseLine(_verticesRaw, _segmentsRaw, $lines.filter(filter)); @@ -333,7 +347,7 @@ function initPattern(globals){ parseSVG(verticesRaw, bordersRaw, mountainsRaw, valleysRaw, cutsRaw, triangulationsRaw); //find max and min vertices - var max = new THREE.Vector3(-Infinity,-Infinity,Infinity); + var max = new THREE.Vector3(-Infinity,-Infinity,-Infinity); var min = new THREE.Vector3(Infinity,Infinity,Infinity); for (var i=0;i '); - //todo only show montains, valleys, hinges, triangulations, etc - $svg.append($paths); - $svg.append($lines); - $svg.append($rects); - $svg.append($polygons); - $svg.append($polylines); - - $("#svgViewer").html($svg); + var ns = 'http://www.w3.org/2000/svg'; + var svg = document.createElementNS(ns, 'svg'); + svg.setAttribute('viewBox', viewBoxTxt); + for (var i=0;i