summaryrefslogtreecommitdiff
path: root/futuregael/src
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2023-09-20 17:59:25 +0100
committerTim Redfern <tim@getdrop.com>2023-09-20 17:59:25 +0100
commitbd36919b53bdc0f93ef9efd2d5ed469e4eea6c07 (patch)
treeaddce59288465cbfd4409b9d3a4f2fcd6a3ce3bc /futuregael/src
parent5c59ea6a5797bb44a46846008ddc235c8a5537af (diff)
complete interim show
Diffstat (limited to 'futuregael/src')
-rw-r--r--futuregael/src/main.cpp2
-rw-r--r--futuregael/src/show.h11
2 files changed, 10 insertions, 3 deletions
diff --git a/futuregael/src/main.cpp b/futuregael/src/main.cpp
index 79ed500..02bf31b 100644
--- a/futuregael/src/main.cpp
+++ b/futuregael/src/main.cpp
@@ -8,7 +8,7 @@ int main(int argc, char *argv[]){
ofGLFWWindowSettings settings;
- settings.setSize(512,512); // 1/8 scale
+ settings.setSize(1024,1024); // 1/8 scale
//1200 = 13.2° = 42898 pts theoretical
diff --git a/futuregael/src/show.h b/futuregael/src/show.h
index e3aeebe..c5a7605 100644
--- a/futuregael/src/show.h
+++ b/futuregael/src/show.h
@@ -92,10 +92,11 @@ public:
if (word2amt>1.0f) word2amt=1.0f;
outlines.clear();
- float p=-ofGetWidth()/2;
float s=0.1f;
+ float p=(-(ofGetWidth()/3))/s;
+
if (word1>-1&&word1<words.size()){
for (auto& g:words[word1].glyphs){
for (auto& o:g.outline){
@@ -178,7 +179,13 @@ public:
}
void play(){
- if (playline==script.end()) return;
+ if (playline==script.end()){
+ if (script.size()){
+ playline=script.begin();
+ ofLog()<<"Restarted!";
+ }
+ else return;
+ }
if (playline->audio.isLoaded()){
playline->audio.play();