mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Tabify.
This commit is contained in:
Person 2020-10-20 21:57:31 -07:00
parent 8c4d9fd866
commit 73efd76bdd
4 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Fractorium/FractoriumParams.cpp
View File

@ -423,9 +423,9 @@ template <typename T> void FractoriumEmberController<T>::RotateChanged(double d)
} }
void Fractorium::OnRotateChanged(double d) void Fractorium::OnRotateChanged(double d)
{ {
if(d < -180) if (d < -180)
d = 180 - ((-d + m_RotateSpin->value()) - (180 + m_RotateSpin->value())); d = 180 - ((-d + m_RotateSpin->value()) - (180 + m_RotateSpin->value()));
else if(d > 180) else if (d > 180)
d = -180 + ((d - m_RotateSpin->value()) - (180 - m_RotateSpin->value())); d = -180 + ((d - m_RotateSpin->value()) - (180 - m_RotateSpin->value()));
m_Controller->RotateChanged(d); // d is ever between -180 and +180 m_Controller->RotateChanged(d); // d is ever between -180 and +180

4
Source/Fractorium/GLWidget.cpp
View File

@ -904,7 +904,7 @@ void GLEmberController<T>::MousePress(QMouseEvent* e)
m_CenterDownX = ember->m_CenterX;//Capture these because they will change when rotating and scaling. m_CenterDownX = ember->m_CenterX;//Capture these because they will change when rotating and scaling.
m_CenterDownY = ember->m_CenterY; m_CenterDownY = ember->m_CenterY;
if(GetAlt() && GetShift()) if (GetAlt() && GetShift())
{ {
m_PitchDown = ember->m_CamPitch * RAD_2_DEG_T; m_PitchDown = ember->m_CamPitch * RAD_2_DEG_T;
m_YawDown = ember->m_CamYaw * RAD_2_DEG_T; m_YawDown = ember->m_CamYaw * RAD_2_DEG_T;
@ -1070,7 +1070,7 @@ void GLEmberController<T>::MouseMove(QMouseEvent* e)
T yaw; T yaw;
auto rotate = ember->m_Rotate; auto rotate = ember->m_Rotate;
if((rotate <= 45 && rotate >= -45) || (rotate >= 135) || (rotate <= -135)) if ((rotate <= 45 && rotate >= -45) || (rotate >= 135) || (rotate <= -135))
{ {
pitch = m_PitchDown + (m_MouseWorldPos.y - m_MouseDownWorldPos.y) * 100; pitch = m_PitchDown + (m_MouseWorldPos.y - m_MouseDownWorldPos.y) * 100;
yaw = m_YawDown + (m_MouseWorldPos.x - m_MouseDownWorldPos.x) * 100; yaw = m_YawDown + (m_MouseWorldPos.x - m_MouseDownWorldPos.x) * 100;