diff options
Diffstat (limited to 'lasertext/src/ofApp.cpp')
| -rw-r--r-- | lasertext/src/ofApp.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lasertext/src/ofApp.cpp b/lasertext/src/ofApp.cpp index 2974056..96b56ab 100644 --- a/lasertext/src/ofApp.cpp +++ b/lasertext/src/ofApp.cpp @@ -5,10 +5,6 @@ what do we want to store/control per letter? */ - -int MAX_POINTS=40000; -int LASER_INTENSITY=128; - //-------------------------------------------------------------- void ofApp::setup(){ fonts.open("fonts/"); @@ -20,10 +16,11 @@ void ofApp::setup(){ banner.loadFont("fonts/EMSPepita.svg"); //fonts.getPath(currentFont)); banner.init("Everything Is Going To Be Alright"); - laser.set_pts(MAX_POINTS); - laser.set_intensity(LASER_INTENSITY); + textgui.setup("text","",5,680); + textgui.add(text_scale.set("scale", 1.0f, 0.5f, 3.0f)); + textgui.add(text_speed.set("speed", 1.0f, 0.0f, 2.0f)); - lasergui.setup("laser","",5,700); + lasergui.setup("laser","",5,750); lasergui.add(laser_power.set("power", true)); lasergui.add(laser_intensity.set("intensity", 30, 0, 255)); lasergui.add(laser_points.set("points", 30000, 0, 40000)); @@ -41,7 +38,7 @@ void ofApp::setup(){ } //-------------------------------------------------------------- void ofApp::update(){ - banner.update(1.0f); + banner.update(text_speed); laser.set_pts(laser_points); laser.set_subdivide(laser_subdivide); @@ -56,9 +53,10 @@ void ofApp::draw(){ ofBackground(0,0,0); ofSetColor(255,255,255); + textgui.draw(); lasergui.draw(); - vector<colourPolyline> shapes = banner.getOutlines(0.08f); //+(0.02f*sin(ofGetElapsedTimef()*.1f))); + vector<colourPolyline> shapes = banner.getOutlines(0.08f*text_scale); //+(0.02f*sin(ofGetElapsedTimef()*.1f))); int num = 0; |