diff --git a/example/bin/data/ofxpimapper.xml b/example/bin/data/ofxpimapper.xml index 2390ae8..99a1ecc 100644 --- a/example/bin/data/ofxpimapper.xml +++ b/example/bin/data/ofxpimapper.xml @@ -2,16 +2,16 @@ - 140.000000000 - 65.000000000 + 119.000000000 + 379.000000000 - 397.625549316 - 304.812774658 + 387.000000000 + 96.000000000 - 90.374511719 - 304.812774658 + 405.000000000 + 657.000000000 @@ -36,8 +36,8 @@ - 183.000000000 - 70.000000000 + 387.000000000 + 96.000000000 862.290893555 @@ -48,8 +48,8 @@ 652.968627930 - 195.000000000 - 711.000000000 + 405.000000000 + 657.000000000 @@ -78,46 +78,91 @@ 1 - + + + + 860.523620605 + 46.077301025 + + + 860.523620605 + 247.922729492 + + + 1379.000000000 + 533.000000000 + + + 1183.476318359 + 46.077301025 + + + + + 0.000000000 + 0.000000000 + + + 1.000000000 + 0.000000000 + + + 1.000000000 + 1.000000000 + + + 0.000000000 + 1.000000000 + + + + image + image2.jpg + + + 1 + + + - 219.956512451 - 481.153137207 + 1276.000000000 + 204.000000000 - 742.043579102 - 481.153137207 + 724.000000000 + 387.000000000 - 742.043579102 - 792.846923828 + 707.000000000 + 809.000000000 - 219.956512451 - 792.846923828 + 1284.000000000 + 708.000000000 - 0.106250003 + 0.101562500 0.000000000 - 0.918749988 + 0.884374976 0.000000000 - 0.918749988 - 0.994444430 + 0.884374976 + 1.002777815 - 0.106250003 - 0.994444430 + 0.101562500 + 1.002777815 video - earth-and-technicians.mp4 + control-panel-and-operation.mp4 1 diff --git a/example/src/main.cpp b/example/src/main.cpp index d743ec0..9bdae84 100644 --- a/example/src/main.cpp +++ b/example/src/main.cpp @@ -14,9 +14,25 @@ int main(int argc, char * argv[]){ break; } } - - Settings::instance()->setFullscreen(fullscreen); - ofSetupOpenGL(1024, 768, OF_WINDOW); - ofRunApp(new ofApp()); + shared_ptr window; +#ifdef TARGET_OPENGLES + ofGLESWindowSettings esSettings; + esSettings.glesVersion = 2; + esSettings.width = 1440; + esSettings.height = 900; + window = ofCreateWindow(esSettings); +#else + ofGLWindowSettings glSettings; + glSettings.glVersionMajor = 2; + glSettings.glVersionMinor = 1; + glSettings.width = 1440; + glSettings.height = 900; + window = ofCreateWindow(glSettings); +#endif + + auto app = std::make_shared(); + ofRunApp(window, app); + Settings::instance()->setFullscreen(fullscreen); + ofRunMainLoop(); }