Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1032 from ashdnazg/master

Browse Source 
use cmath and C++ (std::) versions of math functions
This commit is contained in:
Kim Kulling
2016-10-17 17:26:32 +02:00
committed by GitHub
parent 09ad67f469 a84bf869c2
commit 862dfd5a05
15 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/X3DImporter.cpp
View File

@@ -784,7 +784,7 @@ void X3DImporter::XML_ReadNode_GetAttrVal_AsListS(const int pAttrIdx, std::list<
aiVector3D X3DImporter::GeometryHelper_Make_Point2D(const float pAngle, const float pRadius)
{
return aiVector3D(pRadius * cosf(pAngle), pRadius * sinf(pAngle), 0);
return aiVector3D(pRadius * std::cos(pAngle), pRadius * std::sin(pAngle), 0);
}
void X3DImporter::GeometryHelper_Make_Arc2D(const float pStartAngle, const float pEndAngle, const float pRadius, size_t pNumSegments,
@@ -805,7 +805,7 @@ void X3DImporter::GeometryHelper_Make_Arc2D(const float pStartAngle, const float
}
// calculate arc angle and check type of arc
float angle_full = fabs(pEndAngle - pStartAngle);
float angle_full = std::fabs(pEndAngle - pStartAngle);
if ( ( angle_full > AI_MATH_TWO_PI_F ) || ( angle_full == 0.0f ) )
{
angle_full = AI_MATH_TWO_PI_F;