Some math functions now prefixed with std::

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 {

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;
     }

addons/ofxiOS/src/core/ofxiOSViewController.mm

@@ -127,11 +127,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;
     }

addons/ofxiOS/src/utils/ofxiOSImagePicker.mm

@@ -198,11 +198,11 @@ - (instancetype) initWithPicker:(canLoadPixels *) _picker
              */
             UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
             if(orientation == UIInterfaceOrientationLandscapeLeft) {
-                _imagePicker.view.transform = CGAffineTransformMakeRotation(-PI*0.5);
+                _imagePicker.view.transform = CGAffineTransformMakeRotation(-glm::half_pi<float>());
             } else if(orientation == UIInterfaceOrientationLandscapeRight) {
-                _imagePicker.view.transform = CGAffineTransformMakeRotation(PI*0.5);
+                _imagePicker.view.transform = CGAffineTransformMakeRotation(glm::half_pi<float>());
             } else if(orientation == UIInterfaceOrientationPortraitUpsideDown) {
-                _imagePicker.view.transform = CGAffineTransformMakeRotation(PI);
+                _imagePicker.view.transform = CGAffineTransformMakeRotation(glm::pi<float>());
             }
         }
 
@@ -330,11 +330,11 @@ - (BOOL) showCameraOverlayWithCustomView:(UIView *)overlayView {
         overlay.center = CGPointMake(screenSize.width * 0.5, screenSize.height * 0.5);
         UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
         if(orientation == UIInterfaceOrientationLandscapeLeft) {
-            overlay.transform = CGAffineTransformMakeRotation(-PI * 0.5);
+            overlay.transform = CGAffineTransformMakeRotation(-glm::half_pi<float>());
         } else if(orientation == UIInterfaceOrientationLandscapeRight) {
-            overlay.transform = CGAffineTransformMakeRotation(PI * 0.5);
+            overlay.transform = CGAffineTransformMakeRotation(glm::half_pi<float>());
         } else if(orientation == UIInterfaceOrientationPortraitUpsideDown) {
-            overlay.transform = CGAffineTransformMakeRotation(PI);
+            overlay.transform = CGAffineTransformMakeRotation(glm::pi<float>());
         }
     }
 
@@ -458,7 +458,7 @@ - (UIImage *)scaleAndRotateImage:(UIImage *)image {
 			break;
 		case UIImageOrientationDown:
 			transform = CGAffineTransformMakeTranslation(imageSize.width, imageSize.height);
-			transform = CGAffineTransformRotate(transform, M_PI);
+			transform = CGAffineTransformRotate(transform, glm::pi<float>());
 			break;
 		case UIImageOrientationDownMirrored:
 			transform = CGAffineTransformMakeTranslation(0.0, imageSize.height);
@@ -470,28 +470,28 @@ - (UIImage *)scaleAndRotateImage:(UIImage *)image {
 			bounds.size.width = boundHeight;
 			transform = CGAffineTransformMakeTranslation(imageSize.height, imageSize.width);
 			transform = CGAffineTransformScale(transform, -1.0, 1.0);
-			transform = CGAffineTransformRotate(transform, 3.0 * M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::pi<float>() + glm::half_pi<float>());
 			break;
 		case UIImageOrientationLeft:
 			boundHeight = bounds.size.height;
 			bounds.size.height = bounds.size.width;
 			bounds.size.width = boundHeight;
 			transform = CGAffineTransformMakeTranslation(0.0, imageSize.width);
-			transform = CGAffineTransformRotate(transform, 3.0 * M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::pi<float>() + glm::half_pi<float>());
 			break;
 		case UIImageOrientationRightMirrored:
 			boundHeight = bounds.size.height;
 			bounds.size.height = bounds.size.width;
 			bounds.size.width = boundHeight;
 			transform = CGAffineTransformMakeScale(-1.0, 1.0);
-			transform = CGAffineTransformRotate(transform, M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::half_pi<float>());
 			break;
 		case UIImageOrientationRight:
 			boundHeight = bounds.size.height;
 			bounds.size.height = bounds.size.width;
 			bounds.size.width = boundHeight;
 			transform = CGAffineTransformMakeTranslation(imageSize.height, 0.0);
-			transform = CGAffineTransformRotate(transform, M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::half_pi<float>());
 			break;
 		default:
 			[NSException raise:NSInternalInconsistencyException format:@"Invalid image orientation"];

addons/ofxiOS/src/utils/ofxiOSKeyboard.mm

@@ -370,23 +370,23 @@ - (void) setFrame: (CGRect) rect
         switch (ofGetOrientation())
         {
             case OF_ORIENTATION_90_LEFT:
-                _textField.transform = CGAffineTransformMakeRotation(M_PI_2);
+                _textField.transform = CGAffineTransformMakeRotation(glm::half_pi<float>());
                 x = rect.origin.y-rect.size.height;
                 y = s.height-rect.size.width-rect.origin.x;
                 w = rect.size.height;
                 h = rect.size.width;
                 break;
 
             case OF_ORIENTATION_90_RIGHT:
-                _textField.transform = CGAffineTransformMakeRotation(-M_PI_2);
+                _textField.transform = CGAffineTransformMakeRotation(-glm::half_pi<float>());
                 x = s.width-rect.origin.y;
                 y = rect.origin.x;
                 w = rect.size.height;
                 h = rect.size.width;
                 break;
 
             case OF_ORIENTATION_180:
-                _textField.transform = CGAffineTransformMakeRotation(M_PI);
+                _textField.transform = CGAffineTransformMakeRotation(glm::pi<float>());
                 x = rect.origin.x;
                 y = rect.origin.y-rect.size.height;
                 w = rect.size.width;

addons/ofxiOS/src/video/AVFoundationVideoGrabber.mm

@@ -456,13 +456,13 @@ - (void)eraseGrabberPtr {
 
 		if(ofGetOrientation() == OF_ORIENTATION_DEFAULT) {
 			transform = CGAffineTransformMakeTranslation(0.0, height);
-			transform = CGAffineTransformRotate(transform, 3.0 * M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::half_pi<float>() + glm::pi<float>());
 
 			CGContextConcatCTM(spriteContext, transform);
 			CGContextDrawImage(spriteContext, CGRectMake(0.0, 0.0, (CGFloat)height, (CGFloat)width), ref);
 		} else if(ofGetOrientation() == OF_ORIENTATION_180) {
 			transform = CGAffineTransformMakeTranslation(width, 0.0);
-			transform = CGAffineTransformRotate(transform, M_PI / 2.0);
+			transform = CGAffineTransformRotate(transform, glm::half_pi<float>());
 
 			CGContextConcatCTM(spriteContext, transform);
 			CGContextDrawImage(spriteContext, CGRectMake(0.0, 0.0, (CGFloat)height, (CGFloat)width), ref);

examples/3d/3DPrimitivesExample/src/ofApp.cpp

@@ -342,7 +342,7 @@ void ofApp::draw() {
 			ofPushMatrix();
 			if (bottomCap.getNumNormals() > 0) {
 				ofTranslate(bottomCap.getNormal(0) * cone.getHeight()*.5);
-				ofRotateDeg(sin(ofGetElapsedTimef() * 5) * RAD_TO_DEG, 1, 0, 0);
+				ofRotateDeg( glm::degrees( sin(ofGetElapsedTimef() * 5) ), 1, 0, 0);
 				bottomCap.draw();
 			}
 			ofPopMatrix();

examples/android/androidAudioExample/src/ofApp.cpp

@@ -88,7 +88,7 @@ void ofApp::touchMoved(int x, int y, int id){
 	float height = (float)ofGetHeight();
 	float heightPct = ((height-y) / height);
 	targetFrequency = 2000.0f * heightPct;
-	phaseAdderTarget = (targetFrequency / (float) sampleRate) * TWO_PI;
+	phaseAdderTarget = (targetFrequency / (float) sampleRate) * glm::two_pi<float>();
 }
 
 //--------------------------------------------------------------
@@ -153,9 +153,9 @@ void ofApp::audioOut(ofSoundBuffer & buffer){
 	float rightScale = pan;
 
 	// sin (n) seems to have trouble when n is very large, so we
-	// keep phase in the range of 0-TWO_PI like this:
-	while (phase > TWO_PI){
-		phase -= TWO_PI;
+	// keep phase in the range of 0-glm::two_pi<float>() like this:
+	while (phase > glm::two_pi<float>()){
+		phase -= glm::two_pi<float>();
 	}
 
 	if ( bNoise == true){

examples/android/androidPolygonExample/src/ofApp.cpp

@@ -102,7 +102,7 @@ void ofApp::draw(){
 	float yPct = (float)(mouseY) / (float)(ofGetHeight());
 	int nTips = 5 + xPct * 60;
 	int nStarPts = nTips * 2;
-	float angleChangePerPt = TWO_PI / (float)nStarPts;
+	float angleChangePerPt = glm::two_pi<float>() / (float)nStarPts;
 	float innerRadius = 0 + yPct*80;
 	float outerRadius = 80;
 	float origx = 525;
@@ -114,13 +114,13 @@ void ofApp::draw(){
 	for (int i = 0; i < nStarPts; i++){
 		if (i % 2 == 0) {
 			// inside point:
-			float x = origx + innerRadius * cos(angle);
-			float y = origy + innerRadius * sin(angle);
+			float x = origx + innerRadius * std::cos(angle);
+			float y = origy + innerRadius * std::sin(angle);
 			ofVertex(x,y);
 		} else {
 			// outside point
-			float x = origx + outerRadius * cos(angle);
-			float y = origy + outerRadius * sin(angle);
+			float x = origx + outerRadius * std::cos(angle);
+			float y = origy + outerRadius * std::sin(angle);
 			ofVertex(x,y);
 		}
 		angle += angleChangePerPt;
@@ -155,13 +155,13 @@ void ofApp::draw(){
 		ofFill();
 		ofSetPolyMode(OF_POLY_WINDING_ODD);
 		ofBeginShape();
-		float angleStep 	= TWO_PI/(100.0f + sin(ofGetElapsedTimef()/5.0f) * 60); 
+		float angleStep 	= glm::two_pi<float>()/(100.0f + std::sin(ofGetElapsedTimef()/5.0f) * 60); 
 		float radiusAdder 	= 0.5f;
 		float radius 		= 0;
 		for (int i = 0; i < 200; i++){
 			float anglef = (i) * angleStep;
-			float x = radius * cos(anglef);
-			float y = radius * sin(anglef); 
+			float x = radius * std::cos(anglef);
+			float y = radius * std::sin(anglef); 
 			ofVertex(x,y);
 			radius 	+= radiusAdder; 
 		}
@@ -325,9 +325,9 @@ void ofApp::draw(){
 		ofNextContour(true);
 
 		for (int i = 0; i < 20; i++){
-			float anglef = ((float)i / 19.0f) * TWO_PI;
-			float x = 340 + 30 * cos(anglef);
-			float y = 550 + 30 * sin(anglef); 
+			float anglef = ((float)i / 19.0f) * glm::two_pi<float>();
+			float x = 340 + 30 * std::cos(anglef);
+			float y = 550 + 30 * std::sin(anglef); 
 			ofVertex(x,y);
 			radius 	+= radiusAdder; 
 		}
@@ -347,9 +347,9 @@ void ofApp::draw(){
 		ofNextContour(true);
 
 		for (int i = 0; i < 20; i++){
-			float anglef = ((float)i / 19.0f) * TWO_PI;
-			float x = 340 + 30 * cos(anglef);
-			float y = 550 + 30 * sin(anglef); 
+			float anglef = ((float)i / 19.0f) * glm::two_pi<float>();
+			float x = 340 + 30 * std::cos(anglef);
+			float y = 550 + 30 * std::sin(anglef); 
 			ofVertex(x,y);
 			radius 	+= radiusAdder; 
 		}
@@ -365,7 +365,7 @@ void ofApp::draw(){
 		ofNextContour(true);
 
 		for (int i = 0; i < 20; i++){
-			float anglef = ((float)i / 19.0f) * TWO_PI;
+			float anglef = ((float)i / 19.0f) * glm::two_pi<float>();
 			float x = 340 + 30 * cos(anglef);
 			float y = 550 + 30 * sin(anglef); 
 			ofVertex(x,y);

examples/computer_vision/opencvImageClassification/src/yolo5ImageClassify.h

@@ -187,7 +187,7 @@ class yolo5ImageClassify{
 		cv::Mat format_yolov5(const cv::Mat &source) {
 			int col = source.cols;
 			int row = source.rows;
-			int _max = MAX(col, row);
+			int _max = std::max(col, row);
 			cv::Mat result = cv::Mat::zeros(_max, _max, CV_8UC3);
 			source.copyTo(result(cv::Rect(0, 0, col, row)));
 			return result;

examples/computer_vision/opencvOpticalFlowExample/src/ofApp.cpp

@@ -265,7 +265,7 @@ void ofApp::draw(){
 	float deltaTime = ofClamp( ofGetLastFrameTime(), 1.f / 5000.f, 1.f / 5.f );
 
 	ofSetColor( 255 );
-	float scale = grayImage.getWidth() / MAX(1,currentImage.getWidth());
+	float scale = grayImage.getWidth() / std::max(1.f,currentImage.getWidth());
 
 	if(grayImage.bAllocated){
 		if( mode == MODE_SPIN_CUBES ){

examples/gl/billboardRotationExample/src/ofApp.cpp

@@ -74,7 +74,7 @@ void ofApp::update() {
 		}
 
 		// get the 2d heading
-		float angle = (float)atan2(-vel[i].y, vel[i].x) + PI;
+		float angle = std::atan2(-vel[i].y, vel[i].x) + glm::pi<float>();
 		rotations[i] = (angle * -1.0);
 	}
 }

examples/gl/materialPBRAdvancedExample/src/ofApp.cpp

@@ -155,7 +155,7 @@ void ofApp::renderScene(bool bShadowPass) {
 
 	matSphere.begin();
 	ofPushMatrix();
-	ofTranslate( 700.0*cos(angle-PI), -20, sin(angle-PI)*300.0-100 );
+	ofTranslate( 700.0 * std::cos(angle - glm::pi<float>()), -20, std::sin(angle - glm::pi<float>())*300.0-100 );
 	ofScale(120);
 	meshPlySphere.draw();
 	ofPopMatrix();

examples/gl/multiLightExample/src/ofApp.cpp

@@ -80,7 +80,7 @@ void ofApp::update() {
 						   sin(ofGetElapsedTimef()*.8f) * radius * 2 + center.y,
 						   -cos(ofGetElapsedTimef()*.8f) * radius * 2 + center.z);
 
-	spotLight.setOrientation( { 0, cos(ofGetElapsedTimef()) * RAD_TO_DEG, 0 } );
+	spotLight.setOrientation( { 0, glm::degrees(cos(ofGetElapsedTimef())), 0 } );
 	spotLight.setPosition( mouseX, mouseY, 200);
 }