From 0f946aca3b2fcaf45e15ee6181ed315f47268bc8 Mon Sep 17 00:00:00 2001 From: Marco Hutter Date: Sun, 19 Sep 2021 15:22:58 +0200 Subject: [PATCH] Include style fixes for CesiumGeospatial --- .../include/CesiumGeospatial/BoundingRegion.h | 5 +++-- .../include/CesiumGeospatial/Cartographic.h | 3 ++- .../include/CesiumGeospatial/CartographicPolygon.h | 2 ++ CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h | 4 +++- .../include/CesiumGeospatial/EllipsoidTangentPlane.h | 4 +++- .../include/CesiumGeospatial/GeographicProjection.h | 4 +++- .../include/CesiumGeospatial/GlobeRectangle.h | 4 +++- .../include/CesiumGeospatial/Projection.h | 1 + .../include/CesiumGeospatial/Transforms.h | 1 + .../include/CesiumGeospatial/WebMercatorProjection.h | 1 + CesiumGeospatial/src/BoundingRegion.cpp | 11 +++++++---- CesiumGeospatial/src/CartographicPolygon.cpp | 4 +++- CesiumGeospatial/src/Ellipsoid.cpp | 4 +++- CesiumGeospatial/src/EllipsoidTangentPlane.cpp | 8 +++++--- CesiumGeospatial/src/GeographicProjection.cpp | 3 ++- CesiumGeospatial/src/GlobeRectangle.cpp | 3 ++- CesiumGeospatial/src/Projection.cpp | 1 + CesiumGeospatial/src/Transforms.cpp | 4 +++- CesiumGeospatial/src/WebMercatorProjection.cpp | 5 ++++- 19 files changed, 52 insertions(+), 20 deletions(-) diff --git a/CesiumGeospatial/include/CesiumGeospatial/BoundingRegion.h b/CesiumGeospatial/include/CesiumGeospatial/BoundingRegion.h index c689ba71c..847cebc9f 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/BoundingRegion.h +++ b/CesiumGeospatial/include/CesiumGeospatial/BoundingRegion.h @@ -1,11 +1,12 @@ #pragma once -#include "CesiumGeometry/CullingResult.h" -#include "CesiumGeometry/OrientedBoundingBox.h" #include "CesiumGeospatial/Ellipsoid.h" #include "CesiumGeospatial/GlobeRectangle.h" #include "CesiumGeospatial/Library.h" +#include +#include + namespace CesiumGeometry { class Plane; } diff --git a/CesiumGeospatial/include/CesiumGeospatial/Cartographic.h b/CesiumGeospatial/include/CesiumGeospatial/Cartographic.h index b7b70492f..9959de639 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/Cartographic.h +++ b/CesiumGeospatial/include/CesiumGeospatial/Cartographic.h @@ -1,7 +1,8 @@ #pragma once #include "CesiumGeospatial/Library.h" -#include "CesiumUtility/Math.h" + +#include namespace CesiumGeospatial { diff --git a/CesiumGeospatial/include/CesiumGeospatial/CartographicPolygon.h b/CesiumGeospatial/include/CesiumGeospatial/CartographicPolygon.h index 525ef5463..45806caa1 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/CartographicPolygon.h +++ b/CesiumGeospatial/include/CesiumGeospatial/CartographicPolygon.h @@ -2,7 +2,9 @@ #include "CesiumGeospatial/GlobeRectangle.h" #include "CesiumGeospatial/Library.h" + #include + #include #include #include diff --git a/CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h b/CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h index 841cbceb9..f6412adad 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h +++ b/CesiumGeospatial/include/CesiumGeospatial/Ellipsoid.h @@ -2,7 +2,9 @@ #include "CesiumGeospatial/Cartographic.h" #include "CesiumGeospatial/Library.h" -#include "CesiumUtility/Math.h" + +#include + #include #include diff --git a/CesiumGeospatial/include/CesiumGeospatial/EllipsoidTangentPlane.h b/CesiumGeospatial/include/CesiumGeospatial/EllipsoidTangentPlane.h index 2a5129010..6842676c3 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/EllipsoidTangentPlane.h +++ b/CesiumGeospatial/include/CesiumGeospatial/EllipsoidTangentPlane.h @@ -1,8 +1,10 @@ #pragma once -#include "CesiumGeometry/Plane.h" #include "CesiumGeospatial/Ellipsoid.h" #include "CesiumGeospatial/Library.h" + +#include + #include #include #include diff --git a/CesiumGeospatial/include/CesiumGeospatial/GeographicProjection.h b/CesiumGeospatial/include/CesiumGeospatial/GeographicProjection.h index 49c269c36..d84982e17 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/GeographicProjection.h +++ b/CesiumGeospatial/include/CesiumGeospatial/GeographicProjection.h @@ -3,7 +3,9 @@ #include "CesiumGeospatial/Ellipsoid.h" #include "CesiumGeospatial/GlobeRectangle.h" #include "CesiumGeospatial/Library.h" -#include "CesiumUtility/Math.h" + +#include + #include #include diff --git a/CesiumGeospatial/include/CesiumGeospatial/GlobeRectangle.h b/CesiumGeospatial/include/CesiumGeospatial/GlobeRectangle.h index b117d8dd1..61b4764e8 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/GlobeRectangle.h +++ b/CesiumGeospatial/include/CesiumGeospatial/GlobeRectangle.h @@ -3,7 +3,9 @@ #include "CesiumGeometry/Rectangle.h" #include "CesiumGeospatial/Cartographic.h" #include "CesiumGeospatial/Library.h" -#include "CesiumUtility/Math.h" + +#include + #include namespace CesiumGeospatial { diff --git a/CesiumGeospatial/include/CesiumGeospatial/Projection.h b/CesiumGeospatial/include/CesiumGeospatial/Projection.h index 0bb969d75..ff10a1a73 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/Projection.h +++ b/CesiumGeospatial/include/CesiumGeospatial/Projection.h @@ -2,6 +2,7 @@ #include "CesiumGeospatial/GeographicProjection.h" #include "CesiumGeospatial/WebMercatorProjection.h" + #include namespace CesiumGeospatial { diff --git a/CesiumGeospatial/include/CesiumGeospatial/Transforms.h b/CesiumGeospatial/include/CesiumGeospatial/Transforms.h index 268a0b077..4e10775ac 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/Transforms.h +++ b/CesiumGeospatial/include/CesiumGeospatial/Transforms.h @@ -2,6 +2,7 @@ #include "CesiumGeospatial/Ellipsoid.h" #include "CesiumGeospatial/Library.h" + #include #include diff --git a/CesiumGeospatial/include/CesiumGeospatial/WebMercatorProjection.h b/CesiumGeospatial/include/CesiumGeospatial/WebMercatorProjection.h index 885a56535..b08bd31b2 100644 --- a/CesiumGeospatial/include/CesiumGeospatial/WebMercatorProjection.h +++ b/CesiumGeospatial/include/CesiumGeospatial/WebMercatorProjection.h @@ -3,6 +3,7 @@ #include "CesiumGeospatial/Ellipsoid.h" #include "CesiumGeospatial/GlobeRectangle.h" #include "CesiumGeospatial/Library.h" + #include #include diff --git a/CesiumGeospatial/src/BoundingRegion.cpp b/CesiumGeospatial/src/BoundingRegion.cpp index 575136575..0eb7222c4 100644 --- a/CesiumGeospatial/src/BoundingRegion.cpp +++ b/CesiumGeospatial/src/BoundingRegion.cpp @@ -1,9 +1,12 @@ #include "CesiumGeospatial/BoundingRegion.h" -#include "CesiumGeometry/IntersectionTests.h" -#include "CesiumGeometry/Plane.h" -#include "CesiumGeometry/Ray.h" + #include "CesiumGeospatial/EllipsoidTangentPlane.h" -#include "CesiumUtility/Math.h" + +#include +#include +#include +#include + #include using namespace CesiumUtility; diff --git a/CesiumGeospatial/src/CartographicPolygon.cpp b/CesiumGeospatial/src/CartographicPolygon.cpp index 39f6b053a..5a27a6b30 100644 --- a/CesiumGeospatial/src/CartographicPolygon.cpp +++ b/CesiumGeospatial/src/CartographicPolygon.cpp @@ -1,8 +1,10 @@ #include "CesiumGeospatial/CartographicPolygon.h" -#include + #include +#include + namespace CesiumGeospatial { static std::vector diff --git a/CesiumGeospatial/src/Ellipsoid.cpp b/CesiumGeospatial/src/Ellipsoid.cpp index cae7e0ea5..322f17948 100644 --- a/CesiumGeospatial/src/Ellipsoid.cpp +++ b/CesiumGeospatial/src/Ellipsoid.cpp @@ -1,5 +1,7 @@ #include "CesiumGeospatial/Ellipsoid.h" -#include "CesiumUtility/Math.h" + +#include + #include #include diff --git a/CesiumGeospatial/src/EllipsoidTangentPlane.cpp b/CesiumGeospatial/src/EllipsoidTangentPlane.cpp index 6947babee..79721fc56 100644 --- a/CesiumGeospatial/src/EllipsoidTangentPlane.cpp +++ b/CesiumGeospatial/src/EllipsoidTangentPlane.cpp @@ -1,9 +1,11 @@ #include "CesiumGeospatial/EllipsoidTangentPlane.h" -#include "CesiumGeometry/IntersectionTests.h" -#include "CesiumGeometry/Plane.h" -#include "CesiumGeometry/Ray.h" + #include "CesiumGeospatial/Transforms.h" +#include +#include +#include + #include using namespace CesiumGeometry; diff --git a/CesiumGeospatial/src/GeographicProjection.cpp b/CesiumGeospatial/src/GeographicProjection.cpp index ae2c1a16f..ef7d1e681 100644 --- a/CesiumGeospatial/src/GeographicProjection.cpp +++ b/CesiumGeospatial/src/GeographicProjection.cpp @@ -1,6 +1,7 @@ #include "CesiumGeospatial/GeographicProjection.h" #include "CesiumGeospatial/Cartographic.h" -#include "CesiumUtility/Math.h" + +#include namespace CesiumGeospatial { diff --git a/CesiumGeospatial/src/GlobeRectangle.cpp b/CesiumGeospatial/src/GlobeRectangle.cpp index 6505ab022..0a49a91a4 100644 --- a/CesiumGeospatial/src/GlobeRectangle.cpp +++ b/CesiumGeospatial/src/GlobeRectangle.cpp @@ -1,5 +1,6 @@ #include "CesiumGeospatial/GlobeRectangle.h" -#include "CesiumUtility/Math.h" + +#include using namespace CesiumUtility; diff --git a/CesiumGeospatial/src/Projection.cpp b/CesiumGeospatial/src/Projection.cpp index e2186b99a..1c564af07 100644 --- a/CesiumGeospatial/src/Projection.cpp +++ b/CesiumGeospatial/src/Projection.cpp @@ -1,4 +1,5 @@ #include "CesiumGeospatial/Projection.h" + #include namespace CesiumGeospatial { diff --git a/CesiumGeospatial/src/Transforms.cpp b/CesiumGeospatial/src/Transforms.cpp index 379f3fe5d..ac36092e5 100644 --- a/CesiumGeospatial/src/Transforms.cpp +++ b/CesiumGeospatial/src/Transforms.cpp @@ -1,5 +1,7 @@ #include "CesiumGeospatial/Transforms.h" -#include "CesiumUtility/Math.h" + +#include + #include using namespace CesiumUtility; diff --git a/CesiumGeospatial/src/WebMercatorProjection.cpp b/CesiumGeospatial/src/WebMercatorProjection.cpp index ef299240d..a6fce7fba 100644 --- a/CesiumGeospatial/src/WebMercatorProjection.cpp +++ b/CesiumGeospatial/src/WebMercatorProjection.cpp @@ -1,6 +1,9 @@ #include "CesiumGeospatial/WebMercatorProjection.h" + #include "CesiumGeospatial/Cartographic.h" -#include "CesiumUtility/Math.h" + +#include + #include #include