File tree Expand file tree Collapse file tree 4 files changed +9
-12
lines changed
Expand file tree Collapse file tree 4 files changed +9
-12
lines changed Original file line number Diff line number Diff line change @@ -113,10 +113,8 @@ void moTimeline::customReset(){
113113void moTimeline::setupObjectContent (shared_ptr<ofAppGLFWWindow> &mainWindow){
114114
115115 ofGLFWWindowSettings settings;
116- #if defined(MO_GL_VERSION_MAJOR)
117- settings.setGLVersion (4 ,1 );
118- #elif defined(MO_GL_VERSION_MINOR)
119- settings.setGLVersion (3 ,2 );
116+ #if defined(OFXVP_GL_VERSION_MAJOR) && defined(OFXVP_GL_VERSION_MINOR)
117+ settings.setGLVersion (OFXVP_GL_VERSION_MAJOR,OFXVP_GL_VERSION_MINOR);
120118#else
121119 settings.setGLVersion (3 ,2 );
122120#endif
Original file line number Diff line number Diff line change @@ -117,10 +117,8 @@ void OutputWindow::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
117117 loadWindowSettings ();
118118
119119 ofGLFWWindowSettings settings;
120- #if defined(MO_GL_VERSION_MAJOR)
121- settings.setGLVersion (4 ,1 );
122- #elif defined(MO_GL_VERSION_MINOR)
123- settings.setGLVersion (3 ,2 );
120+ #if defined(OFXVP_GL_VERSION_MAJOR) && defined(OFXVP_GL_VERSION_MINOR)
121+ settings.setGLVersion (OFXVP_GL_VERSION_MAJOR,OFXVP_GL_VERSION_MINOR);
124122#else
125123 settings.setGLVersion (3 ,2 );
126124#endif
Original file line number Diff line number Diff line change @@ -91,10 +91,8 @@ void ProjectionMapping::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWind
9191 fileDialog.setIsRetina (this ->isRetina );
9292
9393 ofGLFWWindowSettings settings;
94- #if defined(MO_GL_VERSION_MAJOR)
95- settings.setGLVersion (4 ,1 );
96- #elif defined(MO_GL_VERSION_MINOR)
97- settings.setGLVersion (3 ,2 );
94+ #if defined(OFXVP_GL_VERSION_MAJOR) && defined(OFXVP_GL_VERSION_MINOR)
95+ settings.setGLVersion (OFXVP_GL_VERSION_MAJOR,OFXVP_GL_VERSION_MINOR);
9896#else
9997 settings.setGLVersion (3 ,2 );
10098#endif
Original file line number Diff line number Diff line change 4444 #define MOD_KEY OF_KEY_CONTROL
4545#endif
4646
47+ #define OFXVP_GL_VERSION_MAJOR 4
48+ #define OFXVP_GL_VERSION_MINOR 1
49+
4750#define OUTPUT_TEX_MAX_WIDTH 4800
4851#define OUTPUT_TEX_MAX_HEIGHT 4800
4952
You can’t perform that action at this time.
0 commit comments