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

Use cvfMath for PI and sin/cos in PointTangentManipulator

Browse Source 
To avoid errors from pedantic compilers
This commit is contained in:
Jacob Støren
2019-11-07 08:57:50 +01:00
parent 0caaaf7159
commit 38e8f04990
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@
#include "cvfBoxGenerator.h"
#include "cvfDrawableGeo.h"
#include "cvfGeometryBuilderFaceList.h"
#include "cvfGeometryBuilderTriangles.h"
#include "cvfGeometryUtils.h"
#include "cvfHitItem.h"
#include "cvfModelBasicList.h"
#include "cvfPart.h"
@@ -34,15 +36,10 @@
#include "cvfPrimitiveSetIndexedUInt.h"
#include "cvfRay.h"
#include "cvfGeometryBuilderTriangles.h"
#include "cvfGeometryUtils.h"
#include "cvfMath.h"
#include <QDebug>
#ifndef MY_PI
#define MY_PI 3.14159265358f
#endif
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -259,12 +256,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 * 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 );
float cos_pi_12 = cvf::Math::cos( 0.5 * cvf::PI_F / 12 );
float sin_pi_12 = cvf::Math::sin( 0.5 * cvf::PI_F / 12 );
float cos_3pi_12 = cvf::Math::cos( 3 * cvf::PI_F / 12 );
float sin_3pi_12 = cvf::Math::sin( 3 * cvf::PI_F / 12 );
float cos_5pi_12 = cvf::Math::cos( 5.5 * cvf::PI_F / 12 );
float sin_5pi_12 = cvf::Math::sin( 5.5 * cvf::PI_F / 12 );
vertexArray->set( 0, {1.25, 0, 0} );
vertexArray->set( 1, {cos_pi_12, sin_pi_12, 0} );