summaryrefslogtreecommitdiff
path: root/futuregael/src/ofApp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'futuregael/src/ofApp.cpp')
-rw-r--r--futuregael/src/ofApp.cpp27
1 files changed, 9 insertions, 18 deletions
diff --git a/futuregael/src/ofApp.cpp b/futuregael/src/ofApp.cpp
index c912916..2393618 100644
--- a/futuregael/src/ofApp.cpp
+++ b/futuregael/src/ofApp.cpp
@@ -4,32 +4,23 @@
//--------------------------------------------------------------
void ofApp::setup(){
- // Load a CSV File.
- if(csv.load("show.csv","|")) {
-
- for (auto row:csv){
- if (row.size()<2){
- ofLog()<<"Error, found row with "<<row.size()<<" elements";
- }
- else script.push_back(scriptLine(row[0],row[1],row[2]));
- }
-
- ofLog()<<"loaded show, "<<csv.getNumRows()<<" lines";
-
- playline=script.begin();
+
+ if (show.loadFont("fonts/EMSQwandry.svg")){
+ show.load("show.csv");
}
- else playline=script.end();
}
//--------------------------------------------------------------
void ofApp::update(){
+ show.update();
+
}
//--------------------------------------------------------------
void ofApp::draw(){
-
+ ofBackground(0);
}
@@ -61,10 +52,10 @@ void ofApp::keyReleased(int key){
break;
}
case ' ':{
- if (playline->isPlaying()){
- playline->stop();
+ if (show.isPlaying){
+ show.stop();
}
- else playline->play();
+ else show.play();
break;
}
default:{