Changeset 9031 for OpenSceneGraph/trunk/examples/osgrobot/osgrobot.cpp

Timestamp:

10/14/08 18:44:14 (5 years ago)

Author:

robert

Message:

Converted M_PI* usage across to osg::PI

Files:

• OpenSceneGraph/trunk/examples/osgrobot/osgrobot.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/examples/osgrobot/osgrobot.cpp

@@ -152 +152 @@
                 {
                 case 'q':
-                    rotate(M_PIl/180, joint1); 
+                    rotate(osg::PI/180, joint1); 
                     return true;
                 case 'a':
-                    rotate(-M_PIl/180, joint1); 
+                    rotate(-osg::PI/180, joint1); 
                     return true;
                 case 'w':
-                    rotate(M_PIl/180, joint2); 
+                    rotate(osg::PI/180, joint2); 
                     return true;
                 case 's':
-                    rotate(-M_PIl/180, joint2); 
+                    rotate(-osg::PI/180, joint2); 
                     return true;
                 case 'e':
-                    rotate(M_PIl/180, joint3); 
+                    rotate(osg::PI/180, joint3); 
                     return true;
                 case 'd':
-                    rotate(-M_PIl/180, joint3); 
+                    rotate(-osg::PI/180, joint3); 
                     return true;
                 case 'r':
-                    rotate(M_PIl/180, joint4); 
+                    rotate(osg::PI/180, joint4); 
                     return true;
                 case 'f':
-                    rotate(-M_PIl/180, joint4); 
+                    rotate(-osg::PI/180, joint4); 
                     return true;
                 case 't':
-                    rotate(M_PIl/180, joint5); 
+                    rotate(osg::PI/180, joint5); 
                     return true;
                 case 'g':
-                    rotate(-M_PIl/180, joint5); 
+                    rotate(-osg::PI/180, joint5); 
                     return true;
                 case 'y':
-                    rotate(M_PIl/180, joint6); 
+                    rotate(osg::PI/180, joint6); 
                     return true;
                 case 'h':
-                    rotate(-M_PIl/180, joint6); 
+                    rotate(-osg::PI/180, joint6); 
                     return true;
                 }
@@ -251 +251 @@
     osg::MatrixTransform* xTransform = new osg::MatrixTransform();
     previousJoint->addChild(xTransform);
-    osg::Matrix xRot = osg::Matrix::rotate(M_PI_2, 1.0, 0.0, 0.0);
+    osg::Matrix xRot = osg::Matrix::rotate(osg::PI_2, 1.0, 0.0, 0.0);
     xTransform->setMatrix(xRot);
     osg::Geode* joint = new osg::Geode();
@@ -259 +259 @@
     osg::MatrixTransform* zTransform = new osg::MatrixTransform();
     osg::Matrix zTrans = osg::Matrix::translate( 0.0, 0.0, height);
-    osg::Matrix zRot = osg::Matrix::rotate(M_PI_2+jointAngle2, 0.0,0.0,1.0);
+    osg::Matrix zRot = osg::Matrix::rotate(osg::PI_2+jointAngle2, 0.0,0.0,1.0);
     zTransform->setMatrix(zTrans*zRot);
     xTransform->addChild(zTransform);
@@ -275 +275 @@
     osg::MatrixTransform* xTransform = new osg::MatrixTransform();
     previousJoint->addChild(xTransform);
-    osg::Matrix xRot = osg::Matrix::rotate(M_PI_2, 1.0,0.0,0.0);
+    osg::Matrix xRot = osg::Matrix::rotate(osg::PI_2, 1.0,0.0,0.0);
     xTransform->setMatrix(xRot);
     osg::Geode* tube3 = new osg::Geode();
@@ -295 +295 @@
     osg::MatrixTransform* xTransform = new osg::MatrixTransform();
     previousJoint->addChild(xTransform);
-    osg::Matrix xRot = osg::Matrix::rotate(-M_PI_2, 1.0, 0.0, 0.0);
+    osg::Matrix xRot = osg::Matrix::rotate(-osg::PI_2, 1.0, 0.0, 0.0);
     xTransform->setMatrix(xRot);
     if (showAxis)
@@ -332 +332 @@
     previousJoint->addChild(xTransform);
     xTransform->addChild(tube4);
-    osg::Matrix xRot= osg::Matrix::rotate(M_PI_2, 1,0,0);
+    osg::Matrix xRot= osg::Matrix::rotate(osg::PI_2, 1,0,0);
     xTransform->setMatrix(xRot);
     height = 7.5;
     osg::Matrix zTrans = osg::Matrix::translate(0,0,17.5);
-    osg::Matrix zRot = osg::Matrix::rotate(jointAngle4-M_PI_2, 0,0,1);
+    osg::Matrix zRot = osg::Matrix::rotate(jointAngle4-osg::PI_2, 0,0,1);
 
     osg::MatrixTransform* zTransform = new osg::MatrixTransform();
@@ -373 +373 @@
     osg::MatrixTransform* xTransform = new osg::MatrixTransform();
     previousJoint->addChild(xTransform);
-    osg::Matrix xRot= osg::Matrix::rotate(-M_PI_2, 1.0,0,0);
+    osg::Matrix xRot= osg::Matrix::rotate(-osg::PI_2, 1.0,0,0);
     xTransform->setMatrix(xRot);
     xTransform->addChild(joint);
@@ -396 +396 @@
     joint->addDrawable(new osg::ShapeDrawable(new osg::Cylinder(osg::Vec3(0.0f,0.0f,height/2),radius,height),hints));
     osg::MatrixTransform* xTransform = new osg::MatrixTransform();
-    osg::Matrix xRot= osg::Matrix::rotate(M_PI_2, 1.0, 0.0, 0.0);
+    osg::Matrix xRot= osg::Matrix::rotate(osg::PI_2, 1.0, 0.0, 0.0);
     xTransform->setMatrix(xRot);
     xTransform->addChild(joint);
@@ -453 +453 @@
     previousJoint->addChild(mt);
 
-    osg::Matrix xMatrix = osg::Matrix::rotate(-M_PI_2, 0.0, 1.0, 0.0);
+    osg::Matrix xMatrix = osg::Matrix::rotate(-osg::PI_2, 0.0, 1.0, 0.0);
     mt->setMatrix(xMatrix);
 
@@ -466 +466 @@
     osg::MatrixTransform *yMt = new osg::MatrixTransform();
     previousJoint->addChild(yMt);
-    osg::Matrix yMatrix = osg::Matrix::rotate(M_PI_2, 1.0, 0.0, 0.0);
+    osg::Matrix yMatrix = osg::Matrix::rotate(osg::PI_2, 1.0, 0.0, 0.0);
     yMt->setMatrix(yMatrix);