Merge branch 'master' of github.com:openframeworks/openFrameworks

ofTheo · Sep 23, 2018 · fe5f7df · fe5f7df
2 parents 3593610 + e6386bb
commit fe5f7df
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -72,22 +72,22 @@ matrix:
           - libstdc++6
 
   - os: osx
-    osx_image: xcode8
+    osx_image: xcode9.4
     compiler: clang
     env: TARGET="osx"
 
   - os: osx
-    osx_image: xcode8
+    osx_image: xcode9.4
     compiler: clang
     env: TARGET="osx" OPT="makefiles"
 
   - os: osx
-    osx_image: xcode8
+    osx_image: xcode9.4
     compiler: clang
     env: TARGET="ios"
 
   - os: osx
-    osx_image: xcode8
+    osx_image: xcode9.4
     compiler: clang
     env: TARGET="tvos"
 

diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.cpp b/libs/openFrameworks/app/ofAppGLFWWindow.cpp
@@ -236,6 +236,9 @@ void ofAppGLFWWindow::setup(const ofGLFWWindowSettings & _settings){
 		if(settings.windowMode==OF_FULLSCREEN){
 			int count = 0;
 			auto monitors = glfwGetMonitors(&count);
+			auto mode = glfwGetVideoMode(monitors[settings.monitor]);
+			currentW = mode->width;
+			currentH = mode->height;
 			if(!settings.isPositionSet()){
 				if(count > 0){
 					int x = 0, y = 0;
@@ -525,7 +528,7 @@ void ofAppGLFWWindow::setWindowTitle(string title){
 
 //------------------------------------------------------------
 int ofAppGLFWWindow::getPixelScreenCoordScale(){
-	return pixelScreenCoordScale;
+    return pixelScreenCoordScale;
 }
 
 //------------------------------------------------------------
@@ -547,9 +550,9 @@ glm::vec2 ofAppGLFWWindow::getWindowSize(){
 glm::vec2 ofAppGLFWWindow::getWindowPosition(){
 	int x, y;
 	glfwGetWindowPos(windowP, &x, &y);
-
-	x *= pixelScreenCoordScale;
-	y *= pixelScreenCoordScale;
+    
+    x *= pixelScreenCoordScale;
+    y *= pixelScreenCoordScale;
 
 	if( orientation == OF_ORIENTATION_DEFAULT || orientation == OF_ORIENTATION_180 ){
 		return glm::vec2{x,y};

diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -5,7 +5,7 @@
 #define OF_VERSION_MAJOR 0
 #define OF_VERSION_MINOR 11
 #define OF_VERSION_PATCH 0
-#define OF_VERSION_PRE_RELEASE "stable"
+#define OF_VERSION_PRE_RELEASE "master"
 
 // Set to 1 for compatibility with old projects using ofVec instead of glm
 #ifndef OF_USE_LEGACY_VECTOR_MATH

diff --git a/scripts/dev/head.template b/scripts/dev/head.template
@@ -1,5 +1,5 @@
 <title>openFrameworks</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
-<link rel="stylesheet" type="text/css" href="http://openframeworks.cc/assets/css/style.css" media="all" />
-<link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
+<link rel="stylesheet" type="text/css" href="https://openframeworks.cc/assets/css/style.css" media="all" />
+<link href='https://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
diff --git a/scripts/qtcreator/templates/wizards/openFrameworks/qtcreator.qbs b/scripts/qtcreator/templates/wizards/openFrameworks/qtcreator.qbs
@@ -45,6 +45,9 @@ Project{
         of.frameworks: []       // osx only, additional frameworks to link with the project
         of.staticLibraries: []  // static libraries
         of.dynamicLibraries: [] // dynamic libraries
+
+        // create a console window when the application start
+        consoleApplication: %{ConsoleWindow}
 
         // other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html
         // eg: this will enable ccache when compiling

diff --git a/scripts/qtcreator/templates/wizards/openFrameworks/wizard.json b/scripts/qtcreator/templates/wizards/openFrameworks/wizard.json
@@ -105,6 +105,24 @@
                 }
             ]
         },
+        {
+            "trDisplayName": "Console windows",
+            "trShortTitle": "Console",
+            "typeId": "Fields",
+            "data" :
+            [
+                {
+                    "name": "ConsoleWindow",
+                    "trDisplayName": "Create a console window when application start",
+                    "type": "CheckBox",
+                    "data": {
+                        "checkedValue": "true",
+                        "uncheckedValue": "false",
+                        "checked": "false"
+                    }
+                }
+            ]
+        },
         {
             "trDisplayName": "Addons",
             "trShortTitle": "Addons",

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update.qbs b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update.qbs
@@ -40,6 +40,9 @@ Project{
         of.frameworks: []       // osx only, additional frameworks to link with the project
         of.staticLibraries: []  // static libraries
         of.dynamicLibraries: [] // dynamic libraries
+
+        // create a console window when the application start
+        consoleApplication: %{ConsoleWindow}
 
         // other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html
         // eg: this will enable ccache when compiling

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update_no_addons.qbs b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/qtcreator_update_no_addons.qbs
@@ -34,6 +34,9 @@ Project{
         of.frameworks: []       // osx only, additional frameworks to link with the project
         of.staticLibraries: []  // static libraries
         of.dynamicLibraries: [] // dynamic libraries
+
+        // create a console window when the application start
+        consoleApplication: %{ConsoleWindow}
 
         // other flags can be set through the cpp module: http://doc.qt.io/qbs/cpp-module.html
         // eg: this will enable ccache when compiling

diff --git a/scripts/qtcreator/templates/wizards/openFrameworksUpdate/wizard.json b/scripts/qtcreator/templates/wizards/openFrameworksUpdate/wizard.json
@@ -122,6 +122,24 @@
                 }
             ]
         },
+        {
+            "trDisplayName": "Console windows",
+            "trShortTitle": "Console",
+            "typeId": "Fields",
+            "data" :
+            [
+                {
+                    "name": "ConsoleWindow",
+                    "trDisplayName": "Create a console window when application start",
+                    "type": "CheckBox",
+                    "data": {
+                        "checkedValue": "true",
+                        "uncheckedValue": "false",
+                        "checked": "false"
+                    }
+                }
+            ]
+        },
         {
             "trDisplayName": "Kit Selection",
             "trShortTitle": "Kits",

diff --git a/scripts/vs/setupCommandLine.cmd b/scripts/vs/setupCommandLine.cmd
@@ -147,11 +147,12 @@ for /d %%X in (..\..\examples\*) do (
 			echo.
 
 			if "%BUILD_TOOL%"=="msbuild" (
-				if not "%CONFIGURATION%"=="release" (msbuild /nologo /noautoresponse %%Z /p:Configuration=Debug)
-				if not "%CONFIGURATION%"=="debug" (msbuild /nologo /noautoresponse %%Z /p:Configuration=Release)
+				if not "%CONFIGURATION%"=="release" (msbuild %%Z /t:%ACTION% /nologo /noautoresponse /maxcpucount /p:Configuration=Debug)
+				if not "%CONFIGURATION%"=="debug" (msbuild %%Z /t:%ACTION% /nologo /noautoresponse /maxcpucount /p:Configuration=Release)
 			) else (
-				if not "%CONFIGURATION%"=="release" (%BUILD_TOOL% "%CD%\%%X\%%Y\%%Z" /%ACTION% Debug /nologo)
-				if not "%CONFIGURATION%"=="debug" (%BUILD_TOOL% "%CD%\%%X\%%Y\%%Z" /%ACTION% Release /nologo))
+				if not "%CONFIGURATION%"=="release" (%BUILD_TOOL% "%CD%\%%X\%%Z" /%ACTION% "Debug|%PLATFORM%" /nologo)
+				if not "%CONFIGURATION%"=="debug" (%BUILD_TOOL% "%CD%\%%X\%%Z" /%ACTION% "Release|%PLATFORM%" /nologo)
+			)
 		)
 		cd ../
 	)