diff options
Diffstat (limited to 'gui/src/ofApp.cpp')
| -rw-r--r-- | gui/src/ofApp.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gui/src/ofApp.cpp b/gui/src/ofApp.cpp index cfa9df1..3514776 100644 --- a/gui/src/ofApp.cpp +++ b/gui/src/ofApp.cpp @@ -1,4 +1,4 @@ -#include "ofApp.h" + #include "ofApp.h" #include "glew.h" const ofPoint outputWindowSize=ofPoint(1200,900); @@ -758,11 +758,13 @@ void ofApp::drawOutput(ofEventArgs & args){ if (use_segmenter){ auto segments=segmenters[s].getSegments(segmenter_number,segmenter_length,phase); for (auto segment=segments.begin();segment!=segments.end();segment++){ - polyOutput.push_back(colourPolyline(*segment,ofColor(laser_R,laser_G,laser_B))); + //polyOutput.push_back(colourPolyline(*segment,ofColor(laser_R,laser_G,laser_B))); + polyOutput.push_back(*segment); } } else { - polyOutput.push_back(colourPolyline(segmenters[s].getPoly(),ofColor(laser_R,laser_G,laser_B))); + //polyOutput.push_back(colourPolyline(segmenters[s].getPoly(),ofColor(laser_R,laser_G,laser_B))); + polyOutput.push_back(segmenters[s].getPoly()); } } framecounter--; @@ -772,12 +774,13 @@ void ofApp::drawOutput(ofEventArgs & args){ if (use_segmenter){ auto segments=shape->getSegments(segmenter_number,segmenter_length,phase); for (auto segment=segments.begin();segment!=segments.end();segment++){ - polyOutput.push_back(colourPolyline(*segment,ofColor(laser_R,laser_G,laser_B))); + //polyOutput.push_back(colourPolyline(*segment,ofColor(laser_R,laser_G,laser_B))); + polyOutput.push_back(*segment); } } else { - polyOutput.push_back(colourPolyline(shape->getPoly(),ofColor(laser_R,laser_G,laser_B))); - + //polyOutput.push_back(colourPolyline(shape->getPoly(),ofColor(laser_R,laser_G,laser_B))); + polyOutput.push_back(shape->getPoly()); } } } @@ -837,6 +840,7 @@ void ofApp::drawOutput(ofEventArgs & args){ { clip.simplify(contour_simplify); clippedOutput.push_back(colourPolyline(clip,ofColor(laser_R,laser_G,laser_B))); + clippedOutput.push_back(colourPolyline(clip,ofColor(laser_R,laser_G,laser_B))); } } else { @@ -1109,7 +1113,7 @@ void ofApp::dragEvent(ofDragInfo dragInfo){ strm << outline.size() << "->"; outline.simplify(contour_simplify); strm << outline.size() << " "; - segmenters.push_back(lineSegmenter(outline)); + segmenters.push_back(colourLineSegmenter(outline,path.getStrokeColor())); } strm << " , "; } |