From 9e0236016f5d6afd3a73edad183dfb2b02387e98 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Sun, 23 Apr 2023 23:22:38 +0100 Subject: many fixes for Nextus show at the complex April 22 2023 --- nextus/src/vectorPlugin.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'nextus/src/vectorPlugin.cpp') diff --git a/nextus/src/vectorPlugin.cpp b/nextus/src/vectorPlugin.cpp index c87de08..8a5a53d 100644 --- a/nextus/src/vectorPlugin.cpp +++ b/nextus/src/vectorPlugin.cpp @@ -44,13 +44,14 @@ void svgPanel::load(string filename){ ofColor c1=path.getStrokeColor(); ofColor colour=path.getFillColor(); if (colour.r==colour.g&&colour.g==colour.b){ + //if there appears to be no fill colour resort to stroke colour=c1; - } + }; segmenters.push_back( colourLineSegmenter( xformed, - path.getStrokeColor() + colour ) ); shape_selection_durations.push_back(0.0f); @@ -180,17 +181,15 @@ vector svgPanel::getLines(){ } } } - /* - this should happen at output stage? - if (contour_useColour){ - vector newPolys; - for (auto p: output){ - newPolys.push_back(colourPolyline((ofPolyline)p,ofColor(laser_R,laser_G,laser_B))) ; + //this should happen at output stage? + + if (colourise){ + for (auto p=output.begin();p!=output.end();p++){ + p->setColour(ofColor(255,255,255)); } - output=newPolys; } - */ + //} return output; } \ No newline at end of file -- cgit v1.2.3