diff options
| author | Comment <tim@gray.(none)> | 2013-06-28 23:32:10 +0100 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-06-28 23:32:10 +0100 |
| commit | 1a7e15a63d78a6351028d977b90052f6b0d6bf7d (patch) | |
| tree | 8345507e9c4dd871cd08eb884fe8b9fe2816137d /06_performance/src/main.cpp | |
| parent | fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e (diff) | |
first performance version
Diffstat (limited to '06_performance/src/main.cpp')
| -rw-r--r-- | 06_performance/src/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/06_performance/src/main.cpp b/06_performance/src/main.cpp index 733d488..464bd9d 100644 --- a/06_performance/src/main.cpp +++ b/06_performance/src/main.cpp @@ -5,7 +5,11 @@ int main( ){ //ofSetupOpenGL(4080,768, OF_WINDOW); // <-------- setup the GL context +<<<<<<< HEAD + ofSetupOpenGL(2400,450, OF_WINDOW); // <-------- setup the GL context +======= ofSetupOpenGL(1400,262, OF_WINDOW); // <-------- setup the GL context +>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e |