Skip to content

Commit af5b6c2

Browse files
committed
✨ Apply clang-format
1 parent 68da2e3 commit af5b6c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+85
-85
lines changed

plugins/csl-tools/src/DeletableMark.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class CSL_TOOLS_EXPORT DeletableMark : public Mark {
2828
DeletableMark(DeletableMark&& other) = delete;
2929

3030
DeletableMark& operator=(DeletableMark const& other) = delete;
31-
DeletableMark& operator=(DeletableMark&& other) = delete;
31+
DeletableMark& operator=(DeletableMark&& other) = delete;
3232

3333
~DeletableMark() override;
3434

plugins/csl-tools/src/Mark.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ void Mark::initData() {
306306
double height = surface ? surface->getHeight(lngLat) : 0.0;
307307
auto radii = object->getRadii();
308308
mPosition = cs::utils::convert::toCartesian(
309-
lngLat, radii, height * mSettings->mGraphics.pHeightScale.get());
309+
lngLat, radii, height * mSettings->mGraphics.pHeightScale.get());
310310
});
311311

312312
// connect the heightscale value to this object. Whenever the heightscale value changes

plugins/csl-tools/src/Mark.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class CSL_TOOLS_EXPORT Mark : public IVistaOpenGLDraw, public Tool {
5959
Mark(Mark&& other) = default;
6060

6161
Mark& operator=(Mark const& other) = delete;
62-
Mark& operator=(Mark&& other) = delete;
62+
Mark& operator=(Mark&& other) = delete;
6363

6464
~Mark() override;
6565

plugins/csl-tools/src/MultiPointTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class CSL_TOOLS_EXPORT MultiPointTool : public Tool {
5050
MultiPointTool(MultiPointTool&& other) = delete;
5151

5252
MultiPointTool& operator=(MultiPointTool const& other) = delete;
53-
MultiPointTool& operator=(MultiPointTool&& other) = delete;
53+
MultiPointTool& operator=(MultiPointTool&& other) = delete;
5454

5555
~MultiPointTool() override;
5656

plugins/csl-tools/src/Tool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CSL_TOOLS_EXPORT Tool {
4040
Tool(Tool const& other) = default;
4141
Tool(Tool&& other) noexcept = default;
4242

43-
Tool& operator=(Tool const& other) = default;
43+
Tool& operator=(Tool const& other) = default;
4444
Tool& operator=(Tool&& other) noexcept = default;
4545

4646
virtual ~Tool() = default;

plugins/csp-anchor-labels/src/AnchorLabel.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class AnchorLabel {
4646
AnchorLabel(AnchorLabel&& other) = delete;
4747

4848
AnchorLabel& operator=(AnchorLabel const& other) = delete;
49-
AnchorLabel& operator=(AnchorLabel&& other) = delete;
49+
AnchorLabel& operator=(AnchorLabel&& other) = delete;
5050

5151
void update();
5252

plugins/csp-lod-bodies/src/BaseTileData.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class BaseTileData {
2828
BaseTileData(BaseTileData&& other) = default;
2929

3030
BaseTileData& operator=(BaseTileData const& other) = delete;
31-
BaseTileData& operator=(BaseTileData&& other) = default;
31+
BaseTileData& operator=(BaseTileData&& other) = default;
3232

3333
/// Returns the enum value for the data type stored in this tile.
3434
virtual TileDataType getDataType() const = 0;

plugins/csp-lod-bodies/src/LodBody.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class LodBody : public cs::scene::CelestialSurface,
4747
LodBody(LodBody&& other) = delete;
4848

4949
LodBody& operator=(LodBody const& other) = delete;
50-
LodBody& operator=(LodBody&& other) = delete;
50+
LodBody& operator=(LodBody&& other) = delete;
5151

5252
~LodBody() override;
5353

plugins/csp-lod-bodies/src/MinMaxPyramid.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MinMaxPyramid {
2828
MinMaxPyramid(MinMaxPyramid&& other) = default;
2929

3030
MinMaxPyramid& operator=(MinMaxPyramid const& other) = default;
31-
MinMaxPyramid& operator=(MinMaxPyramid&& other) = default;
31+
MinMaxPyramid& operator=(MinMaxPyramid&& other) = default;
3232

3333
virtual ~MinMaxPyramid() = default;
3434

plugins/csp-lod-bodies/src/PlanetShader.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class PlanetShader : public TerrainShader {
4141
PlanetShader(PlanetShader&& other) = delete;
4242

4343
PlanetShader& operator=(PlanetShader const& other) = delete;
44-
PlanetShader& operator=(PlanetShader&& other) = delete;
44+
PlanetShader& operator=(PlanetShader&& other) = delete;
4545

4646
~PlanetShader() override;
4747

plugins/csp-lod-bodies/src/TerrainShader.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TerrainShader {
2525
TerrainShader(TerrainShader&& other) = delete;
2626

2727
TerrainShader& operator=(TerrainShader const& other) = delete;
28-
TerrainShader& operator=(TerrainShader&& other) = delete;
28+
TerrainShader& operator=(TerrainShader&& other) = delete;
2929

3030
virtual ~TerrainShader() = default;
3131

plugins/csp-lod-bodies/src/TileData.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class TileData : public BaseTileData {
2424
TileData(TileData&& other) = delete;
2525

2626
TileData& operator=(TileData const& other) = delete;
27-
TileData& operator=(TileData&& other) = delete;
27+
TileData& operator=(TileData&& other) = delete;
2828

2929
~TileData() override;
3030

plugins/csp-lod-bodies/src/TileNode.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class TileNode {
2525
TileNode(TileNode&& other) = default;
2626

2727
TileNode& operator=(TileNode const& other) = delete;
28-
TileNode& operator=(TileNode&& other) = default;
28+
TileNode& operator=(TileNode&& other) = default;
2929

3030
/// Returns the tile data assigned to this. Can be null.
3131
std::shared_ptr<BaseTileData> const& getTileData(TileDataType type) const;

plugins/csp-lod-bodies/src/TileRenderer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ void TileRenderer::renderTile(TileNode* node, UniformLocs const& locs) {
278278
// Convert tile corners to camera-relative coordinates in double precision.
279279
for (int i(0); i < 4; ++i) {
280280
corners.at(i) = cs::utils::convert::toCartesian(cornersLngLat.at(i), mParams->mRadii,
281-
averageHeight * static_cast<float>(mParams->mHeightScale));
281+
averageHeight * static_cast<float>(mParams->mHeightScale));
282282
cornersWorldSpace.at(i) = glm::fvec3(mMatM * glm::dvec4(corners.at(i), 1.0));
283283

284284
normals.at(i) = cs::utils::convert::lngLatToNormal(cornersLngLat.at(i));

plugins/csp-lod-bodies/src/TileRenderer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TileRenderer {
3737
TileRenderer(TileRenderer&& other) = delete;
3838

3939
TileRenderer& operator=(TileRenderer const& other) = delete;
40-
TileRenderer& operator=(TileRenderer&& other) = delete;
40+
TileRenderer& operator=(TileRenderer&& other) = delete;
4141

4242
TreeManager* getTreeManager() const;
4343

plugins/csp-lod-bodies/src/TileSource.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class TileSource {
2828
TileSource(TileSource const& other) = default;
2929
TileSource(TileSource&& other) noexcept = default;
3030

31-
TileSource& operator=(TileSource const& other) = default;
31+
TileSource& operator=(TileSource const& other) = default;
3232
TileSource& operator=(TileSource&& other) noexcept = default;
3333

3434
virtual ~TileSource() = default;

plugins/csp-lod-bodies/src/TileSourceWebMapService.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TileSourceWebMapService : public TileSource {
2727
TileSourceWebMapService(TileSourceWebMapService&& other) = delete;
2828

2929
TileSourceWebMapService& operator=(TileSourceWebMapService const& other) = delete;
30-
TileSourceWebMapService& operator=(TileSourceWebMapService&& other) = delete;
30+
TileSourceWebMapService& operator=(TileSourceWebMapService&& other) = delete;
3131

3232
~TileSourceWebMapService() override = default;
3333

plugins/csp-lod-bodies/src/TileTextureArray.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TileTextureArray {
3737
TileTextureArray(TileTextureArray&& other) = delete;
3838

3939
TileTextureArray& operator=(TileTextureArray const& other) = delete;
40-
TileTextureArray& operator=(TileTextureArray&& other) = delete;
40+
TileTextureArray& operator=(TileTextureArray&& other) = delete;
4141

4242
~TileTextureArray();
4343

plugins/csp-lod-bodies/src/TreeManager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class TreeManager {
4545
TreeManager(TreeManager&& other) = delete;
4646

4747
TreeManager& operator=(TreeManager const& other) = delete;
48-
TreeManager& operator=(TreeManager&& other) = delete;
48+
TreeManager& operator=(TreeManager&& other) = delete;
4949

5050
virtual ~TreeManager() = default;
5151

plugins/csp-lod-bodies/src/VistaPlanet.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class VistaPlanet : public cs::graphics::ShadowCaster {
5151
VistaPlanet(VistaPlanet&& other) = delete;
5252

5353
VistaPlanet& operator=(VistaPlanet const& other) = delete;
54-
VistaPlanet& operator=(VistaPlanet&& other) = delete;
54+
VistaPlanet& operator=(VistaPlanet&& other) = delete;
5555

5656
~VistaPlanet();
5757

plugins/csp-measurement-tools/src/DipStrikeTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class DipStrikeTool : public IVistaOpenGLDraw, public csl::tools::MultiPointTool
4848
DipStrikeTool(DipStrikeTool&& other) = delete;
4949

5050
DipStrikeTool& operator=(DipStrikeTool const& other) = delete;
51-
DipStrikeTool& operator=(DipStrikeTool&& other) = delete;
51+
DipStrikeTool& operator=(DipStrikeTool&& other) = delete;
5252

5353
~DipStrikeTool() override;
5454

plugins/csp-measurement-tools/src/EllipseTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class EllipseTool : public IVistaOpenGLDraw, public csl::tools::Tool {
2929
EllipseTool(EllipseTool&& other) = delete;
3030

3131
EllipseTool& operator=(EllipseTool const& other) = delete;
32-
EllipseTool& operator=(EllipseTool&& other) = delete;
32+
EllipseTool& operator=(EllipseTool&& other) = delete;
3333

3434
~EllipseTool() override;
3535

plugins/csp-measurement-tools/src/FlagTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class FlagTool : public csl::tools::Mark {
3636
FlagTool(FlagTool&& other) = delete;
3737

3838
FlagTool& operator=(FlagTool const& other) = delete;
39-
FlagTool& operator=(FlagTool&& other) = delete;
39+
FlagTool& operator=(FlagTool&& other) = delete;
4040

4141
~FlagTool() override;
4242

plugins/csp-measurement-tools/src/PathTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class PathTool : public IVistaOpenGLDraw, public csl::tools::MultiPointTool {
4242
PathTool(PathTool&& other) = delete;
4343

4444
PathTool& operator=(PathTool const& other) = delete;
45-
PathTool& operator=(PathTool&& other) = delete;
45+
PathTool& operator=(PathTool&& other) = delete;
4646

4747
~PathTool() override;
4848

plugins/csp-measurement-tools/src/PolygonTool.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class PolygonTool : public IVistaOpenGLDraw, public csl::tools::MultiPointTool {
4949
PolygonTool(PolygonTool&& other) = delete;
5050

5151
PolygonTool& operator=(PolygonTool const& other) = delete;
52-
PolygonTool& operator=(PolygonTool&& other) = delete;
52+
PolygonTool& operator=(PolygonTool&& other) = delete;
5353

5454
~PolygonTool() override;
5555

plugins/csp-measurement-tools/src/voronoi/BreakpointTree.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BreakpointTree {
2727
BreakpointTree(BreakpointTree&& other) = default;
2828

2929
BreakpointTree& operator=(BreakpointTree const& other) = default;
30-
BreakpointTree& operator=(BreakpointTree&& other) = default;
30+
BreakpointTree& operator=(BreakpointTree&& other) = default;
3131

3232
~BreakpointTree();
3333

plugins/csp-measurement-tools/src/voronoi/Vector2f.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ struct Vector2f {
2626
Vector2f(Vector2f&& other) = default;
2727

2828
Vector2f& operator=(Vector2f const& other) = default;
29-
Vector2f& operator=(Vector2f&& other) = default;
29+
Vector2f& operator=(Vector2f&& other) = default;
3030

3131
~Vector2f() = default;
3232

plugins/csp-minimap/src/Plugin.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ void Plugin::onAddBookmark(std::shared_ptr<const cs::scene::CelestialObject> con
195195
if (activeObject && activeObject->getCenterName() == bookmark.mLocation.value().mCenter) {
196196
auto radii = activeObject->getRadii();
197197
auto p = cs::utils::convert::cartesianToLngLat(
198-
bookmark.mLocation.value().mPosition.value(), radii);
198+
bookmark.mLocation.value().mPosition.value(), radii);
199199
p = cs::utils::convert::toDegrees(p);
200200
auto c = bookmark.mColor.value_or(glm::vec3(0.8F, 0.8F, 1.0F)) * 255.F;
201201
mGuiManager->getGui()->callJavascript("CosmoScout.minimap.addBookmark", bookmarkID,

plugins/csp-rings/src/Ring.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Ring : public cs::scene::CelestialObject, public IVistaOpenGLDraw {
3838
Ring(Ring&& other) = default;
3939

4040
Ring& operator=(Ring const& other) = delete;
41-
Ring& operator=(Ring&& other) = delete;
41+
Ring& operator=(Ring&& other) = delete;
4242

4343
~Ring() override;
4444

plugins/csp-satellites/src/Satellite.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Satellite {
3838
Satellite(Satellite&& other) = default;
3939

4040
Satellite& operator=(Satellite const& other) = delete;
41-
Satellite& operator=(Satellite&& other) = delete;
41+
Satellite& operator=(Satellite&& other) = delete;
4242

4343
~Satellite();
4444

plugins/csp-sharad/src/Sharad.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Sharad : public IVistaOpenGLDraw {
3434
Sharad(Sharad&& other) = delete;
3535

3636
Sharad& operator=(Sharad const& other) = delete;
37-
Sharad& operator=(Sharad&& other) = delete;
37+
Sharad& operator=(Sharad&& other) = delete;
3838

3939
~Sharad();
4040

plugins/csp-simple-bodies/src/SimpleBody.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class SimpleBody : public cs::scene::CelestialSurface,
4343
SimpleBody(SimpleBody&& other) = default;
4444

4545
SimpleBody& operator=(SimpleBody const& other) = delete;
46-
SimpleBody& operator=(SimpleBody&& other) = default;
46+
SimpleBody& operator=(SimpleBody&& other) = default;
4747

4848
~SimpleBody() override;
4949

plugins/csp-timings/gui/js/csp-timings.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class TimingsApi extends IApi {
275275
}
276276

277277
// Compute the number of required grid lines.
278-
let ticks = Math.floor(maxTime / interval);
278+
let ticks = Math.floor(maxTime / interval);
279279
const gridLines = document.createElement('template');
280280

281281
for (let i = 0; i <= ticks; i++) {

plugins/csp-trajectories/src/DeepSpaceDot.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class DeepSpaceDot : public IVistaOpenGLDraw {
6565
DeepSpaceDot(DeepSpaceDot&& other) = default;
6666

6767
DeepSpaceDot& operator=(DeepSpaceDot const& other) = delete;
68-
DeepSpaceDot& operator=(DeepSpaceDot&& other) = default;
68+
DeepSpaceDot& operator=(DeepSpaceDot&& other) = default;
6969

7070
~DeepSpaceDot() override;
7171

plugins/csp-trajectories/src/Trajectory.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Trajectory : public IVistaOpenGLDraw {
3838
Trajectory(Trajectory&& other) = delete;
3939

4040
Trajectory& operator=(Trajectory const& other) = delete;
41-
Trajectory& operator=(Trajectory&& other) = delete;
41+
Trajectory& operator=(Trajectory&& other) = delete;
4242

4343
~Trajectory() override;
4444

plugins/csp-vr-accessibility/src/FloorGrid.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class FloorGrid : public IVistaOpenGLDraw {
3939
FloorGrid(FloorGrid&& other) = default;
4040

4141
FloorGrid& operator=(FloorGrid const& other) = delete;
42-
FloorGrid& operator=(FloorGrid&& other) = delete;
42+
FloorGrid& operator=(FloorGrid&& other) = delete;
4343

4444
~FloorGrid();
4545

plugins/csp-vr-accessibility/src/FovVignette.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class FovVignette : public IVistaOpenGLDraw {
4141
FovVignette(FovVignette&& other) = default;
4242

4343
FovVignette& operator=(FovVignette const& other) = delete;
44-
FovVignette& operator=(FovVignette&& other) = delete;
44+
FovVignette& operator=(FovVignette&& other) = delete;
4545

4646
~FovVignette();
4747

plugins/csp-wms-overlays/gui/js/csp-wms-overlays.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626

2727
this._defaultBoundsLabel = document.getElementById("wmsOverlays-defaultBounds");
2828
this._defaultBoundsGoTo = document.querySelector(
29-
'[onclick="CosmoScout.callbacks.wmsOverlays.goToDefaultBounds()"]');
29+
'[onclick="CosmoScout.callbacks.wmsOverlays.goToDefaultBounds()"]');
3030
this._currentBoundsLabel = document.getElementById("wmsOverlays-currentBounds");
3131
this._currentBoundsGoTo = document.querySelector(
32-
'[onclick="CosmoScout.callbacks.wmsOverlays.goToCurrentBounds()"]');
32+
'[onclick="CosmoScout.callbacks.wmsOverlays.goToCurrentBounds()"]');
3333
this._currentBoundsUpdate =
3434
document.querySelector('[onclick="CosmoScout.callbacks.wmsOverlays.updateBounds()"]');
3535
this._currentBoundsReset =

plugins/csp-wms-overlays/src/Plugin.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ void Plugin::onLoad() {
542542
mWmsCreationThreads.at(settings.first).enqueue([this, settings, wmsUrl]() {
543543
try {
544544
WebMapService wms(wmsUrl, mPluginSettings->mUseCapabilityCache.get(),
545-
mPluginSettings->mCapabilityCache.get());
545+
mPluginSettings->mCapabilityCache.get());
546546
std::unique_lock<std::mutex> lock(mWmsInsertMutex);
547547
mWms[settings.first].push_back(std::move(wms));
548548
} catch (std::exception const& e) {
@@ -607,8 +607,8 @@ void Plugin::setWMSServer(
607607
std::shared_ptr<TextureOverlayRenderer> const& wmsOverlay, std::string const& name) {
608608
auto& settings = getBodySettings(wmsOverlay);
609609
auto const& server = std::find_if(mWms.at(wmsOverlay->getObjectName()).begin(),
610-
mWms.at(wmsOverlay->getObjectName()).end(),
611-
[&name](WebMapService const& wms) { return wms.getTitle() == name; });
610+
mWms.at(wmsOverlay->getObjectName()).end(),
611+
[&name](WebMapService const& wms) { return wms.getTitle() == name; });
612612

613613
if (server == mWms.at(wmsOverlay->getObjectName()).end()) {
614614
if (name != "None") {

plugins/csp-wms-overlays/src/WebMapService.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ std::vector<WebMapLayer> const& WebMapService::getLayers() const {
7070
std::optional<WebMapLayer> WebMapService::getLayer(std::string const& name) const {
7171
std::vector<WebMapLayer> layers = getLayers();
7272
auto layer = std::find_if(
73-
layers.begin(), layers.end(), [name](WebMapLayer const& l) { return l.getName() == name; });
73+
layers.begin(), layers.end(), [name](WebMapLayer const& l) { return l.getName() == name; });
7474
if (layer == layers.end()) {
7575
return {};
7676
}

resources/gui/js/apis/gui.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ class GuiApi extends IApi {
174174
* @see {initInputs}
175175
*/
176176
initDraggableWindows() {
177-
const windows = document.querySelectorAll(".draggable-window");
178-
var currentZIndex = 100;
177+
const windows = document.querySelectorAll(".draggable-window");
178+
var currentZIndex = 100;
179179

180180
windows.forEach((w) => {
181181
// Center initially.

0 commit comments

Comments
 (0)