Merge branch 'master' into update/log-and-docs-cleanup

Author: danomatika

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;

addons/ofxOsc/src/ofxOscReceiver.cpp

@@ -104,11 +104,11 @@ void ofxOscReceiver::stop() {
 	if (listenSocket) {
 		listenSocket->AsynchronousBreak();
 	} else {
-		ofLogNotice("socket already torn down ");
+		ofLogVerbose("socket already torn down ");
 	}
 
 	if (!listenThread.joinable()) {
-		ofLogNotice("not joinable");
+		ofLogVerbose("not joinable");
 	} else {
 		listenThread.join();
 	}

apps/projectGenerator

@@ -2,9 +2,6 @@
 #pragma once
 
 #include "ofParameter.h"
-
-#define GLM_FORCE_CTOR_INIT
-#define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtc/quaternion.hpp>
 
 #include <array>

libs/openFrameworks/3d/ofNode.h

@@ -855,7 +855,7 @@ void ofCubeMap::_createIrradianceMap(GLuint aSrcCubeFid, bool aBMakeCache, const
 	std::vector<glm::mat4> views = _getViewMatrices( glm::vec3(0,0,0) );
 
 	if( !shaderIrradianceMap.isLoaded() ) {
-		auto isource = ofCubeMapShaders::irriadianceCubeMap();
+		auto isource = ofCubeMapShaders::irradianceCubeMap();
 		shaderIrradianceMap.setupShaderFromSource(GL_VERTEX_SHADER, isource.vertShader );
 		shaderIrradianceMap.setupShaderFromSource(GL_FRAGMENT_SHADER, isource.fragShader );
 		shaderIrradianceMap.bindDefaults();

libs/openFrameworks/gl/ofCubeMap.cpp

@@ -63,7 +63,9 @@ class ofCubeMap {
 	static bool hasActiveCubeMap();
 	static std::shared_ptr<ofCubeMap::Data> getActiveData();
 	static void clearTextureData(std::shared_ptr<ofCubeMap::Data> adata);
+	#ifdef TARGET_ANDROID
 	static void regenerateAllTextures();
+	#endif
 	static const ofTexture & getBrdfLutTexture();
 
 	ofCubeMap();

libs/openFrameworks/gl/ofCubeMap.h

@@ -103,7 +103,7 @@ class ofCubeMapShaders {
 		return rsource;
 	}
 
-	static ShaderSource irriadianceCubeMap() {
+	static ShaderSource irradianceCubeMap() {
 		ShaderSource rsource;
 		rsource.vertShader = defaultVertShader();
 

libs/openFrameworks/gl/ofCubeMapShaders.h

@@ -228,10 +228,23 @@ static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _
 		return ofLoadImage(pix, ofLoadURL(ofPathToString(_fileName)).data);
 	}
 
+
+	ofFile file(_fileName);
+	if (!file.exists()) {
+		ofLogError("loadImage") << "File not found: " << _fileName;
+		return false;
+	}
+
+	std::uint64_t fileSize = file.getSize();
+	if (fileSize == 0) {
+		ofLogError("loadImage") << "File is empty: " << _fileName;
+		return false;
+	}
 
 	bool bLoaded = false;
 	FIBITMAP * bmp = nullptr;
 
+	try {
 	FREE_IMAGE_FORMAT fif = FIF_UNKNOWN;
 #ifdef OF_OS_WINDOWS
 	fif = FreeImage_GetFileTypeU(_fileName.c_str(), 0);
@@ -251,8 +264,12 @@ static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _
 		if(fif == FIF_JPEG) {
 			option = getJpegOptionFromImageLoadSetting(settings);
 		}
+		if (!FreeImage_FIFSupportsReading(fif)) {
+			std::cerr << "Error: FreeImage does not support reading this format." << std::endl;
+		}
 		auto fileName = ofToDataPathFS(_fileName);
 
+
 #ifdef OF_OS_WINDOWS
 		bmp = FreeImage_LoadU(fif, fileName.c_str(), option | settings.freeImageFlags);
 #else
@@ -264,6 +281,16 @@ static bool loadImage(ofPixels_<PixelType> & pix, const of::filesystem::path & _
 		}
 	}
 
+	}
+catch (const std::exception & e) {
+	std::cerr << "Exception caught in FreeImage_Load: " << e.what() << std::endl;
+	return false;
+}
+catch (...) {
+	std::cerr << "Unknown exception caught in FreeImage_Load." << std::endl;
+	return false;
+}
+
 	//-----------------------------
 
 	if ( bLoaded ){

libs/openFrameworks/graphics/ofImage.cpp

@@ -204,7 +204,9 @@ void ofRtAudioSoundStream::start() {
 	if (audio == nullptr) return;
 
 	try {
-		audio->startStream();
+		if (!audio->isStreamRunning()) {
+			audio->startStream();
+		}
 	}
 	catch (std::exception &error) {
 		ofLogError() << error.what();

libs/openFrameworks/sound/ofRtAudioSoundStream.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;