Merge branch 'master' into hs8

Author: dimitre

.github/workflows/build-msys2.yml

@@ -41,9 +41,14 @@ jobs:
     - uses: msys2/setup-msys2@v2
       with:
         cache: true
+        release: true
         update: false
         msystem: ${{matrix.msystem}}
-        pacboy: assimp:p cairo:p curl:p freeglut:p FreeImage:p gcc:p gdb:p glew:p glfw:p glm:p harfbuzz:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p ntldd-git:p openal:p opencv:p pkgconf:p pugixml:p rtaudio:p uriparser:p utf8cpp:p zlib:p poco:p
+        pacboy: gcc:p assimp:p cairo:p curl:p freeglut:p FreeImage:p glew:p glfw:p glm:p libsndfile:p libusb:p libxml2:p mpg123:p nlohmann-json:p openal:p opencv:p pugixml:p rtaudio:p uriparser:p utf8cpp:p
+        install: >-
+          unzip
+          make
+        # gcc:p gdb:p zlib:p poco:p pkgconf:p harfbuzz:p ntldd-git:p 
         # boost:p tools:p
         # install: >-
         # unzip
@@ -60,3 +65,4 @@ jobs:
     - name: Run tests
       run: ./scripts/ci/msys2/run_tests.sh
 
+

addons/ofxAccelerometer/src/ofxAccelerometer.h

@@ -140,8 +140,8 @@ class ofxAccelerometerHandler {
 		if(!orientDirty) return;
 		orientDirty = false;
 
-		orientation.x = atan2(accelOrientation.y, -accelOrientation.z) * RAD_TO_DEG; 
-		orientation.y = atan2(accelOrientation.x, -accelOrientation.z) * RAD_TO_DEG;
+		orientation.x = glm::degrees( atan2(accelOrientation.y, -accelOrientation.z) );
+		orientation.y = glm::degrees( atan2(accelOrientation.x, -accelOrientation.z) );
 		orientation.z = 0;
 	}
 

addons/ofxAssimpModelLoader/src/ofxAssimpAnimation.cpp

@@ -56,7 +56,7 @@ void ofxAssimpAnimation::update() {
 		position = 1.0;
 		stop();
 	} else if(position > 1.0 && loopType == OF_LOOP_NORMAL) {
-		position = fmod(position, 1.0f);
+		position = std::fmod(position, 1.0f);
 	} else if(position > 1.0 && loopType == OF_LOOP_PALINDROME) {
 		speedFactor *= -1;
 	} else if(position < 0.0 && loopType == OF_LOOP_PALINDROME) {

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp

@@ -219,7 +219,7 @@ void ofxAssimpModelLoader::calculateDimensions(){
 	normalizedScale = scene_max.x-scene_min.x;
 	normalizedScale = std::max(double(scene_max.y - scene_min.y), normalizedScale);
 	normalizedScale = std::max(double(scene_max.z - scene_min.z), normalizedScale);
-	if (fabs(normalizedScale) < std::numeric_limits<float>::epsilon()){
+	if (std::abs(normalizedScale) < std::numeric_limits<float>::epsilon()){
 		ofLogWarning("ofxAssimpModelLoader") << "Error calculating normalized scale of scene" << std::endl;
 		normalizedScale = 1.0;
 	} else {
@@ -749,6 +749,12 @@ void ofxAssimpModelLoader::setPositionForAllAnimations(float position) {
 	}
 }
 
+void ofxAssimpModelLoader::setSpeedForAllAnimations(float speed) {
+	for (auto & a : animations) {
+		a.setSpeed(speed);
+	}
+}
+
 // DEPRECATED.
 void ofxAssimpModelLoader::setAnimation(int animationIndex) {
 	if(!hasAnimations()) {

addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h

@@ -76,6 +76,8 @@ class ofxAssimpModelLoader{
 		void setPausedForAllAnimations(bool pause);
 		void setLoopStateForAllAnimations(ofLoopType state);
 		void setPositionForAllAnimations(float position);
+		void setSpeedForAllAnimations(float speed);
+	
 		[[deprecated("Use ofxAssimpAnimation")]]
 		void setAnimation(int animationIndex);
 		[[deprecated("Use ofxAssimpAnimation")]]

addons/ofxGui/src/ofxColorPicker.cpp

@@ -23,10 +23,10 @@ PolCord getPolarCoordinate(const glm::vec2 & p, float radius){
 
 	float px = p.x - radius;						// point x from center.
 	float py = p.y - radius;						// point x from center.
-	float pl = sqrt(px * px + py * py);     // point length from center.
-	float pa = atan2(px, py);				// point angle around center.
+	float pl = std::sqrt(px * px + py * py);     // point length from center.
+	float pa = std::atan2(px, py);				// point angle around center.
 
-	pa *= RAD_TO_DEG;
+	pa = glm::degrees(pa);
 	pa -= 90;
 	pl /= radius;
 
@@ -39,8 +39,8 @@ PolCord getPolarCoordinate(const glm::vec2 & p, float radius){
 
 glm::vec2 getPoint(float a, float r){
 	glm::vec2 p;
-	p.x = r * cos(-a * DEG_TO_RAD);
-	p.y = r * sin(-a * DEG_TO_RAD);
+	p.x = r * std::cos(glm::radians(-a));
+	p.y = r * std::sin(glm::radians(-a));
 
 	return p;
 }
@@ -248,9 +248,9 @@ ofMesh ofxColorPicker_<ColorType>::getColorWheel() {
 
 		int j = i % COLOR_WHEEL_RES;
 		float p = j / (float)COLOR_WHEEL_RES;
-		float a = p * TWO_PI;
+		float a = p * glm::two_pi<float>();
 
-		ofFloatColor c0 = getCircularColor<float>(a * RAD_TO_DEG, 1.0, colorScale);
+		ofFloatColor c0 = getCircularColor<float>(glm::degrees(a), 1.0, colorScale);
 		meshColorWheel.addColor(ofFloatColor::white);
 		meshColorWheel.addColor(c0);
 		meshColorWheel.addColor(c0);

addons/ofxKinect/src/ofxKinect.cpp

@@ -384,7 +384,7 @@ void ofxKinect::update() {
             if( videoPixels.getHeight() == videoPixelsIntra.getHeight() ){
                 std::swap(videoPixels,videoPixelsIntra);
             }else{
-				int minimumSize = MIN(videoPixels.size(), videoPixelsIntra.size());
+				int minimumSize = std::min(videoPixels.size(), videoPixelsIntra.size());
 				memcpy(videoPixels.getData(), videoPixelsIntra.getData(), minimumSize);
             }
 			bNeedsUpdateVideo = false;

addons/ofxOpenCv/src/ofxCvImage.cpp

@@ -620,8 +620,8 @@ void ofxCvImage::transform( float angle, float centerX, float centerY,
 		return;		
 	}	
 
-    float sina = sin(angle * DEG_TO_RAD);
-    float cosa = cos(angle * DEG_TO_RAD);
+    float sina = std::sin(glm::radians(angle));
+    float cosa = std::cos(glm::radians(angle));
     CvMat*  transmat = cvCreateMat( 2,3, CV_32F );
     cvmSet( transmat, 0,0, scaleX*cosa );
     cvmSet( transmat, 0,1, scaleY*sina );

addons/ofxSvg/src/ofxSvg.cpp

@@ -98,7 +98,7 @@ void ofxSvg::fixSvgString(std::string & xmlstring) {
 		for (ofXml & element : strokeWidthElements) {
 			//cout << element.toString() << endl;
 			float strokewidth = element.getAttribute("stroke-width").getFloatValue();
-			strokewidth = MAX(1, round(strokewidth));
+			strokewidth = std::fmax(1.0, std::round(strokewidth));
 			element.getAttribute("stroke-width").set(strokewidth);
 		}
 	}

addons/ofxiOS/src/core/ofxiOSGLKViewController.mm

@@ -195,11 +195,11 @@ - (float)rotationForOrientation:(UIInterfaceOrientation)interfaceOrientation {
     if (interfaceOrientation == UIInterfaceOrientationPortrait) {
         return 0;           // 0 degrees.
     } else if (interfaceOrientation == UIInterfaceOrientationLandscapeRight) {
-        return M_PI * 0.5;  // 90 degrees.
+        return glm::half_pi<float>();  // 90 degrees.
     } else if (interfaceOrientation == UIInterfaceOrientationPortraitUpsideDown) {
-        return M_PI;        // 180 degrees.
+        return glm::pi<float>();        // 180 degrees.
     } else if (interfaceOrientation == UIInterfaceOrientationLandscapeLeft) {
-        return M_PI * 1.5;  // 270 degrees.
+        return glm::pi<float>() + glm::half_pi<float>();  // 270 degrees.
     } else {
         return 0;
     }