Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use dedicated functions to convert between degrees and radians

Browse Source
This commit is contained in:
Artur Wieczorek
2020-10-04 21:47:43 +02:00
parent 9e5f333bcc
commit fe064de26b
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/drawing/drawing.cpp
View File

@@ -1338,8 +1338,8 @@ void MyCanvas::DrawSplines(wxDC& dc)
{ {
angle += angles[ angle_pos ]; angle += angles[ angle_pos ];
int r = R * radii[ radius_pos ] / 100; int r = R * radii[ radius_pos ] / 100;
pts[ i ].x = center.x + (wxCoord)( r * cos( M_PI * angle / 180.0) ); pts[ i ].x = center.x + (wxCoord)( r * cos(wxDegToRad(angle)) );
pts[ i ].y = center.y + (wxCoord)( r * sin( M_PI * angle / 180.0) ); pts[ i ].y = center.y + (wxCoord)( r * sin(wxDegToRad(angle)) );
angle_pos++; angle_pos++;
if ( angle_pos >= WXSIZEOF(angles) ) angle_pos = 0; if ( angle_pos >= WXSIZEOF(angles) ) angle_pos = 0;

15
src/common/geometry.cpp
View File

@@ -176,8 +176,7 @@ wxDouble wxPoint2DInt::GetVectorAngle() const
return 180; return 180;
} }
// casts needed for MIPSpro compiler under SGI wxDouble deg = wxRadToDeg(atan2( (double)m_y , (double)m_x ));
wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI;
if ( deg < 0 ) if ( deg < 0 )
{ {
deg += 360; deg += 360;
@@ -189,8 +188,9 @@ wxDouble wxPoint2DInt::GetVectorAngle() const
void wxPoint2DInt::SetVectorAngle( wxDouble degrees ) void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
{ {
wxDouble length = GetVectorLength(); wxDouble length = GetVectorLength();
m_x = (int)(length * cos( degrees / 180 * M_PI )); double rad = wxDegToRad(degrees);
m_y = (int)(length * sin( degrees / 180 * M_PI )); m_x = (int)(length * cos(rad));
m_y = (int)(length * sin(rad));
} }
wxDouble wxPoint2DDouble::GetVectorAngle() const wxDouble wxPoint2DDouble::GetVectorAngle() const
@@ -209,7 +209,7 @@ wxDouble wxPoint2DDouble::GetVectorAngle() const
else else
return 180; return 180;
} }
wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI; wxDouble deg = wxRadToDeg(atan2( m_y , m_x ));
if ( deg < 0 ) if ( deg < 0 )
{ {
deg += 360; deg += 360;
@@ -220,8 +220,9 @@ wxDouble wxPoint2DDouble::GetVectorAngle() const
void wxPoint2DDouble::SetVectorAngle( wxDouble degrees ) void wxPoint2DDouble::SetVectorAngle( wxDouble degrees )
{ {
wxDouble length = GetVectorLength(); wxDouble length = GetVectorLength();
m_x = length * cos( degrees / 180 * M_PI ); double rad = wxDegToRad(degrees);
m_y = length * sin( degrees / 180 * M_PI ); m_x = length * cos(rad);
m_y = length * sin(rad);
} }
// wxRect2D // wxRect2D