FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the M_PI defines from include/osg/Math and have use a const double osg::PI etc

Browse Source 
in its place.
This commit is contained in:
Robert Osfield
2002-01-30 15:27:45 +00:00
parent 9471714ba4
commit 4d43f83295
6 changed files with 18 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Demos/hangglide/sky.cpp
View File

@@ -48,8 +48,8 @@ Node *makeSky( void )
{
for( j = 0; j <= 18; j++ )
{
alpha = lev[i] * M_PI/180.0;
theta = (float)(j*20) * M_PI/180.0;
alpha = osg::DegreesToRadians(lev[i]);
theta = osg::DegreesToRadians((float)(j*20));
x = radius * cosf( alpha ) * cosf( theta );
y = radius * cosf( alpha ) * -sinf( theta );

4
src/Demos/hangglide/tank.cpp
View File

@@ -68,7 +68,7 @@ Node *makeTank( void )
{
float x, y, z;
float s, t;
float theta = (float)i * M_PI/180.0;
float theta = osg::DegreesToRadians((float)i);
s = (float)i/90.0;
t = 1.0;
@@ -144,7 +144,7 @@ Node *makeTank( void )
{
float x, y, z;
float s, t;
float theta = (float)i * M_PI/180.0;
float theta = osg::DegreesToRadians((float)i);
// s = (float)i/360.0;
// t = 1.0;

3
src/osg/Matrix.cpp
View File

@@ -8,9 +8,6 @@
using namespace osg;
#define DEG2RAD(x) ((x)*M_PI/180.0)
#define RAD2DEG(x) ((x)*180.0/M_PI)
#define SET_ROW(row, v1, v2, v3, v4 ) \
_mat[(row)][0] = (v1); \
_mat[(row)][1] = (v2); \

4
src/osgPlugins/obj/glm.cpp
View File

@@ -20,6 +20,8 @@
#endif
#include "glm.h"
#include <osg/Math>
/* defines */
#define T(x) model->triangles[(x)]
@@ -1091,7 +1093,7 @@ glmVertexNormals(GLMmodel* model, GLfloat angle)
assert(model->facetnorms);
/* calculate the cosine of the angle (in degrees) */
cos_angle = (float)cos(angle * M_PI / 180.0);
cos_angle = (float)cos(osg::DegreesToRadians(angle));
/* nuke any previous normals */
if (model->normals)

4
src/osgUtil/CullVisitor.cpp
View File

@@ -22,8 +22,6 @@
using namespace osg;
using namespace osgUtil;
#define DEG2RAD(x) ((x)*M_PI/180.0)
inline float MAX_F(float a, float b)
{ return a>b?a:b; }
inline int EQUAL_F(float a, float b)
@@ -594,7 +592,7 @@ void CullVisitor::calcClippingDirections() const
osg::Vec3 t_up = _camera->getUpVector();
osg::Vec3 t_side = _camera->getSideVector();
double t_VFOV_2 = _camera->calc_fovy() * M_PI / 360.0;//half of vertical FOV in radians
double t_VFOV_2 = osg::DegreesToRadians(_camera->calc_fovy() * 0.5);//half of vertical FOV in radians
//we need to pitch up the cameras up vector for angle that is half fovy,
osg::Vec3 pitched_up_up = t_up * osg::Matrix::rotate(t_VFOV_2, t_side.x(), t_side.y(), t_side.z());