PI / TWO_PI -> glm versions in examples (#8423)

Author: dimitre

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

@@ -178,7 +178,7 @@ void ofApp::draw() {
 			box.transformGL();
 			for (int i = 0; i < ofBoxPrimitive::SIDES_TOTAL; i++) {
 				ofPushMatrix();
-				ofTranslate(boxSides[i].getNormal(0) * sin(ofGetElapsedTimef()) * 50);
+				ofTranslate(boxSides[i].getNormal(0) * sin(ofGetElapsedTimef()) * 50.0f);
 				boxSides[i].draw();
 				ofPopMatrix();
 			}
@@ -294,13 +294,13 @@ void ofApp::draw() {
 			cylinder.transformGL();
 			ofPushMatrix(); {
 				if (topCap.getNumNormals() > 0) {
-					ofTranslate(topCap.getNormal(0) * (cos(ofGetElapsedTimef() * 5) + 1)*.5f * 100);
+					ofTranslate(topCap.getNormal(0) * (cos(ofGetElapsedTimef() * 5) + 1)*.5f * 100.0f);
 					topCap.draw();
 				}
 			} ofPopMatrix();
 			ofPushMatrix(); {
 				if (bottomCap.getNumNormals() > 0) {
-					ofTranslate(bottomCap.getNormal(0) * (cos(ofGetElapsedTimef() * 4) + 1)*.5f * 100);
+					ofTranslate(bottomCap.getNormal(0) * (cos(ofGetElapsedTimef() * 4) + 1)*.5f * 100.0f);
 					bottomCap.draw();
 				}
 			} ofPopMatrix();
@@ -341,7 +341,7 @@ void ofApp::draw() {
 			cone.transformGL();
 			ofPushMatrix();
 			if (bottomCap.getNumNormals() > 0) {
-				ofTranslate(bottomCap.getNormal(0) * cone.getHeight()*.5);
+				ofTranslate(bottomCap.getNormal(0) * (float)cone.getHeight()*.5f);
 				ofRotateDeg( glm::degrees( sin(ofGetElapsedTimef() * 5) ), 1, 0, 0);
 				bottomCap.draw();
 			}

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

@@ -22,8 +22,8 @@ void ofApp::setup(){
 
 	//loop around and make verts in a circle, with a bit of a z-wave
 	for (int i = 0; i < max; i++){
-		float step = 2*PI/max; // step size around circle
-		float theta = ofMap(i, 0, max-1, 0, 2*PI - step); //map i as circle divisions to actual radian values around the circle (note we don't go quite all the way around by one step, because it will be the same as where we started, so we'll just index that starting vertex when we make faces)
+		float step = glm::two_pi<float>()/max; // step size around circle
+		float theta = ofMap(i, 0, max-1, 0, glm::two_pi<float>() - step); //map i as circle divisions to actual radian values around the circle (note we don't go quite all the way around by one step, because it will be the same as where we started, so we'll just index that starting vertex when we make faces)
 
 		float prevTheta = theta - step; //one step back
 		float nextTheta = theta + step; // one step forward
@@ -52,7 +52,7 @@ void ofApp::setup(){
 
 		//add a color too
 		ofColor c;
-		c.setHsb(40 + 30*sin(2*theta+PI),255,255,255);
+		c.setHsb(40 + 30*sin(2*theta+glm::pi<float>()),255,255,255);
 		mesh.addColor(c);
 	}
 

examples/android/androidCompositeExample/ofApp/src/main/cpp/ofApp.cpp

@@ -58,10 +58,10 @@ void ofApp::setup(){
     volume				= 0.1f;
     bNoise 				= false;
 	initialBufferSize = 256;
-		
+
 	lAudio = new float[initialBufferSize];
 	rAudio = new float[initialBufferSize];
-	
+
 	memset(lAudio, 0, initialBufferSize * sizeof(float));
 	memset(rAudio, 0, initialBufferSize * sizeof(float));
 
@@ -95,7 +95,7 @@ void ofApp::draw(){
     int b = 128 + 50 * sinf(ofGetElapsedTimef());
 
     ofBackground(r,g,b);
-	
+
 	if( doShader ){
 		shader.begin();
 		//we want to pass in some varrying values to animate our type / color
@@ -122,7 +122,7 @@ void ofApp::draw(){
         ofVertex(20+i*10,ofGetHeight() / 2 + 250 + rAudio[i]*500.0f);
     }
     ofEndShape(false);
-    
+
     //finally draw our text
     text.draw();
 
@@ -133,13 +133,13 @@ void ofApp::draw(){
 }
 
 //--------------------------------------------------------------
-void ofApp::keyPressed  (int key){ 
-	
+void ofApp::keyPressed  (int key){
+
 }
 
 //--------------------------------------------------------------
-void ofApp::keyReleased(int key){ 
-	
+void ofApp::keyReleased(int key){
+
 }
 
 //--------------------------------------------------------------
@@ -182,7 +182,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>();
 }
 
 //--------------------------------------------------------------
@@ -248,8 +248,8 @@ void ofApp::audioOut(ofSoundBuffer & buffer){
 
 	// 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;
+	while (phase > glm::two_pi<float>()){
+		phase -= glm::two_pi<float>();
 	}
 
 	if ( bNoise == true){