added define to fast switch between opengl 4.1 or 3.2 compile

Author: d3cod3

src/PatchObject.h

@@ -33,7 +33,7 @@
 #pragma once
 #include "ofMain.h"
 
-#include "config.h"
+#include "ofxVPConfig.h"
 #include "utils.h"
 
 #include "ofxXmlSettings.h"

src/objects/gui/moTimeline.cpp

@@ -113,7 +113,13 @@ void moTimeline::customReset(){
 void moTimeline::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
 
     ofGLFWWindowSettings settings;
+#if defined(MO_GL_VERSION_MAJOR)
     settings.setGLVersion(4,1);
+#elif defined(MO_GL_VERSION_MINOR)
+    settings.setGLVersion(3,2);
+#else
+    settings.setGLVersion(3,2);
+#endif
     settings.shareContextWith = mainWindow;
     settings.decorated = true;
     settings.resizable = true;
@@ -226,7 +232,7 @@ void moTimeline::updateObjectContent(map<int,shared_ptr<PatchObject>> &patchObje
     }
 
     // pass timeline data to outlets (if any)
-    for(int i=0;i<actualTracks->size();i++){
+    for(int i=0;i<static_cast<int>(actualTracks->size());i++){
         if(this->getOutletType(i) == VP_LINK_NUMERIC){
             if(actualTracks->at(i).at(2) == 'S' || (actualTracks->at(i).at(0) == '_' && actualTracks->at(i).at(3) == 'S')){ // SWITCHES
                 ofxTLSwitches* tempMT = (ofxTLSwitches*)timeline->getTrack(actualTracks->at(i));
@@ -497,7 +503,7 @@ string moTimeline::getLoadingTimelineName(string path){
     ofDirectory dir(temppath);
     if(dir.isDirectory()){
         dir.listDir();
-        for(int i = 0; i < dir.size(); i++){
+        for(int i = 0; i < static_cast<int>(dir.size()); i++){
             size_t found = dir.getPath(i).find_last_of("/\\");
             string fileStr = dir.getPath(i).substr(found+1);
             size_t found2 = fileStr.find_first_of("_");
@@ -520,7 +526,7 @@ void moTimeline::autoAddTracks(string path){
     ofDirectory dir(temppath);
     if(dir.isDirectory()){
         dir.listDir();
-        for(int i = 0; i < dir.size(); i++){
+        for(int i = 0; i < static_cast<int>(dir.size()); i++){
             size_t found = dir.getPath(i).find_last_of("/\\");
             string fileStr = dir.getPath(i).substr(found+1);
             size_t found2 = fileStr.find_first_of("_");
@@ -623,7 +629,7 @@ void moTimeline::loadTimelineData(string folder){
     timeline->clear();
 
     vector<ofxTLTrack*> tempTracks = timeline->getPage("Page One")->getTracks();
-    for(int i=0;i<tempTracks.size();i++){
+    for(int i=0;i<static_cast<int>(tempTracks.size());i++){
         timeline->removeTrack(tempTracks.at(i));
     }
 
@@ -707,7 +713,7 @@ void moTimeline::saveOutletConfig(){
                                 XML.setValue("type",this->outletsType.at(j));
 
                                 // re-add previous links
-                                for(int z=0;z<tempLinks.size();z++){
+                                for(int z=0;z<static_cast<int>(tempLinks.size());z++){
                                     if(static_cast<int>(floor(tempLinks.at(z).x)) == j){
                                         int newTo = XML.addTag("to");
                                         if(XML.pushTag("to", newTo)){
@@ -743,7 +749,7 @@ void moTimeline::resetOutlets(){
 
     this->numOutlets = tempTracks.size();
 
-    for( int i = 0; i < tempTracks.size(); i++){
+    for( int i = 0; i < static_cast<int>(tempTracks.size()); i++){
         if(tempTracks.at(i)->getTrackType() == "Colors"){
             _outletParams[i] = new vector<float>();
             static_cast<vector<float> *>(_outletParams[i])->assign(3,0.0f);

src/objects/windowing/OutputWindow.cpp

@@ -117,7 +117,13 @@ void OutputWindow::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWindow){
     loadWindowSettings();
 
     ofGLFWWindowSettings settings;
+#if defined(MO_GL_VERSION_MAJOR)
     settings.setGLVersion(4,1);
+#elif defined(MO_GL_VERSION_MINOR)
+    settings.setGLVersion(3,2);
+#else
+    settings.setGLVersion(3,2);
+#endif
     settings.shareContextWith = mainWindow;
     settings.decorated = true;
     settings.resizable = true;

src/objects/windowing/ProjectionMapping.cpp

@@ -91,7 +91,13 @@ void ProjectionMapping::setupObjectContent(shared_ptr<ofAppGLFWWindow> &mainWind
     fileDialog.setIsRetina(this->isRetina);
 
     ofGLFWWindowSettings settings;
+#if defined(MO_GL_VERSION_MAJOR)
     settings.setGLVersion(4,1);
+#elif defined(MO_GL_VERSION_MINOR)
+    settings.setGLVersion(3,2);
+#else
+    settings.setGLVersion(3,2);
+#endif
     settings.shareContextWith = mainWindow;
     settings.decorated = true;
     settings.resizable = true;

src/config.h src/ofxVPConfig.hsrc/config.h renamed to src/ofxVPConfig.h

@@ -34,7 +34,7 @@
 
 #include "ofMain.h"
 
-#include "config.h"
+#include "ofxVPConfig.h"
 
 #include "ofxInfiniteCanvas.h"
 #include "ofxPDSP.h"