From 66b4e761440da66be27fc2cbe486c6e21ba03f34 Mon Sep 17 00:00:00 2001 From: Tim Redfern Date: Wed, 19 Apr 2023 16:42:06 +0100 Subject: include vector text header --- nextus/src/ofApp.cpp | 4 +- nextus/src/vectorPlugin.h | 75 ++++++++-- nextus/src/vectortext.h | 366 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 434 insertions(+), 11 deletions(-) create mode 100644 nextus/src/vectortext.h diff --git a/nextus/src/ofApp.cpp b/nextus/src/ofApp.cpp index 48bcb9a..048a128 100644 --- a/nextus/src/ofApp.cpp +++ b/nextus/src/ofApp.cpp @@ -66,7 +66,7 @@ void ofApp::draw(){ textinput.draw(); //process the pipeline - vector output=svginput.getLines(); + vector output=svginput.getOutput(); ofPushMatrix(); ofTranslate(695,5); @@ -82,7 +82,7 @@ void ofApp::draw(){ madlaser.panel.draw(); - madlaser.draw(output); + madlaser.drawNormalised(output); } diff --git a/nextus/src/vectorPlugin.h b/nextus/src/vectorPlugin.h index d71b8fa..e20be8f 100644 --- a/nextus/src/vectorPlugin.h +++ b/nextus/src/vectorPlugin.h @@ -31,13 +31,14 @@ class vectorPanel { ofPushMatrix(); ofTranslate(size/2); ofScale(DISPLAYSIZE.x/2.0f); - vector lines=getLines(); + vector lines=getOutput(); for (auto& line:lines){ line.draw(); } ofPopMatrix(); ofPopMatrix(); } + vector getOutput() {return getLines();}; virtual vector getLines() {}; virtual void update() {}; @@ -62,13 +63,64 @@ class defaultPanel: public vectorPanel{ void update(){}; }; -class svgPanel: public vectorPanel{ +class transformPanel: public vectorPanel{ + //a base class which supports transformation public: - svgPanel( + transformPanel( string _title="", ofVec2f _size=DISPLAYSIZE, ofVec2f _pos=ofPoint(5,5) ) : vectorPanel(_title,_size,_pos){ + origin=ofPoint(0,0); + rotation=0; + panel.add(use_rotate.set("rotate",false)); + panel.add(rotation_delta.set("rotation",0.1,-2.0,2.0)); + } + void update(){ + timedelta=ofGetElapsedTimef()-last_frame_time; + last_frame_time=ofGetElapsedTimef(); + if (use_rotate) rotation+=rotation_delta*timedelta; + }; + vector getOutput(){ + vector lines=getLines(); + if (use_rotate){ + ofMatrix4x4 rm = ofMatrix4x4::newIdentityMatrix(); + rm.rotateRad(rotation,0,0,1); + + //if (use_scale){ + // rm.scale(scale_amt,scale_amt,scale_amt); + //} + //rm.translate(outputWindowSize.x/2,outputWindowSize.y/2,0); + vector transformedLines; + for (auto& line:lines){ + transformedLines.push_back(lineTransformer::polyLineTransform(rm,line)); + } + return transformedLines; + } + return lines; + }; + protected: + ofPoint origin; + float rotation; + ofParameter use_rotate; + ofParameter rotation_delta; + float last_frame_time, timedelta; +}; + +/* +next- enable transform offsets +crop for display +transformers +easy midi +*/ + +class svgPanel: public transformPanel{ + public: + svgPanel( + string _title="", + ofVec2f _size=DISPLAYSIZE, + ofVec2f _pos=ofPoint(5,5) + ) : transformPanel(_title,_size,_pos){ panel.add(shapeslabel.setup("SHAPES","")); panel.add(shapes_randomise.set("randomise",false)); //panel.add(shapes_generate.setup("generate")); @@ -88,12 +140,9 @@ class svgPanel: public vectorPanel{ vector getAllLines(); vector getLines(); void update(){ - timedelta=ofGetElapsedTimef()-last_frame_time; - last_frame_time=ofGetElapsedTimef(); + transformPanel::update(); phase=fmod(phase+(timedelta*segmenter_speed),1); while(phase<0) phase+=1.0f; - //what's the issue with segmenter in reverse - ofLog()<<"phase: "< lines){ + glyph(c,w,lines,ofColor(0,0,0)); + } + glyph(char c,float w,vector lines,ofColor col){ + code=c; + width=w; + outline=lines; + colour=col; + } + void draw(float x, float y){ + ofSetColor(colour); + ofPushMatrix(); + ofTranslate(x,y); + for (auto& v:outline) v.draw(); + ofPopMatrix(); + } + void randomiseColour(){ + colour=ofColor::fromHsb(ofRandom(255.0),225,255); + } + char code; + float width; + vector outline; + ofColor colour; +}; + +class glyphWord{ +public: + glyphWord(){ + amount=1.0f; + val=ofRandom(1.0f); + val2=ofRandom(1.0f); + width=0; + } + vector glyphs; + float amount; + float val; //a random float used for word parameters + float val2; + float width; +}; + +#define STYLE_SENTENCE 1 +#define STYLE_OVERLAPPING 2 + +class glyphbanner{ + ofXml SVGFont; + vector words; + vector outlines; + ofVec2f centre; + float lastUpdateTime; + float playhead; + float enspace; + float last_beat; + float last_beat_duration; + vector palette; + struct { + vector balanced={ + ofColor::fromHex(0xE27D60), + ofColor::fromHex(0x085DCB), + ofColor::fromHex(0xE8A87C), + ofColor::fromHex(0xC38D9E), + ofColor::fromHex(0x41B3A3) + }; + vector uneasy={ + ofColor::fromHex(0x2154B9), + ofColor::fromHex(0xC45A62), + ofColor::fromHex(0x95A28A), + ofColor::fromHex(0x98546D), + ofColor::fromHex(0xE9DADA), + ofColor::fromHex(0x9FF3E9), + ofColor::fromHex(0xD07B37), + ofColor::fromHex(0x741710), + ofColor::fromHex(0x102ADC), + ofColor::fromHex(0x9FA1AC) + }; + vector stark={ + ofColor::fromHex(0xFFFFFF), + ofColor::fromHex(0x000000), + ofColor::fromHex(0x000000), + ofColor::fromHex(0x000000) + }; + }palettes; + vector split(string s) { + size_t pos_start = 0, pos_end; + string token; + vector res; + + while ((pos_end = s.find (" ", pos_start)) != string::npos) { + token = s.substr (pos_start, pos_end - pos_start); + pos_start = pos_end + 1; + res.push_back (token); + } + + res.push_back (s.substr (pos_start)); + return res; + } + float segment; //the fraction that the word has displayed +public: + glyphbanner(){ + palette=palettes.stark; + }; + void init(string message){ + createWords(message); + lastUpdateTime=ofGetElapsedTimef(); + playhead=0.0f; + } + int length(){ + int l=0; + for (auto& w:words) { + l+=w.glyphs.size(); + } + return l+max(0,(int)words.size()-1); + } + float width(){ + float _w=0.0f; + for (auto& w:words) { + for (auto& g:w.glyphs) _w+=g.width; + } + return _w+max((float)(words.size()-1)*enspace,0.0f); + } + int glyphCount(){ + int c=0; + for (auto& w:words){ + c+=w.glyphs.size(); + } + return c; + } + string text(){ + string s; + for (auto& w:words) { + for (auto& g:w.glyphs) s+=ofToString(g.code); + } + return s; + } + void loadFont(filesystem::path path){ + if( SVGFont.load(path) ){ + vector w=words; + clear(); + createWords(w); + enspace=getGlyph(' ').width; + ofLog()<<"loaded "< p){ + palette=p; + } + void loadPalette(string path){ + ofxXmlSettings xml; + if (xml.load(path)){ + ofLog()< palette; + for (int i=0;i m=split(message); + for (auto& word: m){ + glyphWord w; + for (auto& c: word){ + glyph g=getGlyph(c, + usePalette? + palette[ofRandom(palette.size())]: + //112->231 hue sat 0->255 brightness 255 + ofColor::fromHsb(ofRandom(119)+112,ofRandom(255),255) + ); + w.width+=g.width; + w.glyphs.push_back(g); + } + words.push_back(w); + } + ofLog()<<"glyphbanner created "< _words){ + clear(); + for (auto& _w:_words) { + glyphWord w; + for (auto& g: _w.glyphs){ + w.glyphs.push_back(getGlyph(g.code,g.colour)); + } + words.push_back(w); + } + } + glyph getGlyph(char c,ofColor col=ofColor(255,255,255)){ + vector shapes; + ofPolyline shape; + string elementPath = "/svg/defs/font/glyph[@unicode='"+ofToString(c)+"']"; + + if(SVGFont.findFirst(elementPath) == 0 ){ + elementPath = "/svg/defs/font/glyph[@unicode='?']"; + } + + ofXml xmlElement = SVGFont.findFirst(elementPath); + + float charWidth = ofToFloat(xmlElement.getAttribute("horiz-adv-x").getValue()); + + vector splitGlyphPath = ofSplitString(xmlElement.getAttribute("d").getValue(), " ");//glyph path data in SVG looks like this: "M 139 -9.45 L 230 18.9 L 299 22.1 L 227 25.2" + + for(int i=0; iwords[theword].glyphs.size()){ + theletter-=words[theword].glyphs.size(); + theword++; + } + float playfraction=playhead-int(playhead); + + //segment=(((float)theletter+words[theword].glyphs.size()+playhead-int(playhead))/words[theword].glyphs.size()); + segment=(((float)theletter+playfraction-1)/words[theword].glyphs.size()); + } + //calculate params for word/letter anim + for (int i=0;i& getOutlines(float s=1.0f,int style=STYLE_SENTENCE,float x=0,float y=0,bool anim=false,bool reverse=false, float vert_spread=0.0f, bool use_beat=false, float beat_duration=0.0f){ + outlines.clear(); + + if (beat_duration>segment){ //I don't think this is what segment is + return outlines; + } + switch (style){ + case STYLE_SENTENCE:{ + float p=((-width())/2); + for (auto& w:words){ + for (auto& g:w.glyphs){ + if (w.amount>0.0f&&g.colour.getBrightness()>0){ + for (auto& o:g.outline){ + auto q=o; + q.scale(s,-s); + q.translate(glm::vec3((p*s)+x,y,0)); + outlines.push_back(colourPolyline(q,g.colour*w.amount)); + } + } + p+=g.width; + } + p+=enspace; + } + break; + } + case STYLE_OVERLAPPING:{ + for (auto& w:words){ + float p=(w.val*(ofGetWidth()-w.width)); + float v=y+(vert_spread*w.val*(ofGetHeight())); + for (auto& g:w.glyphs){ + if (w.amount>0.0f&&g.colour.getBrightness()>0){ + for (auto& o:g.outline){ + auto q=o; + float a=anim?reverse?1.0f-segment:segment:1.0; + q.scale(s*a,-s*a); + q.translate(glm::vec3((p*s*a)+x,v,0)); + outlines.push_back(colourPolyline(q,g.colour*w.amount)); + } + } + p+=g.width*(anim?reverse?1.0f-segment:segment:1.0); + } + } + } + default:{ + break; + } + } + return outlines; + } +}; \ No newline at end of file -- cgit v1.2.3