diff --git a/addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h b/addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h index 0bb062aca39..42ba840836e 100644 --- a/addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h +++ b/addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h @@ -12,8 +12,6 @@ #include "ofxAssimpTexture.h" #include "ofVbo.h" #include "ofMesh.h" -#define GLM_FORCE_CTOR_INIT -#define GLM_ENABLE_EXPERIMENTAL #include "glm/mat4x4.hpp" struct aiMesh; diff --git a/apps/projectGenerator b/apps/projectGenerator index fd5f21c2c01..74afcd48555 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit fd5f21c2c01679c87d240b813ace04c9c1c43c0a +Subproject commit 74afcd48555ba9b3d0c430b2853ddad306a89b63 diff --git a/libs/openFrameworks/3d/ofNode.h b/libs/openFrameworks/3d/ofNode.h index b53e7acef6b..e9d992270f6 100644 --- a/libs/openFrameworks/3d/ofNode.h +++ b/libs/openFrameworks/3d/ofNode.h @@ -2,9 +2,6 @@ #pragma once #include "ofParameter.h" - -#define GLM_FORCE_CTOR_INIT -#define GLM_ENABLE_EXPERIMENTAL #include #include diff --git a/libs/openFrameworks/utils/ofTimerFps.cpp b/libs/openFrameworks/utils/ofTimerFps.cpp index 03a4d85d697..ee6c09b548a 100644 --- a/libs/openFrameworks/utils/ofTimerFps.cpp +++ b/libs/openFrameworks/utils/ofTimerFps.cpp @@ -24,11 +24,12 @@ void ofTimerFps::setFps(int fps) { void ofTimerFps::waitNext() { // Lazy wakeup - std::this_thread::sleep_until(wakeTime - 36ms); //4ms + std::this_thread::sleep_until(wakeTime - 8ms); //4ms // Processor Coffee while(steady_clock::now() < (wakeTime)) { // 0.05ms 0.5us // - 0.5us - 1ns - std::this_thread::yield(); +// std::this_thread::yield(); + std::this_thread::sleep_for(5us); } lastWakeTime = wakeTime; diff --git a/scripts/apothecary b/scripts/apothecary index 809eb84f0e1..fae96e61587 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 809eb84f0e1807c81dfb6c771707899ce7101765 +Subproject commit fae96e615875a701d48dc29cf4a3be24bc472a07 diff --git a/scripts/templates/osx/Project.xcconfig b/scripts/templates/osx/Project.xcconfig index 3b5e6c79b9e..b7be98fc428 100644 --- a/scripts/templates/osx/Project.xcconfig +++ b/scripts/templates/osx/Project.xcconfig @@ -8,7 +8,7 @@ OF_PATH = ../../.. //UNCOMMENT BELOW TO ENABLE C++ 17 and std::filesystem CLANG_CXX_LANGUAGE_STANDARD = c++23 CLANG_C_LANGUAGE_STANDARD = c17 -MACOSX_DEPLOYMENT_TARGET = 10.15 +MACOSX_DEPLOYMENT_TARGET = 11.5 // App Settings PRODUCT_NAME = $(TARGET_NAME) @@ -30,7 +30,7 @@ INFOPLIST_KEY_LSApplicationCategoryType = public.app-category.games // suggested to use semantic versioning format ala #.#.# MARKETING_VERSION = 0.1.0 -// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script +// If users upgrade project to recommended settings it enables script sandboxing which breaks our post build script ENABLE_USER_SCRIPT_SANDBOXING=NO // this is "Build" in the Xcode target Identity UI, an incremental build number @@ -65,7 +65,7 @@ ICON_FILE = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/$(ICON_NAME) HIGH_RESOLUTION_CAPABLE = NO -// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. +// Optional include to keep any permanent settings as CODE_SIGN_IDENTITY. #include? "App.xcconfig" //FOR AV ENGINE SOUND PLAYER UNCOMMENT THREE LINES BELOW diff --git a/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj b/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj index e04ede6dc49..328b4277060 100644 --- a/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj +++ b/scripts/templates/osx/emptyExample.xcodeproj/project.pbxproj @@ -323,4 +323,4 @@ }, "objectVersion" : "54", "rootObject" : "E4B69B4C0A3A1720003C02F2" -} \ No newline at end of file +}