drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/drape_frontend/navigator.cpp
View File

@@ -7,9 +7,9 @@
#include "platform/settings.hpp"
#include "geometry/angles.hpp"
#include "geometry/transformations.hpp"
#include "geometry/point2d.hpp"
#include "geometry/distance_on_sphere.hpp"
#include "geometry/point2d.hpp"
#include "geometry/transformations.hpp"
#include "base/logging.hpp"
@@ -164,20 +164,17 @@ void Navigator::Scale(m2::PointD const & pixelScaleCenter, double factor)
ApplyScale(pixelScaleCenter, factor, m_Screen);
}
bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
m2::PointD const & oldPt1, m2::PointD const & oldPt2,
bool skipMinScaleAndBordersCheck, bool doRotateScreen,
bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2, m2::PointD const & oldPt1,
m2::PointD const & oldPt2, bool skipMinScaleAndBordersCheck, bool doRotateScreen,
ScreenBase & screen)
{
m2::PointD const center3d = oldPt1;
m2::PointD const center2d = screen.P3dtoP(center3d);
m2::PointD const centerG = screen.PtoG(center2d);
m2::PointD const offset = center2d - center3d;
m2::PointD const offset = center2d - center3d;
math::Matrix<double, 3, 3> const newM =
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset,
doRotateScreen,
true);
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset, newPt1 + offset,
newPt2 + offset, doRotateScreen, true);
ScreenBase tmp = screen;
tmp.SetGtoPMatrix(newM);
@@ -186,10 +183,8 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
if (doRotateScreen)
{
math::Matrix<double, 3, 3> const tmpM =
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
newPt1 + offset, newPt2 + offset,
doRotateScreen,
false);
screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset, newPt1 + offset,
newPt2 + offset, doRotateScreen, false);
tmp.SetGtoPMatrix(tmpM);
}
else
@@ -265,9 +260,8 @@ void Navigator::DoScale(m2::PointD const & pt1, m2::PointD const & pt2)
m_Screen = PrevScreen;
if (!ScaleImpl(pt1, pt2, m_LastPt1, m_LastPt2,
pt1.Length(pt2) > m_LastPt1.Length(m_LastPt2),
m_IsRotatingDuringScale, m_Screen))
if (!ScaleImpl(pt1, pt2, m_LastPt1, m_LastPt2, pt1.Length(pt2) > m_LastPt1.Length(m_LastPt2), m_IsRotatingDuringScale,
m_Screen))
{
m_Screen = PrevScreen;
}
@@ -317,9 +311,8 @@ m2::AnyRectD ToRotated(Navigator const & navigator, m2::RectD const & rect)
double const dx = rect.SizeX();
double const dy = rect.SizeY();
return m2::AnyRectD(rect.Center(),
ang::Angle<double>(navigator.Screen().GetAngle()),
m2::RectD(-dx/2, -dy/2, dx/2, dy/2));
return m2::AnyRectD(rect.Center(), ang::Angle<double>(navigator.Screen().GetAngle()),
m2::RectD(-dx / 2, -dy / 2, dx / 2, dy / 2));
}
void CheckMinGlobalRect(m2::RectD & rect, uint32_t tileSize, double visualScale, double scale3d)
@@ -336,8 +329,7 @@ void CheckMinGlobalRect(m2::RectD & rect, double scale3d)
CheckMinGlobalRect(rect, p.GetTileSize(), p.GetVisualScale(), scale3d);
}
void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale,
uint32_t tileSize, double visualScale, double scale3d)
void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale, uint32_t tileSize, double visualScale, double scale3d)
{
CheckMinGlobalRect(rect, tileSize, visualScale, scale3d);
int scale = df::GetDrawTileScale(rect, tileSize, visualScale);