OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix M_PI related errors

Browse Source
This commit is contained in:
Jacob Støren 2019-11-06 18:59:40 +01:00
parent e78ae37cb7
commit 7d2f1ec9c1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp
View File

@ -15,8 +15,6 @@
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#define _USE_MATH_DEFINES
#include "RicPointTangentManipulatorPartMgr.h"
#include "RivPartPriority.h"
@ -41,6 +39,10 @@
#include <QDebug>
#ifndef MY_PI
#define MY_PI 3.14159265358f
#endif
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -257,12 +259,12 @@ cvf::ref<cvf::DrawableGeo> RicPointTangentManipulatorPartMgr::createHorizontalPl
cvf::ref<cvf::Vec3fArray> vertexArray = new cvf::Vec3fArray( 16 );
cvf::ref<cvf::Vec3fArray> triangleVertexArray = new cvf::Vec3fArray( 16 * 3 );
float cos_pi_12 = cos( 0.5 * M_PI / 12 );
float sin_pi_12 = sin( 0.5 * M_PI / 12 );
float cos_3pi_12 = cos( 3 * M_PI / 12 );
float sin_3pi_12 = sin( 3 * M_PI / 12 );
float cos_5pi_12 = cos( 5.5 * M_PI / 12 );
float sin_5pi_12 = sin( 5.5 * M_PI / 12 );
float cos_pi_12 = cos( 0.5 * MY_PI / 12 );
float sin_pi_12 = sin( 0.5 * MY_PI / 12 );
float cos_3pi_12 = cos( 3 * MY_PI / 12 );
float sin_3pi_12 = sin( 3 * MY_PI / 12 );
float cos_5pi_12 = cos( 5.5 * MY_PI / 12 );
float sin_5pi_12 = sin( 5.5 * MY_PI / 12 );
vertexArray->set( 0, { 1.25, 0, 0 } );
vertexArray->set( 1, { cos_pi_12, sin_pi_12, 0 } );